Issue %3005 - Move rdf/ to components/

70 files changed, 72 insertions, 233 deletions

diff --git a/components/build/moz.build b/components/build/moz.build
index 1fbb84d34..a97c6b517 100644
--- a/components/build/moz.build
+++ b/components/build/moz.build
@@ -3,9 +3,13 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-EXPORTS += ['nsToolkitCompsCID.h']
+EXPORTS += [
+  'nsRDFCID.h',
+  'nsToolkitCompsCID.h'
+]
 
 SOURCES += [
+  'nsRDFModule.cpp',
   'nsToolkitCompsModule.cpp',
   'nsXPFEFactory.cpp'
 ]
@@ -18,6 +22,7 @@ LOCAL_INCLUDES += [
   '../find',
   '../jsdownloads/src',
   '../perfmonitoring',
+  '../rdf/src',
   '../startup',
   '../statusfilter',
   '../typeaheadfind',
diff --git a/rdf/build/nsRDFCID.h b/components/build/nsRDFCID.h
index 18d47aed5..18d47aed5 100644
--- a/rdf/build/nsRDFCID.h
+++ b/components/build/nsRDFCID.h
diff --git a/rdf/build/nsRDFModule.cpp b/components/build/nsRDFModule.cpp
index d1af94bc0..d1af94bc0 100644
--- a/rdf/build/nsRDFModule.cpp
+++ b/components/build/nsRDFModule.cpp
diff --git a/components/moz.build b/components/moz.build
index e3b042673..b854260ef 100644
--- a/components/moz.build
+++ b/components/moz.build
@@ -53,6 +53,7 @@ DIRS += [
     'profile',
     'promiseworker',
     'prompts',
+    'rdf',
     'reader',
     'remotebrowserutils',
     'reflect',
diff --git a/components/rdf/moz.build b/components/rdf/moz.build
new file mode 100644
index 000000000..3d08b2ee2
--- /dev/null
+++ b/components/rdf/moz.build
@@ -0,0 +1,63 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DIRS += ['util']
+
+XPIDL_SOURCES += [
+  'public/nsIRDFCompositeDataSource.idl',
+  'public/nsIRDFContainer.idl',
+  'public/nsIRDFContainerUtils.idl',
+  'public/nsIRDFDataSource.idl',
+  'public/nsIRDFDelegateFactory.idl',
+  'public/nsIRDFInferDataSource.idl',
+  'public/nsIRDFInMemoryDataSource.idl',
+  'public/nsIRDFLiteral.idl',
+  'public/nsIRDFNode.idl',
+  'public/nsIRDFObserver.idl',
+  'public/nsIRDFPropagatableDataSource.idl',
+  'public/nsIRDFPurgeableDataSource.idl',
+  'public/nsIRDFRemoteDataSource.idl',
+  'public/nsIRDFResource.idl',
+  'public/nsIRDFService.idl',
+  'public/nsIRDFXMLParser.idl',
+  'public/nsIRDFXMLSerializer.idl',
+  'public/nsIRDFXMLSink.idl',
+  'public/nsIRDFXMLSource.idl',
+  'public/rdfIDataSource.idl',
+  'public/rdfISerializer.idl',
+  'public/rdfITripleVisitor.idl',
+]
+
+EXPORTS += [
+  'src/nsILocalStore.h',
+  'src/nsIRDFContentSink.h',
+  'src/rdf.h',
+]
+
+UNIFIED_SOURCES += [
+  'src/nsCompositeDataSource.cpp',
+  'src/nsContainerEnumerator.cpp',
+  'src/nsDefaultResourceFactory.cpp',
+  'src/nsFileSystemDataSource.cpp',
+  'src/nsInMemoryDataSource.cpp',
+  'src/nsLocalStore.cpp',
+  'src/nsNameSpaceMap.cpp',
+  'src/nsRDFContainer.cpp',
+  'src/nsRDFContainerUtils.cpp',
+  'src/nsRDFContentSink.cpp',
+  'src/nsRDFService.cpp',
+  'src/nsRDFXMLDataSource.cpp',
+  'src/nsRDFXMLParser.cpp',
+  'src/nsRDFXMLSerializer.cpp',
+  'src/rdfTriplesSerializer.cpp',
+  'src/rdfutil.cpp',
+]
+
+if CONFIG['GNU_CXX']:
+  CXXFLAGS += ['-Wno-error=shadow']
+
+XPIDL_MODULE = 'rdf'
+FINAL_LIBRARY = 'xul'
+
diff --git a/rdf/base/nsIRDFCompositeDataSource.idl b/components/rdf/public/nsIRDFCompositeDataSource.idl
index 071b8f3ac..071b8f3ac 100644
--- a/rdf/base/nsIRDFCompositeDataSource.idl
+++ b/components/rdf/public/nsIRDFCompositeDataSource.idl
diff --git a/rdf/base/nsIRDFContainer.idl b/components/rdf/public/nsIRDFContainer.idl
index 78352b2b3..78352b2b3 100644
--- a/rdf/base/nsIRDFContainer.idl
+++ b/components/rdf/public/nsIRDFContainer.idl
diff --git a/rdf/base/nsIRDFContainerUtils.idl b/components/rdf/public/nsIRDFContainerUtils.idl
index 21cb0b625..21cb0b625 100644
--- a/rdf/base/nsIRDFContainerUtils.idl
+++ b/components/rdf/public/nsIRDFContainerUtils.idl
diff --git a/rdf/base/nsIRDFDataSource.idl b/components/rdf/public/nsIRDFDataSource.idl
index 2915425c8..2915425c8 100644
--- a/rdf/base/nsIRDFDataSource.idl
+++ b/components/rdf/public/nsIRDFDataSource.idl
diff --git a/rdf/base/nsIRDFDelegateFactory.idl b/components/rdf/public/nsIRDFDelegateFactory.idl
index 6fbc42fd5..6fbc42fd5 100644
--- a/rdf/base/nsIRDFDelegateFactory.idl
+++ b/components/rdf/public/nsIRDFDelegateFactory.idl
diff --git a/rdf/base/nsIRDFInMemoryDataSource.idl b/components/rdf/public/nsIRDFInMemoryDataSource.idl
index 35734efe6..35734efe6 100644
--- a/rdf/base/nsIRDFInMemoryDataSource.idl
+++ b/components/rdf/public/nsIRDFInMemoryDataSource.idl
diff --git a/rdf/base/nsIRDFInferDataSource.idl b/components/rdf/public/nsIRDFInferDataSource.idl
index 07bafcfff..07bafcfff 100644
--- a/rdf/base/nsIRDFInferDataSource.idl
+++ b/components/rdf/public/nsIRDFInferDataSource.idl
diff --git a/rdf/base/nsIRDFLiteral.idl b/components/rdf/public/nsIRDFLiteral.idl
index 3d289c4fe..3d289c4fe 100644
--- a/rdf/base/nsIRDFLiteral.idl
+++ b/components/rdf/public/nsIRDFLiteral.idl
diff --git a/rdf/base/nsIRDFNode.idl b/components/rdf/public/nsIRDFNode.idl
index 2bd7d4967..2bd7d4967 100644
--- a/rdf/base/nsIRDFNode.idl
+++ b/components/rdf/public/nsIRDFNode.idl
diff --git a/rdf/base/nsIRDFObserver.idl b/components/rdf/public/nsIRDFObserver.idl
index 1923c5b38..1923c5b38 100644
--- a/rdf/base/nsIRDFObserver.idl
+++ b/components/rdf/public/nsIRDFObserver.idl
diff --git a/rdf/base/nsIRDFPropagatableDataSource.idl b/components/rdf/public/nsIRDFPropagatableDataSource.idl
index dfe510e9c..dfe510e9c 100644
--- a/rdf/base/nsIRDFPropagatableDataSource.idl
+++ b/components/rdf/public/nsIRDFPropagatableDataSource.idl
diff --git a/rdf/base/nsIRDFPurgeableDataSource.idl b/components/rdf/public/nsIRDFPurgeableDataSource.idl
index 05973df0e..05973df0e 100644
--- a/rdf/base/nsIRDFPurgeableDataSource.idl
+++ b/components/rdf/public/nsIRDFPurgeableDataSource.idl
diff --git a/rdf/base/nsIRDFRemoteDataSource.idl b/components/rdf/public/nsIRDFRemoteDataSource.idl
index fd2cd1b0b..fd2cd1b0b 100644
--- a/rdf/base/nsIRDFRemoteDataSource.idl
+++ b/components/rdf/public/nsIRDFRemoteDataSource.idl
diff --git a/rdf/base/nsIRDFResource.idl b/components/rdf/public/nsIRDFResource.idl
index df4d4b8ff..df4d4b8ff 100644
--- a/rdf/base/nsIRDFResource.idl
+++ b/components/rdf/public/nsIRDFResource.idl
diff --git a/rdf/base/nsIRDFService.idl b/components/rdf/public/nsIRDFService.idl
index 08023feab..08023feab 100644
--- a/rdf/base/nsIRDFService.idl
+++ b/components/rdf/public/nsIRDFService.idl
diff --git a/rdf/base/nsIRDFXMLParser.idl b/components/rdf/public/nsIRDFXMLParser.idl
index 1e7dde51f..1e7dde51f 100644
--- a/rdf/base/nsIRDFXMLParser.idl
+++ b/components/rdf/public/nsIRDFXMLParser.idl
diff --git a/rdf/base/nsIRDFXMLSerializer.idl b/components/rdf/public/nsIRDFXMLSerializer.idl
index e16ef2a2a..e16ef2a2a 100644
--- a/rdf/base/nsIRDFXMLSerializer.idl
+++ b/components/rdf/public/nsIRDFXMLSerializer.idl
diff --git a/rdf/base/nsIRDFXMLSink.idl b/components/rdf/public/nsIRDFXMLSink.idl
index 8c9d9461c..8c9d9461c 100644
--- a/rdf/base/nsIRDFXMLSink.idl
+++ b/components/rdf/public/nsIRDFXMLSink.idl
diff --git a/rdf/base/nsIRDFXMLSource.idl b/components/rdf/public/nsIRDFXMLSource.idl
index 794d8b662..794d8b662 100644
--- a/rdf/base/nsIRDFXMLSource.idl
+++ b/components/rdf/public/nsIRDFXMLSource.idl
diff --git a/rdf/base/rdfIDataSource.idl b/components/rdf/public/rdfIDataSource.idl
index 848cbca11..848cbca11 100644
--- a/rdf/base/rdfIDataSource.idl
+++ b/components/rdf/public/rdfIDataSource.idl
diff --git a/rdf/base/rdfISerializer.idl b/components/rdf/public/rdfISerializer.idl
index 9ec6b69ea..9ec6b69ea 100644
--- a/rdf/base/rdfISerializer.idl
+++ b/components/rdf/public/rdfISerializer.idl
diff --git a/rdf/base/rdfITripleVisitor.idl b/components/rdf/public/rdfITripleVisitor.idl
index ecac14871..ecac14871 100644
--- a/rdf/base/rdfITripleVisitor.idl
+++ b/components/rdf/public/rdfITripleVisitor.idl
diff --git a/rdf/base/nsCompositeDataSource.cpp b/components/rdf/src/nsCompositeDataSource.cpp
index 37167d356..37167d356 100644
--- a/rdf/base/nsCompositeDataSource.cpp
+++ b/components/rdf/src/nsCompositeDataSource.cpp
diff --git a/rdf/base/nsContainerEnumerator.cpp b/components/rdf/src/nsContainerEnumerator.cpp
index f1bfc6454..f1bfc6454 100644
--- a/rdf/base/nsContainerEnumerator.cpp
+++ b/components/rdf/src/nsContainerEnumerator.cpp
diff --git a/rdf/base/nsDefaultResourceFactory.cpp b/components/rdf/src/nsDefaultResourceFactory.cpp
index 448822a9d..448822a9d 100644
--- a/rdf/base/nsDefaultResourceFactory.cpp
+++ b/components/rdf/src/nsDefaultResourceFactory.cpp
diff --git a/rdf/datasource/nsFileSystemDataSource.cpp b/components/rdf/src/nsFileSystemDataSource.cpp
index 35632d1a3..35632d1a3 100644
--- a/rdf/datasource/nsFileSystemDataSource.cpp
+++ b/components/rdf/src/nsFileSystemDataSource.cpp
diff --git a/rdf/datasource/nsFileSystemDataSource.h b/components/rdf/src/nsFileSystemDataSource.h
index 09fa17400..09fa17400 100644
--- a/rdf/datasource/nsFileSystemDataSource.h
+++ b/components/rdf/src/nsFileSystemDataSource.h
diff --git a/rdf/datasource/nsILocalStore.h b/components/rdf/src/nsILocalStore.h
index b41226593..b41226593 100644
--- a/rdf/datasource/nsILocalStore.h
+++ b/components/rdf/src/nsILocalStore.h
diff --git a/rdf/base/nsIRDFContentSink.h b/components/rdf/src/nsIRDFContentSink.h
index 5abb536de..5abb536de 100644
--- a/rdf/base/nsIRDFContentSink.h
+++ b/components/rdf/src/nsIRDFContentSink.h
diff --git a/rdf/datasource/nsIRDFFTP.h b/components/rdf/src/nsIRDFFTP.h
index 8965b4a38..8965b4a38 100644
--- a/rdf/datasource/nsIRDFFTP.h
+++ b/components/rdf/src/nsIRDFFTP.h
diff --git a/rdf/base/nsInMemoryDataSource.cpp b/components/rdf/src/nsInMemoryDataSource.cpp
index 9bdd6b4fb..9bdd6b4fb 100644
--- a/rdf/base/nsInMemoryDataSource.cpp
+++ b/components/rdf/src/nsInMemoryDataSource.cpp
diff --git a/rdf/datasource/nsLocalStore.cpp b/components/rdf/src/nsLocalStore.cpp
index d5750ff70..d5750ff70 100644
--- a/rdf/datasource/nsLocalStore.cpp
+++ b/components/rdf/src/nsLocalStore.cpp
diff --git a/rdf/base/nsNameSpaceMap.cpp b/components/rdf/src/nsNameSpaceMap.cpp
index b486a233d..b486a233d 100644
--- a/rdf/base/nsNameSpaceMap.cpp
+++ b/components/rdf/src/nsNameSpaceMap.cpp
diff --git a/rdf/base/nsNameSpaceMap.h b/components/rdf/src/nsNameSpaceMap.h
index bc7c02029..bc7c02029 100644
--- a/rdf/base/nsNameSpaceMap.h
+++ b/components/rdf/src/nsNameSpaceMap.h
diff --git a/rdf/base/nsRDFBaseDataSources.h b/components/rdf/src/nsRDFBaseDataSources.h
index 0243e1359..0243e1359 100644
--- a/rdf/base/nsRDFBaseDataSources.h
+++ b/components/rdf/src/nsRDFBaseDataSources.h
diff --git a/rdf/datasource/nsRDFBuiltInDataSources.h b/components/rdf/src/nsRDFBuiltInDataSources.h
index 297fe7164..297fe7164 100644
--- a/rdf/datasource/nsRDFBuiltInDataSources.h
+++ b/components/rdf/src/nsRDFBuiltInDataSources.h
diff --git a/rdf/base/nsRDFContainer.cpp b/components/rdf/src/nsRDFContainer.cpp
index 6000c70d5..6000c70d5 100644
--- a/rdf/base/nsRDFContainer.cpp
+++ b/components/rdf/src/nsRDFContainer.cpp
diff --git a/rdf/base/nsRDFContainerUtils.cpp b/components/rdf/src/nsRDFContainerUtils.cpp
index 299722d4b..299722d4b 100644
--- a/rdf/base/nsRDFContainerUtils.cpp
+++ b/components/rdf/src/nsRDFContainerUtils.cpp
diff --git a/rdf/base/nsRDFContentSink.cpp b/components/rdf/src/nsRDFContentSink.cpp
index ae05a9381..ae05a9381 100644
--- a/rdf/base/nsRDFContentSink.cpp
+++ b/components/rdf/src/nsRDFContentSink.cpp
diff --git a/rdf/base/nsRDFContentSinkAtomList.h b/components/rdf/src/nsRDFContentSinkAtomList.h
index 5ef4f7b4e..5ef4f7b4e 100644
--- a/rdf/base/nsRDFContentSinkAtomList.h
+++ b/components/rdf/src/nsRDFContentSinkAtomList.h
diff --git a/rdf/base/nsRDFService.cpp b/components/rdf/src/nsRDFService.cpp
index 13a5e7195..13a5e7195 100644
--- a/rdf/base/nsRDFService.cpp
+++ b/components/rdf/src/nsRDFService.cpp
diff --git a/rdf/base/nsRDFService.h b/components/rdf/src/nsRDFService.h
index 0cc8c79ce..0cc8c79ce 100644
--- a/rdf/base/nsRDFService.h
+++ b/components/rdf/src/nsRDFService.h
diff --git a/rdf/base/nsRDFXMLDataSource.cpp b/components/rdf/src/nsRDFXMLDataSource.cpp
index 0e9127420..0e9127420 100644
--- a/rdf/base/nsRDFXMLDataSource.cpp
+++ b/components/rdf/src/nsRDFXMLDataSource.cpp
diff --git a/rdf/base/nsRDFXMLParser.cpp b/components/rdf/src/nsRDFXMLParser.cpp
index 67de90820..67de90820 100644
--- a/rdf/base/nsRDFXMLParser.cpp
+++ b/components/rdf/src/nsRDFXMLParser.cpp
diff --git a/rdf/base/nsRDFXMLParser.h b/components/rdf/src/nsRDFXMLParser.h
index d35c873fb..d35c873fb 100644
--- a/rdf/base/nsRDFXMLParser.h
+++ b/components/rdf/src/nsRDFXMLParser.h
diff --git a/rdf/base/nsRDFXMLSerializer.cpp b/components/rdf/src/nsRDFXMLSerializer.cpp
index 3b9018068..3b9018068 100644
--- a/rdf/base/nsRDFXMLSerializer.cpp
+++ b/components/rdf/src/nsRDFXMLSerializer.cpp
diff --git a/rdf/base/nsRDFXMLSerializer.h b/components/rdf/src/nsRDFXMLSerializer.h
index b31a088cd..b31a088cd 100644
--- a/rdf/base/nsRDFXMLSerializer.h
+++ b/components/rdf/src/nsRDFXMLSerializer.h
diff --git a/rdf/base/rdf.h b/components/rdf/src/rdf.h
index a863884a0..a863884a0 100644
--- a/rdf/base/rdf.h
+++ b/components/rdf/src/rdf.h
diff --git a/rdf/base/rdfTriplesSerializer.cpp b/components/rdf/src/rdfTriplesSerializer.cpp
index f419c7612..f419c7612 100644
--- a/rdf/base/rdfTriplesSerializer.cpp
+++ b/components/rdf/src/rdfTriplesSerializer.cpp
diff --git a/rdf/base/rdfutil.cpp b/components/rdf/src/rdfutil.cpp
index 849072145..849072145 100644
--- a/rdf/base/rdfutil.cpp
+++ b/components/rdf/src/rdfutil.cpp
diff --git a/rdf/base/rdfutil.h b/components/rdf/src/rdfutil.h
index c11581a4a..c11581a4a 100644
--- a/rdf/base/rdfutil.h
+++ b/components/rdf/src/rdfutil.h
diff --git a/rdf/util/internal/moz.build b/components/rdf/util/internal/moz.build
index 65e6c6fe0..65e6c6fe0 100644
--- a/rdf/util/internal/moz.build
+++ b/components/rdf/util/internal/moz.build
diff --git a/rdf/util/moz.build b/components/rdf/util/moz.build
index f8d1a621f..b5c43bff9 100644
--- a/rdf/util/moz.build
+++ b/components/rdf/util/moz.build
@@ -9,9 +9,7 @@
 
 DIRS += ['internal']
 
-EXPORTS += [
-    'nsRDFResource.h',
-]
+EXPORTS += ['nsRDFResource.h']
 
 include('objs.mozbuild')
 
diff --git a/rdf/util/nsRDFResource.cpp b/components/rdf/util/nsRDFResource.cpp
index 0e6f01f14..0e6f01f14 100644
--- a/rdf/util/nsRDFResource.cpp
+++ b/components/rdf/util/nsRDFResource.cpp
diff --git a/rdf/util/nsRDFResource.h b/components/rdf/util/nsRDFResource.h
index 7556b323c..7556b323c 100644
--- a/rdf/util/nsRDFResource.h
+++ b/components/rdf/util/nsRDFResource.h
diff --git a/rdf/util/objs.mozbuild b/components/rdf/util/objs.mozbuild
index aaa31c2c2..ae220f776 100644
--- a/rdf/util/objs.mozbuild
+++ b/components/rdf/util/objs.mozbuild
@@ -4,5 +4,5 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 rdf_util_src_cppsrcs = [
-    '/rdf/util/nsRDFResource.cpp',
+    '/components/rdf/util/nsRDFResource.cpp',
 ]
diff --git a/rdf/base/moz.build b/rdf/base/moz.build
deleted file mode 100644
index 2c8113026..000000000
--- a/rdf/base/moz.build
+++ /dev/null
@@ -1,58 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-XPIDL_SOURCES += [
-    'nsIRDFCompositeDataSource.idl',
-    'nsIRDFContainer.idl',
-    'nsIRDFContainerUtils.idl',
-    'nsIRDFDataSource.idl',
-    'nsIRDFDelegateFactory.idl',
-    'nsIRDFInferDataSource.idl',
-    'nsIRDFInMemoryDataSource.idl',
-    'nsIRDFLiteral.idl',
-    'nsIRDFNode.idl',
-    'nsIRDFObserver.idl',
-    'nsIRDFPropagatableDataSource.idl',
-    'nsIRDFPurgeableDataSource.idl',
-    'nsIRDFRemoteDataSource.idl',
-    'nsIRDFResource.idl',
-    'nsIRDFService.idl',
-    'nsIRDFXMLParser.idl',
-    'nsIRDFXMLSerializer.idl',
-    'nsIRDFXMLSink.idl',
-    'nsIRDFXMLSource.idl',
-    'rdfIDataSource.idl',
-    'rdfISerializer.idl',
-    'rdfITripleVisitor.idl',
-]
-
-XPIDL_MODULE = 'rdf'
-
-EXPORTS += [
-    'nsIRDFContentSink.h',
-    'rdf.h',
-]
-
-UNIFIED_SOURCES += [
-    'nsCompositeDataSource.cpp',
-    'nsContainerEnumerator.cpp',
-    'nsDefaultResourceFactory.cpp',
-    'nsInMemoryDataSource.cpp',
-    'nsNameSpaceMap.cpp',
-    'nsRDFContainer.cpp',
-    'nsRDFContainerUtils.cpp',
-    'nsRDFContentSink.cpp',
-    'nsRDFService.cpp',
-    'nsRDFXMLDataSource.cpp',
-    'nsRDFXMLParser.cpp',
-    'nsRDFXMLSerializer.cpp',
-    'rdfTriplesSerializer.cpp',
-    'rdfutil.cpp',
-]
-
-FINAL_LIBRARY = 'xul'
-
-if CONFIG['GNU_CXX']:
-    CXXFLAGS += ['-Wno-error=shadow']
diff --git a/rdf/build/moz.build b/rdf/build/moz.build
deleted file mode 100644
index 68f130edd..000000000
--- a/rdf/build/moz.build
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-EXPORTS += [
-    'nsRDFCID.h',
-]
-
-SOURCES += [
-    'nsRDFModule.cpp',
-]
-
-FINAL_LIBRARY = 'xul'
-
-LOCAL_INCLUDES += [
-    '/rdf/base',
-    '/rdf/datasource',
-]
diff --git a/rdf/datasource/moz.build b/rdf/datasource/moz.build
deleted file mode 100644
index 0ee4d6129..000000000
--- a/rdf/datasource/moz.build
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-EXPORTS += [
-    'nsILocalStore.h',
-]
-
-UNIFIED_SOURCES += [
-    'nsFileSystemDataSource.cpp',
-    'nsLocalStore.cpp',
-]
-
-FINAL_LIBRARY = 'xul'
-
-# "This is a dependency on rdfutil.h: it'll go away once that becomes
-# a first-class XPCOM interface."
-LOCAL_INCLUDES += [
-    '/rdf/base',
-]
diff --git a/rdf/moz.build b/rdf/moz.build
deleted file mode 100644
index 33271094d..000000000
--- a/rdf/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DIRS += ['base', 'util', 'datasource', 'build']
-TEST_DIRS += ['tests']
-
diff --git a/rdf/tests/moz.build b/rdf/tests/moz.build
deleted file mode 100644
index ac86c7402..000000000
--- a/rdf/tests/moz.build
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/rdf/tests/unit/sample.rdf b/rdf/tests/unit/sample.rdf
deleted file mode 100755
index 42de8cd08..000000000
--- a/rdf/tests/unit/sample.rdf
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-
-<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:dc="http://purl.org/dc/elements/1.1/">
-
-  <rdf:Description about="urn:mozilla:sample-data"
-    dc:title="Sample" />
-
-</rdf:RDF>
diff --git a/rdf/tests/unit/test_rdfredirect.js b/rdf/tests/unit/test_rdfredirect.js
deleted file mode 100644
index 40b01a49a..000000000
--- a/rdf/tests/unit/test_rdfredirect.js
+++ /dev/null
@@ -1,97 +0,0 @@
-var Cc = Components.classes;
-var Ci = Components.interfaces;
-var Cu = Components.utils;
-var Cr = Components.results;
-
-Cu.import("resource://testing-common/httpd.js");
-
-function getRDFService()
-{
-  return Cc["@mozilla.org/rdf/rdf-service;1"].
-    getService(Ci.nsIRDFService);
-}
-
-var server1, server2;
-
-function run_test()
-{
-  var samplefile = do_get_file('sample.rdf');
-
-  server1 = new HttpServer();
-  server1.registerPathHandler("/sample-xs.rdf", xsRedirect);
-  server1.registerPathHandler("/sample-local.rdf", localRedirect);
-  server1.registerFile('/sample.rdf', samplefile);
-  server1.start(4444);
-
-  server2 = new HttpServer();
-  server2.registerFile('/sample.rdf', samplefile);
-  server2.start(4445);
-
-  do_test_pending();
-
-  new rdfLoadObserver('http://localhost:4444/sample.rdf', true);
-  new rdfLoadObserver('http://localhost:4445/sample.rdf', true);
-  new rdfLoadObserver('http://localhost:4444/sample-xs.rdf', false);
-  new rdfLoadObserver('http://localhost:4444/sample-local.rdf', true);
-}
-
-var gPending = 0;
-
-function rdfLoadObserver(uri, shouldPass)
-{
-  this.shouldPass = shouldPass;
-  this.uri = uri;
-
-  ++gPending;
-
-  var rdfService = getRDFService();
-  this.ds = rdfService.GetDataSource(uri).
-    QueryInterface(Ci.nsIRDFXMLSink);
-  this.ds.addXMLSinkObserver(this);
-}
-
-rdfLoadObserver.prototype =
-{
-  onBeginLoad : function() { },
-  onInterrupt : function() { },
-  onResume : function() { },
-  onEndLoad : function() {
-    print("Testing results of loading " + this.uri);
-
-    var rdfs = getRDFService();
-    var res = rdfs.GetResource("urn:mozilla:sample-data");
-    var arc = rdfs.GetResource("http://purl.org/dc/elements/1.1/title");
-    var answer = this.ds.GetTarget(res, arc, true);
-    if (answer !== null) {
-      do_check_true(this.shouldPass);
-      do_check_true(answer instanceof Ci.nsIRDFLiteral);
-      do_check_eq(answer.Value, "Sample");
-    }
-    else {
-      do_check_false(this.shouldPass);
-    }
-
-    gPending -= 1;
-
-    this.ds.removeXMLSinkObserver(this);
-
-    if (gPending == 0) {
-      do_test_pending();
-      server1.stop(do_test_finished);
-      server2.stop(do_test_finished);
-    }
-  },
-  onError : function() { }
-}
-
-function xsRedirect(metadata, response)
-{
-  response.setStatusLine(metadata.httpVersion, 301, "Moved Permanently");
-  response.setHeader("Location", "http://localhost:4445/sample.rdf", false);
-}
-
-function localRedirect(metadata, response)
-{
-  response.setStatusLine(metadata.httpVersion, 301, "Moved Permanently");
-  response.setHeader("Location", "http://localhost:4444/sample.rdf", false);
-}
diff --git a/rdf/tests/unit/xpcshell.ini b/rdf/tests/unit/xpcshell.ini
deleted file mode 100644
index 99ab82395..000000000
--- a/rdf/tests/unit/xpcshell.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[DEFAULT]
-head =
-tail =
-support-files = sample.rdf
-
-[test_rdfredirect.js]
diff --git a/toolkit/toolkit.mozbuild b/toolkit/toolkit.mozbuild
index fe126d9a9..d2654251d 100644
--- a/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
@@ -53,10 +53,6 @@ if CONFIG['MOZ_PERMISSIONS']:
         '/extensions/permissions',
     ]
 
-DIRS += [
-    '/rdf',
-]
-
 if CONFIG['MOZ_WEBRTC']:
     DIRS += [
         '/media/webrtc',