Bug 263042 part 2 - move the LDAP parts of XPFE autocomplete to mailnews/addrbook, which is the only consumer, r=dmose

mailnews/addrbook/build/nsAbFactory.cpp

@@ -87,6 +87,7 @@
 #include "nsAbLDAPReplicationData.h"
 #include "nsAbLDAPChangeLogQuery.h"
 #include "nsAbLDAPChangeLogData.h"
+#include "nsLDAPAutoCompleteSession.h"
 #endif
 
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsAddressBook)
@@ -126,6 +127,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbLDAPReplicationQuery)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbLDAPProcessReplicationData)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbLDAPChangeLogQuery)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbLDAPProcessChangeLogData)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsLDAPAutoCompleteSession)
 #endif
 
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbDirectoryQueryProxy)
@@ -315,6 +317,11 @@ static const nsModuleComponentInfo components[] =
     NS_ABLDAPAUTOCOMPFORMATTER_CONTRACTID,
     nsAbLDAPAutoCompFormatterConstructor },
 
+  { "LDAP Autocomplete Session",
+     NS_LDAPAUTOCOMPLETESESSION_CID,
+     "@mozilla.org/autocompleteSession;1?type=ldap",
+     nsLDAPAutoCompleteSessionConstructor },
+
 #endif
 
   { "The directory query proxy interface",

mailnews/addrbook/public/Makefile.in

@@ -73,6 +73,8 @@ XPIDLSRCS	= \
 ifdef MOZ_LDAP_XPCOM
 XPIDLSRCS       += \
 		nsILDAPPrefsService.idl \
+		nsILDAPAutoCompleteSession.idl \
+		nsILDAPAutoCompFormatter.idl \
 		nsIAbLDAPAutoCompFormatter.idl \
                 nsIAbLDAPReplicationService.idl \
                 nsIAbLDAPReplicationQuery.idl \

mailnews/addrbook/src/Makefile.in

@@ -146,6 +146,7 @@ CPPSRCS		+= nsAbLDAPDirectory.cpp \
                 nsAbLDAPReplicationData.cpp \
                 nsAbLDAPChangeLogQuery.cpp \
                 nsAbLDAPChangeLogData.cpp \
+		nsLDAPAutoCompleteSession.cpp \
 		$(NULL)
 endif
 

mailnews/addrbook/src/nsAbLDAPAutoCompFormatter.cpp

@@ -212,12 +212,12 @@ nsAbLDAPAutoCompFormatter::FormatException(PRInt32 aState,
     } 
 
     rv = stringBundleSvc->CreateBundle(
-        "chrome://global/locale/ldapAutoCompErrs.properties",
+        "chrome://mailnews/locale/addressbook/ldapAutoCompErrs.properties",
         getter_AddRefs(ldapACBundle));
     if (NS_FAILED(rv)) {
         NS_ERROR("nsAbLDAPAutoCompleteFormatter::FormatException():"
                  " error creating string bundle"
-                 " chrome://global/locale/ldapAutoCompErrs.properties");
+                 " chrome://mailnews/locale/addressbook/ldapAutoCompErrs.properties");
         return rv;
     }
 
@@ -228,7 +228,7 @@ nsAbLDAPAutoCompFormatter::FormatException(PRInt32 aState,
     if (NS_FAILED(rv)) {
         NS_ERROR("nsAbLDAPAutoCompleteFormatter::FormatException():"
                  " error getting general error from bundle"
-                 " chrome://global/locale/ldapAutoCompErrs.properties");
+                 " chrome://mailnews/locale/addressbook/ldapAutoCompErrs.properties");
         return rv;
     }
 

mailnews/build/nsMailModule.cpp

@@ -158,6 +158,7 @@
 #include "nsAbLDAPReplicationData.h"
 #include "nsAbLDAPChangeLogQuery.h"
 #include "nsAbLDAPChangeLogData.h"
+#include "nsLDAPAutoCompleteSession.h"
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -381,6 +382,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbLDAPReplicationQuery)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbLDAPProcessReplicationData)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbLDAPChangeLogQuery)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbLDAPProcessChangeLogData)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsLDAPAutoCompleteSession)
 #endif
 
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbDirectoryQueryProxy)
@@ -923,6 +925,10 @@ static const nsModuleComponentInfo gComponents[] = {
       NS_ABLDAPSACDIRFACTORY_CONTRACTID, nsAbLDAPDirFactoryConstructor },
     { "Address book LDAP autocomplete formatter", NS_ABLDAPAUTOCOMPFORMATTER_CID,
       NS_ABLDAPAUTOCOMPFORMATTER_CONTRACTID,nsAbLDAPAutoCompFormatterConstructor },
+    { "LDAP Autocomplete Session",
+      NS_LDAPAUTOCOMPLETESESSION_CID,
+      "@mozilla.org/autocompleteSession;1?type=ldap",
+      nsLDAPAutoCompleteSessionConstructor },
 #endif
     { "The directory query proxy interface", NS_ABDIRECTORYQUERYPROXY_CID,
       NS_ABDIRECTORYQUERYPROXY_CONTRACTID, nsAbDirectoryQueryProxyConstructor},

mailnews/jar.mn

@@ -192,6 +192,7 @@ messenger.jar:
 
 en-US.jar:
 *   locale/en-US/messenger/contents.rdf                                (base/resources/locale/en-US/contents.rdf)
+    locale/en-US/messenger/addressbook/ldapAutoCompErrs.properties     (addrbook/resources/locale/en-US/ldapAutoCompErrs.properties)
     locale/en-US/messenger/addressbook/abAddressBookNameDialog.dtd     (addrbook/resources/locale/en-US/abAddressBookNameDialog.dtd)
     locale/en-US/messenger/addressbook/abCardOverlay.dtd               (addrbook/resources/locale/en-US/abCardOverlay.dtd)
     locale/en-US/messenger/addressbook/abCardViewOverlay.dtd           (addrbook/resources/locale/en-US/abCardViewOverlay.dtd)

xpfe/components/autocomplete/public/Makefile.in

@@ -51,13 +51,5 @@ XPIDLSRCS	= \
 		nsIAutoCompleteSession.idl \
 		$(NULL)
 
-ifdef MOZ_LDAP_XPCOM
-REQUIRES	+= mozldap necko
-XPIDLSRCS	+= \
-		nsILDAPAutoCompleteSession.idl \
-		nsILDAPAutoCompFormatter.idl \
-		$(NULL)
-endif
-
 include $(topsrcdir)/config/rules.mk
 

xpfe/components/autocomplete/src/Makefile.in

@@ -58,12 +58,6 @@ REQUIRES	= xpcom \
 
 CPPSRCS		= nsAutoComplete.cpp
 
-ifdef MOZ_LDAP_XPCOM
-REQUIRES	+= mozldap necko
-CPPSRCS		+= nsLDAPAutoCompleteSession.cpp
-DEFINES		+= -DMOZ_LDAP_XPCOM
-endif
-
 EXTRA_DSO_LDOPTS += \
 	$(MOZ_UNICHARUTIL_LIBS) \
 	$(MOZ_COMPONENT_LIBS) \

xpfe/components/autocomplete/src/nsAutoComplete.cpp

@@ -42,10 +42,6 @@
 #include "nsReadableUtils.h"
 #include "nsIGenericFactory.h"
 
-#if defined(MOZ_LDAP_XPCOM)
-#include "nsLDAPAutoCompleteSession.h"
-#endif
-
 /******************************************************************************
  * nsAutoCompleteItem
  ******************************************************************************/
@@ -184,19 +180,7 @@ NS_IMETHODIMP nsAutoCompleteResults::SetDefaultItemIndex(PRInt32 aDefaultItemInd
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsAutoCompleteItem)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsAutoCompleteResults)
 
-#if defined(MOZ_LDAP_XPCOM)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsLDAPAutoCompleteSession)
-#endif
-
 static const nsModuleComponentInfo components[] = {
-#if defined(MOZ_LDAP_XPCOM)
-    {
-        "LDAP Autocomplete Session",
-        NS_LDAPAUTOCOMPLETESESSION_CID,
-        "@mozilla.org/autocompleteSession;1?type=ldap",
-        nsLDAPAutoCompleteSessionConstructor
-    },
-#endif
     {
         "AutoComplete Search Results",
         NS_AUTOCOMPLETERESULTS_CID,

xpfe/components/jar.mn

@@ -186,7 +186,6 @@ en-US.jar:
     locale/en-US/global/console.properties                      (console/resources/locale/en-US/console.properties)
     locale/en-US/global/finddialog.dtd                          (find/resources/locale/en-US/finddialog.dtd)
     locale/en-US/global/finddialog.properties                   (find/resources/locale/en-US/finddialog.properties)
-    locale/en-US/global/ldapAutoCompErrs.properties             (autocomplete/resources/locale/en-US/ldapAutoCompErrs.properties)
 *   locale/en-US/cookie/contents.rdf                            (cookie/locale/en-US/contents.rdf)
     locale/en-US/cookie/cookieAcceptDialog.properties           (/toolkit/locales/en-US/chrome/cookie/cookieAcceptDialog.properties)
     locale/en-US/cookie/cookieAcceptDialog.dtd                  (/toolkit/locales/en-US/chrome/cookie/cookieAcceptDialog.dtd)