Merge branch '1.2.x'

This commit is contained in:
Stephane Nicoll 2015-07-20 10:01:16 +02:00
commit 1bf0abc456

View File

@ -52,6 +52,7 @@
<portNames> <portNames>
<portName>appserver.port</portName> <portName>appserver.port</portName>
<portName>appserver.ajp.port</portName> <portName>appserver.ajp.port</portName>
<portName>appserver.transaction.port</portName>
</portNames> </portNames>
</configuration> </configuration>
</execution> </execution>
@ -72,6 +73,9 @@
<properties> <properties>
<cargo.servlet.port>${appserver.port}</cargo.servlet.port> <cargo.servlet.port>${appserver.port}</cargo.servlet.port>
<cargo.jboss.ajp.port>${appserver.ajp.port}</cargo.jboss.ajp.port> <cargo.jboss.ajp.port>${appserver.ajp.port}</cargo.jboss.ajp.port>
<cargo.jboss.transaction.statusManager.port>
${appserver.transaction.port}
</cargo.jboss.transaction.statusManager.port>
<cargo.jboss.configuration>standalone-full</cargo.jboss.configuration> <cargo.jboss.configuration>standalone-full</cargo.jboss.configuration>
</properties> </properties>
</configuration> </configuration>