From a2f26dc0854d26648836f99e655bdd895329296c Mon Sep 17 00:00:00 2001
From: Sean Flanigan <sflaniga@redhat.com>
Date: Mon, 15 Sep 2014 21:02:45 +1000
Subject: [PATCH] Control WildFly ports via environment variables

---
 .../resources/conf/standalone_wildfly.xml     | 31 ++++++++++++-------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/functional-test/src/test/resources/conf/standalone_wildfly.xml b/functional-test/src/test/resources/conf/standalone_wildfly.xml
index 7c858aeaf2..abc5daf4dc 100644
--- a/functional-test/src/test/resources/conf/standalone_wildfly.xml
+++ b/functional-test/src/test/resources/conf/standalone_wildfly.xml
@@ -287,7 +287,7 @@
         <simple name="java:global/zanata/security/admin-users" value="admin"/>
         <simple name="java:global/zanata/email/default-from-address"
           value="no-reply@zanata.org" />
-        <simple name="java:global/zanata/smtp/port" value="${smtp.port}" />
+        <simple name="java:global/zanata/smtp/port" value="${smtp.port,env.SMTP_PORT:2552}" />
         <simple name="java:global/zanata/files/document-storage-directory"
           value="${project.build.directory}/zanata-documents" />
         <lookup name="java:jboss/exported/zanata/files/document-storage-directory"
@@ -437,17 +437,26 @@
     </interface>
   </interfaces>
 
-  <socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
-    <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
-    <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9993}"/>
-    <socket-binding name="ajp" port="${jboss.ajp.port:8009}"/>
-    <socket-binding name="http" port="${jboss.http.port:8080}"/>
-    <socket-binding name="https" port="${jboss.https.port:8443}"/>
-    <socket-binding name="remoting" port="4447" />
-    <socket-binding name="txn-recovery-environment" port="4712"/>
-    <socket-binding name="txn-status-manager" port="4713"/>
+  <socket-binding-group name="standard-sockets" default-interface="public"
+    port-offset="${jboss.socket.binding.port-offset:0}">
+    <socket-binding name="management-http" interface="management"
+      port="${jboss.management.http.port,env.JBOSS_MANAGEMENT_HTTP_PORT:10090}"/>
+    <socket-binding name="management-https" interface="management"
+      port="${jboss.management.https.port,env.JBOSS_MANAGEMENT_HTTPS_PORT:10093}"/>
+    <socket-binding name="ajp"
+     port="${jboss.ajp.port,env.JBOSS_AJP_PORT:8109}"/>
+    <socket-binding name="http"
+     port="${jboss.http.port,env.JBOSS_HTTP_PORT:8180}"/>
+    <socket-binding name="https"
+     port="${jboss.https.port,env.JBOSS_HTTPS_PORT:8543}"/>
+    <socket-binding name="remoting"
+     port="${jboss.remoting.port,env.JBOSS_REMOTING_PORT:4547}" />
+    <socket-binding name="txn-recovery-environment"
+     port="${jboss.txn.recovery.port,env.JBOSS_TXN_RECOVERY_PORT:4812}"/>
+    <socket-binding name="txn-status-manager"
+     port="${jboss.txn.status.port,env.JBOSS_TXN_STATUS_PORT:4813}"/>
     <outbound-socket-binding name="mail-smtp">
-      <remote-destination host="localhost" port="25"/>
+      <remote-destination host="localhost" port="${smtp.port,env.SMTP_PORT:2552}"/>
     </outbound-socket-binding>
   </socket-binding-group>