ARQ-476 Add portBindingSet property to JBoss 5.1 configuration

Author: DavideD

jbossas-managed-5.1/src/main/java/org/jboss/arquillian/container/jbossas/managed_5_1/JBossASConfiguration.java

@@ -17,6 +17,7 @@
 package org.jboss.arquillian.container.jbossas.managed_5_1;
 
 import java.io.File;
+import java.util.HashMap;
 
 import org.jboss.arquillian.container.spi.ConfigurationException;
 import org.jboss.arquillian.container.spi.client.container.ContainerConfiguration;
@@ -39,6 +40,8 @@ public class JBossASConfiguration implements ContainerConfiguration
 
    private String profileName = "default";
 
+   private String portBindingSet = null;
+
    private boolean useRmiPortForAliveCheck = false;
 
    private String jbossHome = System.getenv("JBOSS_HOME");
@@ -51,6 +54,46 @@ public class JBossASConfiguration implements ContainerConfiguration
 
    private int shutdownTimeoutInSeconds = 45;
 
+   enum JBossBindingSet {
+      PORTS_01("ports-01", 100),
+      PORTS_02("ports-02", 200),
+      PORTS_03("ports-03", 300);
+
+      private final String name;
+      private final int rmiPort;
+      private final int httpPort;
+
+      private static final HashMap<String, JBossBindingSet> bindings = new HashMap<String, JBossBindingSet>();
+      
+      static
+      {
+         for (JBossBindingSet binding : values())
+         {
+            bindings.put(binding.name, binding);
+         }
+      }
+
+      static JBossBindingSet getBindingSet(String name)
+      {
+         return bindings.get(name);
+      }
+
+      private JBossBindingSet(String name, int offSet)
+      {
+         this.name = name;
+         this.rmiPort = 1099 + offSet;
+         this.httpPort = 8080 + offSet;
+      }
+
+      int getRmiPort() {
+         return rmiPort;
+      }
+
+      int getHttpPort() {
+         return httpPort;
+      }
+   }
+
    /* (non-Javadoc)
     * @see org.jboss.arquillian.spi.client.container.ContainerConfiguration#validate()
     */
@@ -76,6 +119,16 @@ public int getHttpPort()
       return httpPort;
    }
 
+   public String getPortBindingSet()
+   {
+      return portBindingSet;
+   }
+
+   public void setPortBindingSet(String portBindingSet)
+   {
+      this.portBindingSet = portBindingSet;
+   }
+
    /**
     * Set the HTTP Connect port. <br/>
     * This is not the JBoss AS HTTP Bind port, bind port must be set in the JBoss XML configuration.<br/>

jbossas-managed-5.1/src/main/java/org/jboss/arquillian/container/jbossas/managed_5_1/JBossASLocalContainer.java

@@ -25,6 +25,7 @@
 
 import javax.naming.Context;
 
+import org.jboss.arquillian.container.jbossas.managed_5_1.JBossASConfiguration.JBossBindingSet;
 import org.jboss.arquillian.container.spi.client.container.DeployableContainer;
 import org.jboss.arquillian.container.spi.client.container.DeploymentException;
 import org.jboss.arquillian.container.spi.client.container.LifecycleException;
@@ -299,8 +300,8 @@ private Server createAndConfigureServer()
    {
       Server server = new Server();
       server.setName(configuration.getProfileName());
-      server.setHttpPort(configuration.getHttpPort());
-      server.setRmiPort(configuration.getRmiPort());
+      server.setHttpPort(httpPort());
+      server.setRmiPort(rmiPort());
       server.setHost(configuration.getBindAddress());
       server.setHasWebServer(!configuration.isUseRmiPortForAliveCheck());
 
@@ -309,7 +310,7 @@ private Server createAndConfigureServer()
       server.setPartition(Long.toHexString(System.currentTimeMillis()));
 
       // Set server's JVM arguments
-      setServerVMArgs(server, configuration.getJavaVmArguments());
+      setServerVMArgs(server, javaVmArguments());
 
       // Set server's system properties
       Property prop = new Property();
@@ -324,6 +325,39 @@ private Server createAndConfigureServer()
       return server;
    }
 
+   private int httpPort()
+   {
+      JBossBindingSet jbossBindingSet = getJBossBindingSet();
+      if (jbossBindingSet == null)
+         return configuration.getHttpPort();
+
+      return jbossBindingSet.getHttpPort();
+   }
+
+   private int rmiPort()
+   {
+      JBossBindingSet jbossBindingSet = getJBossBindingSet();
+      if (jbossBindingSet == null)
+         return configuration.getRmiPort();
+
+      return jbossBindingSet.getRmiPort();
+   }
+
+   private JBossBindingSet getJBossBindingSet()
+   {
+      return JBossBindingSet.getBindingSet(configuration.getPortBindingSet());
+   }
+
+   private String javaVmArguments()
+   {
+      String javaVmArguments = configuration.getJavaVmArguments();
+      if (configuration.getPortBindingSet() != null)
+      {
+         javaVmArguments += " -Djboss.service.binding.set=" + configuration.getPortBindingSet();
+      }
+      return javaVmArguments;
+   }
+
    private void setServerVMArgs(Server server, String arguments)
    {
       for(String argument: arguments.split(" "))