Author: rmannibucau
Date: Mon Sep 26 19:49:07 2011
New Revision: 1176013
URL: http://svn.apache.org/viewvc?rev=1176013&view=rev
Log:
activating IT in arquillian remote
Added:
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/remote/TomEEContainerIT.java
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/remote/TstEjb.java
- copied, changed from r1173275,
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/remote/TestEjb.java
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/remote/TstServlet.java
- copied, changed from r1173275,
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/remote/TestServlet.java
Removed:
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/remote/TestEjb.java
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/remote/TestServlet.java
Modified:
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded-using-war/pom.xml
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded-using-war/src/main/java/org/apache/openejb/arquillian/TomEEConfiguration.java
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded-using-war/src/main/java/org/apache/openejb/arquillian/TomEEContainer.java
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/pom.xml
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote/pom.xml
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote/src/test/resources/arquillian.xml
Modified:
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded-using-war/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded-using-war/pom.xml?rev=1176013&r1=1176012&r2=1176013&view=diff
==============================================================================
---
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded-using-war/pom.xml
(original)
+++
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded-using-war/pom.xml
Mon Sep 26 19:49:07 2011
@@ -33,7 +33,7 @@
<url>http://maven.apache.org</url>
<properties>
- <version.org.apache.tomcat>7.0.12</version.org.apache.tomcat>
+ <version.org.apache.tomcat>7.0.21</version.org.apache.tomcat>
<version.cdi-api>1.0</version.cdi-api>
<version.arquillian>1.0.0.Alpha5</version.arquillian>
</properties>
Modified:
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded-using-war/src/main/java/org/apache/openejb/arquillian/TomEEConfiguration.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded-using-war/src/main/java/org/apache/openejb/arquillian/TomEEConfiguration.java?rev=1176013&r1=1176012&r2=1176013&view=diff
==============================================================================
---
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded-using-war/src/main/java/org/apache/openejb/arquillian/TomEEConfiguration.java
(original)
+++
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded-using-war/src/main/java/org/apache/openejb/arquillian/TomEEConfiguration.java
Mon Sep 26 19:49:07 2011
@@ -24,6 +24,7 @@ public class TomEEConfiguration implemen
private int httpPort = 8080;
private int stopPort = 8005;
private String dir = System.getProperty("java.io.tmpdir") +
"/arquillian-apache-tomee";
+ private boolean plusContainer = true;
public int getHttpPort() {
return httpPort;
@@ -49,6 +50,14 @@ public class TomEEConfiguration implemen
this.dir = dir;
}
+ public boolean isPlusContainer() {
+ return plusContainer;
+ }
+
+ public void setPlusContainer(boolean plusContainer) {
+ this.plusContainer = plusContainer;
+ }
+
public void validate() throws ConfigurationException {
}
}
Modified:
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded-using-war/src/main/java/org/apache/openejb/arquillian/TomEEContainer.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded-using-war/src/main/java/org/apache/openejb/arquillian/TomEEContainer.java?rev=1176013&r1=1176012&r2=1176013&view=diff
==============================================================================
---
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded-using-war/src/main/java/org/apache/openejb/arquillian/TomEEContainer.java
(original)
+++
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded-using-war/src/main/java/org/apache/openejb/arquillian/TomEEContainer.java
Mon Sep 26 19:49:07 2011
@@ -50,6 +50,7 @@ import org.jboss.shrinkwrap.descriptor.a
import org.jboss.shrinkwrap.resolver.impl.maven.filter.StrictFilter;
public class TomEEContainer implements DeployableContainer<TomEEConfiguration>
{
+ private static final String OPENEJB_VERSION = "4.0.0-SNAPSHOT";
private Bootstrap bootstrap;
private TomEEConfiguration configuration;
@@ -107,9 +108,17 @@ public class TomEEContainer implements D
}
private void installOpenEJB(File catalinaDirectory) throws IOException {
- Collection<GenericArchive> archives = new SimpleMavenBuilderImpl()
-
.artifact("org.apache.openejb:openejb-tomcat-webapp:war:4.0.0-SNAPSHOT")
- .resolveAs(GenericArchive.class, new StrictFilter());
+ Collection<GenericArchive> archives;
+
+ if (configuration.isPlusContainer()) {
+ archives = new SimpleMavenBuilderImpl()
+ .artifact("org.apache.openejb:openejb-tomcat-plus-webapp:war:" +
OPENEJB_VERSION)
+ .resolveAs(GenericArchive.class, new StrictFilter());
+ } else {
+ archives = new SimpleMavenBuilderImpl()
+ .artifact("org.apache.openejb:openejb-tomcat-webapp:war:" +
OPENEJB_VERSION)
+ .resolveAs(GenericArchive.class, new StrictFilter());
+ }
GenericArchive archive = archives.iterator().next();
archive.as(ZipExporter.class).exportTo(new File(catalinaDirectory,
"webapps/openejb.war"), true);
Modified:
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/pom.xml?rev=1176013&r1=1176012&r2=1176013&view=diff
==============================================================================
--- openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/pom.xml
(original)
+++ openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/pom.xml
Mon Sep 26 19:49:07 2011
@@ -33,7 +33,7 @@
<url>http://maven.apache.org</url>
<properties>
- <version.org.apache.tomcat>7.0.16</version.org.apache.tomcat>
+ <version.org.apache.tomcat>7.0.21</version.org.apache.tomcat>
<version.cdi-api>1.0</version.cdi-api>
<version.arquillian>1.0.0.Alpha5</version.arquillian>
</properties>
Modified: openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote/pom.xml?rev=1176013&r1=1176012&r2=1176013&view=diff
==============================================================================
--- openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote/pom.xml
(original)
+++ openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote/pom.xml Mon
Sep 26 19:49:07 2011
@@ -17,7 +17,7 @@
limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>arquillian-tomee</artifactId>
@@ -33,288 +33,359 @@
<url>http://maven.apache.org</url>
<properties>
- <version.org.apache.tomcat>7.0.12</version.org.apache.tomcat>
- <version.cdi-api>1.0</version.cdi-api>
- <version.arquillian>1.0.0.Alpha5</version.arquillian>
- </properties>
-
- <repositories>
- <repository>
- <id>apache-m2-snapshot</id>
- <name>Apache Snapshot Repository</name>
- <url>http://repository.apache.org/snapshots</url>
- </repository>
- <repository>
+ <version.org.apache.tomcat>7.0.12</version.org.apache.tomcat>
+ <version.cdi-api>1.0</version.cdi-api>
+ <version.arquillian>1.0.0.Alpha5</version.arquillian>
+ <version.org.apache.openejb>4.0.0-SNAPSHOT</version.org.apache.openejb>
+ </properties>
+
+ <repositories>
+ <repository>
+ <id>apache-m2-snapshot</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ </repository>
+ <repository>
<id>jboss-public</id>
<name>JBoss public repo</name>
<url>https://repository.jboss.org/nexus/content/groups/public</url>
- </repository>
- </repositories>
-
- <dependencies>
-
- <dependency>
- <groupId>org.jboss.arquillian</groupId>
- <artifactId>arquillian-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>
- <version>${version.arquillian}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.arquillian.testenricher</groupId>
- <artifactId>arquillian-testenricher-ejb</artifactId>
- <version>${version.arquillian}</version>
- </dependency>
-
-
-
-
- <dependency>
- <groupId>org.jboss.arquillian</groupId>
- <artifactId>arquillian-junit</artifactId>
- <version>${version.arquillian}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <artifactId>xbean-reflect</artifactId>
- <groupId>org.apache.xbean</groupId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- <version>${version.cdi-api}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.jdt.core.compiler</groupId>
- <artifactId>ecj</artifactId>
- <version>3.5.1</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>javaee-api</artifactId>
- <version>6.0-SNAPSHOT</version>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.6.4</version>
- <type>jar</type>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <artifactId>commons-lang</artifactId>
- <groupId>commons-lang</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
- <version>1.1</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-client</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <artifactId>javaee-api-embedded</artifactId>
- <groupId>org.apache.openejb</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-core</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <artifactId>mbean-annotation-api</artifactId>
- <groupId>org.apache.openejb</groupId>
- </exclusion>
- <exclusion>
- <artifactId>log4j</artifactId>
- <groupId>log4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-lang</artifactId>
- <groupId>commons-lang</groupId>
- </exclusion>
- <exclusion>
- <artifactId>javaee-api-embedded</artifactId>
- <groupId>org.apache.openejb</groupId>
- </exclusion>
- <exclusion>
- <artifactId>openejb-api</artifactId>
- <groupId>org.apache.openejb</groupId>
- </exclusion>
- <exclusion>
- <artifactId>openejb-loader</artifactId>
- <groupId>org.apache.openejb</groupId>
- </exclusion>
- <exclusion>
- <artifactId>openejb-javaagent</artifactId>
- <groupId>org.apache.openejb</groupId>
- </exclusion>
- <exclusion>
- <artifactId>openejb-jee</artifactId>
- <groupId>org.apache.openejb</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-cli</artifactId>
- <groupId>commons-cli</groupId>
- </exclusion>
- <exclusion>
- <artifactId>activemq-ra</artifactId>
- <groupId>org.apache.activemq</groupId>
- </exclusion>
- <exclusion>
- <artifactId>activemq-core</artifactId>
- <groupId>org.apache.activemq</groupId>
- </exclusion>
- <exclusion>
- <artifactId>geronimo-connector</artifactId>
- <groupId>org.apache.geronimo.components</groupId>
- </exclusion>
- <exclusion>
- <artifactId>geronimo-transaction</artifactId>
- <groupId>org.apache.geronimo.components</groupId>
- </exclusion>
- <exclusion>
- <artifactId>howl</artifactId>
- <groupId>org.objectweb.howl</groupId>
- </exclusion>
- <exclusion>
- <artifactId>geronimo-javamail_1.4_mail</artifactId>
- <groupId>org.apache.geronimo.javamail</groupId>
- </exclusion>
- <exclusion>
- <artifactId>xbean-asm-shaded</artifactId>
- <groupId>org.apache.xbean</groupId>
- </exclusion>
- <exclusion>
- <artifactId>xbean-finder-shaded</artifactId>
- <groupId>org.apache.xbean</groupId>
- </exclusion>
- <exclusion>
- <artifactId>xbean-reflect</artifactId>
- <groupId>org.apache.xbean</groupId>
- </exclusion>
- <exclusion>
- <artifactId>xbean-naming</artifactId>
- <groupId>org.apache.xbean</groupId>
- </exclusion>
- <exclusion>
- <artifactId>xbean-bundleutils</artifactId>
- <groupId>org.apache.xbean</groupId>
- </exclusion>
- <exclusion>
- <artifactId>hsqldb</artifactId>
- <groupId>hsqldb</groupId>
- </exclusion>
- <exclusion>
- <artifactId>bval-core</artifactId>
- <groupId>org.apache.bval</groupId>
- </exclusion>
- <exclusion>
- <artifactId>bval-jsr303</artifactId>
- <groupId>org.apache.bval</groupId>
- </exclusion>
- <exclusion>
- <artifactId>openjpa</artifactId>
- <groupId>org.apache.openjpa</groupId>
- </exclusion>
- <exclusion>
- <artifactId>openwebbeans-web</artifactId>
- <groupId>org.apache.openwebbeans</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-dbcp</artifactId>
- <groupId>commons-dbcp</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-pool</artifactId>
- <groupId>commons-pool</groupId>
- </exclusion>
- <exclusion>
- <artifactId>swizzle-stream</artifactId>
- <groupId>org.codehaus.swizzle</groupId>
- </exclusion>
- <exclusion>
- <artifactId>wsdl4j</artifactId>
- <groupId>wsdl4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>quartz</artifactId>
- <groupId>org.quartz-scheduler</groupId>
- </exclusion>
- <exclusion>
- <artifactId>openwebbeans-impl</artifactId>
- <groupId>org.apache.openwebbeans</groupId>
- </exclusion>
- <exclusion>
- <artifactId>openwebbeans-ee-common</artifactId>
- <groupId>org.apache.openwebbeans</groupId>
- </exclusion>
- <exclusion>
- <artifactId>slf4j-log4j12</artifactId>
- <groupId>org.slf4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>slf4j-api</artifactId>
- <groupId>org.slf4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>openwebbeans-spi</artifactId>
- <groupId>org.apache.openwebbeans</groupId>
- </exclusion>
- <exclusion>
- <artifactId>openwebbeans-ejb</artifactId>
- <groupId>org.apache.openwebbeans</groupId>
- </exclusion>
- <exclusion>
- <artifactId>openwebbeans-ee</artifactId>
- <groupId>org.apache.openwebbeans</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
+ </repository>
+ <repository>
+ <id>sonatype-oss-repository</id>
+ <name>Sonatype OSS repo</name>
+ <url>https://oss.sonatype.org/content/groups/public/</url>
+ </repository>
+ </repositories>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.jboss.arquillian</groupId>
+ <artifactId>arquillian-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>
+ <version>${version.arquillian}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.arquillian.testenricher</groupId>
+ <artifactId>arquillian-testenricher-ejb</artifactId>
+ <version>${version.arquillian}</version>
+ </dependency>
+
+
+ <dependency>
+ <groupId>org.jboss.arquillian</groupId>
+ <artifactId>arquillian-junit</artifactId>
+ <version>${version.arquillian}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>xbean-reflect</artifactId>
+ <groupId>org.apache.xbean</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ <version>${version.cdi-api}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.jdt.core.compiler</groupId>
+ <artifactId>ecj</artifactId>
+ <version>3.5.1</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>javaee-api</artifactId>
+ <version>6.0-SNAPSHOT</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>1.6.4</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-lang</artifactId>
+ <groupId>commons-lang</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
+ <version>1.1</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-client</artifactId>
+ <version>${version.org.apache.openejb}</version>
+ <type>jar</type>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>javaee-api-embedded</artifactId>
+ <groupId>org.apache.openejb</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-core</artifactId>
+ <version>${version.org.apache.openejb}</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>mbean-annotation-api</artifactId>
+ <groupId>org.apache.openejb</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>log4j</artifactId>
+ <groupId>log4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-lang</artifactId>
+ <groupId>commons-lang</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>javaee-api-embedded</artifactId>
+ <groupId>org.apache.openejb</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>openejb-api</artifactId>
+ <groupId>org.apache.openejb</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>openejb-loader</artifactId>
+ <groupId>org.apache.openejb</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>openejb-javaagent</artifactId>
+ <groupId>org.apache.openejb</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>openejb-jee</artifactId>
+ <groupId>org.apache.openejb</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-cli</artifactId>
+ <groupId>commons-cli</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>activemq-ra</artifactId>
+ <groupId>org.apache.activemq</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>activemq-core</artifactId>
+ <groupId>org.apache.activemq</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>geronimo-connector</artifactId>
+ <groupId>org.apache.geronimo.components</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>geronimo-transaction</artifactId>
+ <groupId>org.apache.geronimo.components</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>howl</artifactId>
+ <groupId>org.objectweb.howl</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>geronimo-javamail_1.4_mail</artifactId>
+ <groupId>org.apache.geronimo.javamail</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>xbean-asm-shaded</artifactId>
+ <groupId>org.apache.xbean</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>xbean-finder-shaded</artifactId>
+ <groupId>org.apache.xbean</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>xbean-reflect</artifactId>
+ <groupId>org.apache.xbean</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>xbean-naming</artifactId>
+ <groupId>org.apache.xbean</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>xbean-bundleutils</artifactId>
+ <groupId>org.apache.xbean</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>hsqldb</artifactId>
+ <groupId>hsqldb</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>bval-core</artifactId>
+ <groupId>org.apache.bval</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>bval-jsr303</artifactId>
+ <groupId>org.apache.bval</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>openjpa</artifactId>
+ <groupId>org.apache.openjpa</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>openwebbeans-web</artifactId>
+ <groupId>org.apache.openwebbeans</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-dbcp</artifactId>
+ <groupId>commons-dbcp</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-pool</artifactId>
+ <groupId>commons-pool</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>swizzle-stream</artifactId>
+ <groupId>org.codehaus.swizzle</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>wsdl4j</artifactId>
+ <groupId>wsdl4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>quartz</artifactId>
+ <groupId>org.quartz-scheduler</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>openwebbeans-impl</artifactId>
+ <groupId>org.apache.openwebbeans</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>openwebbeans-ee-common</artifactId>
+ <groupId>org.apache.openwebbeans</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.slf4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>slf4j-api</artifactId>
+ <groupId>org.slf4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>openwebbeans-spi</artifactId>
+ <groupId>org.apache.openwebbeans</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>openwebbeans-ejb</artifactId>
+ <groupId>org.apache.openwebbeans</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>openwebbeans-ee</artifactId>
+ <groupId>org.apache.openwebbeans</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.googlecode.t7mp</groupId>
+ <artifactId>maven-t7-plugin</artifactId>
+ <version>0.9.7</version>
+ <executions>
+ <execution>
+ <id>start-tomcat</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tomcatSetAwait>false</tomcatSetAwait>
+ </configuration>
+ </execution>
+ <execution>
+ <id>stop-tomcat</id>
+ <goals>
+ <goal>stop</goal>
+ </goals>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tomcatSetAwait>false</tomcatSetAwait>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <tomcatHttpPort>8080</tomcatHttpPort>
+ <tomcatShutdownPort>8181</tomcatShutdownPort>
+ <tomcatVersion>${version.org.apache.tomcat}</tomcatVersion>
+ <webapps>
+ <webappArtifact>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-tomcat-plus-webapp</artifactId>
+ <version>${version.org.apache.openejb}</version>
+ <contextPath>openejb</contextPath>
+ </webappArtifact>
+ </webapps>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.6</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>2.6</version>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Added:
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/remote/TomEEContainerIT.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/remote/TomEEContainerIT.java?rev=1176013&view=auto
==============================================================================
---
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/remote/TomEEContainerIT.java
(added)
+++
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/remote/TomEEContainerIT.java
Mon Sep 26 19:49:07 2011
@@ -0,0 +1,67 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.apache.openejb.arquillian.remote;
+
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.net.URL;
+
+import junit.framework.Assert;
+
+import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.jboss.shrinkwrap.descriptor.api.Descriptors;
+import org.jboss.shrinkwrap.descriptor.api.spec.servlet.web.WebAppDescriptor;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(Arquillian.class)
+public class TomEEContainerIT {
+
+ @Deployment(testable = false)
+ public static WebArchive createDeployment() {
+ return ShrinkWrap.create(WebArchive.class, "test.war")
+ .addClass(TstServlet.class)
+ .addClass(TstEjb.class)
+ .setWebXML(new
StringAsset(Descriptors.create(WebAppDescriptor.class)
+ .version("3.0")
+ .servlet(TstServlet.class, "/Test")
+ .exportAsString()));
+ }
+
+ @Test
+ public void testShouldBeAbleToAccessServletAndEjb() throws Exception {
+ InputStream is = new
URL("http://localhost:8080/test/Test";).openStream();
+ ByteArrayOutputStream os = new ByteArrayOutputStream();
+
+ int bytesRead;
+ byte[] buffer = new byte[8192];
+ while ((bytesRead = is.read(buffer)) > -1) {
+ os.write(buffer, 0, bytesRead);
+ }
+
+ is.close();
+ os.close();
+
+ String output = new String(os.toByteArray(), "UTF-8");
+ Assert.assertTrue(output.contains("Hello, OpenEJB"));
+ }
+
+}
Copied:
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/remote/TstEjb.java
(from r1173275,
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/remote/TestEjb.java)
URL:
http://svn.apache.org/viewvc/openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/remote/TstEjb.java?p2=openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/remote/TstEjb.java&p1=openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/remote/TestEjb.java&r1=1173275&r2=1176013&rev=1176013&view=diff
==============================================================================
---
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/remote/TestEjb.java
(original)
+++
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/remote/TstEjb.java
Mon Sep 26 19:49:07 2011
@@ -19,7 +19,7 @@ package org.apache.openejb.arquillian.re
import javax.ejb.Stateless;
@Stateless
-public class TestEjb {
+public class TstEjb {
public String greet(String name) {
return "Hello, " + name;
Copied:
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/remote/TstServlet.java
(from r1173275,
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/remote/TestServlet.java)
URL:
http://svn.apache.org/viewvc/openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/remote/TstServlet.java?p2=openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/remote/TstServlet.java&p1=openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/remote/TestServlet.java&r1=1173275&r2=1176013&rev=1176013&view=diff
==============================================================================
---
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/remote/TestServlet.java
(original)
+++
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/remote/TstServlet.java
Mon Sep 26 19:49:07 2011
@@ -24,10 +24,10 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-public class TestServlet extends HttpServlet {
+public class TstServlet extends HttpServlet {
@EJB
- private TestEjb myEjb;
+ private TstEjb myEjb;
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
Modified:
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote/src/test/resources/arquillian.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote/src/test/resources/arquillian.xml?rev=1176013&r1=1176012&r2=1176013&view=diff
==============================================================================
---
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote/src/test/resources/arquillian.xml
(original)
+++
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote/src/test/resources/arquillian.xml
Mon Sep 26 19:49:07 2011
@@ -25,4 +25,4 @@
<property name="httpPort">8080</property>
</configuration>
</container>
-</arquillian>
\ No newline at end of file
+</arquillian>
