Merge pull request #30 from futures/path-to-modeshape-config

Allow the path to the modeshape config to be passed in as a property (either classpath or filepath.
fcrepo · Mar 7, 2013 · 3f523f6 · 3f523f6
2 parents 0b7fafd + 9525e5d
commit 3f523f6
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 45 deletions.
diff --git a/fcrepo-dc/src/test/resources/spring-test/repo.xml b/fcrepo-dc/src/test/resources/spring-test/repo.xml
@@ -10,15 +10,13 @@
 
     <context:annotation-config/>
 
-    <bean name="modeshapeRepofactory" class="org.fcrepo.spring.ModeShapeRepositoryFactoryBean"/>
+    <bean name="modeshapeRepofactory"
+          class="org.fcrepo.spring.ModeShapeRepositoryFactoryBean">
+      <property name="repositoryConfiguration" value="${fcrepo.modeshape.configuration:my_repository.json}"/>
+    </bean>
 
     <bean class="org.modeshape.jcr.JcrRepositoryFactory"/>
 
-    <bean class="org.springframework.core.io.ClassPathResource">
-        <qualifier type="ModeShapeRepositoryConfiguration"/>
-        <constructor-arg type="String" value="my_repository.json"/>
-    </bean>
-
     <bean class="org.fcrepo.services.ObjectService"/>
 
 </beans>
diff --git a/fcrepo-http-api/src/test/resources/spring-test/repo.xml b/fcrepo-http-api/src/test/resources/spring-test/repo.xml
@@ -10,14 +10,13 @@
 
     <context:annotation-config/>
 
-    <bean name="modeshapeRepofactory" class="org.fcrepo.spring.ModeShapeRepositoryFactoryBean"/>
+    <bean name="modeshapeRepofactory"
+          class="org.fcrepo.spring.ModeShapeRepositoryFactoryBean">
+      <property name="repositoryConfiguration" value="${fcrepo.modeshape.configuration:test_repository.json}"/>
+    </bean>
 
     <bean class="org.modeshape.jcr.JcrRepositoryFactory"/>
 
-    <bean class="org.springframework.core.io.ClassPathResource">
-        <qualifier type="ModeShapeRepositoryConfiguration"/>
-        <constructor-arg type="String" value="test_repository.json"/>
-    </bean>
 
     <bean class="org.fcrepo.services.ObjectService"/>
     <bean class="org.fcrepo.services.DatastreamService"/>

diff --git a/fcrepo-jms/src/test/resources/spring-test/repo.xml b/fcrepo-jms/src/test/resources/spring-test/repo.xml
@@ -10,15 +10,13 @@
 
     <context:annotation-config/>
 
+
     <bean name="modeshapeRepofactory"
-        class="org.fcrepo.spring.ModeShapeRepositoryFactoryBean"/>
+          class="org.fcrepo.spring.ModeShapeRepositoryFactoryBean">
+      <property name="repositoryConfiguration" value="${fcrepo.modeshape.configuration:my_repository.json}"/>
+    </bean>
 
     <bean class="org.modeshape.jcr.JcrRepositoryFactory"/>
 
-    <bean class="org.springframework.core.io.ClassPathResource">
-        <qualifier type="ModeShapeRepositoryConfiguration"/>
-        <constructor-arg type="String" value="my_repository.json"/>
-    </bean>
-
 
 </beans>
diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/spring/ModeShapeRepositoryFactoryBean.java b/fcrepo-kernel/src/main/java/org/fcrepo/spring/ModeShapeRepositoryFactoryBean.java
@@ -5,6 +5,7 @@
 
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
+import javax.inject.Qualifier;
 import javax.jcr.RepositoryException;
 
 import org.modeshape.jcr.JcrRepository;
@@ -20,8 +21,6 @@ public class ModeShapeRepositoryFactoryBean implements
 	@Inject
 	private JcrRepositoryFactory jcrRepositoryFactory;
 
-	@Inject
-	@ModeShapeRepositoryConfiguration
 	private Resource repositoryConfiguration;
 	private JcrRepository repository;
 
@@ -47,4 +46,7 @@ public boolean isSingleton() {
 		return true;
 	}
 
+    public void setRepositoryConfiguration(Resource repositoryConfiguration) {
+        this.repositoryConfiguration = repositoryConfiguration;
+    }
 }
diff --git a/fcrepo-kernel/src/test/resources/spring-test/repo.xml b/fcrepo-kernel/src/test/resources/spring-test/repo.xml
@@ -10,17 +10,17 @@
 
     <context:annotation-config/>
 
+
+  <context:property-placeholder/>
+
     <bean name="modeshapeRepofactory"
-        class="org.fcrepo.spring.ModeShapeRepositoryFactoryBean"/>
+        class="org.fcrepo.spring.ModeShapeRepositoryFactoryBean">
+      <property name="repositoryConfiguration" value="${fcrepo.modeshape.configuration:test_repository.json}"/>
+    </bean>
 
     <bean class="org.modeshape.jcr.JcrRepositoryFactory"/>
 
-    <bean class="org.springframework.core.io.ClassPathResource">
-        <qualifier type="ModeShapeRepositoryConfiguration"/>
-        <constructor-arg type="String" value="test_repository.json"/>
-    </bean>
+    <bean class="org.fcrepo.services.ObjectService"/>
+    <bean class="org.fcrepo.services.DatastreamService"/>
 
-    <bean class="org.fcrepo.services.ObjectService"/>    
-    <bean class="org.fcrepo.services.DatastreamService"/>    
-
 </beans>
diff --git a/fcrepo-legacy-api/src/test/resources/spring-test/repo.xml b/fcrepo-legacy-api/src/test/resources/spring-test/repo.xml
@@ -10,15 +10,13 @@
 
     <context:annotation-config/>
 
-    <bean name="modeshapeRepofactory" class="org.fcrepo.spring.ModeShapeRepositoryFactoryBean"/>
+    <bean name="modeshapeRepofactory"
+          class="org.fcrepo.spring.ModeShapeRepositoryFactoryBean">
+      <property name="repositoryConfiguration" value="${fcrepo.modeshape.configuration:test_repository.json}"/>
+    </bean>
 
     <bean class="org.modeshape.jcr.JcrRepositoryFactory"/>
 
-    <bean class="org.springframework.core.io.ClassPathResource">
-        <qualifier type="ModeShapeRepositoryConfiguration"/>
-        <constructor-arg type="String" value="test_repository.json"/>
-    </bean>
-
     <bean class="org.fcrepo.services.ObjectService"/>
     <bean class="org.fcrepo.services.DatastreamService"/>
 

diff --git a/fcrepo-rss/src/test/resources/spring-test/repo.xml b/fcrepo-rss/src/test/resources/spring-test/repo.xml
@@ -10,15 +10,14 @@
 
     <context:annotation-config/>
 
+
     <bean name="modeshapeRepofactory"
-        class="org.fcrepo.spring.ModeShapeRepositoryFactoryBean"/>
+          class="org.fcrepo.spring.ModeShapeRepositoryFactoryBean">
+      <property name="repositoryConfiguration" value="${fcrepo.modeshape.configuration:test_repository.json}"/>
+    </bean>
 
     <bean class="org.modeshape.jcr.JcrRepositoryFactory"/>
 
-    <bean class="org.springframework.core.io.ClassPathResource">
-        <qualifier type="ModeShapeRepositoryConfiguration"/>
-        <constructor-arg type="String" value="test_repository.json"/>
-    </bean>
 
 
 </beans>
diff --git a/fcrepo-webapp/src/main/resources/config/repository.json b/fcrepo-webapp/src/main/resources/config/repository.json
@@ -22,7 +22,7 @@
     },
     "storage" : {
         "cacheName" : "FedoraRepository",
-        "cacheConfiguration" : "config/infinispan_configuration.xml",
+        "cacheConfiguration" : "${fcrepo.infinispan.cache_configuration:config/infinispan_configuration.xml}",
         "binaryStorage" : {
             "type" : "cache",
             "dataCacheName" : "FedoraRepository",

diff --git a/fcrepo-webapp/src/main/resources/spring/repo.xml b/fcrepo-webapp/src/main/resources/spring/repo.xml
@@ -10,15 +10,13 @@
 
     <context:annotation-config/>
 
-    <bean name="modeshapeRepofactory" class="org.fcrepo.spring.ModeShapeRepositoryFactoryBean"/>
+    <bean name="modeshapeRepofactory"
+          class="org.fcrepo.spring.ModeShapeRepositoryFactoryBean">
+      <property name="repositoryConfiguration" value="${fcrepo.modeshape.configuration:/config/repository.json}"/>
+    </bean>
 
     <bean class="org.modeshape.jcr.JcrRepositoryFactory"/>
 
-    <bean class="org.springframework.core.io.ClassPathResource">
-        <qualifier type="ModeShapeRepositoryConfiguration"/>
-        <constructor-arg type="String" value="/config/repository.json"/>
-    </bean>
-
     <bean class="org.fcrepo.services.ObjectService"/>
     <bean class="org.fcrepo.services.DatastreamService"/>