Bug 92650 directory/xpcom/public/nsLDAP.h should go away. r/sr=dmose

git-svn-id: svn://10.0.0.236/trunk@187337 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/directory/xpcom/base/public/Makefile.in

@@ -64,9 +64,6 @@ ifdef MOZ_LDAP_XPCOM_EXPERIMENTAL
 XPIDLSRCS	+=	\
 			$(NULL)
 endif
-EXPORTS		= \
-		nsLDAP.h \
-		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 

mozilla/directory/xpcom/base/public/nsILDAPConnection.idl

@@ -42,6 +42,10 @@
 interface nsILDAPOperation;
 interface nsILDAPMessageListener;
 
+%{C++
+#define NS_LDAPCONNECTION_CONTRACTID "@mozilla.org/network/ldap-connection;1" 
+%}
+
 [scriptable, uuid(337ad2fe-1dd2-11b2-89f8-aae1221ec86c)]
 interface nsILDAPConnection : nsISupports
 {

mozilla/directory/xpcom/base/public/nsILDAPMessage.idl

@@ -42,6 +42,10 @@
 interface nsILDAPBERValue;
 interface nsILDAPOperation;
 
+%{C++
+#define NS_LDAPMESSAGE_CONTRACTID "@mozilla.org/network/ldap-message;1"
+%}
+
 [scriptable, uuid(973ff50f-2002-4f0c-b57d-2242156139a2)]
 interface nsILDAPMessage : nsISupports
 {

mozilla/directory/xpcom/base/public/nsILDAPOperation.idl

@@ -44,6 +44,10 @@ interface nsILDAPMessage;
 interface nsILDAPMessageListener;
 interface nsIMutableArray;
 
+%{C++
+#define NS_LDAPOPERATION_CONTRACTID "@mozilla.org/network/ldap-operation;1" 
+%}
+
 // XXXdmose check to make sure ctl-related err codes documented
 
 typedef PRUint32 PRIntervalTime;

mozilla/directory/xpcom/base/public/nsILDAPURL.idl

@@ -40,6 +40,10 @@
 
 #include "nsIURI.idl"
 
+%{C++
+#define NS_LDAPURL_CONTRACTID "@mozilla.org/network/ldap-url;1"
+%}
+
 /**
  * Strings in methods inherited from nsIURI, which are using XPIDL
  * |string| types, are expected to be UTF8 encoded. All such strings

mozilla/directory/xpcom/base/src/nsLDAPConnection.cpp

@@ -58,6 +58,7 @@
 #include "nsEventQueueUtils.h"
 #include "nsNetError.h"
 #include "nsLDAPOperation.h"
+#include "nsILDAPErrors.h"
 
 const char kConsoleServiceContractId[] = "@mozilla.org/consoleservice;1";
 const char kDNSServiceContractId[] = "@mozilla.org/network/dns-service;1";

mozilla/directory/xpcom/base/src/nsLDAPInternal.h

@@ -41,7 +41,7 @@
 #define FORCE_PR_LOG /* Allow logging in the release build */
 #endif
 
-#include "nsLDAP.h"
+#include "prlog.h"
 
 #ifdef PR_LOGGING
 extern PRLogModuleInfo *gLDAPLogModule;    // defn in nsLDAPProtocolModule.cpp

mozilla/directory/xpcom/base/src/nsLDAPMessage.cpp

@@ -46,7 +46,7 @@
 #include "nsReadableUtils.h"
 #include "nsISupportsUtils.h"
 #include "nsLDAPBERValue.h"
-
+#include "nsILDAPErrors.h"
 
 NS_IMPL_THREADSAFE_ADDREF(nsLDAPMessage)
 NS_IMPL_THREADSAFE_RELEASE(nsLDAPMessage)

mozilla/directory/xpcom/base/src/nsLDAPOperation.cpp

@@ -38,7 +38,6 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsLDAPInternal.h"
-#include "nsLDAP.h"
 #include "nsLDAPOperation.h"
 #include "nsLDAPConnection.h"
 #include "nsILDAPMessage.h"
@@ -47,6 +46,7 @@
 #include "nspr.h"
 #include "nsISimpleEnumerator.h"
 #include "nsLDAPControl.h"
+#include "nsILDAPErrors.h"
 
 // constructor
 nsLDAPOperation::nsLDAPOperation()

mozilla/directory/xpcom/base/src/nsLDAPServer.h

@@ -38,7 +38,6 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsCOMPtr.h"
-#include "nsLDAP.h"
 #include "nsString.h"
 #include "nsILDAPServer.h"
 #include "nsILDAPURL.h"

mozilla/directory/xpcom/base/src/nsLDAPService.cpp

@@ -48,6 +48,7 @@
 #include "nsILDAPURL.h"
 #include "nsAutoLock.h"
 #include "nsCRT.h"
+#include "nsILDAPErrors.h"
 
 // Constants for CIDs used here.
 //

mozilla/directory/xpcom/base/src/nsLDAPService.h

@@ -37,7 +37,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsLDAP.h"
 #include "ldap.h"
 #include "nsString.h"
 #include "nsCOMArray.h"

mozilla/directory/xpcom/base/src/nsLDAPURL.h

@@ -38,7 +38,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsLDAP.h"
 #include "ldap.h"
 #include "nsString.h"
 #include "nsVoidArray.h"

mozilla/mailnews/addrbook/src/nsAbLDAPAutoCompFormatter.cpp

@@ -51,12 +51,12 @@
 #include "nsIServiceManager.h"
 #include "nsIMsgHeaderParser.h"
 #include "nsILDAPMessage.h"
-#include "nsLDAP.h"
 #include "nsReadableUtils.h"
 #include "nsIStringBundle.h"
 #include "nsXPCOM.h"
 #include "nsISupportsPrimitives.h"
 #include "nsNetError.h"
+#include "nsILDAPErrors.h"
 
 NS_IMPL_ISUPPORTS2(nsAbLDAPAutoCompFormatter, 
 		   nsILDAPAutoCompFormatter, 

mozilla/mailnews/addrbook/src/nsAbLDAPChangeLogData.cpp

@@ -39,7 +39,6 @@
 
 #include "nsAbLDAPChangeLogData.h"
 #include "nsAbLDAPChangeLogQuery.h"
-#include "nsLDAP.h"
 #include "nsILDAPMessage.h"
 #include "nsIAbCard.h"
 #include "nsIAddrBookSession.h"
@@ -54,6 +53,8 @@
 #include "nsIWindowWatcher.h"
 #include "nsUnicharUtils.h"
 #include "plstr.h"
+#include "nsILDAPErrors.h"
+#include "prmem.h"
 
 // defined here since to be used 
 // only locally to this file.

mozilla/mailnews/addrbook/src/nsAbLDAPDirectory.cpp

@@ -59,7 +59,6 @@
 #include "nsIPrefBranch.h"
 #include "nsCOMArray.h"
 #include "nsArrayEnumerator.h"
-#include "nsLDAP.h"
 #include "nsIAbLDAPAttributeMap.h"
 
 nsAbLDAPDirectory::nsAbLDAPDirectory() :

mozilla/mailnews/addrbook/src/nsAbLDAPDirectoryQuery.cpp

@@ -46,7 +46,6 @@
 #include "nsILDAPOperation.h"
 #include "nsIAbLDAPAttributeMap.h"
 #include "nsAbUtils.h"
-#include "nsLDAP.h"
 
 #include "nsIAuthPrompt.h"
 #include "nsIStringBundle.h"

mozilla/mailnews/addrbook/src/nsAbLDAPReplicationData.cpp

@@ -39,7 +39,6 @@
 
 #include "nsILDAPMessage.h"
 #include "nsAbLDAPReplicationData.h"
-#include "nsLDAP.h"
 #include "nsIAbCard.h"
 #include "nsIAddrBookSession.h"
 #include "nsAbBaseCID.h"
@@ -50,6 +49,7 @@
 #include "nsCPasswordManager.h"
 #include "nsIRDFService.h"
 #include "nsIRDFResource.h"
+#include "nsILDAPErrors.h"
 
 // once bug # 101252 gets fixed, this should be reverted back to be non threadsafe
 // implementation is not really thread safe since each object should exist 

mozilla/mailnews/addrbook/src/nsAbLDAPReplicationQuery.cpp

@@ -46,10 +46,10 @@
 #include "nsILDAPURL.h"
 #include "nsAbBaseCID.h"
 #include "nsProxiedService.h"
-#include "nsLDAP.h"
 #include "nsAbUtils.h"
 #include "nsDirPrefs.h"
 #include "nsCRT.h"
+#include "prmem.h"
 
 NS_IMPL_ISUPPORTS1(nsAbLDAPReplicationQuery, nsIAbLDAPReplicationQuery)
 

mozilla/mailnews/addrbook/src/nsLDAPAutoCompleteSession.cpp

@@ -57,7 +57,6 @@
 #include "nsXPIDLString.h"
 #include "nsReadableUtils.h"
 #include "nspr.h"
-#include "nsLDAP.h"
 #include "nsIStringBundle.h"
 #include "nsCRT.h"
 #include "nsIObserverService.h"
@@ -66,6 +65,7 @@
 #include "nsCategoryManagerUtils.h"
 #include "nsILDAPService.h"
 #include "nsILDAPMessage.h"
+#include "nsILDAPErrors.h"
 
 #ifdef PR_LOGGING
 static PRLogModuleInfo *sLDAPAutoCompleteLogModule = 0;