[DS-1144] Maven Project Consolidation : Load Discovery with API

DSpace · Oct 3, 2012 · db255b7 · db255b7
1 parent e15609c
commit db255b7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 48 deletions.
diff --git a/dspace-api/src/main/java/org/dspace/discovery/configuration/DiscoverySpringLoader.java b/dspace-api/src/main/java/org/dspace/discovery/configuration/DiscoverySpringLoader.java
diff --git a/...-addon-discovery-solr-plugin-services.xml → dspace/config/spring/api/discovery-solr.xml b/...-addon-discovery-solr-plugin-services.xml → dspace/config/spring/api/discovery-solr.xml
@@ -18,13 +18,6 @@
 
     <context:annotation-config /> <!-- allows us to use spring annotations in beans -->
 
-    <bean class="org.dspace.discovery.SolrServiceResourceRestrictionPlugin" id="solrServiceResourceIndexPlugin" scope="prototype"/>
 
-    <alias name="solrServiceResourceIndexPlugin" alias="org.dspace.discovery.SolrServiceResourceRestrictionPlugin"/>
-
-    <!-- Additional indexing plugin to implement the browse system via SOLR -->
-    <bean id="solrBrowseIndexer" scope="prototype" 
-    	class="org.dspace.browse.SolrBrowseCreateDAO">
-    </bean>
 
 </beans>
diff --git a/...ddon-discovery-configuration-services.xml → dspace/config/spring/api/discovery.xml b/...ddon-discovery-configuration-services.xml → dspace/config/spring/api/discovery.xml
@@ -19,6 +19,15 @@
 
     <context:annotation-config /> <!-- allows us to use spring annotations in beans -->
 
+    <bean id="solrServiceResourceIndexPlugin" class="org.dspace.discovery.SolrServiceResourceRestrictionPlugin" scope="prototype"/>
+
+    <alias name="solrServiceResourceIndexPlugin" alias="org.dspace.discovery.SolrServiceResourceRestrictionPlugin"/>
+
+    <!-- Additional indexing plugin to implement the browse system via SOLR -->
+    <bean id="solrBrowseIndexer" scope="prototype"
+          class="org.dspace.browse.SolrBrowseCreateDAO">
+    </bean>
+
     <!--Bean that is used for mapping communities/collections to certain discovery configurations.-->
     <bean id="org.dspace.discovery.configuration.DiscoveryConfigurationService" class="org.dspace.discovery.configuration.DiscoveryConfigurationService">
         <property name="map">