--- a/allmakefiles.sh
+++ b/allmakefiles.sh
@@ -56,17 +56,17 @@ fi
 # Common makefiles used by everyone
 #
 add_makefiles "
 Makefile
 config/autoconf.mk
 "
 
 if [ "$MOZ_LDAP_XPCOM" ]; then
-  . "${srcdir}/directory/makefiles.sh"
+  . "${srcdir}/ldap/makefiles.sh"
 fi
 
 if [ "$MOZ_COMPOSER" ]; then
   . "${srcdir}/editor/ui/makefiles.sh"
 fi
 
 if [ "$MOZ_MAIL_NEWS" ]; then
   . "${srcdir}/mailnews/makefiles.sh"

--- a/bridge/bridge.mk
+++ b/bridge/bridge.mk
@@ -34,18 +34,18 @@
 #
 # ***** END LICENSE BLOCK *****
 
 INCLUDED_BRIDGE_MK = 1
 
 APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/mozilla/xpfe/components/autocomplete
 
 #ifdef MOZ_LDAP_XPCOM
-APP_LIBXUL_STATICDIRS += $(DEPTH)$(SUBDIR)/directory/c-sdk
-APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/directory/xpcom
+APP_LIBXUL_STATICDIRS += $(DEPTH)$(SUBDIR)/ldap/sdks/c-sdk
+APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/ldap/xpcom
 #endif
 
 ifdef MOZ_MAIL_NEWS
 APP_LIBXUL_DIRS += \
   $(DEPTH)$(SUBDIR)/mailnews/base \
   $(DEPTH)$(SUBDIR)/mailnews/mime/public \
   $(DEPTH)$(SUBDIR)/mailnews \
   $(NULL)

--- a/client.py
+++ b/client.py
@@ -1,24 +1,24 @@
 #!/usr/bin/env python
 
 # Warning, this file must be compatible with Python 2.4, for our
 # various tools, such as http://mxr.mozilla.org/ see-also: Bug 601207
 
 # Repo Defaults
 # 'REV' controls the default rev for All the various repo's
 # Define x_REV to override. Where x can be one of:
-#  "COMM", "MOZILLA", "CHATZILLA", "INSPECTOR" or "VENKMAN"
+#  "COMM", "MOZILLA", "CHATZILLA", "INSPECTOR", "VENKMAN", "LDAPSDKS"
 DEFAULTS = {
   # Global Default Revision
   'REV': "default",
 
-  # LDAP
-  'LDAPCSDK_CO_TAG': 'LDAPCSDK_6_0_6D_MOZILLA_RTM',
-  'LDAPCSDK_DIRS': ('directory/c-sdk',),
+  # LDAPSDKS
+  'LDAPSDKS_REPO': 'http://hg.mozilla.org/projects/ldap-sdks/',
+  'LDAPSDKS_REV': 'LDAPCSDK_6_0_6D_MOZILLA_RTM',
 
   # URL of the default hg repository to clone for ChatZilla.
   'CHATZILLA_REPO': 'http://hg.mozilla.org/chatzilla/',
 
   # URL of the default hg repository to clone for DOM Inspector.
   'INSPECTOR_REPO': 'http://hg.mozilla.org/dom-inspector/',
 
   # URL of the default hg repository to clone for Venkman.
@@ -304,33 +304,16 @@ def do_hg_pull(dir, repository, hg, rev)
         cmd.append('-v')
     # Explicitly never retry 'hg update': otherwise any merge failures are ignored.
     # This command is local: a failure can't be caused by a network error.
     check_call_noisy(cmd, retryMax=0)
 
     check_call([hg, 'parent', '-R', fulldir,
                 '--template=Updated to revision {node}.\n'])
 
-def do_cvs_checkout(modules, tag, cvsroot, cvs, checkoutdir):
-    """Check out a CVS directory into the checkoutdir subdirectory.
-    modules is a list of directories to check out, e.g. ['extensions/irc']
-    """
-    for module in modules:
-        (parent, leaf) = os.path.split(module)
-        print "CVS checkout begin: " + datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S UTC")
-        revopt = ((tag == 'HEAD') and ['-A']) or ['-r', tag]
-        # Explicitly never retry 'cvs checkout': otherwise any merge failures are ignored.
-        # No way to tell whether a failure is caused by a network error or a local conflict: better be safe.
-        check_call_noisy([cvs, '-d', cvsroot, '-q',
-                          'checkout', '-P'] + revopt + ['-d', leaf,
-                          'mozilla/%s' % module],
-                         retryMax=0,
-                         cwd=os.path.join(topsrcdir, checkoutdir, parent))
-        print "CVS checkout end: " + datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S UTC")
-
 def check_retries_option(option, opt_str, value, parser):
   if value < 0:
     raise OptionValueError("%s option value needs to be positive (not '%d')" % (opt_str, value))
   setattr(parser.values, option.dest, value)
 
 def do_apply_patch(hg, patch, repo):
     check_call_noisy([hg, 
         'import', 
@@ -344,16 +327,17 @@ def do_apply_patch(hg, patch, repo):
 
 import glob
 def do_apply_patches(topsrcdir, hg):
     prefix_map = {
         'mozilla': 'mozilla',
         'chatzilla': os.path.join('mozilla', 'extensions', 'irc'),
         'inspector': os.path.join('mozilla', 'extensions', 'inspector'),
         'venkman':   os.path.join('mozilla', 'extensions', 'venkman'),
+        'ldap':      os.path.join('ldap', 'sdks'),
     }
 
     for prefix in prefix_map.keys():
         prefix_dir = prefix_map.get(prefix)
         files = glob.glob("%s*.patch" % prefix)
         files.sort()
         for file in files:
             patch = os.path.join(topsrcdir, file)
@@ -386,19 +370,25 @@ o.add_option("--inspector-repo", dest="i
              help="URL of DOM Inspector repository to pull from (default: use hg default in mozilla/extensions/inspector/.hg/hgrc; or if that file doesn't exist, use \"" + DEFAULTS['INSPECTOR_REPO'] + "\".)")
 o.add_option("--skip-inspector", dest="skip_inspector",
              action="store_true", default=False,
              help="Skip pulling the DOM Inspector repository.")
 o.add_option("--inspector-rev", dest="inspector_rev",
              default=None,
              help="Revision of DOM Inspector repository to update to. Default: \"" + get_DEFAULT_tag('INSPECTOR_REV') + "\"")
 
+o.add_option("--ldap-repo", dest="ldap_repo",
+             default=None,
+             help="URL of LDAP repository to pull from (default: use hg default in ldap/sdks/.hg/hgrc; or if that file doesn't exist use \"" + DEFAULTS['LDAPSDKS_REPO'] + "\".)")
 o.add_option("--skip-ldap", dest="skip_ldap",
              action="store_true", default=False,
-             help="Skip pulling LDAP from the Mozilla CVS repository.")
+             help="Skip pulling the LDAP repository.")
+o.add_option("--ldap-rev", dest="ldap_rev",
+             default=None,
+             help="Revision of LDAP repository to update to. Default: \"" + get_DEFAULT_tag('LDAPSDKS_REV') + "\"")
 
 o.add_option("--chatzilla-repo", dest = "chatzilla_repo",
              default = None,
              help = "URL of ChatZilla repository to pull from (default: use hg default in mozilla/extensions/irc/.hg/hgrc; or if that file doesn't exist, use \"" + DEFAULTS['CHATZILLA_REPO'] + "\".)")
 o.add_option("--skip-chatzilla", dest="skip_chatzilla",
              action="store_true", default=False,
              help="Skip pulling the ChatZilla repository.")
 o.add_option("--chatzilla-rev", dest = "chatzilla_rev",
@@ -420,22 +410,16 @@ o.add_option("--hg", dest="hg", default=
 o.add_option("-v", "--verbose", dest="verbose",
              action="store_true", default=False,
              help="Enable verbose output on hg updates")
 o.add_option("--hg-options", dest="hgopts",
              help="Pass arbitrary options to hg commands (i.e. --debug, --time)")
 o.add_option("--hg-clone-options", dest="hgcloneopts",
              help="Pass arbitrary options to hg clone commands (i.e. --uncompressed)")
 
-o.add_option("--cvs", dest="cvs", default=os.environ.get('CVS', 'cvs'),
-             help="The location of the cvs binary")
-o.add_option("--cvsroot", dest="cvsroot",
-             default=os.environ.get('CVSROOT', ':pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot'),
-             help="The CVSROOT (default: :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot")
-
 o.add_option("--retries", dest="retries", type="int", metavar="NUM",
              default=1, help="Number of times to retry a failed command before giving up. (default: 1)",
              action="callback", callback=check_retries_option)
 
 o.add_option("-r", "--rev", dest = "default_rev",
              default = None,
              help = "Revision of all repositories to update to, unless otherwise specified.")
 
@@ -518,26 +502,41 @@ def fixup_venkman_repo_options(options):
     backup_cvs_extension('Venkman', 'venkman', extensionPath)
 
     if options.venkman_repo is None and not os.path.exists(extensionPath):
         options.venkman_repo = DEFAULTS['VENKMAN_REPO']
 
     if options.venkman_rev is None:
         options.venkman_rev = get_DEFAULT_tag("VENKMAN_REV")
 
+def fixup_ldap_repo_options(options):
+    """Handle special case: initial checkout of LDAP.
+
+    See fixup_comm_repo_options().
+    """
+
+    # No cvs backup needed as LDAP directory name changed when it moved to hg
+    if options.ldap_repo is None and \
+            not os.path.exists(os.path.join(topsrcdir, 'ldap', 'sdks')):
+        options.ldap_repo = DEFAULTS['LDAPSDKS_REPO']
+
+    if options.ldap_rev is None:
+        options.ldap_rev = get_DEFAULT_tag("LDAPSDKS_REV")
+
 try:
     (options, (action,)) = o.parse_args()
 except ValueError:
     o.print_help()
     sys.exit(2)
 
 if options.default_rev:
   # We now wish to override all the DEFAULTS.
   DEFAULTS['REV'] = options.default_rev
-  for index in ['CHATZILLA', 'INSPECTOR', 'VENKMAN', 'COMM', 'MOZILLA']:
+  for index in ['CHATZILLA', 'INSPECTOR', 'VENKMAN', 'COMM', 'MOZILLA',
+                'LDAPSDKS']:
     index += "_REV"
     # Clear the rest from file-defaults
     if index in DEFAULTS:
       del DEFAULTS[index]
 
 if action in ('checkout', 'co'):
     # Update Comm repository configuration.
     repo_config()
@@ -562,17 +561,18 @@ if action in ('checkout', 'co'):
         fixup_chatzilla_repo_options(options)
         do_hg_pull(os.path.join('mozilla', 'extensions', 'irc'), options.chatzilla_repo, options.hg, options.chatzilla_rev)
 
     if not options.skip_inspector:
         fixup_inspector_repo_options(options)
         do_hg_pull(os.path.join('mozilla', 'extensions', 'inspector'), options.inspector_repo, options.hg, options.inspector_rev)
 
     if not options.skip_ldap:
-        do_cvs_checkout(DEFAULTS['LDAPCSDK_DIRS'], DEFAULTS['LDAPCSDK_CO_TAG'], options.cvsroot, options.cvs, '')
+        fixup_ldap_repo_options(options)
+        do_hg_pull(os.path.join('ldap', 'sdks'), options.ldap_repo, options.hg, options.ldap_rev)
 
     if not options.skip_venkman:
         fixup_venkman_repo_options(options)
         do_hg_pull(os.path.join('mozilla', 'extensions', 'venkman'), options.venkman_repo, options.hg, options.venkman_rev)
   
     if options.apply_patches:
         do_apply_patches(topsrcdir, options.hg)
 

--- a/configure.in
+++ b/configure.in
@@ -7276,26 +7276,29 @@ AC_OUTPUT_SUBDIRS(mozilla)
 ac_configure_args="$_SUBDIR_CONFIG_ARGS"
 MOZ_BUILD_APP="$MOZ_BUILD_APP_CACHED"
 
 # if we're building the LDAP XPCOM component, we need to build 
 # the c-sdk first.  
 if test -n "$COMPILE_ENVIRONMENT" -a -n "$MOZ_LDAP_XPCOM"; then
     # these subdirs may not yet have been created in the build tree.
     # don't use the "-p" switch to mkdir, since not all platforms have it
-    if test ! -d "directory/c-sdk/ldap"; then
-        if test ! -d "directory/c-sdk"; then
-            if test ! -d "directory"; then
-                mkdir "directory"
+    if test ! -d "ldap/sdks/c-sdk/ldap"; then
+        if test ! -d "ldap/sdks/c-sdk"; then
+            if test ! -d "ldap/sdks"; then
+                if test ! -d "ldap"; then
+                    mkdir "ldap"
+                fi
+                mkdir "ldap/sdks"
             fi
-            mkdir "directory/c-sdk"
+            mkdir "ldap/sdks/c-sdk"
         fi
-        mkdir "directory/c-sdk/ldap"
+        mkdir "ldap/sdks/c-sdk/ldap"
     fi
 
     ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/mozilla/dist --with-dist-prefix=$MOZ_BUILD_ROOT/mozilla/dist --without-nss --with-mozilla"
     if test -n "$HAVE_64BIT_OS"; then
         dnl A 64-bit OS was (auto-)detected: (explicitly) enable 64-bit support.
         ac_configure_args="$ac_configure_args --enable-64bit"
     fi
-    AC_OUTPUT_SUBDIRS(directory/c-sdk)
+    AC_OUTPUT_SUBDIRS(ldap/sdks/c-sdk)
     ac_configure_args="$_SUBDIR_CONFIG_ARGS"
 fi # COMPILE_ENVIRONMENT && MOZ_LDAP_XPCOM

rename from directory/makefiles.sh
rename to ldap/makefiles.sh
--- a/directory/makefiles.sh
+++ b/ldap/makefiles.sh
@@ -32,13 +32,13 @@
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
 add_makefiles "
-directory/xpcom/Makefile
-directory/xpcom/base/Makefile
-directory/xpcom/base/public/Makefile
-directory/xpcom/base/src/Makefile
+ldap/xpcom/Makefile
+ldap/xpcom/base/Makefile
+ldap/xpcom/base/public/Makefile
+ldap/xpcom/base/src/Makefile
 "

rename from directory/xpcom/Makefile.in
rename to ldap/xpcom/Makefile.in

rename from directory/xpcom/README.txt
rename to ldap/xpcom/README.txt

rename from directory/xpcom/TODO.txt
rename to ldap/xpcom/TODO.txt

rename from directory/xpcom/base/Makefile.in
rename to ldap/xpcom/base/Makefile.in

rename from directory/xpcom/base/public/Makefile.in
rename to ldap/xpcom/base/public/Makefile.in

rename from directory/xpcom/base/public/nsILDAPBERElement.idl
rename to ldap/xpcom/base/public/nsILDAPBERElement.idl

rename from directory/xpcom/base/public/nsILDAPBERValue.idl
rename to ldap/xpcom/base/public/nsILDAPBERValue.idl

rename from directory/xpcom/base/public/nsILDAPConnection.idl
rename to ldap/xpcom/base/public/nsILDAPConnection.idl

rename from directory/xpcom/base/public/nsILDAPControl.idl
rename to ldap/xpcom/base/public/nsILDAPControl.idl

rename from directory/xpcom/base/public/nsILDAPErrors.idl
rename to ldap/xpcom/base/public/nsILDAPErrors.idl

rename from directory/xpcom/base/public/nsILDAPMessage.idl
rename to ldap/xpcom/base/public/nsILDAPMessage.idl

rename from directory/xpcom/base/public/nsILDAPMessageListener.idl
rename to ldap/xpcom/base/public/nsILDAPMessageListener.idl

rename from directory/xpcom/base/public/nsILDAPModification.idl
rename to ldap/xpcom/base/public/nsILDAPModification.idl

rename from directory/xpcom/base/public/nsILDAPOperation.idl
rename to ldap/xpcom/base/public/nsILDAPOperation.idl

rename from directory/xpcom/base/public/nsILDAPServer.idl
rename to ldap/xpcom/base/public/nsILDAPServer.idl

rename from directory/xpcom/base/public/nsILDAPService.idl
rename to ldap/xpcom/base/public/nsILDAPService.idl

rename from directory/xpcom/base/public/nsILDAPSyncQuery.idl
rename to ldap/xpcom/base/public/nsILDAPSyncQuery.idl

rename from directory/xpcom/base/public/nsILDAPURL.idl
rename to ldap/xpcom/base/public/nsILDAPURL.idl

rename from directory/xpcom/base/src/Makefile.in
rename to ldap/xpcom/base/src/Makefile.in

rename from directory/xpcom/base/src/ldapComponents.manifest
rename to ldap/xpcom/base/src/ldapComponents.manifest

rename from directory/xpcom/base/src/nsLDAPBERElement.cpp
rename to ldap/xpcom/base/src/nsLDAPBERElement.cpp

rename from directory/xpcom/base/src/nsLDAPBERElement.h
rename to ldap/xpcom/base/src/nsLDAPBERElement.h

rename from directory/xpcom/base/src/nsLDAPBERValue.cpp
rename to ldap/xpcom/base/src/nsLDAPBERValue.cpp

rename from directory/xpcom/base/src/nsLDAPBERValue.h
rename to ldap/xpcom/base/src/nsLDAPBERValue.h

rename from directory/xpcom/base/src/nsLDAPChannel.cpp
rename to ldap/xpcom/base/src/nsLDAPChannel.cpp

rename from directory/xpcom/base/src/nsLDAPChannel.h
rename to ldap/xpcom/base/src/nsLDAPChannel.h

rename from directory/xpcom/base/src/nsLDAPConnection.cpp
rename to ldap/xpcom/base/src/nsLDAPConnection.cpp

rename from directory/xpcom/base/src/nsLDAPConnection.h
rename to ldap/xpcom/base/src/nsLDAPConnection.h

rename from directory/xpcom/base/src/nsLDAPControl.cpp
rename to ldap/xpcom/base/src/nsLDAPControl.cpp

rename from directory/xpcom/base/src/nsLDAPControl.h
rename to ldap/xpcom/base/src/nsLDAPControl.h

rename from directory/xpcom/base/src/nsLDAPInternal.h
rename to ldap/xpcom/base/src/nsLDAPInternal.h

rename from directory/xpcom/base/src/nsLDAPMessage.cpp
rename to ldap/xpcom/base/src/nsLDAPMessage.cpp

rename from directory/xpcom/base/src/nsLDAPMessage.h
rename to ldap/xpcom/base/src/nsLDAPMessage.h

rename from directory/xpcom/base/src/nsLDAPModification.cpp
rename to ldap/xpcom/base/src/nsLDAPModification.cpp

rename from directory/xpcom/base/src/nsLDAPModification.h
rename to ldap/xpcom/base/src/nsLDAPModification.h

rename from directory/xpcom/base/src/nsLDAPOperation.cpp
rename to ldap/xpcom/base/src/nsLDAPOperation.cpp

rename from directory/xpcom/base/src/nsLDAPOperation.h
rename to ldap/xpcom/base/src/nsLDAPOperation.h

rename from directory/xpcom/base/src/nsLDAPProtocolHandler.js
rename to ldap/xpcom/base/src/nsLDAPProtocolHandler.js

rename from directory/xpcom/base/src/nsLDAPProtocolModule.cpp
rename to ldap/xpcom/base/src/nsLDAPProtocolModule.cpp

rename from directory/xpcom/base/src/nsLDAPSecurityGlue.cpp
rename to ldap/xpcom/base/src/nsLDAPSecurityGlue.cpp

rename from directory/xpcom/base/src/nsLDAPServer.cpp
rename to ldap/xpcom/base/src/nsLDAPServer.cpp

rename from directory/xpcom/base/src/nsLDAPServer.h
rename to ldap/xpcom/base/src/nsLDAPServer.h

rename from directory/xpcom/base/src/nsLDAPService.cpp
rename to ldap/xpcom/base/src/nsLDAPService.cpp

rename from directory/xpcom/base/src/nsLDAPService.h
rename to ldap/xpcom/base/src/nsLDAPService.h

rename from directory/xpcom/base/src/nsLDAPSyncQuery.cpp
rename to ldap/xpcom/base/src/nsLDAPSyncQuery.cpp

rename from directory/xpcom/base/src/nsLDAPSyncQuery.h
rename to ldap/xpcom/base/src/nsLDAPSyncQuery.h

rename from directory/xpcom/base/src/nsLDAPURL.cpp
rename to ldap/xpcom/base/src/nsLDAPURL.cpp

rename from directory/xpcom/base/src/nsLDAPURL.h
rename to ldap/xpcom/base/src/nsLDAPURL.h

rename from directory/xpcom/datasource/Makefile.in
rename to ldap/xpcom/datasource/Makefile.in

rename from directory/xpcom/datasource/nsLDAPDataSource.js
rename to ldap/xpcom/datasource/nsLDAPDataSource.js

rename from directory/xpcom/tests/Makefile.in
rename to ldap/xpcom/tests/Makefile.in

rename from directory/xpcom/tests/example.rdf
rename to ldap/xpcom/tests/example.rdf

rename from directory/xpcom/tests/example.xul
rename to ldap/xpcom/tests/example.xul

rename from directory/xpcom/tests/jar.mn
rename to ldap/xpcom/tests/jar.mn

rename from directory/xpcom/tests/ldapshell.js
rename to ldap/xpcom/tests/ldapshell.js

rename from directory/xpcom/tests/unit/test_nsLDAPURL.js
rename to ldap/xpcom/tests/unit/test_nsLDAPURL.js