Author: rmannibucau
Date: Mon May 7 11:27:51 2012
New Revision: 1334958
URL: http://svn.apache.org/viewvc?rev=1334958&view=rev
Log:
adding multiple-tomee-arquillian sample with tomee remote
Added:
openejb/trunk/openejb/examples/multiple-tomee-arquillian/
openejb/trunk/openejb/examples/multiple-tomee-arquillian/pom.xml
openejb/trunk/openejb/examples/multiple-tomee-arquillian/src/
openejb/trunk/openejb/examples/multiple-tomee-arquillian/src/test/
openejb/trunk/openejb/examples/multiple-tomee-arquillian/src/test/java/
openejb/trunk/openejb/examples/multiple-tomee-arquillian/src/test/java/org/
openejb/trunk/openejb/examples/multiple-tomee-arquillian/src/test/java/org/superbiz/
openejb/trunk/openejb/examples/multiple-tomee-arquillian/src/test/java/org/superbiz/tomee/
openejb/trunk/openejb/examples/multiple-tomee-arquillian/src/test/java/org/superbiz/tomee/arquillian/
openejb/trunk/openejb/examples/multiple-tomee-arquillian/src/test/java/org/superbiz/tomee/arquillian/multiple/
openejb/trunk/openejb/examples/multiple-tomee-arquillian/src/test/java/org/superbiz/tomee/arquillian/multiple/MultipleTomEETests.java
openejb/trunk/openejb/examples/multiple-tomee-arquillian/src/test/resources/
openejb/trunk/openejb/examples/multiple-tomee-arquillian/src/test/resources/arquillian.xml
Modified:
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
openejb/trunk/openejb/examples/pom.xml
Modified:
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java?rev=1334958&r1=1334957&r2=1334958&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
(original)
+++
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
Mon May 7 11:27:51 2012
@@ -16,11 +16,20 @@
*/
package org.apache.openejb.arquillian.common;
-import org.apache.openejb.OpenEJBException;
+import java.io.File;
+import java.io.OutputStream;
+import java.net.Socket;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
import org.apache.openejb.assembler.Deployer;
import org.apache.openejb.assembler.classic.AppInfo;
import org.apache.openejb.assembler.classic.Info;
-import org.apache.openejb.loader.IO;
import org.apache.openejb.loader.Options;
import org.apache.openejb.util.NetworkUtil;
import org.jboss.arquillian.container.spi.client.container.DeployableContainer;
@@ -35,20 +44,6 @@ import org.jboss.shrinkwrap.api.exporter
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.jboss.shrinkwrap.descriptor.api.Descriptor;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import java.io.File;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.Socket;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
public abstract class TomEEContainer<Configuration extends TomEEConfiguration>
implements DeployableContainer<Configuration> {
protected static final Logger LOGGER =
Logger.getLogger(TomEEContainer.class.getName());
@@ -87,7 +82,11 @@ public abstract class TomEEContainer<Con
LOGGER.log(Level.INFO, String.format("Applying override
'%s=%s'", property, value));
map.put(key, value);
} catch (Exception e) {
- LOGGER.log(Level.WARNING, String.format("Override failed
'%s=%s'", property, value), e);
+ try {
+ map.put(key, Integer.parseInt(value)); // we manage
String and int so let's try an int
+ } catch (Exception ignored) {
+ LOGGER.log(Level.WARNING, String.format("Override
failed '%s=%s'", property, value), e);
+ }
}
}
}
Added: openejb/trunk/openejb/examples/multiple-tomee-arquillian/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/multiple-tomee-arquillian/pom.xml?rev=1334958&view=auto
==============================================================================
--- openejb/trunk/openejb/examples/multiple-tomee-arquillian/pom.xml (added)
+++ openejb/trunk/openejb/examples/multiple-tomee-arquillian/pom.xml Mon May 7
11:27:51 2012
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+-->
+<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";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.superbiz</groupId>
+ <artifactId>multiple-tomee-arquillian</artifactId>
+ <packaging>jar</packaging>
+ <version>1.1-SNAPSHOT</version>
+ <name>OpenEJB :: Examples :: Multiple TomEE with Arquillian</name>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.12</version>
+ <configuration>
+ <systemProperties> <!-- to activate the group -->
+ <arquillian.launch>tomee-cluster</arquillian.launch>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <repositories>
+ <repository>
+ <id>apache-m2-snapshot</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ </repository>
+ </repositories>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>javaee-api</artifactId>
+ <version>6.0-3</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <!--
+ The <scope>test</scope> guarantees that non of your runtime
+ code is dependent on any OpenEJB classes.
+ -->
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-core</artifactId>
+ <version>4.0.0-beta-3-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>arquillian-tomee-remote</artifactId>
+ <version>1.0.0-beta-3-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.junit</groupId>
+ <artifactId>arquillian-junit-container</artifactId>
+ <version>1.0.0.Final</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.container</groupId>
+ <artifactId>arquillian-container-test-impl-base</artifactId>
+ <version>1.0.0.Final</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>ziplock</artifactId>
+ <version>1.0.0-beta-3-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <!--
+ This section allows you to configure where to publish libraries for sharing.
+ It is not required and may be deleted. For more information see:
+ http://maven.apache.org/plugins/maven-deploy-plugin/
+ -->
+ <distributionManagement>
+ <repository>
+ <id>localhost</id>
+ <url>file://${basedir}/target/repo/</url>
+ </repository>
+ <snapshotRepository>
+ <id>localhost</id>
+ <url>file://${basedir}/target/snapshot-repo/</url>
+ </snapshotRepository>
+ </distributionManagement>
+</project>
\ No newline at end of file
Added:
openejb/trunk/openejb/examples/multiple-tomee-arquillian/src/test/java/org/superbiz/tomee/arquillian/multiple/MultipleTomEETests.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/multiple-tomee-arquillian/src/test/java/org/superbiz/tomee/arquillian/multiple/MultipleTomEETests.java?rev=1334958&view=auto
==============================================================================
---
openejb/trunk/openejb/examples/multiple-tomee-arquillian/src/test/java/org/superbiz/tomee/arquillian/multiple/MultipleTomEETests.java
(added)
+++
openejb/trunk/openejb/examples/multiple-tomee-arquillian/src/test/java/org/superbiz/tomee/arquillian/multiple/MultipleTomEETests.java
Mon May 7 11:27:51 2012
@@ -0,0 +1,58 @@
+package org.superbiz.tomee.arquillian.multiple;
+
+import java.io.IOException;
+import java.net.URL;
+import org.apache.ziplock.IO;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OperateOnDeployment;
+import org.jboss.arquillian.container.test.api.RunAsClient;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.assertEquals;
+
+@RunAsClient // can be replaced by testable = false in @Deployment
+@RunWith(Arquillian.class)
+public class MultipleTomEETests {
+ @ArquillianResource
+ @OperateOnDeployment("war1")
+ private URL url1;
+
+ @ArquillianResource
+ @OperateOnDeployment("war2")
+ private URL url2;
+
+ @Deployment(name = "war1")
+ @TargetsContainer("tomee-1")
+ public static WebArchive createDep1() {
+ return ShrinkWrap.create(WebArchive.class, "application1.war")
+ .addAsWebResource(new StringAsset("Hello from TomEE 1"),
"index.html");
+ }
+
+ @Deployment(name = "war2")
+ @TargetsContainer("tomee-2")
+ public static WebArchive createDep2() {
+ return ShrinkWrap.create(WebArchive.class, "application2.war")
+ .addAsWebResource(new StringAsset("Hello from TomEE 2"),
"index.html");
+ }
+
+ @Test
+ @OperateOnDeployment("war1")
+ public void testRunningInDep1() throws IOException {
+ final String content = IO.slurp(url1);
+ assertEquals("Hello from TomEE 1", content);
+ }
+
+ @Test
+ @OperateOnDeployment("war2")
+ public void testRunningInDep2() throws IOException {
+ final String content = IO.slurp(url2);
+ assertEquals("Hello from TomEE 2", content);
+ }
+}
Added:
openejb/trunk/openejb/examples/multiple-tomee-arquillian/src/test/resources/arquillian.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/multiple-tomee-arquillian/src/test/resources/arquillian.xml?rev=1334958&view=auto
==============================================================================
---
openejb/trunk/openejb/examples/multiple-tomee-arquillian/src/test/resources/arquillian.xml
(added)
+++
openejb/trunk/openejb/examples/multiple-tomee-arquillian/src/test/resources/arquillian.xml
Mon May 7 11:27:51 2012
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+
+ 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.
+-->
+<arquillian xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://jboss.org/schema/arquillian
http://jboss.org/schema/arquillian/arquillian_1_0.xsd";>
+ <group qualifier="tomee-cluster">
+ <container qualifier="tomee-1">
+ <configuration>
+ <property name="httpPort">-1</property>
+ <property name="stopPort">-1</property>
+ <property name="ajpPort">-1</property>
+ <property name="version">1.0.0-beta-3-SNAPSHOT</property>
+ <property name="dir">target/apache-tomee-remote-1</property>
+ <property
name="appWorkingDir">target/arquillian-test-working-dir-1</property>
+ </configuration>
+ </container>
+ <container qualifier="tomee-2">
+ <configuration>
+ <property name="httpPort">-1</property>
+ <property name="stopPort">-1</property>
+ <property name="ajpPort">-1</property>
+ <property name="version">1.0.0-beta-3-SNAPSHOT</property>
+ <property name="dir">target/apache-tomee-remote-2</property>
+ <property
name="appWorkingDir">target/arquillian-test-working-dir-2</property>
+ </configuration>
+ </container>
+ </group>
+</arquillian>
\ No newline at end of file
Modified: openejb/trunk/openejb/examples/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/pom.xml?rev=1334958&r1=1334957&r2=1334958&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/pom.xml (original)
+++ openejb/trunk/openejb/examples/pom.xml Mon May 7 11:27:51 2012
@@ -106,6 +106,7 @@
<module>webservice-ws-security</module>
<module>webservice-handlerchain</module>
<module>webservice-holder</module>
+ <module>multiple-tomee-arquillian</module>
</modules>
<profiles>
<profile>
