Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Control WildFly ports via environment variables
Browse files Browse the repository at this point in the history
  • Loading branch information
@seanf
seanf committed Sep 17, 2014
1 parent 358c87a commit 21cae28
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 21 deletions.
29 changes: 19 additions & 10 deletions functional-test/src/test/java/org/zanata/util/CleanDocumentStorageRule.java
View file
Expand Up @@ -47,30 +47,39 @@ public static String getDocumentStoragePath() {
org.jboss.naming.remote.client.InitialContextFactory.class
.getName());
long portOffset = Integer.parseInt(
PropertiesHolder.getProperty("cargo.port.offset", "0"));
String port = System.getenv("JBOSS_REMOTING_PORT");
int portNum = port != null ? parseInt(port) : 4547;
long rmiPort = portOffset + portNum;
PropertiesHolder.getProperty("cargo.port.offset", "0"));
String rmiPort = System.getenv("JBOSS_REMOTING_PORT");
int rmiPortNum = rmiPort != null ? parseInt(rmiPort) : 4547;
long realRmiPort = portOffset + rmiPortNum;

env.put(Context.PROVIDER_URL, "remote://localhost:" + rmiPort);
String remoteUrl = "remote://localhost:" + realRmiPort;
env.put(Context.PROVIDER_URL, remoteUrl);
InitialContext remoteContext = null;
try {
remoteContext = new InitialContext(env);
storagePath =
(String) remoteContext
.lookup("zanata/files/document-storage-directory");
(String) remoteContext
.lookup("zanata/files/document-storage-directory");
}
catch (NamingException e) {
// wildfly uses 'http-remoting:' not 'remote:'
String httpPort = System.getenv("JBOSS_HTTP_PORT");
int httpPortNum = httpPort != null ? parseInt(httpPort) : 8180;

long realHttpPort = httpPortNum + portOffset;
String httpRemotingUrl = "http-remoting://localhost:" + realHttpPort;
log.warn("Unable to access {}: {}; trying {}", remoteUrl,
e.toString(), httpRemotingUrl);
try {
// wildfly uses 'http-remoting:' not 'remote:'
rmiPort = 8080+portOffset;
env.put(Context.PROVIDER_URL, "http-remoting://localhost:" + rmiPort);
env.put(Context.PROVIDER_URL, httpRemotingUrl);
remoteContext = new InitialContext(env);
storagePath =
(String) remoteContext
.lookup("zanata/files/document-storage-directory");
} catch (NamingException e1) {
// fall back option:
log.warn("Unable to access {}: {}", httpRemotingUrl,
e.toString());
URL testClassRoot =
Thread.currentThread().getContextClassLoader()
.getResource("setup.properties");
Expand Down
31 changes: 20 additions & 11 deletions functional-test/src/test/resources/conf/standalone_wildfly.xml
View file
Expand Up @@ -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"
Expand Down Expand Up @@ -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>

Expand Down

0 comments on commit 21cae28

Please sign in to comment.