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/14 00:27:44 UTC
svn commit: r1183141 - 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/org/apache/openejb/arquil...
Author: rmannibucau
Date: Thu Oct 13 22:27:44 2011
New Revision: 1183141
URL: http://svn.apache.org/viewvc?rev=1183141&view=rev
Log:
removing jboss enrichers and making test class managed by CDI
Removed:
openejb/trunk/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEArchiveAppender.java
openejb/trunk/arquillian-tomee/arquillian-tomee-embedded/src/main/resources/META-INF/services/org.jboss.arquillian.spi.client.deployment.AuxiliaryArchiveAppender
Modified:
openejb/trunk/arquillian-tomee/arquillian-tomee-common/pom.xml
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-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEExtension.java
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=1183141&r1=1183140&r2=1183141&view=diff
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-common/pom.xml (original)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-common/pom.xml Thu Oct 13 22:27:44 2011
@@ -47,25 +47,6 @@
</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>
- <version>1.0.0.CR4</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.arquillian.testenricher</groupId>
- <artifactId>arquillian-testenricher-ejb</artifactId>
- <version>${version.arquillian}</version>
- </dependency>
-
-
- <dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId>
<version>${version.arquillian}</version>
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=1183141&r1=1183140&r2=1183141&view=diff
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-embedded/pom.xml (original)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-embedded/pom.xml Thu Oct 13 22:27:44 2011
@@ -49,11 +49,6 @@
<artifactId>arquillian-container-test-spi</artifactId>
<version>${version.arquillian}</version>
</dependency>
- <dependency>
- <groupId>org.jboss.arquillian.testenricher</groupId>
- <artifactId>arquillian-testenricher-initialcontext</artifactId>
- <version>${version.arquillian}</version>
- </dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
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=1183141&r1=1183140&r2=1183141&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 Thu Oct 13 22:27:44 2011
@@ -16,11 +16,9 @@
*/
package org.apache.openejb.arquillian.embedded;
-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.openejb.util.NetworkUtil;
import org.apache.tomee.embedded.Configuration;
import org.apache.tomee.embedded.Container;
@@ -30,14 +28,9 @@ import org.jboss.arquillian.container.sp
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.Context;
-import javax.naming.NamingException;
import java.io.File;
public class EmbeddedTomEEContainer extends TomEEContainer {
@@ -45,8 +38,6 @@ public class EmbeddedTomEEContainer exte
public static final String TOMEE_ARQUILLIAN_HTTP_PORT = "tomee.arquillian.http";
public static final String TOMEE_ARQUILLIAN_STOP_PORT = "tomee.arquillian.stop";
- @Inject @ContainerScoped private InstanceProducer<Context> jndiContext;
-
private Container container;
public EmbeddedTomEEContainer() {
@@ -114,8 +105,7 @@ public class EmbeddedTomEEContainer exte
archive.as(ZipExporter.class).exportTo(file, true);
- AppContext context = container.deploy(name, file);
- jndiContext.set(new RemoveJavaPrefixContext(context.getGlobalJndiContext()));
+ container.deploy(name, file);
HTTPContext httpContext = new HTTPContext("0.0.0.0", configuration.getHttpPort());
httpContext.add(new Servlet("ArquillianServletRunner", "/" + getArchiveNameWithoutExtension(archive)));
@@ -135,24 +125,4 @@ 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));
- }
- }
}
Modified: 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=1183141&r1=1183140&r2=1183141&view=diff
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEExtension.java (original)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEExtension.java Thu Oct 13 22:27:44 2011
@@ -2,12 +2,14 @@ package org.apache.openejb.arquillian.em
import org.jboss.arquillian.container.spi.client.container.DeployableContainer;
import org.jboss.arquillian.core.spi.LoadableExtension;
+import org.jboss.arquillian.test.spi.TestEnricher;
/**
* @author rmannibucau
*/
public class EmbeddedTomEEExtension implements LoadableExtension {
@Override public void register(ExtensionBuilder builder) {
- builder.service(DeployableContainer.class, EmbeddedTomEEContainer.class);
+ builder.service(DeployableContainer.class, EmbeddedTomEEContainer.class)
+ .service(TestEnricher.class, EmbeddedTomEEEnricher.class);
}
}