Author: rmannibucau
Date: Mon Jun 18 07:27:21 2012
New Revision: 1351223

URL: http://svn.apache.org/viewvc?rev=1351223&view=rev
Log:
TOMEE-236 allowing to skip arquillian adapter if another one is selected

Added:
    openejb/trunk/openejb/arquillian/arquillian-common/
    openejb/trunk/openejb/arquillian/arquillian-common/pom.xml
    openejb/trunk/openejb/arquillian/arquillian-common/src/
    openejb/trunk/openejb/arquillian/arquillian-common/src/main/
    openejb/trunk/openejb/arquillian/arquillian-common/src/main/java/
    openejb/trunk/openejb/arquillian/arquillian-common/src/main/java/org/
    openejb/trunk/openejb/arquillian/arquillian-common/src/main/java/org/apache/
    
openejb/trunk/openejb/arquillian/arquillian-common/src/main/java/org/apache/openejb/
    
openejb/trunk/openejb/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/
    
openejb/trunk/openejb/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/
    
openejb/trunk/openejb/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/ArquillianUtil.java
Modified:
    openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/pom.xml
    
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBExtension.java
    openejb/trunk/openejb/arquillian/arquillian-tomee-common/pom.xml
    openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/pom.xml
    
openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEExtension.java
    openejb/trunk/openejb/arquillian/arquillian-tomee-remote/pom.xml
    
openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEExtension.java
    openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/pom.xml
    
openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappExtension.java
    openejb/trunk/openejb/arquillian/pom.xml
    openejb/trunk/openejb/examples/multiple-arquillian-adapters/pom.xml

Added: openejb/trunk/openejb/arquillian/arquillian-common/pom.xml
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-common/pom.xml?rev=1351223&view=auto
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-common/pom.xml (added)
+++ openejb/trunk/openejb/arquillian/arquillian-common/pom.xml Mon Jun 18 
07:27:21 2012
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<!--
+
+    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>
+  <parent>
+    <artifactId>arquillian</artifactId>
+    <groupId>org.apache.openejb</groupId>
+    <version>1.1.0-SNAPSHOT</version>
+  </parent>
+
+  <groupId>org.apache.openejb</groupId>
+  <artifactId>arquillian-common</artifactId>
+  <version>1.1.0-SNAPSHOT</version>
+  <packaging>jar</packaging>
+
+  <name>OpenEJB :: Arquillian Adaptors Parent :: Common</name>
+</project>

Added: 
openejb/trunk/openejb/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/ArquillianUtil.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/ArquillianUtil.java?rev=1351223&view=auto
==============================================================================
--- 
openejb/trunk/openejb/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/ArquillianUtil.java
 (added)
+++ 
openejb/trunk/openejb/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/ArquillianUtil.java
 Mon Jun 18 07:27:21 2012
@@ -0,0 +1,18 @@
+package org.apache.openejb.arquillian.common;
+
+public final class ArquillianUtil {
+    private static final String OPENEJB_ADAPTER_SYSTEM_PROP = 
"openejb.arquillian.adapter";
+    private static final String TOMEE_ADAPTER_SYSTEM_PROP = 
"tomee.arquillian.adapter";
+
+    private ArquillianUtil() {
+        // no-op
+    }
+
+    public static boolean isCurrentAdapter(final String name) {
+        String adapter = System.getProperty(OPENEJB_ADAPTER_SYSTEM_PROP);
+        if (adapter == null) {
+            adapter = System.getProperty(TOMEE_ADAPTER_SYSTEM_PROP);
+        }
+        return adapter == null || name.equals(adapter);
+    }
+}

Modified: openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/pom.xml
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/pom.xml?rev=1351223&r1=1351222&r2=1351223&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/pom.xml 
(original)
+++ openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/pom.xml Mon 
Jun 18 07:27:21 2012
@@ -63,5 +63,11 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
+
+    <dependency>
+      <groupId>org.apache.openejb</groupId>
+      <artifactId>arquillian-common</artifactId>
+      <version>1.1.0-SNAPSHOT</version>
+    </dependency>
   </dependencies>
 </project>

Modified: 
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBExtension.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBExtension.java?rev=1351223&r1=1351222&r2=1351223&view=diff
==============================================================================
--- 
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBExtension.java
 (original)
+++ 
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBExtension.java
 Mon Jun 18 07:27:21 2012
@@ -4,6 +4,7 @@ import java.util.Enumeration;
 import java.util.logging.Handler;
 import java.util.logging.LogManager;
 import java.util.logging.Logger;
+import org.apache.openejb.arquillian.common.ArquillianUtil;
 import org.apache.openejb.util.JuliLogStreamFactory;
 import org.apache.openejb.util.LogCategory;
 import org.jboss.arquillian.container.spi.client.container.DeployableContainer;
@@ -12,13 +13,17 @@ import org.jboss.arquillian.core.spi.Loa
 import org.jboss.arquillian.test.spi.TestEnricher;
 
 public class OpenEJBExtension implements LoadableExtension {
+    private static final String OPENEJB_ADAPTER_NAME = "openejb";
+
     static { // logging conf
-        if (System.getProperty("java.util.logging.config.class") == null || 
System.getProperty("java.util.logging.config.file") == null) {
-            final Enumeration<String> list = 
LogManager.getLogManager().getLoggerNames();
-            while (list.hasMoreElements()) {
-                initLogger(list.nextElement());
+        if (ArquillianUtil.isCurrentAdapter(OPENEJB_ADAPTER_NAME)) {
+            if (System.getProperty("java.util.logging.config.class") == null 
|| System.getProperty("java.util.logging.config.file") == null) {
+                final Enumeration<String> list = 
LogManager.getLogManager().getLoggerNames();
+                while (list.hasMoreElements()) {
+                    initLogger(list.nextElement());
+                }
+                initLogger(LogCategory.OPENEJB.getName());
             }
-            initLogger(LogCategory.OPENEJB.getName());
         }
     }
 
@@ -36,9 +41,11 @@ public class OpenEJBExtension implements
 
     @Override
     public void register(final ExtensionBuilder extensionBuilder) {
-        extensionBuilder.service(DeployableContainer.class, 
OpenEJBDeployableContainer.class)
-            .service(TestEnricher.class, OpenEJBInjectionEnricher.class)
-            .service(ApplicationArchiveProcessor.class, 
OpenEJBArchiveProcessor.class)
-            .observer(TestObserver.class);
+        if (ArquillianUtil.isCurrentAdapter(OPENEJB_ADAPTER_NAME)) {
+            extensionBuilder.service(DeployableContainer.class, 
OpenEJBDeployableContainer.class)
+                .service(TestEnricher.class, OpenEJBInjectionEnricher.class)
+                .service(ApplicationArchiveProcessor.class, 
OpenEJBArchiveProcessor.class)
+                .observer(TestObserver.class);
+        }
     }
 }

Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-common/pom.xml
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-common/pom.xml?rev=1351223&r1=1351222&r2=1351223&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-common/pom.xml (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-common/pom.xml Mon Jun 18 
07:27:21 2012
@@ -29,7 +29,7 @@
   <version>1.1.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
-  <name>OpenEJB :: Arquillian Adaptors Parent :: Common</name>
+  <name>OpenEJB :: Arquillian Adaptors Parent :: TomEE Common</name>
 
   <dependencies>
 

Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/pom.xml
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/pom.xml?rev=1351223&r1=1351222&r2=1351223&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/pom.xml 
(original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/pom.xml Mon Jun 
18 07:27:21 2012
@@ -132,6 +132,12 @@
       <version>${version.tomee}</version>
       <scope>test</scope>
     </dependency>
+
+    <dependency>
+      <groupId>org.apache.openejb</groupId>
+      <artifactId>arquillian-common</artifactId>
+      <version>1.1.0-SNAPSHOT</version>
+    </dependency>
   </dependencies>
 
 </project>

Modified: 
openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEExtension.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEExtension.java?rev=1351223&r1=1351222&r2=1351223&view=diff
==============================================================================
--- 
openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEExtension.java
 (original)
+++ 
openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEExtension.java
 Mon Jun 18 07:27:21 2012
@@ -17,11 +17,16 @@
 
 package org.apache.openejb.arquillian.embedded;
 
+import org.apache.openejb.arquillian.common.ArquillianUtil;
 import org.jboss.arquillian.container.spi.client.container.DeployableContainer;
 import org.jboss.arquillian.core.spi.LoadableExtension;
 
 public class EmbeddedTomEEExtension implements LoadableExtension {
+    private static final String ADAPTER = "tomee-embedded";
+
     @Override public void register(ExtensionBuilder builder) {
-        builder.service(DeployableContainer.class, 
EmbeddedTomEEContainer.class);
+        if (ArquillianUtil.isCurrentAdapter(ADAPTER)) {
+            builder.service(DeployableContainer.class, 
EmbeddedTomEEContainer.class);
+        }
     }
 }

Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-remote/pom.xml
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-remote/pom.xml?rev=1351223&r1=1351222&r2=1351223&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-remote/pom.xml (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-remote/pom.xml Mon Jun 18 
07:27:21 2012
@@ -128,6 +128,12 @@
     </dependency>
 
     <dependency>
+      <groupId>org.apache.openejb</groupId>
+      <artifactId>arquillian-common</artifactId>
+      <version>1.1.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
       <groupId>org.apache.openwebbeans</groupId>
       <artifactId>openwebbeans-impl</artifactId>
       <version>${org.apache.openwebbeans.version}</version>

Modified: 
openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEExtension.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEExtension.java?rev=1351223&r1=1351222&r2=1351223&view=diff
==============================================================================
--- 
openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEExtension.java
 (original)
+++ 
openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEExtension.java
 Mon Jun 18 07:27:21 2012
@@ -17,13 +17,18 @@
 
 package org.apache.tomee.arquillian.remote;
 
+import org.apache.openejb.arquillian.common.ArquillianUtil;
 import org.jboss.arquillian.container.spi.client.container.DeployableContainer;
 import 
org.jboss.arquillian.container.test.spi.client.deployment.AuxiliaryArchiveAppender;
 import org.jboss.arquillian.core.spi.LoadableExtension;
 
 public class RemoteTomEEExtension implements LoadableExtension {
+    private static final String ADAPTER = "tomee-remote";
+
     @Override public void register(ExtensionBuilder builder) {
-        builder.service(DeployableContainer.class, RemoteTomEEContainer.class)
-            .service(AuxiliaryArchiveAppender.class, 
RemoteTomEEEJBEnricherArchiveAppender.class);
+        if (ArquillianUtil.isCurrentAdapter(ADAPTER)) {
+            builder.service(DeployableContainer.class, 
RemoteTomEEContainer.class)
+                .service(AuxiliaryArchiveAppender.class, 
RemoteTomEEEJBEnricherArchiveAppender.class);
+        }
     }
 }

Modified: 
openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/pom.xml
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/pom.xml?rev=1351223&r1=1351222&r2=1351223&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/pom.xml 
(original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/pom.xml Mon 
Jun 18 07:27:21 2012
@@ -290,6 +290,12 @@
       <version>3.1</version>
       <scope>test</scope>
     </dependency>
+
+    <dependency>
+      <groupId>org.apache.openejb</groupId>
+      <artifactId>arquillian-common</artifactId>
+      <version>1.1.0-SNAPSHOT</version>
+    </dependency>
   </dependencies>
 
   <build>

Modified: 
openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappExtension.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappExtension.java?rev=1351223&r1=1351222&r2=1351223&view=diff
==============================================================================
--- 
openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappExtension.java
 (original)
+++ 
openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappExtension.java
 Mon Jun 18 07:27:21 2012
@@ -17,13 +17,19 @@
 
 package org.apache.tomee.arquillian.webapp;
 
+import org.apache.openejb.arquillian.common.ArquillianUtil;
 import org.jboss.arquillian.container.spi.client.container.DeployableContainer;
 import 
org.jboss.arquillian.container.test.spi.client.deployment.AuxiliaryArchiveAppender;
 import org.jboss.arquillian.core.spi.LoadableExtension;
 
 public class TomEEWebappExtension implements LoadableExtension {
+    private static final String ADAPTER = "tomee-webapp";
+
     @Override
     public void register(ExtensionBuilder builder) {
-        builder.service(DeployableContainer.class, 
TomEEWebappContainer.class).service(AuxiliaryArchiveAppender.class, 
TomEEWebappEJBEnricherArchiveAppender.class);
+        if (ArquillianUtil.isCurrentAdapter(ADAPTER)) {
+            builder.service(DeployableContainer.class, 
TomEEWebappContainer.class)
+                .service(AuxiliaryArchiveAppender.class, 
TomEEWebappEJBEnricherArchiveAppender.class);
+        }
     }
 }

Modified: openejb/trunk/openejb/arquillian/pom.xml
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/pom.xml?rev=1351223&r1=1351222&r2=1351223&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/pom.xml (original)
+++ openejb/trunk/openejb/arquillian/pom.xml Mon Jun 18 07:27:21 2012
@@ -41,6 +41,7 @@
   </properties>
 
   <modules>
+    <module>arquillian-common</module>
     <module>arquillian-tomee-common</module>
     <module>arquillian-tomee-embedded</module>
     <module>arquillian-tomee-remote</module>

Modified: openejb/trunk/openejb/examples/multiple-arquillian-adapters/pom.xml
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/multiple-arquillian-adapters/pom.xml?rev=1351223&r1=1351222&r2=1351223&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/multiple-arquillian-adapters/pom.xml 
(original)
+++ openejb/trunk/openejb/examples/multiple-arquillian-adapters/pom.xml Mon Jun 
18 07:27:21 2012
@@ -49,7 +49,7 @@
       <plugin>
         <!--
         Redefining execution to:
-        1. get the right arquillian adapter
+        1. set the right arquillian adapter
         2. set the category to execute (include/exclude works too)
         3. set the arquillian launcher to use
         -->
@@ -68,10 +68,8 @@
               <groups>org.superbiz.embedded.standalone.Embedded</groups>
               <systemPropertyVariables>
                 <arquillian.launch>embedded</arquillian.launch>
+                
<openejb.arquillian.adapter>openejb</openejb.arquillian.adapter>
               </systemPropertyVariables>
-              <additionalClasspathElements>
-                
<additionalClasspathElement>${settings.localRepository}/org/apache/openejb/arquillian-openejb-embedded-4/${openejb.version}/arquillian-openejb-embedded-4-${openejb.version}.jar</additionalClasspathElement>
-              </additionalClasspathElements>
             </configuration>
           </execution>
           <execution>
@@ -85,10 +83,8 @@
               <groups>org.superbiz.embedded.remote.EmbeddedRemote</groups>
               <systemPropertyVariables>
                 <arquillian.launch>embedded-remote</arquillian.launch>
+                
<openejb.arquillian.adapter>openejb</openejb.arquillian.adapter>
               </systemPropertyVariables>
-              <additionalClasspathElements>
-                
<additionalClasspathElement>${settings.localRepository}/org/apache/openejb/arquillian-openejb-embedded-4/${openejb.version}/arquillian-openejb-embedded-4-${openejb.version}.jar</additionalClasspathElement>
-              </additionalClasspathElements>
             </configuration>
           </execution>
           <execution>
@@ -102,10 +98,8 @@
               <groups>org.superbiz.tomee.embedded.TomEEEmbedded</groups>
               <systemPropertyVariables>
                 <arquillian.launch>tomee-embedded</arquillian.launch>
+                
<openejb.arquillian.adapter>tomee-embedded</openejb.arquillian.adapter>
               </systemPropertyVariables>
-              <additionalClasspathElements>
-                
<additionalClasspathElement>${settings.localRepository}/org/apache/openejb/arquillian-tomee-embedded/${tomee.version}/arquillian-tomee-embedded-${tomee.version}.jar</additionalClasspathElement>
-              </additionalClasspathElements>
             </configuration>
           </execution>
           <execution>
@@ -119,10 +113,8 @@
               <groups>org.superbiz.tomee.remote.TomEERemote</groups>
               <systemPropertyVariables>
                 <arquillian.launch>tomee-remote</arquillian.launch>
+                
<openejb.arquillian.adapter>tomee-remote</openejb.arquillian.adapter>
               </systemPropertyVariables>
-              <additionalClasspathElements>
-                
<additionalClasspathElement>${settings.localRepository}/org/apache/openejb/arquillian-tomee-remote/${tomee.version}/arquillian-tomee-remote-${tomee.version}.jar</additionalClasspathElement>
-              </additionalClasspathElements>
             </configuration>
           </execution>
         </executions>
@@ -164,6 +156,7 @@
       <version>${arquillian.version}</version>
       <scope>test</scope>
     </dependency>
+
     <!-- utility test deps -->
     <dependency>
       <groupId>org.apache.openejb</groupId>
@@ -172,43 +165,31 @@
       <scope>test</scope>
     </dependency>
 
-    <!--
-      here is the weird part
-      we get all adapters deps to avoid to manually manage transitive deps
-    -->
-    <!-- Container part - standalone (openejb-core is enough) + standalone 
remote (jax-rs here) -->
+    <!-- additional container part for embedded JAX-RS test -->
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-cxf-rs</artifactId>
       <version>${openejb.version}</version>
       <scope>test</scope>
     </dependency>
-    <!-- Container part - tomee embedded but brings main dependencies for 
tomee remote too -->
+
+    <!-- arquillian adapters -->
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>tomee-embedded</artifactId>
-      <version>${tomee.version}</version>
+      <artifactId>arquillian-openejb-embedded-4</artifactId>
+      <version>${openejb.version}</version>
       <scope>test</scope>
     </dependency>
-    <!-- Arquillian part - common part of tomee adapters (others doesn't care) 
-->
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>arquillian-tomee-common</artifactId>
+      <artifactId>arquillian-tomee-embedded</artifactId>
       <version>${tomee.version}</version>
       <scope>test</scope>
     </dependency>
-    <!-- Arquillian part - for tomee remote only (others doesn't care) -->
     <dependency>
-      <groupId>org.jboss.arquillian.protocol</groupId>
-      <artifactId>arquillian-protocol-servlet</artifactId>
-      <version>${arquillian.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <!-- Arquillian part -some enricher(s) for tomee, take care it can depends 
on "test.war" name for the archive -->
-    <dependency>
-      <groupId>org.jboss.arquillian.testenricher</groupId>
-      <artifactId>arquillian-testenricher-ejb</artifactId>
-      <version>${arquillian.version}</version>
+      <groupId>org.apache.openejb</groupId>
+      <artifactId>arquillian-tomee-remote</artifactId>
+      <version>${tomee.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>


Reply via email to