Simplify component scanning to the 'org.fcrepo' package

Resolves: https://www.pivotaltracker.com/story/show/78517974
fcrepo · Sep 10, 2014 · 55c4a61 · 55c4a61
1 parent 9735004
commit 55c4a61
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 15 deletions.
diff --git a/fcrepo-auth-common/src/test/resources/spring-test/mocked-fad-repo.xml b/fcrepo-auth-common/src/test/resources/spring-test/mocked-fad-repo.xml
@@ -11,7 +11,7 @@
 
   <context:annotation-config />
 
-  <context:component-scan base-package="org.fcrepo.kernel" />
+  <context:component-scan base-package="org.fcrepo" />
 
   <bean name="modeshapeRepofactory" class="org.fcrepo.kernel.impl.spring.ModeShapeRepositoryFactoryBean"
     depends-on="authenticationProvider" p:repositoryConfiguration="${fcrepo.modeshape.configuration:repository.json}"/>

diff --git a/fcrepo-generator-dc/src/test/resources/spring-test/generator.xml b/fcrepo-generator-dc/src/test/resources/spring-test/generator.xml
@@ -11,7 +11,7 @@
 
     <context:annotation-config />
 
-    <context:component-scan base-package="org.fcrepo.http,org.fcrepo.kernel, org.fcrepo.serialization,org.fcrepo.generator"/>
+    <context:component-scan base-package="org.fcrepo"/>
 
     <bean class="org.fcrepo.http.commons.session.SessionFactory" />
 

diff --git a/fcrepo-http-api/src/main/resources/META-INF/spring/rest.xml b/fcrepo-http-api/src/main/resources/META-INF/spring/rest.xml
@@ -13,7 +13,7 @@
 
     <context:annotation-config />
 
-    <context:component-scan base-package="org.modeshape.web.jcr.rest, org.fcrepo.http"/>
+    <context:component-scan base-package="org.fcrepo"/>
 
 </beans>
 
diff --git a/fcrepo-http-api/src/test/resources/spring-test/rest.xml b/fcrepo-http-api/src/test/resources/spring-test/rest.xml
@@ -18,7 +18,6 @@
 
   <context:annotation-config/>
 
-  <context:component-scan
-    base-package="org.fcrepo.kernel, org.fcrepo.http, org.fcrepo.serialization"/>
+  <context:component-scan base-package="org.fcrepo"/>
 
 </beans>
diff --git a/fcrepo-http-api/src/test/resources/spring-test/transactions.xml b/fcrepo-http-api/src/test/resources/spring-test/transactions.xml
@@ -7,7 +7,7 @@
   http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.0.xsd">
 
   <context:annotation-config />
-  <context:component-scan base-package="org.fcrepo.kernel" />
+  <context:component-scan base-package="org.fcrepo" />
 
   <task:scheduler id="taskScheduler" />
   <task:executor id="taskExecutor" pool-size="1" />

diff --git a/fcrepo-kernel-impl/src/test/resources/spring-test/repo.xml b/fcrepo-kernel-impl/src/test/resources/spring-test/repo.xml
@@ -17,7 +17,7 @@
     class="org.fcrepo.kernel.impl.spring.ModeShapeRepositoryFactoryBean"
     p:repositoryConfiguration="${fcrepo.modeshape.configuration:/config/testing/repository.json}"/> 
 
-  <context:component-scan base-package="org.fcrepo.kernel, org.fcrepo.storage.policy"/>
+  <context:component-scan base-package="org.fcrepo"/>
 
   <bean class="org.modeshape.jcr.JcrRepositoryFactory"/>
 

diff --git a/fcrepo-transform/src/test/resources/spring-test/rest.xml b/fcrepo-transform/src/test/resources/spring-test/rest.xml
@@ -15,8 +15,7 @@
 
   <context:annotation-config/>
 
-  <context:component-scan base-package="org.fcrepo.http, org.fcrepo.kernel,
-    org.fcrepo.transform.http, org.fcrepo.serialization"/>
+  <context:component-scan base-package="org.fcrepo"/>
 
   <bean class="org.fcrepo.http.commons.session.SessionFactory" />
 

diff --git a/fcrepo-webapp/src/main/resources/spring/rest.xml b/fcrepo-webapp/src/main/resources/spring/rest.xml
@@ -25,8 +25,6 @@
 
     <bean class="org.fcrepo.storage.policy.StoragePolicyDecisionPointImpl"/>
 
-    <context:component-scan
-        base-package="org.fcrepo.kernel, org.modeshape.web.jcr.rest, org.fcrepo.http, org.fcrepo.serialization,
-        org.fcrepo.audit, org.fcrepo.storage.policy, org.fcrepo.transform, org.fcrepo.auth.roles.common"/>
+    <context:component-scan base-package="org.fcrepo"/>
 
 </beans>
diff --git a/fcrepo-webapp/src/main/resources/spring/transactions.xml b/fcrepo-webapp/src/main/resources/spring/transactions.xml
@@ -7,7 +7,6 @@
   http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.0.xsd">
 
   <context:annotation-config />
-  <context:component-scan base-package="org.fcrepo.http.commons.api, org.fcrepo.api" />
 
   <task:scheduler id="taskScheduler" />
   <task:executor id="taskExecutor" pool-size="1" />

diff --git a/fcrepo-webapp/src/test/resources/spring-test/rest.xml b/fcrepo-webapp/src/test/resources/spring-test/rest.xml
@@ -20,7 +20,6 @@
 
   <context:annotation-config />
 
-  <context:component-scan base-package="org.fcrepo.kernel, org.fcrepo.http.commons.exceptionhandlers,
-  org.fcrepo.http.commons.responses, org.fcrepo.auth.roles.common"/>
+  <context:component-scan base-package="org.fcrepo"/>
 
 </beans>