Part of Bug 316170. Disable building of the Address Book LDAP change log replication code because it doesn't work and it will make fixing the full replication code easier. ChangeLog replication will be reimplemented by bug 311632. r/sr=bienvenu

mailnews/addrbook/build/nsAbFactory.cpp

@@ -79,8 +79,10 @@
 #include "nsAbLDAPReplicationService.h"
 #include "nsAbLDAPReplicationQuery.h"
 #include "nsAbLDAPReplicationData.h"
-#include "nsAbLDAPChangeLogQuery.h"
-#include "nsAbLDAPChangeLogData.h"
+// XXX These files are not being built as they don't work. Bug 311632 should
+// fix them.
+//#include "nsAbLDAPChangeLogQuery.h"
+//#include "nsAbLDAPChangeLogData.h"
 #include "nsLDAPAutoCompleteSession.h"
 #endif
 
@@ -128,8 +130,10 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbLDAPAutoCompFormatter)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbLDAPReplicationService)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbLDAPReplicationQuery)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbLDAPProcessReplicationData)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbLDAPChangeLogQuery)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbLDAPProcessChangeLogData)
+// XXX These files are not being built as they don't work. Bug 311632 should
+// fix them.
+//NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbLDAPChangeLogQuery)
+//NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbLDAPProcessChangeLogData)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsLDAPAutoCompleteSession)
 #endif
 
@@ -295,15 +299,17 @@ static const nsModuleComponentInfo components[] =
    NS_ABLDAP_PROCESSREPLICATIONDATA_CONTRACTID,
    nsAbLDAPProcessReplicationDataConstructor },
 
- {"Address LDAP ChangeLog Query Interface",
-   NS_ABLDAP_CHANGELOGQUERY_CID,
-   NS_ABLDAP_CHANGELOGQUERY_CONTRACTID,
-   nsAbLDAPChangeLogQueryConstructor },
+// XXX These files are not being built as they don't work. Bug 311632 should
+// fix them.
+// {"Address LDAP ChangeLog Query Interface",
+//   NS_ABLDAP_CHANGELOGQUERY_CID,
+//   NS_ABLDAP_CHANGELOGQUERY_CONTRACTID,
+//   nsAbLDAPChangeLogQueryConstructor },
 
- {"Address LDAP ChangeLog Processor Interface",
-   NS_ABLDAP_PROCESSCHANGELOGDATA_CID,
-   NS_ABLDAP_PROCESSCHANGELOGDATA_CONTRACTID,
-   nsAbLDAPProcessChangeLogDataConstructor },
+// {"Address LDAP ChangeLog Processor Interface",
+//   NS_ABLDAP_PROCESSCHANGELOGDATA_CID,
+//   NS_ABLDAP_PROCESSCHANGELOGDATA_CONTRACTID,
+//   nsAbLDAPProcessChangeLogDataConstructor },
 
   { "Address LDAP autocomplete factory Interface", 
     NS_ABLDAPDIRFACTORY_CID,

mailnews/addrbook/src/Makefile.in

@@ -143,12 +143,17 @@ CPPSRCS		+= \
 		nsAbLDAPReplicationService.cpp \
 		nsAbLDAPReplicationQuery.cpp \
 		nsAbLDAPReplicationData.cpp \
-		nsAbLDAPChangeLogQuery.cpp \
-		nsAbLDAPChangeLogData.cpp \
 		nsLDAPAutoCompleteSession.cpp \
 		$(NULL)
+
+# XXX These files are not being built as they don't work. Bug 311632 should
+# fix them.
+# nsAbLDAPChangeLogQuery.cpp
+# nsAbLDAPChangeLogData.cpp
 endif
 
+
+
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 

mailnews/addrbook/src/nsAbLDAPReplicationService.cpp

@@ -41,7 +41,8 @@
 #include "nsAbBaseCID.h"
 #include "nsIWebProgressListener.h"
 
-#include "nsAbLDAPChangeLogQuery.h"
+// XXX Change log replication doesn't work. Bug 311632 should fix it.
+//#include "nsAbLDAPChangeLogQuery.h"
 #include "nsIAbLDAPReplicationData.h"
 
 /*** implementation of the service ******/
@@ -80,9 +81,10 @@ NS_IMETHODIMP nsAbLDAPReplicationService::StartReplication(const nsACString & aP
         case nsIAbLDAPProcessReplicationData::kDefaultDownloadAll :
             mQuery = do_CreateInstance(NS_ABLDAP_REPLICATIONQUERY_CONTRACTID, &rv);
             break ;
-        case nsIAbLDAPProcessReplicationData::kChangeLogProtocol :
-            mQuery = do_CreateInstance (NS_ABLDAP_CHANGELOGQUERY_CONTRACTID, &rv);
-            break ;
+// XXX Change log replication doesn't work. Bug 311632 should fix it.
+//        case nsIAbLDAPProcessReplicationData::kChangeLogProtocol :
+//            mQuery = do_CreateInstance (NS_ABLDAP_CHANGELOGQUERY_CONTRACTID, &rv);
+//            break ;
         default :
             break;
     }

mailnews/build/nsMailModule.cpp

@@ -156,8 +156,10 @@
 #include "nsAbLDAPReplicationService.h"
 #include "nsAbLDAPReplicationQuery.h"
 #include "nsAbLDAPReplicationData.h"
-#include "nsAbLDAPChangeLogQuery.h"
-#include "nsAbLDAPChangeLogData.h"
+// XXX These files are not being built as they don't work. Bug 311632 should
+// fix them.
+//#include "nsAbLDAPChangeLogQuery.h"
+//#include "nsAbLDAPChangeLogData.h"
 #include "nsLDAPAutoCompleteSession.h"
 #endif
 
@@ -398,8 +400,10 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbLDAPAutoCompFormatter)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbLDAPReplicationService)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbLDAPReplicationQuery)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbLDAPProcessReplicationData)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbLDAPChangeLogQuery)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbLDAPProcessChangeLogData)
+// XXX These files are not being built as they don't work. Bug 311632 should
+// fix them.
+//NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbLDAPChangeLogQuery)
+//NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbLDAPProcessChangeLogData)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsLDAPAutoCompleteSession)
 #endif
 
@@ -969,10 +973,12 @@ static const nsModuleComponentInfo gComponents[] = {
       NS_ABLDAP_REPLICATIONQUERY_CONTRACTID, nsAbLDAPReplicationQueryConstructor },
     { "Address LDAP Replication Processor Interface", NS_ABLDAP_PROCESSREPLICATIONDATA_CID,
       NS_ABLDAP_PROCESSREPLICATIONDATA_CONTRACTID, nsAbLDAPProcessReplicationDataConstructor},
-    { "Address LDAP ChangeLog Query Interface", NS_ABLDAP_CHANGELOGQUERY_CID,
-      NS_ABLDAP_CHANGELOGQUERY_CONTRACTID, nsAbLDAPChangeLogQueryConstructor },
-    { "Address LDAP ChangeLog Processor Interface", NS_ABLDAP_PROCESSCHANGELOGDATA_CID,
-      NS_ABLDAP_PROCESSCHANGELOGDATA_CONTRACTID, nsAbLDAPProcessChangeLogDataConstructor },
+// XXX These files are not being built as they don't work. Bug 311632 should
+// fix them.
+//    { "Address LDAP ChangeLog Query Interface", NS_ABLDAP_CHANGELOGQUERY_CID,
+//      NS_ABLDAP_CHANGELOGQUERY_CONTRACTID, nsAbLDAPChangeLogQueryConstructor },
+//    { "Address LDAP ChangeLog Processor Interface", NS_ABLDAP_PROCESSCHANGELOGDATA_CID,
+//      NS_ABLDAP_PROCESSCHANGELOGDATA_CONTRACTID, nsAbLDAPProcessChangeLogDataConstructor },
     { "Address LDAP autocomplete factory Interface", NS_ABLDAPDIRFACTORY_CID,
       NS_ABLDAPACDIRFACTORY_CONTRACTID, nsAbLDAPDirFactoryConstructor },
     { "Address LDAP over SSL autocomplete factory Interface", NS_ABLDAPDIRFACTORY_CID,