Normalize configuration values

Partial resolution of: https://jira.duraspace.org/browse/FCREPO-1288
fcrepo-exts · Jan 27, 2015 · fab005d · fab005d
1 parent c17cfb4
commit fab005d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml
@@ -7,10 +7,10 @@
         </encoder>
     </appender>
 
-	<logger name="org.fcrepo" additivity="false" level="${log.fcrepo:-INFO}">
+	<logger name="org.fcrepo" additivity="false" level="${fcrepo.log:-INFO}">
         <appender-ref ref="STDOUT"/>
     </logger>
-    <logger name="org.fcrepo.auth" additivity="false" level="${log.fcrepo.auth:-INFO}">
+    <logger name="org.fcrepo.auth" additivity="false" level="${fcrepo.log.auth:-INFO}">
         <appender-ref ref="STDOUT"/>
     </logger>
     <root additivity="false" level="WARN">

diff --git a/src/test/resources/repository.json b/src/test/resources/repository.json
@@ -8,10 +8,10 @@
     },
     "storage" : {
         "cacheName" : "FedoraRepository",
-        "cacheConfiguration" : "${fcrepo.infinispan.cache_configuration:config/infinispan/leveldb-default/infinispan.xml}",
+        "cacheConfiguration" : "${fcrepo.ispn.configuration:config/infinispan/leveldb-default/infinispan.xml}",
         "binaryStorage" : {
             "type" : "file",
-            "directory" : "${fcrepo.binary-store-path:target/binaries}",
+            "directory" : "${fcrepo.binary.directory:target/binaries}",
             "minimumBinarySizeInBytes" : 4096
         }
     },
@@ -25,4 +25,4 @@
         ]
     },
 	"node-types" : ["fedora-node-types.cnd"]
-}
+}
diff --git a/src/test/resources/spring-test/repo.xml b/src/test/resources/spring-test/repo.xml
@@ -22,7 +22,7 @@
     <bean class="org.modeshape.jcr.ModeShapeEngine" init-method="start"/>
 
   <bean class="org.fcrepo.auth.xacml.XACMLWorkspaceInitializer" init-method="initTest">
-    <constructor-arg value="${fcrepo.xacml.initial.policies.dir:src/main/resources/policies}"/>
+    <constructor-arg value="${fcrepo.xacml.initial.policies.directory:src/main/resources/policies}"/>
     <constructor-arg value="${fcrepo.xacml.initial.root.policy.file:src/main/resources/policies/GlobalRolesPolicySet.xml}"/>
   </bean>
 

diff --git a/src/test/resources/spring-test/test-container.xml b/src/test/resources/spring-test/test-container.xml
@@ -13,7 +13,7 @@
   </bean>
 
   <bean id="containerWrapper" class="org.fcrepo.http.commons.test.util.ContainerWrapper" init-method="start" destroy-method="stop" >
-    <property name="port" value="${test.port:8080}"/>
+    <property name="port" value="${fcrepo.test.port:8080}"/>
     <property name="configLocation" value="classpath:web.xml" />
   </bean>