Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Ensure tomcat.ajp and Fedora4 ports are unique
  • Loading branch information
Andrew Woods committed Sep 7, 2013
1 parent 3f773e2 commit 7c417ae
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
5 changes: 5 additions & 0 deletions fcrepo-fedora3-federation-connector/pom.xml
Expand Up @@ -174,7 +174,9 @@
<!-- reserve a port under the property ${servlet.port} for integration
tests -->
<portNames>
<portName>test.port</portName>
<portName>servlet.port</portName>
<portName>tomcat.ajp.port</portName>
</portNames>
</configuration>
<executions>
Expand Down Expand Up @@ -205,7 +207,9 @@
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<systemPropertyVariables>
<test.port>${test.port}</test.port>
<servlet.port>${servlet.port}</servlet.port>
<tomcat.ajp.port>${tomcat.ajp.port}</tomcat.ajp.port>
</systemPropertyVariables>
</configuration>
</plugin>
Expand All @@ -217,6 +221,7 @@
<configuration>
<properties>
<cargo.servlet.port>${servlet.port}</cargo.servlet.port>
<cargo.tomcat.ajp.port>${tomcat.ajp.port}</cargo.tomcat.ajp.port>
<cargo.servlet.uriencoding>UTF-8</cargo.servlet.uriencoding>
<cargo.jvmargs>-XX:MaxPermSize=512m -Xmx1024m</cargo.jvmargs>
<cargo.logging>low</cargo.logging>
Expand Down
Expand Up @@ -21,7 +21,7 @@
{ "classname" : "servlet" }
]
},
"node-types" : ["fedora-node-types.cnd"]
"node-types" : ["fedora-node-types.cnd"],
"externalSources" : {
"fedora3" : {
"classname" : "org.fcrepo.connector.fedora3.Fedora3FederationConnector",
Expand Down

0 comments on commit 7c417ae

Please sign in to comment.