Remove nsXULDataSource.cpp from the build: it's obsolete. Re-factor interfaces into individual .idl files.

rdf/datasource/src/Makefile.in

@@ -35,7 +35,6 @@ CPPSRCS =				\
 	nsHistoryDataSource.cpp		\
 	nsRelatedLinksDataSource.cpp	\
 	nsXULContentSink.cpp		\
-	nsXULDataSource.cpp		\
 	$(NULL)
 
 EXPORTS = \

rdf/datasource/src/makefile.win

@@ -30,7 +30,6 @@ CPP_OBJS=\
         .\$(OBJDIR)\nsRelatedLinksDataSource.obj \
         .\$(OBJDIR)\nsLocalStore.obj            \
         .\$(OBJDIR)\nsXULContentSink.obj        \
-        .\$(OBJDIR)\nsXULDataSource.obj         \
 	$(NULL)
 
 # XXX Note the dependency on $(DEPTH)\rdf\base\src: we use rdfutil.h over

rdf/datasource/src/nsFTPDataSource.cpp

@@ -26,7 +26,6 @@
 #include "nsIRDFDataSource.h"
 #include "nsIRDFNode.h"
 #include "nsIRDFObserver.h"
-#include "nsIRDFResourceFactory.h"
 #include "nsIServiceManager.h"
 #include "nsEnumeratorUtils.h"
 #include "nsString.h"

rdf/datasource/src/nsFileSystemDataSource.cpp

@@ -28,7 +28,6 @@
 #include "nsIRDFDataSource.h"
 #include "nsIRDFNode.h"
 #include "nsIRDFObserver.h"
-#include "nsIRDFResourceFactory.h"
 #include "nsIServiceManager.h"
 #include "nsString.h"
 #include "nsVoidArray.h"  // XXX introduces dependency on raptorbase

rdf/datasource/src/nsFindDataSource.cpp

@@ -27,7 +27,6 @@
 #include "nsIRDFDataSource.h"
 #include "nsIRDFNode.h"
 #include "nsIRDFObserver.h"
-#include "nsIRDFResourceFactory.h"
 #include "nsIServiceManager.h"
 #include "nsISupportsArray.h"
 #include "nsEnumeratorUtils.h"

rdf/datasource/src/nsHistoryDataSource.cpp

@@ -27,7 +27,6 @@
 #include "nscore.h"
 #include "nsIRDFNode.h"
 #include "nsIRDFObserver.h"
-#include "nsIRDFResourceFactory.h"
 #include "nsIServiceManager.h"
 #include "nsIComponentManager.h"
 #include "nsString.h"

rdf/datasource/src/nsRelatedLinksDataSource.cpp

@@ -27,7 +27,6 @@
 #include "nsIRDFDataSource.h"
 #include "nsIRDFNode.h"
 #include "nsIRDFObserver.h"
-#include "nsIRDFResourceFactory.h"
 #include "nsIServiceManager.h"
 #include "nsEnumeratorUtils.h"
 #include "nsString.h"

rdf/datasource/src/nsXULContentSink.cpp

@@ -49,6 +49,7 @@
 #include "nsIParser.h"
 #include "nsIPresShell.h"
 #include "nsIRDFContainer.h"
+#include "nsIRDFContainerUtils.h"
 #include "nsIRDFDocument.h"
 #include "nsIRDFNode.h"
 #include "nsIRDFService.h"