removed RDF dependency from db.

mailnews/db/msgdb/build/Makefile.in

@@ -48,7 +48,6 @@ EXTRA_DSO_LDOPTS = 	\
 	-lxpcom					\
 	-lraptorbase			\
 	-lxp					\
-	-lrdfutil_s				\
 	-lmsgbaseutil			\
 	-lmork					\
 	$(NULL)

mailnews/db/msgdb/build/makefile.win

@@ -46,7 +46,6 @@ LLIBS=\
     $(LIBNSPR)		            \
     $(DIST)\lib\plc3.lib    \
     $(DIST)\lib\raptorbase.lib  \
-    $(DIST)\lib\rdfutil_s.lib	\
 	$(NULL)
 
 MISCDEP=$(LLIBS)
@@ -57,8 +56,6 @@ LINCS=  -I$(DEPTH)\mailnews\local\src	\
 		-I$(PUBLIC)\xpcom				\
 		-I$(PUBLIC)\mailnews			\
 		-I$(PUBLIC)\raptor				\
-		-I$(PUBLIC)\rdf					\
-		-I$(PUBLIC)\rdfutil				\
 		-I$(PUBLIC)\netlib				\
         $(NULL)
 

mailnews/db/msgdb/build/nsMsgDBCID.h

@@ -38,16 +38,6 @@
 { 0x9e4b07ee, 0xe980, 0x11d2,                  \
     { 0x00, 0x60, 0xb0, 0xfc, 0x04, 0xb7 } }
 
-// b0908e06-dc06-11d2-8a46-0060b0fc04d2
-#define NS_MAILBOXMESSAGERESOURCE_CID               \
-{ 0xb0908e06,0xdc06, 0x11d2, \
-	{0x8a, 0x46, 0x00, 0x60, 0xb0, 0xfc, 0x4, 0xd2} }
-
-// 2dae7f80-f104-11d2-973b-00805f916fd3 
-#define NS_NEWSMESSAGERESOURCE_CID               \
-{ 0x2dae7f80, 0xf104, 0x11d2, \
-        {0x97, 0x3b, 0x00, 0x80, 0x5f, 0x91, 0x6f, 0xd3} } 
-
 // 225310c0-f69e-11d2-8d6d-00805f8a6617
 #define NS_IMAPMESSAGERESOURCE_CID \
 	{0x225310c0, 0xf69e, 0x11d2, \

mailnews/db/msgdb/build/nsMsgDBFactory.cpp

@@ -33,9 +33,6 @@ static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID);
 static NS_DEFINE_CID(kCMailDB, NS_MAILDB_CID);
 static NS_DEFINE_CID(kCNewsDB, NS_NEWSDB_CID);
 static NS_DEFINE_CID(kCImapDB, NS_IMAPDB_CID);
-static NS_DEFINE_CID(kMailboxMessageResourceCID, NS_MAILBOXMESSAGERESOURCE_CID);
-static NS_DEFINE_CID(kNewsMessageResourceCID, NS_NEWSMESSAGERESOURCE_CID);
-static NS_DEFINE_CID(kImapMessageResourceCID, NS_IMAPMESSAGERESOURCE_CID);
 ////////////////////////////////////////////////////////////
 //
 ////////////////////////////////////////////////////////////
@@ -128,12 +125,7 @@ nsresult nsMsgDBFactory::CreateInstance(nsISupports *aOuter, const nsIID &aIID,
 	{
 		inst = new nsImapMailDatabase();
 	}
-	else if (mClassID.Equals(kMailboxMessageResourceCID) || mClassID.Equals(kNewsMessageResourceCID) ||
+
-		mClassID.Equals(kImapMessageResourceCID)) 
-	{
-		inst = NS_STATIC_CAST(nsIMessage*, new nsMsgHdr());
-	}
-	
 	if (inst == nsnull)
 		return NS_ERROR_OUT_OF_MEMORY;
 
@@ -204,22 +196,6 @@ NSRegisterSelf(nsISupports* aServMgr, const char* path)
   rv = compMgr->RegisterComponent(kCImapDB, nsnull, nsnull,
                                   path, PR_TRUE, PR_TRUE);
   if (NS_FAILED(rv)) goto done;
-  rv = compMgr->RegisterComponent(kMailboxMessageResourceCID,
-                                  "Mail Resource Factory",
-                                  NS_RDF_RESOURCE_FACTORY_PROGID_PREFIX "mailbox_message",
-                                  path, PR_TRUE, PR_TRUE);
-  if (NS_FAILED(rv)) goto done;
-  rv = compMgr->RegisterComponent(kNewsMessageResourceCID,
-                                  "News Resource Factory",
-                                  NS_RDF_RESOURCE_FACTORY_PROGID_PREFIX "news_message",
-                                  path, PR_TRUE, PR_TRUE);
-  if (NS_FAILED(rv)) goto done;
-  
-  rv = compMgr->RegisterComponent(kImapMessageResourceCID,
-                                  "Imap Resource Factory",
-                                  NS_RDF_RESOURCE_FACTORY_PROGID_PREFIX "imap_message",
-                                  path, PR_TRUE, PR_TRUE);
-  if (NS_FAILED(rv)) goto done;
   
   done:
   (void)servMgr->ReleaseService(kComponentManagerCID, compMgr);
@@ -249,15 +225,6 @@ NSUnregisterSelf(nsISupports* aServMgr, const char* path)
   rv = compMgr->UnregisterFactory(kCNewsDB, path);
   if (NS_FAILED(rv)) goto done;
 
-  rv = compMgr->UnregisterComponent(kMailboxMessageResourceCID, path);
-  if (NS_FAILED(rv)) goto done;
-
-  rv = compMgr->UnregisterComponent(kNewsMessageResourceCID, path);
-  if (NS_FAILED(rv)) goto done;
-
-  rv = compMgr->UnregisterComponent(kImapMessageResourceCID, path);
-  if (NS_FAILED(rv)) goto done;
-
   done:
   (void)servMgr->ReleaseService(kComponentManagerCID, compMgr);
   return rv;