diff --git a/pom.xml b/pom.xml
index fb9fc0e..2c4b2bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -434,7 +434,7 @@
10
STOP
- ${jetty.port.stop}
+ ${jetty.dynamic.stop.port}
true
@@ -459,7 +459,7 @@
- ${test.solr.port}
+ ${solr.dynamic.test.port}
0
true
@@ -515,10 +515,10 @@
1.9.1
- test.port
- test.fuseki.port
- test.solr.port
- jetty.port.stop
+ fcrepo.dynamic.test.port
+ fuseki.dynamic.test.port
+ solr.dynamic.test.port
+ jetty.dynamic.stop.port
@@ -555,9 +555,9 @@
-XX:MaxPermSize=128m ${jacoco.agent.it.arg}
- ${test.port}
- ${test.fuseki.port}
- ${test.solr.port}
+ ${fcrepo.dynamic.test.port}
+ ${fuseki.dynamic.test.port}
+ ${solr.dynamic.test.port}
diff --git a/src/test/java/org/fcrepo/camel/integration/FcrepoSolrIT.java b/src/test/java/org/fcrepo/camel/integration/FcrepoSolrIT.java
index 91b4099..dd61bd4 100644
--- a/src/test/java/org/fcrepo/camel/integration/FcrepoSolrIT.java
+++ b/src/test/java/org/fcrepo/camel/integration/FcrepoSolrIT.java
@@ -125,7 +125,7 @@ protected RouteBuilder createRouteBuilder() {
public void configure() {
final String fcrepo_uri = FcrepoTestUtils.getFcrepoEndpointUri();
final String solr_uri = "http4://localhost:" + System.getProperty(
- "test.solr.port", "8983") + "/solr/testCore/update";
+ "solr.dynamic.test.port", "8983") + "/solr/testCore/update";
from("direct:setup")
.to(fcrepo_uri);
diff --git a/src/test/java/org/fcrepo/camel/integration/FcrepoSparqlIT.java b/src/test/java/org/fcrepo/camel/integration/FcrepoSparqlIT.java
index 9ead0fe..1f59990 100644
--- a/src/test/java/org/fcrepo/camel/integration/FcrepoSparqlIT.java
+++ b/src/test/java/org/fcrepo/camel/integration/FcrepoSparqlIT.java
@@ -60,7 +60,7 @@ public class FcrepoSparqlIT extends CamelTestSupport {
final private Logger logger = getLogger(FcrepoSparqlIT.class);
private static final int FUSEKI_PORT = Integer.parseInt(System.getProperty(
- "test.fuseki.port", "3030"));
+ "fuseki.dynamic.test.port", "3030"));
private static EmbeddedFusekiServer server = null;
@@ -114,7 +114,7 @@ public void testUpdateSparql() throws Exception {
"direct:setup", FcrepoTestUtils.getTurtleDocument(), headers, String.class);
final String identifier = fullPath.replaceAll(FcrepoTestUtils.getFcrepoBaseUrl(), "");
- final String base_url = "http://localhost:" + System.getProperty("test.port", "8080") + "/rest";
+ final String base_url = "http://localhost:" + System.getProperty("fcrepo.dynamic.test.port", "8080") + "/rest";
// Test
final Map testHeaders = new HashMap();
@@ -163,7 +163,7 @@ public void testInsertDeleteSparql() throws Exception {
"direct:setup", FcrepoTestUtils.getTurtleDocument(), headers, String.class);
final String identifier = fullPath.replaceAll(FcrepoTestUtils.getFcrepoBaseUrl(), "");
- final String base_url = "http://localhost:" + System.getProperty("test.port", "8080") + "/rest";
+ final String base_url = "http://localhost:" + System.getProperty("fcrepo.dynamic.test.port", "8080") + "/rest";
// Test
final Map testHeaders = new HashMap();
@@ -217,7 +217,7 @@ public void testInsertDeleteNamedGraphSparql() throws Exception {
"direct:setup", FcrepoTestUtils.getTurtleDocument(), headers, String.class);
final String identifier = fullPath.replaceAll(FcrepoTestUtils.getFcrepoBaseUrl(), "");
- final String base_url = "http://localhost:" + System.getProperty("test.port", "8080") + "/rest";
+ final String base_url = "http://localhost:" + System.getProperty("fcrepo.dynamic.test.port", "8080") + "/rest";
// Test
final Map testHeaders = new HashMap();
@@ -253,7 +253,7 @@ protected RouteBuilder createRouteBuilder() throws Exception {
public void configure() throws IOException {
final String fcrepo_uri = FcrepoTestUtils.getFcrepoEndpointUri();
- final String fuseki_url = "localhost:" + System.getProperty("test.fuseki.port", "3030");
+ final String fuseki_url = "localhost:" + System.getProperty("fuseki.dynamic.test.port", "3030");
final Processor sparqlInsert = new SparqlInsertProcessor();
final Namespaces ns = new Namespaces("rdf", RdfNamespaces.RDF);
ns.add("dc", "http://purl.org/dc/elements/1.1/");
diff --git a/src/test/java/org/fcrepo/camel/integration/FcrepoTestUtils.java b/src/test/java/org/fcrepo/camel/integration/FcrepoTestUtils.java
index 0398bb3..60f1fb4 100644
--- a/src/test/java/org/fcrepo/camel/integration/FcrepoTestUtils.java
+++ b/src/test/java/org/fcrepo/camel/integration/FcrepoTestUtils.java
@@ -26,7 +26,7 @@
public final class FcrepoTestUtils {
private static final int FCREPO_PORT = parseInt(getProperty(
- "test.port", "8080"));
+ "fcrepo.dynamic.test.port", "8080"));
/**
* This is a utility class; the constructor is off-limits
diff --git a/src/test/resources/spring-test/test-container.xml b/src/test/resources/spring-test/test-container.xml
index 9aee2b3..5d9bc48 100644
--- a/src/test/resources/spring-test/test-container.xml
+++ b/src/test/resources/spring-test/test-container.xml
@@ -8,7 +8,7 @@
-
+