You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2011/10/13 01:00:44 UTC
svn commit: r1182611 - in /openejb/trunk/arquillian-tomee: ./
arquillian-tomee-common/
arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/
arquillian-tomee-embedded/
arquillian-tomee-embedded/src/main/java/META-INF/ arquillian-t...
Author: rmannibucau
Date: Wed Oct 12 23:00:43 2011
New Revision: 1182611
URL: http://svn.apache.org/viewvc?rev=1182611&view=rev
Log:
upgrading version of arquillian to be able to use tomee for the showcase. Note: i disabled not updated modules, some work is still to do
Added:
openejb/trunk/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEExtension.java
openejb/trunk/arquillian-tomee/arquillian-tomee-embedded/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
Removed:
openejb/trunk/arquillian-tomee/arquillian-tomee-embedded/src/main/java/META-INF/
openejb/trunk/arquillian-tomee/arquillian-tomee-embedded/src/main/resources/META-INF/services/org.jboss.arquillian.spi.client.container.DeployableContainer
Modified:
openejb/trunk/arquillian-tomee/arquillian-tomee-common/pom.xml
openejb/trunk/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEArchiveAppender.java
openejb/trunk/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java
openejb/trunk/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
openejb/trunk/arquillian-tomee/arquillian-tomee-embedded/pom.xml
openejb/trunk/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java
openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filtercdiinject/ServletFilterCdiInjectionTest.java
openejb/trunk/arquillian-tomee/pom.xml
Modified: openejb/trunk/arquillian-tomee/arquillian-tomee-common/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-common/pom.xml?rev=1182611&r1=1182610&r2=1182611&view=diff
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-common/pom.xml (original)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-common/pom.xml Wed Oct 12 23:00:43 2011
@@ -34,15 +34,16 @@
<dependencies>
<dependency>
- <groupId>org.jboss.arquillian</groupId>
- <artifactId>arquillian-spi</artifactId>
+ <groupId>org.jboss.arquillian.container</groupId>
+ <artifactId>arquillian-container-spi</artifactId>
<version>${version.arquillian}</version>
</dependency>
- <dependency>
+ <dependency> <!-- for embedded mode it is important otherwise you'll have weird error around classloaders -->
<groupId>org.jboss.arquillian.protocol</groupId>
<artifactId>arquillian-protocol-servlet</artifactId>
<version>${version.arquillian}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -54,7 +55,7 @@
<dependency>
<groupId>org.jboss.arquillian.testenricher</groupId>
<artifactId>arquillian-testenricher-resource</artifactId>
- <version>${version.arquillian}</version>
+ <version>1.0.0.CR4</version>
</dependency>
<dependency>
@@ -65,8 +66,8 @@
<dependency>
- <groupId>org.jboss.arquillian</groupId>
- <artifactId>arquillian-junit</artifactId>
+ <groupId>org.jboss.arquillian.junit</groupId>
+ <artifactId>arquillian-junit-container</artifactId>
<version>${version.arquillian}</version>
<scope>test</scope>
<exclusions>
Modified: openejb/trunk/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEArchiveAppender.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEArchiveAppender.java?rev=1182611&r1=1182610&r2=1182611&view=diff
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEArchiveAppender.java (original)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEArchiveAppender.java Wed Oct 12 23:00:43 2011
@@ -16,8 +16,8 @@
*/
package org.apache.openejb.arquillian.common;
-import org.jboss.arquillian.spi.TestEnricher;
-import org.jboss.arquillian.spi.client.deployment.AuxiliaryArchiveAppender;
+import org.jboss.arquillian.container.test.spi.client.deployment.AuxiliaryArchiveAppender;
+import org.jboss.arquillian.test.spi.TestEnricher;
import org.jboss.arquillian.testenricher.cdi.CDIInjectionEnricher;
import org.jboss.arquillian.testenricher.ejb.EJBInjectionEnricher;
import org.jboss.arquillian.testenricher.resource.ResourceInjectionEnricher;
@@ -28,10 +28,9 @@ import org.jboss.shrinkwrap.api.spec.Jav
public class TomEEArchiveAppender implements AuxiliaryArchiveAppender {
public Archive<?> createAuxiliaryArchive() {
- JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "arquillian-jboss-testenrichers.jar")
+ return ShrinkWrap.create(JavaArchive.class, "arquillian-jboss-testenrichers.jar")
.addPackages(true, EJBInjectionEnricher.class.getPackage(), ResourceInjectionEnricher.class.getPackage(), CDIInjectionEnricher.class.getPackage())
.addAsServiceProvider(TestEnricher.class, CDIInjectionEnricher.class, EJBInjectionEnricher.class, ResourceInjectionEnricher.class);
- return archive;
}
}
Modified: openejb/trunk/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java?rev=1182611&r1=1182610&r2=1182611&view=diff
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java (original)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java Wed Oct 12 23:00:43 2011
@@ -16,8 +16,9 @@
*/
package org.apache.openejb.arquillian.common;
-import org.jboss.arquillian.spi.ConfigurationException;
-import org.jboss.arquillian.spi.client.container.ContainerConfiguration;
+
+import org.jboss.arquillian.container.spi.ConfigurationException;
+import org.jboss.arquillian.container.spi.client.container.ContainerConfiguration;
public class TomEEConfiguration implements ContainerConfiguration {
Modified: openejb/trunk/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java?rev=1182611&r1=1182610&r2=1182611&view=diff
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java (original)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java Wed Oct 12 23:00:43 2011
@@ -27,12 +27,13 @@ import javax.naming.Context;
import javax.naming.InitialContext;
import org.apache.openejb.assembler.Deployer;
-import org.jboss.arquillian.spi.client.container.DeployableContainer;
-import org.jboss.arquillian.spi.client.container.DeploymentException;
-import org.jboss.arquillian.spi.client.container.LifecycleException;
-import org.jboss.arquillian.spi.client.protocol.ProtocolDescription;
-import org.jboss.arquillian.spi.client.protocol.metadata.HTTPContext;
-import org.jboss.arquillian.spi.client.protocol.metadata.ProtocolMetaData;
+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;
+import org.jboss.arquillian.container.spi.client.protocol.ProtocolDescription;
+import org.jboss.arquillian.container.spi.client.protocol.metadata.HTTPContext;
+import org.jboss.arquillian.container.spi.client.protocol.metadata.ProtocolMetaData;
+import org.jboss.arquillian.container.spi.client.protocol.metadata.Servlet;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.exporter.ZipExporter;
import org.jboss.shrinkwrap.descriptor.api.Descriptor;
@@ -52,19 +53,19 @@ public abstract class TomEEContainer imp
public abstract void start() throws LifecycleException;
public void stop() throws LifecycleException {
- try {
- String command = "SHUTDOWN";
+ try {
+ String command = "SHUTDOWN";
+
+ Socket socket = new Socket("localhost", configuration.getStopPort());
+ OutputStream out = socket.getOutputStream();
+ out.write(command.getBytes());
- Socket socket = new Socket("localhost", configuration.getStopPort());
- OutputStream out = socket.getOutputStream();
- out.write(command.getBytes());
-
- waitForShutdown(10);
- } catch (Exception e) {
- throw new LifecycleException("Unable to stop TomEE", e);
- }
+ waitForShutdown(10);
+ } catch (Exception e) {
+ throw new LifecycleException("Unable to stop TomEE", e);
+ }
}
-
+
protected void waitForShutdown(int tries) {
try {
@@ -78,7 +79,7 @@ public abstract class TomEEContainer imp
} catch (Exception e2) {
e.printStackTrace();
}
-
+
waitForShutdown(--tries);
}
}
@@ -87,25 +88,27 @@ public abstract class TomEEContainer imp
public ProtocolDescription getDefaultProtocol() {
return new ProtocolDescription("Servlet 3.0");
}
-
+
public ProtocolMetaData deploy(Archive<?> archive) throws DeploymentException {
- try {
- String tmpDir = System.getProperty("java.io.tmpdir");
- File file = new File(tmpDir + File.separator + archive.getName());
- file.deleteOnExit();
- archive.as(ZipExporter.class).exportTo(file, true);
-
- Properties properties = new Properties();
+ try {
+ String tmpDir = System.getProperty("java.io.tmpdir");
+ File file = new File(tmpDir + File.separator + archive.getName());
+ file.deleteOnExit();
+ archive.as(ZipExporter.class).exportTo(file, true);
+
+ Properties properties = new Properties();
properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.RemoteInitialContextFactory");
properties.setProperty(Context.PROVIDER_URL, "http://localhost:" + configuration.getHttpPort() + "/openejb/ejb");
InitialContext context = new InitialContext(properties);
- Deployer deployer = (Deployer) context.lookup("openejb/DeployerBusinessRemote");
- deployer.deploy(file.getAbsolutePath());
-
+ Deployer deployer = (Deployer) context.lookup("openejb/DeployerBusinessRemote");
+ deployer.deploy(file.getAbsolutePath());
+
moduleIds.put(archive.getName(), file.getAbsolutePath());
-
+
HTTPContext httpContext = new HTTPContext("0.0.0.0", configuration.getHttpPort());
+ httpContext.add(new Servlet("ArquillianServletRunner", "/" + getArchiveNameWithoutExtension(archive)));
+ // we should probably get all servlets and add them to the context
return new ProtocolMetaData().addContext(httpContext);
} catch (Exception e) {
e.printStackTrace();
@@ -113,15 +116,29 @@ public abstract class TomEEContainer imp
}
}
+ protected String getArchiveNameWithoutExtension(final Archive<?> archive) {
+ final String archiveName = archive.getName();
+ final int extensionOffset = archiveName.lastIndexOf('.');
+ if (extensionOffset >= 0) {
+ return archiveName.substring(0, extensionOffset);
+ }
+ return archiveName;
+ }
+
+ private Servlet getArquillianServlet() {
+ Servlet servlet = new Servlet("ArquillianServletRunner", "/");
+ return servlet;
+ }
+
public void undeploy(Archive<?> archive) throws DeploymentException {
- try {
- Properties properties = new Properties();
- properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.RemoteInitialContextFactory");
- properties.setProperty(Context.PROVIDER_URL, "http://localhost:" + configuration.getHttpPort() + "/openejb/ejb");
- InitialContext context = new InitialContext(properties);
- String appId = moduleIds.get(archive.getName());
- Deployer deployer = (Deployer) context.lookup("openejb/DeployerBusinessRemote");
- deployer.undeploy(appId);
+ try {
+ Properties properties = new Properties();
+ properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.RemoteInitialContextFactory");
+ properties.setProperty(Context.PROVIDER_URL, "http://localhost:" + configuration.getHttpPort() + "/openejb/ejb");
+ InitialContext context = new InitialContext(properties);
+ String appId = moduleIds.get(archive.getName());
+ Deployer deployer = (Deployer) context.lookup("openejb/DeployerBusinessRemote");
+ deployer.undeploy(appId);
} catch (Exception e) {
e.printStackTrace();
throw new DeploymentException("Unable to undeploy", e);
Modified: openejb/trunk/arquillian-tomee/arquillian-tomee-embedded/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-embedded/pom.xml?rev=1182611&r1=1182610&r2=1182611&view=diff
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-embedded/pom.xml (original)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-embedded/pom.xml Wed Oct 12 23:00:43 2011
@@ -40,32 +40,18 @@
</dependency>
<dependency>
- <groupId>org.jboss.arquillian</groupId>
- <artifactId>arquillian-spi</artifactId>
+ <groupId>org.jboss.arquillian.container</groupId>
+ <artifactId>arquillian-container-spi</artifactId>
<version>${version.arquillian}</version>
</dependency>
-
- <dependency>
- <groupId>org.jboss.arquillian.protocol</groupId>
- <artifactId>arquillian-protocol-servlet</artifactId>
- <version>${version.arquillian}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.arquillian.testenricher</groupId>
- <artifactId>arquillian-testenricher-cdi</artifactId>
- <version>${version.arquillian}</version>
- </dependency>
-
<dependency>
- <groupId>org.jboss.arquillian.testenricher</groupId>
- <artifactId>arquillian-testenricher-resource</artifactId>
+ <groupId>org.jboss.arquillian.container</groupId>
+ <artifactId>arquillian-container-test-spi</artifactId>
<version>${version.arquillian}</version>
</dependency>
-
<dependency>
<groupId>org.jboss.arquillian.testenricher</groupId>
- <artifactId>arquillian-testenricher-ejb</artifactId>
+ <artifactId>arquillian-testenricher-initialcontext</artifactId>
<version>${version.arquillian}</version>
</dependency>
@@ -94,8 +80,8 @@
</dependency>
<dependency>
- <groupId>org.jboss.arquillian</groupId>
- <artifactId>arquillian-junit</artifactId>
+ <groupId>org.jboss.arquillian.junit</groupId>
+ <artifactId>arquillian-junit-container</artifactId>
<version>${version.arquillian}</version>
<scope>test</scope>
</dependency>
Modified: openejb/trunk/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java?rev=1182611&r1=1182610&r2=1182611&view=diff
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java (original)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java Wed Oct 12 23:00:43 2011
@@ -16,23 +16,40 @@
*/
package org.apache.openejb.arquillian.embedded;
-import java.io.File;
-
+import org.apache.openejb.AppContext;
import org.apache.openejb.arquillian.common.FileUtils;
import org.apache.openejb.arquillian.common.TomEEConfiguration;
import org.apache.openejb.arquillian.common.TomEEContainer;
+import org.apache.openejb.core.ivm.naming.ContextWrapper;
import org.apache.tomee.embedded.Configuration;
import org.apache.tomee.embedded.Container;
-import org.jboss.arquillian.spi.client.container.DeploymentException;
-import org.jboss.arquillian.spi.client.container.LifecycleException;
-import org.jboss.arquillian.spi.client.protocol.ProtocolDescription;
-import org.jboss.arquillian.spi.client.protocol.metadata.HTTPContext;
-import org.jboss.arquillian.spi.client.protocol.metadata.ProtocolMetaData;
+import org.jboss.arquillian.container.spi.client.container.DeploymentException;
+import org.jboss.arquillian.container.spi.client.container.LifecycleException;
+import org.jboss.arquillian.container.spi.client.protocol.ProtocolDescription;
+import org.jboss.arquillian.container.spi.client.protocol.metadata.HTTPContext;
+import org.jboss.arquillian.container.spi.client.protocol.metadata.ProtocolMetaData;
+import org.jboss.arquillian.container.spi.client.protocol.metadata.Servlet;
+import org.jboss.arquillian.container.spi.context.annotation.ContainerScoped;
+import org.jboss.arquillian.core.api.InstanceProducer;
+import org.jboss.arquillian.core.api.annotation.Inject;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import javax.naming.Binding;
+import javax.naming.CompositeName;
+import javax.naming.Context;
+import javax.naming.Name;
+import javax.naming.NameClassPair;
+import javax.naming.NameParser;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import java.io.File;
+import java.util.Hashtable;
+
public class EmbeddedTomEEContainer extends TomEEContainer {
+ @Inject @ContainerScoped private InstanceProducer<Context> jndiContext;
+
private Container container;
public EmbeddedTomEEContainer() {
@@ -64,7 +81,6 @@ public class EmbeddedTomEEContainer exte
public void start() throws LifecycleException {
try {
container.start();
-
} catch (Exception e) {
e.printStackTrace();
throw new LifecycleException("Something went wrong", e);
@@ -92,9 +108,11 @@ public class EmbeddedTomEEContainer exte
archive.as(ZipExporter.class).exportTo(file, true);
- container.deploy(name, file);
+ AppContext context = container.deploy(name, file);
+ jndiContext.set(new RemoveJavaPrefixContext(context.getGlobalJndiContext()));
HTTPContext httpContext = new HTTPContext("0.0.0.0", configuration.getHttpPort());
+ httpContext.add(new Servlet("ArquillianServletRunner", "/" + getArchiveNameWithoutExtension(archive)));
return new ProtocolMetaData().addContext(httpContext);
} catch (Exception e) {
e.printStackTrace();
@@ -111,4 +129,24 @@ public class EmbeddedTomEEContainer exte
throw new DeploymentException("Unable to undeploy", e);
}
}
+
+ private class RemoveJavaPrefixContext extends ContextWrapper {
+
+ public static final String JAVA_PREFIX = "java:";
+
+ public RemoveJavaPrefixContext(Context ctx) {
+ super(ctx);
+ }
+
+ private String strip(String s) {
+ if (s.startsWith(JAVA_PREFIX)) {
+ return s.substring(JAVA_PREFIX.length());
+ }
+ return s;
+ }
+
+ @Override public Object lookup(String name) throws NamingException {
+ return context.lookup(strip(name));
+ }
+ }
}
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEExtension.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEExtension.java?rev=1182611&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEExtension.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEExtension.java Wed Oct 12 23:00:43 2011
@@ -0,0 +1,13 @@
+package org.apache.openejb.arquillian.embedded;
+
+import org.jboss.arquillian.container.spi.client.container.DeployableContainer;
+import org.jboss.arquillian.core.spi.LoadableExtension;
+
+/**
+ * @author rmannibucau
+ */
+public class EmbeddedTomEEExtension implements LoadableExtension {
+ @Override public void register(ExtensionBuilder builder) {
+ builder.service(DeployableContainer.class, EmbeddedTomEEContainer.class);
+ }
+}
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-embedded/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-embedded/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension?rev=1182611&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-embedded/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-embedded/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension Wed Oct 12 23:00:43 2011
@@ -0,0 +1 @@
+org.apache.openejb.arquillian.embedded.EmbeddedTomEEExtension
Modified: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filtercdiinject/ServletFilterCdiInjectionTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filtercdiinject/ServletFilterCdiInjectionTest.java?rev=1182611&r1=1182610&r2=1182611&view=diff
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filtercdiinject/ServletFilterCdiInjectionTest.java (original)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filtercdiinject/ServletFilterCdiInjectionTest.java Wed Oct 12 23:00:43 2011
@@ -18,8 +18,6 @@ package org.apache.openejb.arquillian.te
import org.apache.openejb.arquillian.tests.TestRun;
import org.apache.openejb.arquillian.tests.TestSetup;
-import org.jboss.arquillian.api.Deployment;
-import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.jboss.shrinkwrap.descriptor.api.spec.servlet.web.WebAppDescriptor;
import org.junit.Test;
Modified: openejb/trunk/arquillian-tomee/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/pom.xml?rev=1182611&r1=1182610&r2=1182611&view=diff
==============================================================================
--- openejb/trunk/arquillian-tomee/pom.xml (original)
+++ openejb/trunk/arquillian-tomee/pom.xml Wed Oct 12 23:00:43 2011
@@ -49,7 +49,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <version.arquillian>1.0.0.Alpha5</version.arquillian>
+ <version.arquillian>1.0.0.CR1</version.arquillian>
<version.cdi-api>1.0</version.cdi-api>
<version.openejb>4.0.0-beta-2-SNAPSHOT</version.openejb>
<version.org.apache.tomcat>7.0.21</version.org.apache.tomcat>
@@ -59,11 +59,13 @@
<modules>
<module>arquillian-tomee-common</module>
<module>arquillian-tomee-embedded</module>
- <module>arquillian-tomee-embedded-with-war</module>
- <module>arquillian-tomee-remote</module>
- <module>arquillian-tomee-moviefun-example</module>
- <module>arquillian-tomee-tests</module>
- <module>ziplock</module>
+ <!--
+ <module>arquillian-tomee-embedded-with-war</module>
+ <module>arquillian-tomee-remote</module>
+ <module>arquillian-tomee-moviefun-example</module>
+ <module>arquillian-tomee-tests</module>
+ <module>ziplock</module>
+ -->
</modules>
<build>