apply port offset

zanata · Dec 24, 2013 · c063dcb · c063dcb
1 parent 98684e4
commit c063dcb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/functional-test/pom.xml b/functional-test/pom.xml
@@ -18,7 +18,9 @@
     <cargo.wait>false</cargo.wait>
     <cargo.host>localhost</cargo.host>
     <cargo.container>jboss72x</cargo.container>
-    <cargo.servlet.port>8080</cargo.servlet.port>
+    <!--jboss port offset -->
+    <cargo.port.offset>100</cargo.port.offset>
+    <cargo.servlet.port>8180</cargo.servlet.port>
     <cargo.installation>http://downloads.sourceforge.net/project/zanata/server/zanata-server.zip</cargo.installation>
     <cargo.extract.dir>${project.build.directory}/cargo/installs</cargo.extract.dir>
     <cargo.container.home>${project.build.directory}/jboss/container</cargo.container.home>
@@ -406,7 +408,10 @@
                   <ehcache.disk.store.dir>${project.build.directory}/ehcache</ehcache.disk.store.dir>
                   <jboss.server.log.threshold>WARN</jboss.server.log.threshold>
                   <hibernate.search.default.indexBase>${hibernate.search.default.indexBase}</hibernate.search.default.indexBase>
+                  <jboss.socket.binding.port-offset>${cargo.port.offset}</jboss.socket.binding.port-offset>
                 </systemProperties>
+
+                <timeout>0</timeout>
               </container>
 
               <deployables>
@@ -459,6 +464,8 @@
                     -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled
                     ${cargo.debug.jvm.args}
                   </cargo.jvmargs>
+                  <cargo.port.offset>${cargo.port.offset}</cargo.port.offset>
+                  <cargo.jboss.ajp.port>8109</cargo.jboss.ajp.port>
                 </properties>
               </configuration>
             </configuration>

diff --git a/functional-test/src/test/resources/conf/standalone.xml b/functional-test/src/test/resources/conf/standalone.xml
@@ -357,7 +357,7 @@
       port="${jboss.management.http.port:9990}" />
     <socket-binding name="management-https" interface="management"
       port="${jboss.management.https.port:9443}" />
-    <socket-binding name="ajp" port="8109" />
+    <socket-binding name="ajp" port="8009" />
     <socket-binding name="http" port="8080" />
     <socket-binding name="https" port="8443" />
     <socket-binding name="remoting" port="4447" />