Skip to content

Commit

Permalink
Normal configuration values
Browse files Browse the repository at this point in the history 
- Change instances of log.fcrepo.* to fcrepo.log.*
- Update additional configuration values including:
** test.port => fcrepo.test.port
** test.context.path => fcrepo.test.context.path
** RUN_TEST_CRUD_CONCURRENT => fcrepo.test.http.concurrent
** fcrepo4.tx.timeout => fcrepo.transactions.timeout
** fcrepo.test.dir1 => fcrepo.test.connector.file.directory1
** fcrepo.test.dir2 => fcrepo.test.connector.file.directory2
** fcrepo.test.properties.dir => fcrepo.test.connector.file.properties.directory
- The jgroups* configuration remain unchanged

Partial resolution of: https://jira.duraspace.org/browse/FCREPO-1288
  • Loading branch information
@acoburn
acoburn authored and Andrew Woods committed Jan 27, 2015
1 parent 4bf47ae commit 2e09b91
Show file tree
Hide file tree
Showing 50 changed files with 159 additions and 159 deletions.
2 changes: 1 addition & 1 deletion fcrepo-auth-common/src/test/java/org/fcrepo/auth/integration/AbstractResourceIT.java
View file
Expand Up @@ -51,7 +51,7 @@ public void setLogger() {
}

protected static final int SERVER_PORT = Integer.parseInt(System
.getProperty("test.port", "8080"));
.getProperty("fcrepo.test.port", "8080"));

protected static final String HOSTNAME = "localhost";

Expand Down
2 changes: 1 addition & 1 deletion fcrepo-auth-common/src/test/resources/config/basic-authn/repository.json
View file
Expand Up @@ -8,7 +8,7 @@
},
"storage" : {
"cacheName" : "FedoraRepository",
"cacheConfiguration" : "${fcrepo.infinispan.cache_configuration:config/testing/infinispan-basic.xml}",
"cacheConfiguration" : "${fcrepo.ispn.configuration:config/testing/infinispan-basic.xml}",
"binaryStorage" : {
"type" : "cache",
"dataCacheName" : "FedoraRepositoryBinaryData",
Expand Down
4 changes: 2 additions & 2 deletions fcrepo-auth-common/src/test/resources/logback-test.xml
View file
Expand Up @@ -7,10 +7,10 @@
</encoder>
</appender>

<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>
<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>
<root additivity="false" level="WARN">
Expand Down
4 changes: 2 additions & 2 deletions fcrepo-auth-common/src/test/resources/repository.json
View file
Expand Up @@ -8,7 +8,7 @@
},
"storage" : {
"cacheName" : "FedoraRepository",
"cacheConfiguration" : "${fcrepo.infinispan.cache_configuration:config/testing/infinispan-basic.xml}",
"cacheConfiguration" : "${fcrepo.ispn.configuration:config/testing/infinispan-basic.xml}",
"binaryStorage" : {
"type" : "cache",
"dataCacheName" : "FedoraRepositoryBinaryData",
Expand All @@ -25,4 +25,4 @@
]
},
"node-types" : ["fedora-node-types.cnd"]
}
}
2 changes: 1 addition & 1 deletion fcrepo-auth-common/src/test/resources/spring-test/test-container.xml
View file
Expand Up @@ -15,7 +15,7 @@

<bean id="containerWrapper"
class="org.fcrepo.http.commons.test.util.ContainerWrapper"
init-method="start" destroy-method="stop" p:port="${test.port:8080}"
init-method="start" destroy-method="stop" p:port="${fcrepo.test.port:8080}"
p:configLocation="classpath:web.xml"/>

</beans>
30 changes: 15 additions & 15 deletions fcrepo-configs/src/main/resources/config/activemq.xml
View file
Expand Up @@ -7,7 +7,7 @@
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">

<context:property-placeholder/>
<context:property-placeholder/>

<!--
The <broker> element is used to configure the ActiveMQ broker.
Expand All @@ -17,9 +17,9 @@
<!--
For better performances use VM cursor and small memory limit.
For more information, see:
http://activemq.apache.org/message-cursors.html
Also, if your producer is "hanging", it's probably due to producer flow control.
For more information, see:
http://activemq.apache.org/producer-flow-control.html
Expand All @@ -33,9 +33,9 @@
slow topic consumers to block producers and affect other consumers
by limiting the number of messages that are retained
For more information, see:
http://activemq.apache.org/slow-consumer-handling.html
-->
<pendingMessageLimitStrategy>
<constantPendingMessageLimitStrategy limit="1000"/>
Expand All @@ -44,9 +44,9 @@
<policyEntry queue=">" producerFlowControl="true" memoryLimit="1mb">
<!-- Use VM cursor for better latency
For more information, see:
http://activemq.apache.org/message-cursors.html
<pendingQueuePolicy>
<vmQueueCursor/>
</pendingQueuePolicy>
Expand All @@ -61,7 +61,7 @@
The managementContext is used to configure how ActiveMQ is exposed in
JMX. By default, ActiveMQ uses the MBean server that is started by
the JVM. For more information, see:
http://activemq.apache.org/jmx.html
-->
<managementContext>
Expand All @@ -72,11 +72,11 @@
Configure message persistence for the broker. The default persistence
mechanism is the KahaDB store (identified by the kahaDB tag).
For more information, see:
http://activemq.apache.org/persistence.html
-->
<persistenceAdapter>
<kahaDB directory="${fcrepo.activemq.dir:ActiveMQ/kahadb}"/>
<kahaDB directory="${fcrepo.activemq.directory:ActiveMQ/kahadb}"/>
</persistenceAdapter>


Expand Down Expand Up @@ -105,15 +105,15 @@
<!--
The transport connectors expose ActiveMQ over a given protocol to
clients and other brokers. For more information, see:
http://activemq.apache.org/configuring-transports.html
-->
<transportConnectors>
<!-- DOS protection, limit concurrent connections to 1000 and frame size to 100MB -->
<transportConnector name="openwire"
uri="tcp://0.0.0.0:${jms.port:61616}?maximumConnections=1000&amp;wireformat.maxFrameSize=104857600"
uri="tcp://0.0.0.0:${fcrepo.jms.port:61616}?maximumConnections=1000&amp;wireformat.maxFrameSize=104857600"
/>
<transportConnector name="stomp" uri="stomp://0.0.0.0:${stomp.port:61613}"/>
<transportConnector name="stomp" uri="stomp://0.0.0.0:${fcrepo.stomp.port:61613}"/>
</transportConnectors>

<!-- destroy the spring context on shutdown to stop jetty -->
Expand All @@ -126,9 +126,9 @@

<!--
Enable web consoles, REST and Ajax APIs and demos
Take a look at ${ACTIVEMQ_HOME}/conf/jetty.xml for more details
<import resource="jetty.xml"/>
-->
</beans>
2 changes: 1 addition & 1 deletion fcrepo-configs/src/main/resources/config/clustered/repository.json
View file
Expand Up @@ -8,7 +8,7 @@
},
"storage" : {
"cacheName" : "FedoraRepository",
"cacheConfiguration" : "${fcrepo.infinispan.cache_configuration:config/infinispan/leveldb/infinispan.xml}",
"cacheConfiguration" : "${fcrepo.ispn.configuration:config/infinispan/leveldb/infinispan.xml}",
"binaryStorage" : {
"type" : "cache",
"dataCacheName" : "FedoraRepositoryBinaryData",
Expand Down
6 changes: 3 additions & 3 deletions fcrepo-configs/src/main/resources/config/infinispan/clustered/infinispan.xml
View file
Expand Up @@ -61,7 +61,7 @@
preload="false"
fetchPersistentState="true"
purgeOnStartup="false"
location="${fcrepo.ispn.repo.CacheDirPath:target/FedoraRepository/storage}"/>
location="${fcrepo.ispn.repo.cache:target/FedoraRepository/storage}"/>
</persistence>
</namedCache>

Expand Down Expand Up @@ -99,7 +99,7 @@
preload="false"
fetchPersistentState="true"
purgeOnStartup="false"
location="${fcrepo.ispn.CacheDirPath:target/FedoraRepositoryMetaData/storage}"/>
location="${fcrepo.ispn.cache:target/FedoraRepositoryMetaData/storage}"/>
</persistence>
</namedCache>

Expand Down Expand Up @@ -139,7 +139,7 @@
preload="false"
fetchPersistentState="true"
purgeOnStartup="false"
location="${fcrepo.ispn.binary.CacheDirPath:target/FedoraRepositoryBinaryData/storage}"/>
location="${fcrepo.ispn.binary.cache:target/FedoraRepositoryBinaryData/storage}"/>
</persistence>
</namedCache>
</infinispan>
2 changes: 1 addition & 1 deletion fcrepo-configs/src/main/resources/config/infinispan/file/infinispan.xml
View file
Expand Up @@ -31,7 +31,7 @@
preload="false"
fetchPersistentState="true"
purgeOnStartup="false"
location="${fcrepo.ispn.repo.CacheDirPath:target/FedoraRepository/storage}" />
location="${fcrepo.ispn.repo.cache:target/FedoraRepository/storage}" />
</persistence>

</namedCache>
Expand Down
4 changes: 2 additions & 2 deletions fcrepo-configs/src/main/resources/config/infinispan/leveldb-default/infinispan.xml
View file
Expand Up @@ -25,8 +25,8 @@
into memory. -->
<persistence passivation="false">
<store:leveldbStore
location="${fcrepo.ispn.repo.CacheDirPath:target}/data"
expiredLocation="${fcrepo.ispn.repo.CacheDirPath:target}/expired"/>
location="${fcrepo.ispn.repo.cache:target}/data"
expiredLocation="${fcrepo.ispn.repo.cache:target}/expired"/>
</persistence>

</namedCache>
Expand Down
10 changes: 5 additions & 5 deletions fcrepo-configs/src/main/resources/config/infinispan/leveldb/infinispan.xml
View file
Expand Up @@ -28,8 +28,8 @@

<persistence passivation="false">
<store:leveldbStore
location="${fcrepo.ispn.repo.CacheDirPath:target/repo}/data"
expiredLocation="${fcrepo.ispn.repo.CacheDirPath:target/repo}/expired"/>
location="${fcrepo.ispn.repo.cache:target/repo}/data"
expiredLocation="${fcrepo.ispn.repo.cache:target/repo}/expired"/>
</persistence>

</namedCache>
Expand All @@ -52,8 +52,8 @@

<persistence passivation="false">
<store:leveldbStore
location="${fcrepo.ispn.CacheDirPath:target}/data"
expiredLocation="${fcrepo.ispn.CacheDirPath:target}/expired"/>
location="${fcrepo.ispn.cache:target}/data"
expiredLocation="${fcrepo.ispn.cache:target}/expired"/>
</persistence>

</namedCache>
Expand All @@ -79,7 +79,7 @@
preload="false"
fetchPersistentState="true"
purgeOnStartup="false"
location="${fcrepo.ispn.binary.CacheDirPath:target/FedoraRepositoryBinaryData/storage}" />
location="${fcrepo.ispn.binary.cache:target/FedoraRepositoryBinaryData/storage}" />
</persistence>

</namedCache>
Expand Down
4 changes: 2 additions & 2 deletions fcrepo-configs/src/main/resources/config/minimal-default/repository.json
View file
Expand Up @@ -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
}
},
Expand Down
4 changes: 2 additions & 2 deletions fcrepo-configs/src/main/resources/config/minimal/repository.json
View file
Expand Up @@ -10,7 +10,7 @@
"binaryStorage" : {
"type" : "file",
"minimumBinarySizeInBytes" : 1024,
"directory":"${fcrepo.binary-store-path:target/binaries}"
"directory":"${fcrepo.binary.directory:target/binaries}"
}
},
"security" : {
Expand All @@ -23,4 +23,4 @@
]
},
"node-types" : ["fedora-node-types.cnd"]
}
}
4 changes: 2 additions & 2 deletions fcrepo-configs/src/main/resources/config/servlet-auth/repository.json
View file
Expand Up @@ -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
}
},
Expand Down
6 changes: 3 additions & 3 deletions .../test/java/org/fcrepo/integration/connector/file/AbstractFedoraFileSystemConnectorIT.java
View file
Expand Up @@ -125,9 +125,9 @@ public abstract class AbstractFedoraFileSystemConnectorIT {
*/
protected abstract String getFederationRoot();

private final static String PROP_TEST_DIR1 = "fcrepo.test.dir1";
private final static String PROP_TEST_DIR2 = "fcrepo.test.dir2";
private final static String PROP_EXT_TEST_DIR = "fcrepo.test.properties.dir";
private final static String PROP_TEST_DIR1 = "fcrepo.test.connector.file.directory1";
private final static String PROP_TEST_DIR2 = "fcrepo.test.connector.file.directory2";
private final static String PROP_EXT_TEST_DIR = "fcrepo.test.connector.file.properties.directory";

protected String getReadWriteFederationRoot() {
return getProperty(PROP_TEST_DIR1);
Expand Down
6 changes: 3 additions & 3 deletions fcrepo-connector-file/src/test/resources/config/testing/repository.json
View file
Expand Up @@ -9,16 +9,16 @@
"externalSources" : {
"federated-directory" : {
"classname" : "org.fcrepo.connector.file.FedoraFileSystemConnector",
"directoryPath" : "${fcrepo.test.dir1:must-be-provided}",
"directoryPath" : "${fcrepo.test.connector.file.directory1:must-be-provided}",
"projections" : [ "default:/federated => /" ],
"contentBasedSha1" : "false",
"readonly" : false,
"extraPropertiesStorage" : "json"
},
"federated-directory-read-only" : {
"classname" : "org.fcrepo.connector.file.FedoraFileSystemConnector",
"directoryPath" : "${fcrepo.test.dir2:must-be-provided}",
"propertiesDirectoryPath" : "${fcrepo.test.properties.dir:must-be-provided}",
"directoryPath" : "${fcrepo.test.connector.file.directory2:must-be-provided}",
"propertiesDirectoryPath" : "${fcrepo.test.connector.file.properties.directory:must-be-provided}",
"projections" : [ "default:/readonly-federated => /" ],
"contentBasedSha1" : "true",
"cacheTtlSeconds" : 0,
Expand Down
4 changes: 2 additions & 2 deletions fcrepo-connector-file/src/test/resources/logback-test.xml
View file
Expand Up @@ -7,10 +7,10 @@
</encoder>
</appender>

<logger name="org.fcrepo.connector.file" additivity="false" level="${log.fcrepo.connector.file:-INFO}">
<logger name="org.fcrepo.connector.file" additivity="false" level="${fcrepo.log.connector.file:-INFO}">
<appender-ref ref="STDOUT"/>
</logger>
<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>
<root additivity="false" level="WARN">
Expand Down
2 changes: 1 addition & 1 deletion fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/AbstractResourceIT.java
View file
Expand Up @@ -87,7 +87,7 @@ public void setLogger() {
}

protected static final int SERVER_PORT = parseInt(System.getProperty(
"test.port", "8080"));
"fcrepo.test.port", "8080"));

protected static final String HOSTNAME = "localhost";

Expand Down
2 changes: 1 addition & 1 deletion fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraBackupLevelDBIT.java
View file
Expand Up @@ -25,7 +25,7 @@
*/
public class FedoraBackupLevelDBIT extends FedoraBackupIT {

private static final String CACHE_CONFIG_FILE = "fcrepo.infinispan.cache_configuration";
private static final String CACHE_CONFIG_FILE = "fcrepo.ispn.configuration";

@BeforeClass
public static void beforeClass() {
Expand Down
4 changes: 2 additions & 2 deletions fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraCrudConcurrentIT.java
View file
Expand Up @@ -36,13 +36,13 @@
* It takes roughly 2 minutes to complete and should only be run if the timing metrics are wanted.
* In order to activate this utility, the following System Property must be set:
* <p/>
* mvn -DRUN_TEST_CRUD_CONCURRENT install
* mvn -Dfcrepo.test.http.concurrent install
*
* @author lsitu
*/
public class FedoraCrudConcurrentIT extends AbstractResourceIT {

private static final String TEST_ACTIVATION_PROPERTY = "RUN_TEST_CRUD_CONCURRENT";
private static final String TEST_ACTIVATION_PROPERTY = "fcrepo.test.http.concurrent";

@Test
public void testConcurrentIngest() throws Exception {
Expand Down
2 changes: 1 addition & 1 deletion fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraTransactionsIT.java
View file
Expand Up @@ -116,7 +116,7 @@ public boolean apply(final Header input) {
} finally {
System.setProperty(TIMEOUT_SYSTEM_PROPERTY, Long
.toString(DEFAULT_TIMEOUT));
System.clearProperty("fcrepo4.tx.timeout");
System.clearProperty("fcrepo.transactions.timeout");
}
}

Expand Down
6 changes: 3 additions & 3 deletions fcrepo-http-api/src/test/resources/logback-test.xml
View file
Expand Up @@ -7,13 +7,13 @@
</encoder>
</appender>

<logger name="org.fcrepo.http.api" additivity="false" level="${log.fcrepo.http.api:-INFO}">
<logger name="org.fcrepo.http.api" additivity="false" level="${fcrepo.log.http.api:-INFO}">
<appender-ref ref="STDOUT"/>
</logger>
<logger name="org.fcrepo.integration.http" additivity="false" level="${log.fcrepo.integration.http:-INFO}">
<logger name="org.fcrepo.integration.http" additivity="false" level="${fcrepo.log.integration.http:-INFO}">
<appender-ref ref="STDOUT"/>
</logger>
<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="com.gargoylesoftware.htmlunit" additivity="false" level="ERROR">
Expand Down
2 changes: 1 addition & 1 deletion fcrepo-http-api/src/test/resources/spring-test/test-container.xml
View file
Expand Up @@ -10,7 +10,7 @@

<bean id="containerWrapper"
class="org.fcrepo.http.commons.test.util.ContainerWrapper"
init-method="start" destroy-method="stop" p:port="${test.port:8080}"
init-method="start" destroy-method="stop" p:port="${fcrepo.test.port:8080}"
p:configLocation="classpath:web.xml"/>

</beans>

0 comments on commit 2e09b91

Please sign in to comment.