[jboss-svn-commits] JBoss Common SVN: r4423 - arquillian/trunk/containers/jbossas-embedded-60/src/main/java/org/jboss/arquillian/jbossas/embedded60.

[jboss-svn-commits at lists.jboss.org]

Author: aslak
Date: 2010-05-23 15:30:14 -0400 (Sun, 23 May 2010)
New Revision: 4423

Modified:
   arquillian/trunk/containers/jbossas-embedded-60/src/main/java/org/jboss/arquillian/jbossas/embedded60/JBossASContainerConfiguration.java
   arquillian/trunk/containers/jbossas-embedded-60/src/main/java/org/jboss/arquillian/jbossas/embedded60/JBossASEmbeddedContainer.java
Log:
ARQ-154 Added bindAddress, httpPort and profileName to configuration


Modified: arquillian/trunk/containers/jbossas-embedded-60/src/main/java/org/jboss/arquillian/jbossas/embedded60/JBossASContainerConfiguration.java
===================================================================
--- arquillian/trunk/containers/jbossas-embedded-60/src/main/java/org/jboss/arquillian/jbossas/embedded60/JBossASContainerConfiguration.java	2010-05-22 23:54:14 UTC (rev 4422)
+++ arquillian/trunk/containers/jbossas-embedded-60/src/main/java/org/jboss/arquillian/jbossas/embedded60/JBossASContainerConfiguration.java	2010-05-23 19:30:14 UTC (rev 4423)
@@ -27,8 +27,20 @@
  */
 public class JBossASContainerConfiguration implements ContainerConfiguration
 {
+   /**
+    * The profile to start. 
+    */
+   private String profileName = "default";
+
+   /**
+    * Address the server should bind to. 
+    */
    private String bindAddress = "localhost";
    
+   /**
+    * Used by Servlet Protocol to connect to the server. 
+    */
+   private int httpPort = 8080;
    
    /* (non-Javadoc)
     * @see org.jboss.arquillian.spi.ContainerConfiguration#getContainerProfile()
@@ -38,6 +50,16 @@
       return ContainerProfile.STANDALONE;
    }
 
+   public String getProfileName()
+   {
+      return profileName;
+   }
+   
+   public void setProfileName(String profileName)
+   {
+      this.profileName = profileName;
+   }
+   
    public String getBindAddress()
    {
       return bindAddress;
@@ -47,4 +69,14 @@
    {
       this.bindAddress = bindAddress;
    }
+   
+   public int getHttpPort()
+   {
+      return httpPort;
+   }
+   
+   public void setHttpPort(int httpPort)
+   {
+      this.httpPort = httpPort;
+   }
 }

Modified: arquillian/trunk/containers/jbossas-embedded-60/src/main/java/org/jboss/arquillian/jbossas/embedded60/JBossASEmbeddedContainer.java
===================================================================
--- arquillian/trunk/containers/jbossas-embedded-60/src/main/java/org/jboss/arquillian/jbossas/embedded60/JBossASEmbeddedContainer.java	2010-05-22 23:54:14 UTC (rev 4422)
+++ arquillian/trunk/containers/jbossas-embedded-60/src/main/java/org/jboss/arquillian/jbossas/embedded60/JBossASEmbeddedContainer.java	2010-05-23 19:30:14 UTC (rev 4423)
@@ -45,8 +45,10 @@
       JBossASContainerConfiguration containerConfiguration = configuration.getContainerConfig(JBossASContainerConfiguration.class);
 
       JBossASEmbeddedServer server = JBossASEmbeddedServerFactory.createServer();
-      server.getConfiguration().bindAddress(containerConfiguration.getBindAddress());
-      
+      server.getConfiguration()
+               .bindAddress(containerConfiguration.getBindAddress())
+               .serverName(containerConfiguration.getProfileName());
+
       context.add(JBossASEmbeddedServer.class, server);
    }
 
@@ -85,6 +87,8 @@
     */
    public ContainerMethodExecutor deploy(Context context, Archive<?> archive) throws DeploymentException
    {
+      JBossASContainerConfiguration containerConfiguration = context.get(Configuration.class)
+                                                         .getContainerConfig(JBossASContainerConfiguration.class);
       try 
       {
          context.get(JBossASEmbeddedServer.class).deploy(archive);
@@ -92,8 +96,8 @@
          return new ServletMethodExecutor(
                new URL(
                      "http",
-                     context.get(Configuration.class).getContainerConfig(JBossASContainerConfiguration.class).getBindAddress(),
-                     8080,
+                     containerConfiguration.getBindAddress(),
+                     containerConfiguration.getHttpPort(),
                      "/")
                );
       }