[jboss-svn-commits] JBoss Common SVN: r4369 - in arquillian/trunk/containers/jbossas-embedded-60/src/main: resources/META-INF/services and 1 other directory.

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

Author: aslak
Date: 2010-05-08 13:02:36 -0400 (Sat, 08 May 2010)
New Revision: 4369

Added:
   arquillian/trunk/containers/jbossas-embedded-60/src/main/java/org/jboss/arquillian/jboss/JBossContainerConfiguration.java
   arquillian/trunk/containers/jbossas-embedded-60/src/main/resources/META-INF/services/org.jboss.arquillian.spi.ContainerConfiguration
Modified:
   arquillian/trunk/containers/jbossas-embedded-60/src/main/java/org/jboss/arquillian/jboss/JBossEmbeddedContainer.java
Log:
ARQ-122 Added JBossContainerConfiguration and updated contianer impl


Added: arquillian/trunk/containers/jbossas-embedded-60/src/main/java/org/jboss/arquillian/jboss/JBossContainerConfiguration.java
===================================================================
--- arquillian/trunk/containers/jbossas-embedded-60/src/main/java/org/jboss/arquillian/jboss/JBossContainerConfiguration.java	                        (rev 0)
+++ arquillian/trunk/containers/jbossas-embedded-60/src/main/java/org/jboss/arquillian/jboss/JBossContainerConfiguration.java	2010-05-08 17:02:36 UTC (rev 4369)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.arquillian.jboss;
+
+import org.jboss.arquillian.spi.ContainerConfiguration;
+import org.jboss.arquillian.spi.ContainerProfile;
+
+/**
+ * JBossContainerConfiguration
+ *
+ * @author <a href="mailto:aslak at redhat.com">Aslak Knutsen</a>
+ * @version $Revision: $
+ */
+public class JBossContainerConfiguration implements ContainerConfiguration
+{
+   private String bindAddress = "localhost";
+   
+   
+   /* (non-Javadoc)
+    * @see org.jboss.arquillian.spi.ContainerConfiguration#getContainerProfile()
+    */
+   public ContainerProfile getContainerProfile()
+   {
+      return ContainerProfile.STANDALONE;
+   }
+
+   public String getBindAddress()
+   {
+      return bindAddress;
+   }
+   
+   public void setBindAddress(String bindAddress)
+   {
+      this.bindAddress = bindAddress;
+   }
+}

Modified: arquillian/trunk/containers/jbossas-embedded-60/src/main/java/org/jboss/arquillian/jboss/JBossEmbeddedContainer.java
===================================================================
--- arquillian/trunk/containers/jbossas-embedded-60/src/main/java/org/jboss/arquillian/jboss/JBossEmbeddedContainer.java	2010-05-08 00:16:57 UTC (rev 4368)
+++ arquillian/trunk/containers/jbossas-embedded-60/src/main/java/org/jboss/arquillian/jboss/JBossEmbeddedContainer.java	2010-05-08 17:02:36 UTC (rev 4369)
@@ -26,7 +26,7 @@
 import org.jboss.arquillian.spi.DeploymentException;
 import org.jboss.arquillian.spi.LifecycleException;
 import org.jboss.embedded.api.server.JBossASEmbeddedServer;
-import org.jboss.embedded.core.server.JBossASEmbeddedServerImpl;
+import org.jboss.embedded.api.server.JBossASEmbeddedServerFactory;
 import org.jboss.shrinkwrap.api.Archive;
 
 /**
@@ -37,21 +37,17 @@
  */
 public class JBossEmbeddedContainer implements DeployableContainer
 {
-   private JBossASEmbeddedServer server;
-   
-   public JBossEmbeddedContainer()
-   {
-      server = new JBossASEmbeddedServerImpl();
-      server.getConfiguration().bindAddress("localhost");
-   }
-   
    /* (non-Javadoc)
     * @see org.jboss.arquillian.spi.DeployableContainer#setup(org.jboss.arquillian.spi.Context, org.jboss.arquillian.spi.Configuration)
     */
    public void setup(Context context, Configuration configuration)
    {
-      // TODO Auto-generated method stub
+      JBossContainerConfiguration containerConfiguration = configuration.getContainerConfig(JBossContainerConfiguration.class);
+
+      JBossASEmbeddedServer server = JBossASEmbeddedServerFactory.createServer();
+      server.getConfiguration().bindAddress(containerConfiguration.getBindAddress());
       
+      context.add(JBossASEmbeddedServer.class, server);
    }
 
    /* (non-Javadoc)
@@ -61,7 +57,7 @@
    {
       try 
       {
-         server.start();
+         context.get(JBossASEmbeddedServer.class).start();
       }
       catch (Exception e) 
       {
@@ -76,7 +72,7 @@
    {
       try 
       {
-         server.stop();
+         context.get(JBossASEmbeddedServer.class).stop();
       }
       catch (Exception e) 
       {
@@ -91,12 +87,12 @@
    {
       try 
       {
-         server.deploy(archive);
+         context.get(JBossASEmbeddedServer.class).deploy(archive);
          
          return new ServletMethodExecutor(
                new URL(
                      "http",
-                     server.getConfiguration().getBindAddress(),
+                     context.get(Configuration.class).getContainerConfig(JBossContainerConfiguration.class).getBindAddress(),
                      8080,
                      "/")
                );
@@ -114,11 +110,11 @@
    {
       try 
       {
-         server.undeploy(archive);
+         context.get(JBossASEmbeddedServer.class).undeploy(archive);
       }
       catch (Exception e) 
       {
          throw new DeploymentException("Could not undeploy from container", e);
       }
    }
-}
+}
\ No newline at end of file

Added: arquillian/trunk/containers/jbossas-embedded-60/src/main/resources/META-INF/services/org.jboss.arquillian.spi.ContainerConfiguration
===================================================================
--- arquillian/trunk/containers/jbossas-embedded-60/src/main/resources/META-INF/services/org.jboss.arquillian.spi.ContainerConfiguration	                        (rev 0)
+++ arquillian/trunk/containers/jbossas-embedded-60/src/main/resources/META-INF/services/org.jboss.arquillian.spi.ContainerConfiguration	2010-05-08 17:02:36 UTC (rev 4369)
@@ -0,0 +1 @@
+org.jboss.arquillian.jboss.JBossContainerConfiguration
\ No newline at end of file