Remove XML modulestore code - discovery work

common/lib/xmodule/xmodule/modulestore/mixed.py

@@ -1,7 +1,7 @@
 """
 MixedModuleStore allows for aggregation between multiple modulestores.
 
-In this way, courses can be served up both - say - XMLModuleStore or MongoModuleStore
+In this way, courses can be served up via either SplitMongoModuleStore or MongoModuleStore.
 
 """
 
@@ -169,15 +169,6 @@ class MixedModuleStore(ModuleStoreDraftAndPublished, ModuleStoreWriteBase):
 
         for store_settings in stores:
             key = store_settings['NAME']
-            is_xml = 'XMLModuleStore' in store_settings['ENGINE']
-            if is_xml:
-                # restrict xml to only load courses in mapping
-                store_settings['OPTIONS']['course_ids'] = [
-                    course_key.to_deprecated_string()
-                    for course_key, store_key in self.mappings.iteritems()
-                    if store_key == key
-                ]
-
             store = create_modulestore_instance(
                 store_settings['ENGINE'],
                 self.contentstore,

common/lib/xmodule/xmodule/modulestore/tests/django_utils.py

@@ -140,28 +140,6 @@ def split_mongo_store_config(data_dir):
     return store
 
 
-def xml_store_config(data_dir, source_dirs=None):
-    """
-    Defines default module store using XMLModuleStore.
-
-    Note: you should pass in a list of source_dirs that you care about,
-    otherwise all courses in the data_dir will be processed.
-    """
-    store = {
-        'default': {
-            'NAME': 'xml',
-            'ENGINE': 'xmodule.modulestore.xml.XMLModuleStore',
-            'OPTIONS': {
-                'data_dir': data_dir,
-                'default_class': 'xmodule.hidden_module.HiddenDescriptor',
-                'source_dirs': source_dirs,
-            }
-        }
-    }
-
-    return store
-
-
 @patch('xmodule.modulestore.django.create_modulestore_instance', autospec=True)
 def drop_mongo_collections(mock_create):
     """
@@ -180,9 +158,6 @@ def drop_mongo_collections(mock_create):
 
 TEST_DATA_DIR = settings.COMMON_TEST_DATA_ROOT
 
-# This is an XML only modulestore with only the toy course loaded
-TEST_DATA_XML_MODULESTORE = xml_store_config(TEST_DATA_DIR, source_dirs=['toy'])
-
 # This modulestore will provide both a mixed mongo editable modulestore, and
 # an XML store with just the toy course loaded.
 TEST_DATA_MIXED_TOY_MODULESTORE = mixed_store_config(

common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py

@@ -110,15 +110,6 @@ class CommonMixedModuleStoreSetup(CourseComparisonTest):
                 'DOC_STORE_CONFIG': DOC_STORE_CONFIG,
                 'OPTIONS': modulestore_options
             },
-            {
-                'NAME': ModuleStoreEnum.Type.xml,
-                'ENGINE': 'xmodule.modulestore.xml.XMLModuleStore',
-                'OPTIONS': {
-                    'data_dir': DATA_DIR,
-                    'default_class': 'xmodule.hidden_module.HiddenDescriptor',
-                    'xblock_mixins': modulestore_options['xblock_mixins'],
-                }
-            },
         ],
         'xblock_mixins': modulestore_options['xblock_mixins'],
     }