[jboss-svn-commits] JBoss Common SVN: r4271 - in arquillian/trunk/containers: jbossas-remote-51/src/main/java/org/jboss/arquillian/jboss and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Apr 20 11:10:11 EDT 2010
Author: aslak
Date: 2010-04-20 11:10:07 -0400 (Tue, 20 Apr 2010)
New Revision: 4271
Modified:
arquillian/trunk/containers/glassfish-embedded-30/src/main/java/org/jboss/arquillian/glassfish/GlassFishEmbeddedContainer.java
arquillian/trunk/containers/jbossas-remote-51/src/main/java/org/jboss/arquillian/jboss/JbossRemoteContainer.java
arquillian/trunk/containers/jbossas-remote-60/src/main/java/org/jboss/arquillian/jboss/JbossRemoteContainer.java
arquillian/trunk/containers/openejb/src/main/java/org/jboss/arquillian/openejb/OpenEJBContainer.java
arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/openwebbeans/OpenWebBeansSEContainer.java
arquillian/trunk/containers/reloaded/src/main/java/org/jboss/arquillian/container/reloaded/ReloadedContainer.java
arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/weld/WeldSEContainer.java
Log:
ARQ-33 Updated DeployableContainer impls to reflect SPI changes. DeployableContainer.setup(Configuration)
Modified: arquillian/trunk/containers/glassfish-embedded-30/src/main/java/org/jboss/arquillian/glassfish/GlassFishEmbeddedContainer.java
===================================================================
--- arquillian/trunk/containers/glassfish-embedded-30/src/main/java/org/jboss/arquillian/glassfish/GlassFishEmbeddedContainer.java 2010-04-20 15:05:59 UTC (rev 4270)
+++ arquillian/trunk/containers/glassfish-embedded-30/src/main/java/org/jboss/arquillian/glassfish/GlassFishEmbeddedContainer.java 2010-04-20 15:10:07 UTC (rev 4271)
@@ -25,6 +25,7 @@
import org.glassfish.api.embedded.EmbeddedFileSystem;
import org.glassfish.api.embedded.Server;
import org.jboss.arquillian.protocol.servlet.ServletMethodExecutor;
+import org.jboss.arquillian.spi.Configuration;
import org.jboss.arquillian.spi.ContainerMethodExecutor;
import org.jboss.arquillian.spi.DeployableContainer;
import org.jboss.arquillian.spi.DeploymentException;
@@ -42,10 +43,18 @@
{
private String target = "server";
private Server server;
- private int port = 8080;
+
+ private GlassFishConfiguration configuration;
public GlassFishEmbeddedContainer()
{
+ }
+
+ @Override
+ public void setup(Configuration configuration)
+ {
+ this.configuration = configuration.getContainerConfig(GlassFishConfiguration.class);
+
final Server.Builder builder = new Server.Builder(GlassFishEmbeddedContainer.class.getName());
final EmbeddedFileSystem.Builder embeddedFsBuilder = new EmbeddedFileSystem.Builder();
@@ -64,7 +73,7 @@
try
{
for(EmbeddedContainer contianer : server.getContainers()) {
- contianer.bind(server.createPort(port), "http");
+ contianer.bind(server.createPort(configuration.getBindPort()), "http");
contianer.start();
}
}
@@ -113,7 +122,7 @@
new URL(
"http",
"localhost",
- port,
+ configuration.getBindPort(),
"/")
);
}
Modified: arquillian/trunk/containers/jbossas-remote-51/src/main/java/org/jboss/arquillian/jboss/JbossRemoteContainer.java
===================================================================
--- arquillian/trunk/containers/jbossas-remote-51/src/main/java/org/jboss/arquillian/jboss/JbossRemoteContainer.java 2010-04-20 15:05:59 UTC (rev 4270)
+++ arquillian/trunk/containers/jbossas-remote-51/src/main/java/org/jboss/arquillian/jboss/JbossRemoteContainer.java 2010-04-20 15:10:07 UTC (rev 4271)
@@ -30,6 +30,7 @@
import javax.naming.InitialContext;
import org.jboss.arquillian.protocol.servlet.ServletMethodExecutor;
+import org.jboss.arquillian.spi.Configuration;
import org.jboss.arquillian.spi.ContainerMethodExecutor;
import org.jboss.arquillian.spi.DeployableContainer;
import org.jboss.arquillian.spi.DeploymentException;
@@ -65,8 +66,15 @@
private HttpServer httpFileServer;
- public JbossRemoteContainer()
+ private JBossConfiguration configuration;
+
+ /* (non-Javadoc)
+ * @see org.jboss.arquillian.spi.DeployableContainer#setup(org.jboss.arquillian.spi.Configuration)
+ */
+ @Override
+ public void setup(Configuration configuration)
{
+ this.configuration = configuration.getContainerConfig(JBossConfiguration.class);
}
@Override
Modified: arquillian/trunk/containers/jbossas-remote-60/src/main/java/org/jboss/arquillian/jboss/JbossRemoteContainer.java
===================================================================
--- arquillian/trunk/containers/jbossas-remote-60/src/main/java/org/jboss/arquillian/jboss/JbossRemoteContainer.java 2010-04-20 15:05:59 UTC (rev 4270)
+++ arquillian/trunk/containers/jbossas-remote-60/src/main/java/org/jboss/arquillian/jboss/JbossRemoteContainer.java 2010-04-20 15:10:07 UTC (rev 4271)
@@ -30,6 +30,7 @@
import javax.naming.InitialContext;
import org.jboss.arquillian.protocol.servlet.ServletMethodExecutor;
+import org.jboss.arquillian.spi.Configuration;
import org.jboss.arquillian.spi.ContainerMethodExecutor;
import org.jboss.arquillian.spi.DeployableContainer;
import org.jboss.arquillian.spi.DeploymentException;
@@ -65,9 +66,20 @@
private HttpServer httpFileServer;
+ private JBossConfiguration configuration;
+
public JbossRemoteContainer()
{
}
+
+ /* (non-Javadoc)
+ * @see org.jboss.arquillian.spi.DeployableContainer#setup(org.jboss.arquillian.spi.Configuration)
+ */
+ @Override
+ public void setup(Configuration configuration)
+ {
+ this.configuration = configuration.getContainerConfig(JBossConfiguration.class);
+ }
@Override
public void start() throws LifecycleException
Modified: arquillian/trunk/containers/openejb/src/main/java/org/jboss/arquillian/openejb/OpenEJBContainer.java
===================================================================
--- arquillian/trunk/containers/openejb/src/main/java/org/jboss/arquillian/openejb/OpenEJBContainer.java 2010-04-20 15:05:59 UTC (rev 4270)
+++ arquillian/trunk/containers/openejb/src/main/java/org/jboss/arquillian/openejb/OpenEJBContainer.java 2010-04-20 15:10:07 UTC (rev 4271)
@@ -26,6 +26,7 @@
import org.apache.openejb.assembler.classic.SecurityServiceInfo;
import org.apache.openejb.assembler.classic.TransactionServiceInfo;
import org.jboss.arquillian.protocol.local.LocalMethodExecutor;
+import org.jboss.arquillian.spi.Configuration;
import org.jboss.arquillian.spi.ContainerMethodExecutor;
import org.jboss.arquillian.spi.DeployableContainer;
import org.jboss.arquillian.spi.DeploymentException;
@@ -72,10 +73,21 @@
*/
private AppInfo deployment;
+ private OpenEJBConfiguration configuration;
+
//-------------------------------------------------------------------------------------||
// Required Implementations -----------------------------------------------------------||
//-------------------------------------------------------------------------------------||
+ /* (non-Javadoc)
+ * @see org.jboss.arquillian.spi.DeployableContainer#setup(org.jboss.arquillian.spi.Configuration)
+ */
+ @Override
+ public void setup(Configuration configuration)
+ {
+ this.configuration = configuration.getContainerConfig(OpenEJBConfiguration.class);
+ }
+
/**
* {@inheritDoc}
* @see org.jboss.arquillian.spi.DeployableContainer#deploy(org.jboss.shrinkwrap.api.Archive)
Modified: arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/openwebbeans/OpenWebBeansSEContainer.java
===================================================================
--- arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/openwebbeans/OpenWebBeansSEContainer.java 2010-04-20 15:05:59 UTC (rev 4270)
+++ arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/openwebbeans/OpenWebBeansSEContainer.java 2010-04-20 15:10:07 UTC (rev 4271)
@@ -31,6 +31,7 @@
import org.apache.webbeans.spi.ContainerLifecycle;
import org.jboss.arquillian.protocol.local.LocalMethodExecutor;
+import org.jboss.arquillian.spi.Configuration;
import org.jboss.arquillian.spi.ContainerMethodExecutor;
import org.jboss.arquillian.spi.DeployableContainer;
import org.jboss.arquillian.spi.DeploymentException;
@@ -68,6 +69,14 @@
public final static ThreadLocal<ContainerInstanceHolder> CONTAINER_INSTANCE_HOLDER = new ThreadLocal<ContainerInstanceHolder>();
+ /* (non-Javadoc)
+ * @see org.jboss.arquillian.spi.DeployableContainer#setup(org.jboss.arquillian.spi.Configuration)
+ */
+ @Override
+ public void setup(Configuration configuration)
+ {
+ }
+
/**
* @see org.jboss.arquillian.spi.DeployableContainer#start()
*/
Modified: arquillian/trunk/containers/reloaded/src/main/java/org/jboss/arquillian/container/reloaded/ReloadedContainer.java
===================================================================
--- arquillian/trunk/containers/reloaded/src/main/java/org/jboss/arquillian/container/reloaded/ReloadedContainer.java 2010-04-20 15:05:59 UTC (rev 4270)
+++ arquillian/trunk/containers/reloaded/src/main/java/org/jboss/arquillian/container/reloaded/ReloadedContainer.java 2010-04-20 15:10:07 UTC (rev 4271)
@@ -21,6 +21,7 @@
import java.util.List;
import org.jboss.arquillian.protocol.local.LocalMethodExecutor;
+import org.jboss.arquillian.spi.Configuration;
import org.jboss.arquillian.spi.ContainerMethodExecutor;
import org.jboss.arquillian.spi.DeployableContainer;
import org.jboss.arquillian.spi.DeploymentException;
@@ -96,10 +97,20 @@
*/
private ShrinkWrapDeployer deployer;
+ private JBossReloadedConfiguration configuration;
//-------------------------------------------------------------------------------------||
// Required Implementations -----------------------------------------------------------||
//-------------------------------------------------------------------------------------||
+
+ /* (non-Javadoc)
+ * @see org.jboss.arquillian.spi.DeployableContainer#setup(org.jboss.arquillian.spi.Configuration)
+ */
+ public void setup(Configuration configuration)
+ {
+ this.configuration = configuration.getContainerConfig(JBossReloadedConfiguration.class);
+ }
+
/**
* {@inheritDoc}
* @see org.jboss.arquillian.spi.DeployableContainer#deploy(org.jboss.shrinkwrap.api.Archive)
Modified: arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/weld/WeldSEContainer.java
===================================================================
--- arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/weld/WeldSEContainer.java 2010-04-20 15:05:59 UTC (rev 4270)
+++ arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/weld/WeldSEContainer.java 2010-04-20 15:10:07 UTC (rev 4271)
@@ -21,6 +21,7 @@
import java.util.UUID;
import org.jboss.arquillian.protocol.local.LocalMethodExecutor;
+import org.jboss.arquillian.spi.Configuration;
import org.jboss.arquillian.spi.ContainerMethodExecutor;
import org.jboss.arquillian.spi.DeployableContainer;
import org.jboss.arquillian.spi.DeploymentException;
@@ -48,7 +49,18 @@
{
public final static ThreadLocal<WeldHolder> WELD_MANAGER = new ThreadLocal<WeldHolder>();
+ private WeldSEConfiguration configuration;
+
/* (non-Javadoc)
+ * @see org.jboss.arquillian.spi.DeployableContainer#setup(org.jboss.arquillian.spi.Configuration)
+ */
+ @Override
+ public void setup(Configuration configuration)
+ {
+ this.configuration = configuration.getContainerConfig(WeldSEConfiguration.class);
+ }
+
+ /* (non-Javadoc)
* @see org.jboss.arquillian.spi.DeployableContainer#start()
*/
@Override
More information about the jboss-svn-commits
mailing list