mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Merge branch '1.2.x'
This commit is contained in:
commit
1bf0abc456
@ -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>
|
||||||
|
Loading…
Reference in New Issue
Block a user