Author: rmannibucau
Date: Tue May 29 11:03:22 2012
New Revision: 1343666
URL: http://svn.apache.org/viewvc?rev=1343666&view=rev
Log:
renaming arquillian parent arquillian since there is no more only tomee
adapters and fixin openejb embedded adapter version
Added:
openejb/trunk/openejb/arquillian/
- copied from r1343552, openejb/trunk/openejb/arquillian-tomee/
openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
- copied, changed from r1343602,
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java
- copied unchanged from r1343602,
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java
openejb/trunk/openejb/arquillian/arquillian-tomee-extensions/
openejb/trunk/openejb/arquillian/arquillian-tomee-extensions/pom.xml
openejb/trunk/openejb/arquillian/arquillian-tomee-extensions/src/
openejb/trunk/openejb/arquillian/arquillian-tomee-extensions/src/main/
openejb/trunk/openejb/arquillian/arquillian-tomee-extensions/src/main/java/
openejb/trunk/openejb/arquillian/arquillian-tomee-extensions/src/test/
openejb/trunk/openejb/arquillian/arquillian-tomee-extensions/src/test/java/
openejb/trunk/openejb/arquillian/arquillian-tomee-moviefun-example/pom.xml
- copied, changed from r1343633,
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-moviefun-example/pom.xml
openejb/trunk/openejb/arquillian/arquillian-tomee-moviefun-example/src/test/resources/arquillian.xml
- copied unchanged from r1343633,
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-moviefun-example/src/test/resources/arquillian.xml
openejb/trunk/openejb/arquillian/arquillian-tomee-remote/pom.xml
- copied, changed from r1343633,
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/pom.xml
openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java
- copied unchanged from r1343633,
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java
openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/test/resources/arquillian.xml
- copied unchanged from r1343633,
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/test/resources/arquillian.xml
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/servlet/
- copied from r1343602,
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/servlet/
openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/pom.xml
- copied, changed from r1343633,
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/pom.xml
openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappConfiguration.java
- copied unchanged from r1343633,
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappConfiguration.java
openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/src/test/resources/arquillian.xml
- copied unchanged from r1343633,
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/src/test/resources/arquillian.xml
Removed:
openejb/trunk/openejb/arquillian-tomee/
Modified:
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/pom.xml
openejb/trunk/openejb/arquillian/arquillian-tomee-common/pom.xml
openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/pom.xml
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/pom.xml
openejb/trunk/openejb/arquillian/pom.xml
openejb/trunk/openejb/arquillian/ziplock/pom.xml
openejb/trunk/openejb/pom.xml
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=1343666&r1=1343552&r2=1343666&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/pom.xml
(original)
+++ openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/pom.xml Tue
May 29 11:03:22 2012
@@ -3,14 +3,15 @@
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";>
<parent>
- <artifactId>arquillian-tomee</artifactId>
+ <artifactId>arquillian</artifactId>
<groupId>org.apache.openejb</groupId>
<version>1.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>arquillian-openejb-container</artifactId>
- <name>OpenEJB :: TomEE Arquillian Adaptor :: OpenEJB Container</name> <!--
TODO: rename parent to be arquillian-parent -->
+ <artifactId>arquillian-openejb-embedded-4</artifactId>
+ <name>OpenEJB :: Arquillian Adaptors Parent :: OpenEJB Container</name>
+ <version>4.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
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=1343666&r1=1343552&r2=1343666&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-common/pom.xml (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-common/pom.xml Tue May 29
11:03:22 2012
@@ -20,7 +20,7 @@
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>
+ <artifactId>arquillian</artifactId>
<groupId>org.apache.openejb</groupId>
<version>1.1.0-SNAPSHOT</version>
</parent>
@@ -29,7 +29,7 @@
<version>1.1.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>OpenEJB :: TomEE Arquillian Adaptor :: Common</name>
+ <name>OpenEJB :: Arquillian Adaptors Parent :: Common</name>
<dependencies>
Copied:
openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
(from r1343602,
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/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java?p2=openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java&p1=openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java&r1=1343602&r2=1343666&rev=1343666&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/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
Tue May 29 11:03:22 2012
@@ -232,7 +232,8 @@ public abstract class TomEEContainer<Con
addServlets(httpContext, appInfo);
// we should probably get all servlets and add them to the context
- return new ProtocolMetaData().addContext(httpContext);
+ final ProtocolMetaData metadata = new
ProtocolMetaData().addContext(httpContext);
+ return metadata;
} catch (Exception e) {
e.printStackTrace();
throw new DeploymentException("Unable to deploy", e);
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=1343666&r1=1343552&r2=1343666&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/pom.xml
(original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/pom.xml Tue May
29 11:03:22 2012
@@ -20,7 +20,7 @@
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>
+ <artifactId>arquillian</artifactId>
<groupId>org.apache.openejb</groupId>
<version>1.1.0-SNAPSHOT</version>
</parent>
@@ -29,7 +29,7 @@
<version>1.1.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>OpenEJB :: TomEE Arquillian Adaptor :: Embedded Adaptor</name>
+ <name>OpenEJB :: Arquillian Adaptors Parent :: Embedded Adaptor</name>
<dependencies>
Added: openejb/trunk/openejb/arquillian/arquillian-tomee-extensions/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-extensions/pom.xml?rev=1343666&view=auto
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-extensions/pom.xml (added)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-extensions/pom.xml Tue
May 29 11:03:22 2012
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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";>
+ <parent>
+ <artifactId>arquillian</artifactId>
+ <groupId>org.apache.openejb</groupId>
+ <version>1.1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>arquillian-tomee-extensions</artifactId>
+ <name>OpenEJB :: Arquillian Adaptors Parent :: TomEE Extensions</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.arquillian.container</groupId>
+ <artifactId>arquillian-container-test-impl-base</artifactId>
+ <version>${version.arquillian}</version>
+ </dependency>
+ </dependencies>
+</project>
Copied:
openejb/trunk/openejb/arquillian/arquillian-tomee-moviefun-example/pom.xml
(from r1343633,
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-moviefun-example/pom.xml)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-moviefun-example/pom.xml?p2=openejb/trunk/openejb/arquillian/arquillian-tomee-moviefun-example/pom.xml&p1=openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-moviefun-example/pom.xml&r1=1343633&r2=1343666&rev=1343666&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-moviefun-example/pom.xml
(original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-moviefun-example/pom.xml
Tue May 29 11:03:22 2012
@@ -17,14 +17,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.openejb</groupId>
- <artifactId>arquillian-tomee</artifactId>
+ <artifactId>arquillian</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.openejb</groupId>
<artifactId>arquillian-tomee-moviefun-example</artifactId>
<packaging>war</packaging>
<version>1.1.0-SNAPSHOT</version>
- <name>OpenEJB :: TomEE Arquillian Adaptor :: Sample :: Moviefun</name>
+ <name>OpenEJB :: Arquillian Adaptors Parent :: Sample :: Moviefun</name>
<properties>
<version.selenium>2.7.0</version.selenium>
Copied: openejb/trunk/openejb/arquillian/arquillian-tomee-remote/pom.xml (from
r1343633,
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/pom.xml)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-remote/pom.xml?p2=openejb/trunk/openejb/arquillian/arquillian-tomee-remote/pom.xml&p1=openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/pom.xml&r1=1343633&r2=1343666&rev=1343666&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/pom.xml
(original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-remote/pom.xml Tue May 29
11:03:22 2012
@@ -20,7 +20,7 @@
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>
+ <artifactId>arquillian</artifactId>
<groupId>org.apache.openejb</groupId>
<version>1.1.0-SNAPSHOT</version>
</parent>
@@ -29,7 +29,7 @@
<version>1.1.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>OpenEJB :: TomEE Arquillian Adaptor :: Remote</name>
+ <name>OpenEJB :: Arquillian Adaptors Parent :: Remote</name>
<dependencies>
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/pom.xml?rev=1343666&r1=1343552&r2=1343666&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/pom.xml (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-tests/pom.xml Tue May 29
11:03:22 2012
@@ -13,7 +13,7 @@
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>
+ <artifactId>arquillian</artifactId>
<groupId>org.apache.openejb</groupId>
<version>1.1.0-SNAPSHOT</version>
</parent>
@@ -21,7 +21,7 @@
<version>1.1.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>OpenEJB :: TomEE Arquillian Adaptor :: Tests</name>
+ <name>OpenEJB :: Arquillian Adaptors Parent :: Tests</name>
<dependencies>
<dependency>
Copied: openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/pom.xml
(from r1343633,
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/pom.xml)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/pom.xml?p2=openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/pom.xml&p1=openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/pom.xml&r1=1343633&r2=1343666&rev=1343666&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/pom.xml
(original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/pom.xml Tue
May 29 11:03:22 2012
@@ -20,7 +20,7 @@
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>
+ <artifactId>arquillian</artifactId>
<groupId>org.apache.openejb</groupId>
<version>1.1.0-SNAPSHOT</version>
</parent>
@@ -29,7 +29,7 @@
<version>1.1.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>OpenEJB :: TomEE Arquillian Adaptor :: Webapp Remote</name>
+ <name>OpenEJB :: Arquillian Adaptors Parent :: Webapp Remote</name>
<dependencies>
Modified: openejb/trunk/openejb/arquillian/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/pom.xml?rev=1343666&r1=1343552&r2=1343666&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/pom.xml (original)
+++ openejb/trunk/openejb/arquillian/pom.xml Tue May 29 11:03:22 2012
@@ -26,10 +26,10 @@
<version>4.1.0-SNAPSHOT</version>
</parent>
- <artifactId>arquillian-tomee</artifactId>
+ <artifactId>arquillian</artifactId>
<version>1.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>OpenEJB :: TomEE Arquillian Adaptor</name>
+ <name>OpenEJB :: Arquillian Adaptors Parent</name>
<properties>
<version.arquillian>1.0.0.Final</version.arquillian>
@@ -48,5 +48,6 @@
<module>arquillian-tomee-moviefun-example</module>
<module>arquillian-openejb-embedded-4</module>
<module>ziplock</module>
+ <module>arquillian-tomee-extensions</module>
</modules>
</project>
Modified: openejb/trunk/openejb/arquillian/ziplock/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/ziplock/pom.xml?rev=1343666&r1=1343552&r2=1343666&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/ziplock/pom.xml (original)
+++ openejb/trunk/openejb/arquillian/ziplock/pom.xml Tue May 29 11:03:22 2012
@@ -20,7 +20,7 @@
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>
+ <artifactId>arquillian</artifactId>
<groupId>org.apache.openejb</groupId>
<version>1.1.0-SNAPSHOT</version>
</parent>
@@ -29,7 +29,7 @@
<version>1.1.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>OpenEJB :: TomEE Arquillian Adaptor :: ZipLock</name>
+ <name>OpenEJB :: Arquillian Adaptors Parent :: ZipLock</name>
<dependencies>
<dependency>
Modified: openejb/trunk/openejb/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/pom.xml?rev=1343666&r1=1343665&r2=1343666&view=diff
==============================================================================
--- openejb/trunk/openejb/pom.xml (original)
+++ openejb/trunk/openejb/pom.xml Tue May 29 11:03:22 2012
@@ -333,7 +333,7 @@
<module>server</module>
<module>examples</module>
<module>assembly</module>
- <module>arquillian-tomee</module>
+ <module>arquillian</module>
<module>utils</module>
<module>tomee</module>
<module>osgi</module>
@@ -348,7 +348,7 @@
<module>container</module>
<module>server</module>
<module>assembly</module>
- <module>arquillian-tomee</module>
+ <module>arquillian</module>
<module>utils</module>
<module>tomee</module>
</modules>
@@ -362,7 +362,7 @@
<module>container</module>
<module>server</module>
<module>examples</module>
- <module>arquillian-tomee</module>
+ <module>arquillian</module>
<module>assembly</module>
<module>utils</module>
<module>tomee</module>
