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 2015/05/18 15:18:39 UTC

[1/4] tomee git commit: org.apache.tomee as main groupId

Repository: tomee
Updated Branches:
  refs/heads/master 700a10652 -> ac1badeab


http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/server/openejb-derbynet/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-derbynet/pom.xml b/server/openejb-derbynet/pom.xml
index 331cfc4..cbf9625 100644
--- a/server/openejb-derbynet/pom.xml
+++ b/server/openejb-derbynet/pom.xml
@@ -24,7 +24,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>server</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -33,17 +33,17 @@
   <name>OpenEJB :: Server :: Derby Network Service</name>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-loader</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-server</artifactId>
       <version>${project.version}</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/server/openejb-ejbd/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-ejbd/pom.xml b/server/openejb-ejbd/pom.xml
index eb06dab..dba7366 100644
--- a/server/openejb-ejbd/pom.xml
+++ b/server/openejb-ejbd/pom.xml
@@ -23,7 +23,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>server</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -45,7 +45,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>org.apache.openejb</groupId>
+                  <groupId>org.apache.tomee</groupId>
                   <artifactId>openejb-javaagent</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}</outputDirectory>
@@ -81,7 +81,7 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
     </dependency>
     <dependency>
@@ -90,39 +90,39 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-server</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-loader</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-multicast</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-client</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-itests-client</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-itests-beans</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/server/openejb-hessian/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-hessian/pom.xml b/server/openejb-hessian/pom.xml
index cd4f298..593a033 100644
--- a/server/openejb-hessian/pom.xml
+++ b/server/openejb-hessian/pom.xml
@@ -24,7 +24,7 @@ limitations under the License.
 
   <parent>
     <artifactId>server</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
 
@@ -33,7 +33,7 @@ limitations under the License.
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-http</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -45,7 +45,7 @@ limitations under the License.
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-catalina</artifactId>
       <version>${tomee.version}</version>
       <scope>provided</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/server/openejb-hsql/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-hsql/pom.xml b/server/openejb-hsql/pom.xml
index 773a6d1..21a4420 100644
--- a/server/openejb-hsql/pom.xml
+++ b/server/openejb-hsql/pom.xml
@@ -24,7 +24,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>server</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -33,17 +33,17 @@
   <name>OpenEJB :: Server :: Hsql</name>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-loader</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-server</artifactId>
       <version>${project.version}</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/server/openejb-http/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-http/pom.xml b/server/openejb-http/pom.xml
index a6b3d5d..63d864e 100644
--- a/server/openejb-http/pom.xml
+++ b/server/openejb-http/pom.xml
@@ -23,7 +23,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>server</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -51,7 +51,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>org.apache.openejb</groupId>
+                  <groupId>org.apache.tomee</groupId>
                   <artifactId>openejb-javaagent</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}</outputDirectory>
@@ -82,26 +82,26 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-loader</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-server</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-ejbd</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -118,7 +118,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-itests-client</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/server/openejb-multicast/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-multicast/pom.xml b/server/openejb-multicast/pom.xml
index 8506821..c2df1f5 100644
--- a/server/openejb-multicast/pom.xml
+++ b/server/openejb-multicast/pom.xml
@@ -23,7 +23,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>server</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -32,7 +32,7 @@
   <name>OpenEJB :: Server :: Multicast Discovery</name>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-server</artifactId>
       <version>${project.version}</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/server/openejb-rest/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-rest/pom.xml b/server/openejb-rest/pom.xml
index 2cf3917..68e95d3 100644
--- a/server/openejb-rest/pom.xml
+++ b/server/openejb-rest/pom.xml
@@ -20,7 +20,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>server</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/server/openejb-server/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-server/pom.xml b/server/openejb-server/pom.xml
index 84356a4..272a221 100644
--- a/server/openejb-server/pom.xml
+++ b/server/openejb-server/pom.xml
@@ -24,7 +24,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>server</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -60,26 +60,26 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-jee</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-loader</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-client</artifactId>
       <version>${project.version}</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/server/openejb-ssh/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-ssh/pom.xml b/server/openejb-ssh/pom.xml
index 83d6b0b..48eaa6a 100644
--- a/server/openejb-ssh/pom.xml
+++ b/server/openejb-ssh/pom.xml
@@ -22,7 +22,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>server</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/server/openejb-webservices/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-webservices/pom.xml b/server/openejb-webservices/pom.xml
index fcf46d0..baeb9e7 100644
--- a/server/openejb-webservices/pom.xml
+++ b/server/openejb-webservices/pom.xml
@@ -23,7 +23,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>server</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -32,22 +32,22 @@
   <name>OpenEJB :: Server :: Webservices</name>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-loader</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-server</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-http</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -59,7 +59,7 @@
 
     <!-- spec dependencies -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
     </dependency>
     <dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index f609a28..2af7e7f 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -20,7 +20,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>openejb</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/tck/bval-embedded/pom.xml
----------------------------------------------------------------------
diff --git a/tck/bval-embedded/pom.xml b/tck/bval-embedded/pom.xml
index 16e15b9..8033cff 100644
--- a/tck/bval-embedded/pom.xml
+++ b/tck/bval-embedded/pom.xml
@@ -18,7 +18,7 @@
 <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/maven-v4_0_0.xsd">
   <parent>
     <artifactId>tck</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -33,7 +33,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
     </dependency>
     <dependency>
@@ -54,7 +54,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-openejb-embedded-5</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/tck/bval-tomee/pom.xml
----------------------------------------------------------------------
diff --git a/tck/bval-tomee/pom.xml b/tck/bval-tomee/pom.xml
index ac4c92b..1e4fdb7 100644
--- a/tck/bval-tomee/pom.xml
+++ b/tck/bval-tomee/pom.xml
@@ -19,7 +19,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>tck</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -35,7 +35,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tck-common</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
@@ -53,7 +53,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>apache-tomee</artifactId>
       <type>zip</type>
       <version>${tomee.version}</version>
@@ -66,7 +66,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-tomee-remote</artifactId>
       <version>${tomee.version}</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/tck/cdi-embedded/pom.xml
----------------------------------------------------------------------
diff --git a/tck/cdi-embedded/pom.xml b/tck/cdi-embedded/pom.xml
index 4f61d8d..bf49e62 100644
--- a/tck/cdi-embedded/pom.xml
+++ b/tck/cdi-embedded/pom.xml
@@ -19,7 +19,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>tck</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -30,7 +30,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
     </dependency>
     <dependency>
@@ -77,7 +77,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tck-common</artifactId>
       <version>${openejb.version}</version>
       <scope>test</scope>
@@ -129,13 +129,13 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-openejb-embedded-5</artifactId>
       <version>${openejb.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-catalina</artifactId>
       <version>${tomee.version}</version>
       <scope>test</scope>
@@ -147,13 +147,13 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf</artifactId>
       <version>${openejb.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf-rs</artifactId>
       <version>${openejb.version}</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/tck/cdi-embedded/src/test/resources/failing.xml
----------------------------------------------------------------------
diff --git a/tck/cdi-embedded/src/test/resources/failing.xml b/tck/cdi-embedded/src/test/resources/failing.xml
index d995504..ea96a64 100644
--- a/tck/cdi-embedded/src/test/resources/failing.xml
+++ b/tck/cdi-embedded/src/test/resources/failing.xml
@@ -32,7 +32,7 @@
     -Dopenejb.cdi.conversation.http.use-get-parameter=true
     -->
     <classes>
-      <class name="org.jboss.cdi.tck.tests.deployment.shutdown.ApplicationShutdownLifecycleTest" />
+      <class name="org.jboss.cdi.tck.tests.implementation.simple.lifecycle.SimpleBeanLifecycleTest" />
     </classes>
   </test>
 </suite>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/tck/cdi-tomee-embedded/pom.xml
----------------------------------------------------------------------
diff --git a/tck/cdi-tomee-embedded/pom.xml b/tck/cdi-tomee-embedded/pom.xml
index e1be35a..0b6036b 100644
--- a/tck/cdi-tomee-embedded/pom.xml
+++ b/tck/cdi-tomee-embedded/pom.xml
@@ -19,7 +19,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>tck</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -28,7 +28,7 @@
   <name>OpenEJB :: TCK :: CDI-1.2 TomEE Embedded</name>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-embedded</artifactId>
       <version>${tomee.version}</version>
     </dependency>
@@ -38,7 +38,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tck-common</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -116,13 +116,13 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>org.apache.openejb</groupId>
+                  <groupId>org.apache.tomee</groupId>
                   <artifactId>tck-common</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
                 </artifactItem>
                 <artifactItem>
-                  <groupId>org.apache.openejb</groupId>
+                  <groupId>org.apache.tomee</groupId>
                   <artifactId>cdi-tomee-embedded</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/tck/cdi-tomee/pom.xml
----------------------------------------------------------------------
diff --git a/tck/cdi-tomee/pom.xml b/tck/cdi-tomee/pom.xml
index b434752..00df2af 100644
--- a/tck/cdi-tomee/pom.xml
+++ b/tck/cdi-tomee/pom.xml
@@ -19,7 +19,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>tck</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
 
@@ -44,13 +44,13 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>${javaee-api.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>apache-tomee</artifactId>
       <version>${tomee.version}</version>
       <type>zip</type>
@@ -70,7 +70,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-tomee-remote</artifactId>
       <version>${tomee.version}</version>
       <scope>test</scope>
@@ -87,13 +87,13 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tck-common</artifactId>
       <version>${openejb.version}</version>
       <scope>test</scope>
@@ -134,19 +134,19 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-catalina</artifactId>
       <version>${tomee.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-webservices</artifactId>
       <version>${tomee.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-jaxrs</artifactId>
       <version>${tomee.version}</version>
       <scope>test</scope>
@@ -158,13 +158,13 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf</artifactId>
       <version>${openejb.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf-rs</artifactId>
       <version>${openejb.version}</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/tck/pom.xml
----------------------------------------------------------------------
diff --git a/tck/pom.xml b/tck/pom.xml
index 7551168..f3d776a 100644
--- a/tck/pom.xml
+++ b/tck/pom.xml
@@ -18,7 +18,7 @@
 <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/maven-v4_0_0.xsd">
   <parent>
     <artifactId>openejb</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/tck/tck-common/pom.xml
----------------------------------------------------------------------
diff --git a/tck/tck-common/pom.xml b/tck/tck-common/pom.xml
index e45d254..c4f8c00 100644
--- a/tck/tck-common/pom.xml
+++ b/tck/tck-common/pom.xml
@@ -18,7 +18,7 @@
 <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>tck</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -62,7 +62,7 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-util</artifactId>
       <version>${tomee.version}</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/tomee/apache-tomee/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/apache-tomee/pom.xml b/tomee/apache-tomee/pom.xml
index 1dcfb02..a52d2ca 100644
--- a/tomee/apache-tomee/pom.xml
+++ b/tomee/apache-tomee/pom.xml
@@ -23,7 +23,7 @@
 
   <parent>
     <artifactId>tomee</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
 
@@ -71,21 +71,21 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-common</artifactId>
       <version>${project.version}</version>
       <type>jar</type>
       <scope>provided</scope>
     </dependency>
     <dependency> <!-- to be sure to have it -->
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-plus-webapp</artifactId>
       <version>${project.version}</version>
       <type>war</type>
       <scope>provided</scope>
     </dependency>
     <dependency> <!-- to be sure to have it -->
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-plume-webapp</artifactId>
       <version>${project.version}</version>
       <type>war</type>
@@ -94,17 +94,17 @@
 
     <!-- needed for EJBContainer impl so scope compile -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-util</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-client</artifactId>
       <version>${openejb.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <type>jar</type>
     </dependency>
@@ -232,7 +232,7 @@
         <artifactId>groovy-maven-plugin</artifactId>
         <dependencies>
           <dependency>
-            <groupId>org.apache.openejb</groupId>
+            <groupId>org.apache.tomee</groupId>
             <artifactId>openejb-jpa-integration</artifactId>
             <version>${version.openejb}</version>
           </dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy
----------------------------------------------------------------------
diff --git a/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy b/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy
index 512f89e..3241488 100644
--- a/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy
+++ b/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy
@@ -90,7 +90,7 @@ class SetupCommand {
 
         log.info('Deploying the tomee war')
         def localRepo = pom.settings.localRepository
-        ant.unzip(src: "${localRepo}/org/apache/openejb/${webapp}/${tomeeVersion}/${webapp}-${tomeeVersion}.war",
+        ant.unzip(src: "${localRepo}/org/apache/tomee/${webapp}/${tomeeVersion}/${webapp}-${tomeeVersion}.war",
                 dest: "${workDir}/apache-tomcat-${tomcatVersion}/webapps/tomee")
 
         log.info("Installing to: ${catalinaHome}")

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/tomee/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/pom.xml b/tomee/pom.xml
index df97b38..d00109a 100644
--- a/tomee/pom.xml
+++ b/tomee/pom.xml
@@ -23,7 +23,7 @@
 
   <parent>
     <artifactId>openejb</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
 
@@ -81,12 +81,12 @@
       </activation>
       <dependencies>
         <dependency>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
           <artifactId>openejb-core</artifactId>
           <version>${version.openejb}</version>
           <exclusions>
             <exclusion>
-              <groupId>org.apache.openejb</groupId>
+              <groupId>org.apache.tomee</groupId>
               <artifactId>javaee-api</artifactId>
             </exclusion>
             <exclusion>
@@ -122,7 +122,7 @@
       </activation>
       <dependencies>
         <dependency> <!-- to avoid to force exclusions everywhere -->
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
           <artifactId>openejb-core</artifactId>
           <version>${version.openejb}</version>
           <exclusions>
@@ -139,7 +139,7 @@
               <artifactId>bval-jsr303</artifactId>
             </exclusion>
             <exclusion>
-              <groupId>org.apache.openejb</groupId>
+              <groupId>org.apache.tomee</groupId>
               <artifactId>javaee-api</artifactId>
             </exclusion>
             <exclusion>
@@ -169,13 +169,13 @@
           </exclusions>
         </dependency>
         <dependency>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
           <artifactId>openejb-core-hibernate</artifactId>
           <type>pom</type>
           <version>${version.openejb}</version>
           <exclusions>
             <exclusion>
-              <groupId>org.apache.openejb</groupId>
+              <groupId>org.apache.tomee</groupId>
               <artifactId>javaee-api</artifactId>
             </exclusion>
             <exclusion>
@@ -328,12 +328,12 @@
         </exclusions>
       </dependency>
       <dependency>
-        <groupId>org.apache.openejb</groupId>
+        <groupId>org.apache.tomee</groupId>
         <artifactId>openejb-client</artifactId>
         <version>${version.openejb}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.openejb</groupId>
+        <groupId>org.apache.tomee</groupId>
         <artifactId>openejb-core</artifactId>
         <version>${version.openejb}</version>
       </dependency>
@@ -344,27 +344,27 @@
         <type>zip</type>
       </dependency>
       <dependency>
-        <groupId>org.apache.openejb</groupId>
+        <groupId>org.apache.tomee</groupId>
         <artifactId>openejb-server</artifactId>
         <version>${version.openejb}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.openejb</groupId>
+        <groupId>org.apache.tomee</groupId>
         <artifactId>openejb-ejbd</artifactId>
         <version>${version.openejb}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.openejb</groupId>
+        <groupId>org.apache.tomee</groupId>
         <artifactId>openejb-rest</artifactId>
         <version>${version.openejb}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.openejb</groupId>
+        <groupId>org.apache.tomee</groupId>
         <artifactId>openejb-cxf-rs</artifactId>
         <version>${version.openejb}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.openejb</groupId>
+        <groupId>org.apache.tomee</groupId>
         <artifactId>openejb-http</artifactId>
         <version>${version.openejb}</version>
       </dependency>
@@ -374,12 +374,12 @@
         <version>${tomcat.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.openejb</groupId>
+        <groupId>org.apache.tomee</groupId>
         <artifactId>openejb-cxf-transport</artifactId>
         <version>${version.openejb}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.openejb</groupId>
+        <groupId>org.apache.tomee</groupId>
         <artifactId>openejb-loader</artifactId>
         <version>${version.openejb}</version>
       </dependency>
@@ -394,17 +394,17 @@
         <version>${mojarra.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.openejb</groupId>
+        <groupId>org.apache.tomee</groupId>
         <artifactId>openejb-webservices</artifactId>
         <version>${version.openejb}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.openejb</groupId>
+        <groupId>org.apache.tomee</groupId>
         <artifactId>openejb-cxf</artifactId>
         <version>${version.openejb}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.openejb</groupId>
+        <groupId>org.apache.tomee</groupId>
         <artifactId>openejb-core-eclipselink</artifactId>
         <version>${version.openejb}</version>
       </dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/tomee/tomee-catalina/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-catalina/pom.xml b/tomee/tomee-catalina/pom.xml
index 224dd6c..baa669e 100644
--- a/tomee/tomee-catalina/pom.xml
+++ b/tomee/tomee-catalina/pom.xml
@@ -23,7 +23,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>tomee</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
 
@@ -58,40 +58,40 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <classifier>tomcat</classifier>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-common</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-loader</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-jdbc</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-juli</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-server</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-ejbd</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-http</artifactId>
     </dependency>
     <dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/tomee/tomee-common/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-common/pom.xml b/tomee/tomee-common/pom.xml
index 087c07f..818d2d2 100644
--- a/tomee/tomee-common/pom.xml
+++ b/tomee/tomee-common/pom.xml
@@ -22,7 +22,7 @@
 <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/maven-v4_0_0.xsd">
   <parent>
     <artifactId>tomee</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -32,7 +32,7 @@
   <description>This module contains the classes that will be added to the common class loader</description>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-loader</artifactId>
       <version>${version.openejb}</version>
     </dependency>
@@ -45,7 +45,7 @@
       <artifactId>xbean-naming</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-client</artifactId>
       <version>${version.openejb}</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/tomee/tomee-deb/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-deb/pom.xml b/tomee/tomee-deb/pom.xml
index 12ffb6d..9505a44 100644
--- a/tomee/tomee-deb/pom.xml
+++ b/tomee/tomee-deb/pom.xml
@@ -16,7 +16,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>tomee</artifactId>
-        <groupId>org.apache.openejb</groupId>
+        <groupId>org.apache.tomee</groupId>
         <version>7.0.0-SNAPSHOT</version>
     </parent>
 	
@@ -59,7 +59,7 @@
 
         <!-- We need to be sure the ZIP files are built before the debian package. -->
         <dependency>
-            <groupId>org.apache.openejb</groupId>
+            <groupId>org.apache.tomee</groupId>
             <artifactId>apache-tomee</artifactId>
             <version>${project.version}</version>
             <type>pom</type>
@@ -67,22 +67,22 @@
 
         <!-- We use resources from these guys below. -->
         <dependency>
-            <groupId>org.apache.openejb</groupId>
+            <groupId>org.apache.tomee</groupId>
             <artifactId>openejb-core</artifactId>
             <version>${version.openejb}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.openejb</groupId>
+            <groupId>org.apache.tomee</groupId>
             <artifactId>openejb-cxf</artifactId>
             <version>${version.openejb}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.openejb</groupId>
+            <groupId>org.apache.tomee</groupId>
             <artifactId>openejb-cxf-rs</artifactId>
             <version>${version.openejb}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.openejb</groupId>
+            <groupId>org.apache.tomee</groupId>
             <artifactId>openejb-hsql</artifactId>
             <version>${version.openejb}</version>
         </dependency>
@@ -102,7 +102,7 @@
                         <configuration>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>org.apache.openejb</groupId>
+                                    <groupId>org.apache.tomee</groupId>
                                     <artifactId>apache-tomee</artifactId>
                                     <version>${project.version}</version>
                                     <classifier>plus</classifier>
@@ -111,7 +111,7 @@
                                     <destFileName>tomee-plus.zip</destFileName>
                                 </artifactItem>
                                 <artifactItem>
-                                    <groupId>org.apache.openejb</groupId>
+                                    <groupId>org.apache.tomee</groupId>
                                     <artifactId>apache-tomee</artifactId>
                                     <version>${project.version}</version>
                                     <classifier>webprofile</classifier>
@@ -120,7 +120,7 @@
                                     <destFileName>tomee-webprofile.zip</destFileName>
                                 </artifactItem>
                                 <artifactItem>
-                                    <groupId>org.apache.openejb</groupId>
+                                    <groupId>org.apache.tomee</groupId>
                                     <artifactId>apache-tomee</artifactId>
                                     <version>${project.version}</version>
                                     <classifier>plume</classifier>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/tomee/tomee-embedded/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-embedded/pom.xml b/tomee/tomee-embedded/pom.xml
index d55311b..7e98baf 100644
--- a/tomee/tomee-embedded/pom.xml
+++ b/tomee/tomee-embedded/pom.xml
@@ -24,7 +24,7 @@
 
   <parent>
     <artifactId>tomee</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
 
@@ -103,13 +103,13 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-catalina</artifactId>
       <version>${project.version}</version>
       <exclusions>
         <exclusion>
           <artifactId>javaee-api</artifactId>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
         </exclusion>
         <exclusion>
           <artifactId>tomcat-annotations-api</artifactId>
@@ -118,12 +118,12 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-util</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <scope>compile</scope>
       <classifier>tomcat</classifier>
@@ -134,7 +134,7 @@
       <version>${tomcat.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-myfaces</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -148,7 +148,7 @@
       <artifactId>myfaces-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <scope>compile</scope>
       <exclusions>
@@ -158,7 +158,7 @@
         </exclusion>
         <exclusion>
           <artifactId>javaee-api</artifactId>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
         </exclusion>
         <exclusion>
           <artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>
@@ -281,17 +281,17 @@
       <artifactId>velocity</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-client</artifactId>
       <exclusions>
         <exclusion>
           <artifactId>javaee-api</artifactId>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
         </exclusion>
       </exclusions>
     </dependency>
     <dependency> <!-- now in webprofile -->
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-jaxrs</artifactId>
       <version>${project.version}</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/tomee/tomee-jaxrs/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-jaxrs/pom.xml b/tomee/tomee-jaxrs/pom.xml
index 3386a38..9485499 100644
--- a/tomee/tomee-jaxrs/pom.xml
+++ b/tomee/tomee-jaxrs/pom.xml
@@ -22,7 +22,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>tomee</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -32,43 +32,43 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-loader</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-catalina</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-common</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <classifier>tomcat</classifier>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-rest</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf-rs</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-server</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-ejbd</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-http</artifactId>
     </dependency>
     <dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/tomee/tomee-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-jdbc/pom.xml b/tomee/tomee-jdbc/pom.xml
index 17118c6..92668d2 100644
--- a/tomee/tomee-jdbc/pom.xml
+++ b/tomee/tomee-jdbc/pom.xml
@@ -21,7 +21,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>tomee</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -31,7 +31,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>${version.openejb}</version>
       <scope>provided</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/tomee/tomee-juli/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-juli/pom.xml b/tomee/tomee-juli/pom.xml
index 9e6a669..eb4147e 100644
--- a/tomee/tomee-juli/pom.xml
+++ b/tomee/tomee-juli/pom.xml
@@ -21,7 +21,7 @@
 
   <parent>
     <artifactId>tomee</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/tomee/tomee-loader/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-loader/pom.xml b/tomee/tomee-loader/pom.xml
index 080a8b5..d4d1388 100644
--- a/tomee/tomee-loader/pom.xml
+++ b/tomee/tomee-loader/pom.xml
@@ -24,7 +24,7 @@
 
   <parent>
     <artifactId>tomee</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
 
@@ -35,7 +35,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-loader</artifactId>
     </dependency>
     <dependency>
@@ -51,7 +51,7 @@
     </dependency>
     <!--The order of the next two deps is important-->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-juli</artifactId>
       <version>${project.version}</version>
       <scope>compile</scope>
@@ -63,7 +63,7 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-common</artifactId>
       <version>${project.version}</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/tomee/tomee-mojarra/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-mojarra/pom.xml b/tomee/tomee-mojarra/pom.xml
index 459de68..238ab68 100644
--- a/tomee/tomee-mojarra/pom.xml
+++ b/tomee/tomee-mojarra/pom.xml
@@ -22,7 +22,7 @@
 
   <parent>
     <artifactId>tomee</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
 
@@ -33,7 +33,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-catalina</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/tomee/tomee-myfaces/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-myfaces/pom.xml b/tomee/tomee-myfaces/pom.xml
index 66d25c2..4f0f683 100644
--- a/tomee/tomee-myfaces/pom.xml
+++ b/tomee/tomee-myfaces/pom.xml
@@ -21,7 +21,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>tomee</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -31,7 +31,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>${javaee-api.version}</version>
       <scope>provided</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/tomee/tomee-overlay-runner/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-overlay-runner/pom.xml b/tomee/tomee-overlay-runner/pom.xml
index 34e8d98..08e30a9 100644
--- a/tomee/tomee-overlay-runner/pom.xml
+++ b/tomee/tomee-overlay-runner/pom.xml
@@ -22,7 +22,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>tomee</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -33,20 +33,19 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
-      <version>6.0-5</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency> <!-- openejb-core is not needed but parent import it so setting it as provided to avoid wrong packaging -->
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>${openejb.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-catalina</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
@@ -58,4 +57,4 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/tomee/tomee-plume-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-plume-webapp/pom.xml b/tomee/tomee-plume-webapp/pom.xml
index d525287..469a89b 100644
--- a/tomee/tomee-plume-webapp/pom.xml
+++ b/tomee/tomee-plume-webapp/pom.xml
@@ -24,7 +24,7 @@
 
   <parent>
     <artifactId>tomee</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
 
@@ -37,7 +37,7 @@
   <dependencies>
 
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core-eclipselink</artifactId>
     </dependency>
     <dependency>
@@ -46,7 +46,7 @@
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-webapp</artifactId>
       <version>${project.version}</version>
       <type>war</type>
@@ -64,34 +64,34 @@
       <artifactId>activemq-ra</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf-rs</artifactId>
       <scope>runtime</scope>
       <exclusions>
         <exclusion>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
           <artifactId>javaee-api</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf-transport</artifactId>
       <scope>runtime</scope>
       <exclusions>
         <exclusion>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
           <artifactId>javaee-api</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf</artifactId>
       <scope>runtime</scope>
       <exclusions>
         <exclusion>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
           <artifactId>javaee-api</artifactId>
         </exclusion>
       </exclusions>
@@ -103,35 +103,35 @@
       <!-- transitive from xerces but in test scope in parent so needed here -->
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-rest</artifactId>
       <scope>runtime</scope>
       <exclusions>
         <exclusion>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
           <artifactId>javaee-api</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-webservices</artifactId>
       <exclusions>
         <exclusion>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
           <artifactId>javaee-api</artifactId>
         </exclusion>
       </exclusions>
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-webservices</artifactId>
       <version>${project.version}</version>
       <scope>runtime</scope>
       <exclusions>
         <exclusion>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
           <artifactId>javaee-api</artifactId>
         </exclusion>
       </exclusions>
@@ -149,13 +149,13 @@
 
     <!-- if i'm not mistaken we decided to remove it from our default deliveries
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-provisionning</artifactId>
       <version>${version.openejb}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-ssh</artifactId>
       <version>${version.openejb}</version>
       <scope>runtime</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/tomee/tomee-plus-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-plus-webapp/pom.xml b/tomee/tomee-plus-webapp/pom.xml
index cba6c9a..3785ebd 100644
--- a/tomee/tomee-plus-webapp/pom.xml
+++ b/tomee/tomee-plus-webapp/pom.xml
@@ -22,7 +22,7 @@
 <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/maven-v4_0_0.xsd">
   <parent>
     <artifactId>tomee</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
 
@@ -33,7 +33,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-webapp</artifactId>
       <version>${project.version}</version>
       <type>war</type>
@@ -51,73 +51,73 @@
       <artifactId>activemq-ra</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf-rs</artifactId>
       <version>${version.openejb}</version>
       <scope>runtime</scope>
       <exclusions>
         <exclusion>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
           <artifactId>javaee-api</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf-transport</artifactId>
       <version>${version.openejb}</version>
       <scope>runtime</scope>
       <exclusions>
         <exclusion>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
           <artifactId>javaee-api</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf</artifactId>
       <version>${version.openejb}</version>
       <scope>runtime</scope>
       <exclusions>
         <exclusion>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
           <artifactId>javaee-api</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-rest</artifactId>
       <version>${version.openejb}</version>
       <scope>runtime</scope>
       <exclusions>
         <exclusion>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
           <artifactId>javaee-api</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-webservices</artifactId>
       <version>${version.openejb}</version>
       <exclusions>
         <exclusion>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
           <artifactId>javaee-api</artifactId>
         </exclusion>
       </exclusions>
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-webservices</artifactId>
       <version>${project.version}</version>
       <scope>runtime</scope>
       <exclusions>
         <exclusion>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
           <artifactId>javaee-api</artifactId>
         </exclusion>
       </exclusions>
@@ -147,13 +147,13 @@
 
     <!-- if i'm not mistaken we decided to remove it from our default deliveries
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-provisionning</artifactId>
       <version>${version.openejb}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-ssh</artifactId>
       <version>${version.openejb}</version>
       <scope>runtime</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/tomee/tomee-util/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-util/pom.xml b/tomee/tomee-util/pom.xml
index 07fcfb6..aaedcc8 100644
--- a/tomee/tomee-util/pom.xml
+++ b/tomee/tomee-util/pom.xml
@@ -21,7 +21,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>tomee</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -31,7 +31,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-loader</artifactId>
       <scope>provided</scope>
     </dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/tomee/tomee-webaccess/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-webaccess/pom.xml b/tomee/tomee-webaccess/pom.xml
index 45c984a..de351cf 100644
--- a/tomee/tomee-webaccess/pom.xml
+++ b/tomee/tomee-webaccess/pom.xml
@@ -17,7 +17,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>tomee</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>tomee-webaccess</artifactId>
@@ -66,19 +66,19 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-embedded</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf-rs</artifactId>
       <version>${version.openejb}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-tomee-embedded</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
@@ -90,13 +90,13 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-webservices</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>ziplock</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
@@ -185,19 +185,19 @@
       <version>${commons-codec.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>${version.openejb}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-server</artifactId>
       <version>${version.openejb}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>${javaee-api.version}</version>
       <classifier>tomcat</classifier>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/tomee/tomee-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-webapp/pom.xml b/tomee/tomee-webapp/pom.xml
index 4c4e480..48881be 100644
--- a/tomee/tomee-webapp/pom.xml
+++ b/tomee/tomee-webapp/pom.xml
@@ -24,7 +24,7 @@
 
   <parent>
     <artifactId>tomee</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -172,54 +172,54 @@
       <version>1.2</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <classifier>tomcat</classifier>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-client</artifactId>
       <version>${version.openejb}</version>
       <scope>runtime</scope>
       <exclusions>
         <exclusion>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
           <artifactId>javaee-api</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-ejbd</artifactId>
       <version>${version.openejb}</version>
       <scope>runtime</scope>
       <exclusions>
         <exclusion>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
           <artifactId>javaee-api</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-hsql</artifactId>
       <version>${version.openejb}</version>
       <scope>runtime</scope>
       <exclusions>
         <exclusion>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
           <artifactId>javaee-api</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-http</artifactId>
       <version>${version.openejb}</version>
       <scope>runtime</scope>
       <exclusions>
         <exclusion>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
           <artifactId>javaee-api</artifactId>
         </exclusion>
       </exclusions>
@@ -245,12 +245,12 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-server</artifactId>
       <version>${version.openejb}</version>
       <exclusions>
         <exclusion>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
           <artifactId>javaee-api</artifactId>
         </exclusion>
       </exclusions>
@@ -262,13 +262,13 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-catalina</artifactId>
       <version>${project.version}</version>
       <scope>runtime</scope>
       <exclusions>
         <exclusion>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
           <artifactId>javaee-api</artifactId>
         </exclusion>
         <exclusion>
@@ -278,31 +278,31 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-myfaces</artifactId>
       <version>${project.version}</version>
       <scope>runtime</scope>
       <exclusions>
         <exclusion>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
           <artifactId>javaee-api</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-mojarra</artifactId>
       <version>${project.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-common</artifactId>
       <version>${project.version}</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
           <artifactId>javaee-api</artifactId>
         </exclusion>
         <exclusion>
@@ -312,13 +312,13 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-loader</artifactId>
       <version>${project.version}</version>
       <scope>runtime</scope>
       <exclusions>
         <exclusion>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
           <artifactId>javaee-api</artifactId>
         </exclusion>
         <exclusion> <!-- 'provided' -->
@@ -332,46 +332,46 @@
       <artifactId>swizzle-stream</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf-rs</artifactId>
       <scope>runtime</scope>
       <exclusions>
         <exclusion>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
           <artifactId>javaee-api</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf-transport</artifactId>
       <scope>runtime</scope>
       <exclusions>
         <exclusion>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
           <artifactId>javaee-api</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-rest</artifactId>
       <scope>runtime</scope>
       <exclusions>
         <exclusion>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
           <artifactId>javaee-api</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-jaxrs</artifactId>
       <version>${project.version}</version>
       <scope>runtime</scope>
       <exclusions>
         <exclusion>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
           <artifactId>javaee-api</artifactId>
         </exclusion>
       </exclusions>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/tomee/tomee-webservices/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-webservices/pom.xml b/tomee/tomee-webservices/pom.xml
index 1970881..f314340 100644
--- a/tomee/tomee-webservices/pom.xml
+++ b/tomee/tomee-webservices/pom.xml
@@ -22,7 +22,7 @@
 <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/maven-v4_0_0.xsd">
   <parent>
     <artifactId>tomee</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -45,27 +45,27 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <classifier>tomcat</classifier>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-webservices</artifactId>
       <version>${version.openejb}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-rest</artifactId>
       <version>${version.openejb}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf-rs</artifactId>
       <version>${version.openejb}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf</artifactId>
       <version>${version.openejb}</version>
       <exclusions>
@@ -76,32 +76,32 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-common</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-loader</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-catalina</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-server</artifactId>
       <version>${version.openejb}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-ejbd</artifactId>
       <version>${version.openejb}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-http</artifactId>
       <version>${version.openejb}</version>
     </dependency>
@@ -112,7 +112,7 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-jaxrs</artifactId>
       <version>${project.version}</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/utils/openejb-core-eclipselink/pom.xml
----------------------------------------------------------------------
diff --git a/utils/openejb-core-eclipselink/pom.xml b/utils/openejb-core-eclipselink/pom.xml
index c2d9272..248ebaf 100644
--- a/utils/openejb-core-eclipselink/pom.xml
+++ b/utils/openejb-core-eclipselink/pom.xml
@@ -19,7 +19,7 @@
 <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>utils</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -30,7 +30,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>${project.version}</version>
       <exclusions>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/utils/openejb-core-hibernate/pom.xml
----------------------------------------------------------------------
diff --git a/utils/openejb-core-hibernate/pom.xml b/utils/openejb-core-hibernate/pom.xml
index 03cb053..fa3dbb7 100644
--- a/utils/openejb-core-hibernate/pom.xml
+++ b/utils/openejb-core-hibernate/pom.xml
@@ -19,7 +19,7 @@
 <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>utils</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -30,7 +30,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>${project.version}</version>
       <exclusions>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/utils/openejb-mockito/pom.xml
----------------------------------------------------------------------
diff --git a/utils/openejb-mockito/pom.xml b/utils/openejb-mockito/pom.xml
index 8cfb7b9..c4070c0 100644
--- a/utils/openejb-mockito/pom.xml
+++ b/utils/openejb-mockito/pom.xml
@@ -21,7 +21,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>utils</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -31,7 +31,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>${project.version}</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/utils/openejb-provisionning/pom.xml
----------------------------------------------------------------------
diff --git a/utils/openejb-provisionning/pom.xml b/utils/openejb-provisionning/pom.xml
index 14b6769..e059d51 100644
--- a/utils/openejb-provisionning/pom.xml
+++ b/utils/openejb-provisionning/pom.xml
@@ -21,7 +21,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>utils</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/utils/pom.xml
----------------------------------------------------------------------
diff --git a/utils/pom.xml b/utils/pom.xml
index cee2872..e16ff17 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -19,7 +19,7 @@
 <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/maven-v4_0_0.xsd">
   <parent>
     <artifactId>openejb</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/utils/webdeployer/pom.xml
----------------------------------------------------------------------
diff --git a/utils/webdeployer/pom.xml b/utils/webdeployer/pom.xml
index d7dbc7b..8fc255e 100644
--- a/utils/webdeployer/pom.xml
+++ b/utils/webdeployer/pom.xml
@@ -21,19 +21,19 @@
 
   <parent>
     <artifactId>utils</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.apache.openejb</groupId>
+  <groupId>org.apache.tomee</groupId>
   <artifactId>webdeployer</artifactId>
   <name>OpenEJB :: Utils :: TomEE Webapps-based Deployer EJB</name>
   <packaging>jar</packaging>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-catalina</artifactId>
       <version>${tomee.version}</version>
       <type>jar</type>


[2/4] tomee git commit: org.apache.tomee as main groupId

Posted by rm...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/rest-example/pom.xml
----------------------------------------------------------------------
diff --git a/examples/rest-example/pom.xml b/examples/rest-example/pom.xml
index 681623b..daa36bf 100644
--- a/examples/rest-example/pom.xml
+++ b/examples/rest-example/pom.xml
@@ -118,7 +118,7 @@
   
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -130,25 +130,25 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-embedded</artifactId>
       <version>${tomee.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf-rs</artifactId>
       <version>${openejb.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-jaxrs</artifactId>
       <version>${tomee.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>ziplock</artifactId>
       <version>${tomee.version}</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/rest-jaas/pom.xml
----------------------------------------------------------------------
diff --git a/examples/rest-jaas/pom.xml b/examples/rest-jaas/pom.xml
index cc8807d..d50de80 100644
--- a/examples/rest-jaas/pom.xml
+++ b/examples/rest-jaas/pom.xml
@@ -29,7 +29,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/rest-on-ejb/pom.xml
----------------------------------------------------------------------
diff --git a/examples/rest-on-ejb/pom.xml b/examples/rest-on-ejb/pom.xml
index ad820b9..31f27eb 100644
--- a/examples/rest-on-ejb/pom.xml
+++ b/examples/rest-on-ejb/pom.xml
@@ -47,7 +47,7 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <version>2.17</version>
         <configuration>
-          <argLine>"-javaagent:${settings.localRepository}/org/apache/openejb/openejb-javaagent/${openejb.version}/openejb-javaagent-${openejb.version}.jar"</argLine>
+          <argLine>"-javaagent:${settings.localRepository}/org/apache/tomee/openejb-javaagent/${openejb.version}/openejb-javaagent-${openejb.version}.jar"</argLine>
         </configuration>
       </plugin>
     </plugins>
@@ -61,7 +61,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -77,7 +77,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf-rs</artifactId>
       <version>${openejb.version}</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/rest-xml-json/pom.xml
----------------------------------------------------------------------
diff --git a/examples/rest-xml-json/pom.xml b/examples/rest-xml-json/pom.xml
index ae4456b..6203d6c 100644
--- a/examples/rest-xml-json/pom.xml
+++ b/examples/rest-xml-json/pom.xml
@@ -54,7 +54,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -72,7 +72,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf-rs</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/scala-basic/pom.xml
----------------------------------------------------------------------
diff --git a/examples/scala-basic/pom.xml b/examples/scala-basic/pom.xml
index 92ef204..c53545c 100644
--- a/examples/scala-basic/pom.xml
+++ b/examples/scala-basic/pom.xml
@@ -101,7 +101,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -134,7 +134,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/schedule-events/pom.xml
----------------------------------------------------------------------
diff --git a/examples/schedule-events/pom.xml b/examples/schedule-events/pom.xml
index b0f9d90..a8ddefc 100644
--- a/examples/schedule-events/pom.xml
+++ b/examples/schedule-events/pom.xml
@@ -52,7 +52,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -68,7 +68,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/schedule-expression/pom.xml
----------------------------------------------------------------------
diff --git a/examples/schedule-expression/pom.xml b/examples/schedule-expression/pom.xml
index cf2f81b..4140057 100644
--- a/examples/schedule-expression/pom.xml
+++ b/examples/schedule-expression/pom.xml
@@ -52,7 +52,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -68,7 +68,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/schedule-methods-meta/pom.xml
----------------------------------------------------------------------
diff --git a/examples/schedule-methods-meta/pom.xml b/examples/schedule-methods-meta/pom.xml
index 8648197..659c858 100644
--- a/examples/schedule-methods-meta/pom.xml
+++ b/examples/schedule-methods-meta/pom.xml
@@ -52,7 +52,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -68,7 +68,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/schedule-methods/pom.xml
----------------------------------------------------------------------
diff --git a/examples/schedule-methods/pom.xml b/examples/schedule-methods/pom.xml
index 17939f2..f881d2a 100644
--- a/examples/schedule-methods/pom.xml
+++ b/examples/schedule-methods/pom.xml
@@ -52,7 +52,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -68,7 +68,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/server-events/pom.xml
----------------------------------------------------------------------
diff --git a/examples/server-events/pom.xml b/examples/server-events/pom.xml
index 81644ec..78684f4 100644
--- a/examples/server-events/pom.xml
+++ b/examples/server-events/pom.xml
@@ -57,7 +57,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -66,7 +66,7 @@
     The <scope>provided</scope> since that's OpenEJB dependent.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -80,7 +80,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-openejb-embedded-5</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/simple-cdi-interceptor/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple-cdi-interceptor/pom.xml b/examples/simple-cdi-interceptor/pom.xml
index f617be7..ee33873 100644
--- a/examples/simple-cdi-interceptor/pom.xml
+++ b/examples/simple-cdi-interceptor/pom.xml
@@ -46,7 +46,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -62,7 +62,7 @@
     <!-- The <scope>test</scope> guarantees that non of your runtime code is
        dependent on any OpenEJB classes. -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/simple-cmp2/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple-cmp2/pom.xml b/examples/simple-cmp2/pom.xml
index b321906..dfb7acf 100644
--- a/examples/simple-cmp2/pom.xml
+++ b/examples/simple-cmp2/pom.xml
@@ -66,7 +66,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>org.apache.openejb</groupId>
+                  <groupId>org.apache.tomee</groupId>
                   <artifactId>openejb-javaagent</artifactId>
                   <version>${openejb.version}</version>
                   <outputDirectory>${project.build.directory}</outputDirectory>
@@ -89,7 +89,7 @@
 
     <!-- spec apis such as javax.persistence -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -104,7 +104,7 @@
 
     <!-- openejb container for running tests -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/simple-mdb-and-cdi/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple-mdb-and-cdi/pom.xml b/examples/simple-mdb-and-cdi/pom.xml
index bcfe407..4709607 100644
--- a/examples/simple-mdb-and-cdi/pom.xml
+++ b/examples/simple-mdb-and-cdi/pom.xml
@@ -52,7 +52,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -68,7 +68,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/simple-mdb-with-descriptor/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple-mdb-with-descriptor/pom.xml b/examples/simple-mdb-with-descriptor/pom.xml
index 9146ec3..07afb99 100644
--- a/examples/simple-mdb-with-descriptor/pom.xml
+++ b/examples/simple-mdb-with-descriptor/pom.xml
@@ -52,7 +52,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -69,7 +69,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/simple-mdb/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple-mdb/pom.xml b/examples/simple-mdb/pom.xml
index bc1a490..1339a47 100644
--- a/examples/simple-mdb/pom.xml
+++ b/examples/simple-mdb/pom.xml
@@ -52,7 +52,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -68,7 +68,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/simple-rest/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple-rest/pom.xml b/examples/simple-rest/pom.xml
index 29983bb..0f90299 100644
--- a/examples/simple-rest/pom.xml
+++ b/examples/simple-rest/pom.xml
@@ -54,7 +54,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -72,7 +72,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf-rs</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/simple-singleton/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple-singleton/pom.xml b/examples/simple-singleton/pom.xml
index e157184..a81ff54 100644
--- a/examples/simple-singleton/pom.xml
+++ b/examples/simple-singleton/pom.xml
@@ -55,7 +55,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -71,7 +71,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/simple-stateful-callbacks/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple-stateful-callbacks/pom.xml b/examples/simple-stateful-callbacks/pom.xml
index 71e64fb..a4304e8 100644
--- a/examples/simple-stateful-callbacks/pom.xml
+++ b/examples/simple-stateful-callbacks/pom.xml
@@ -52,7 +52,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -68,7 +68,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/simple-stateful/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple-stateful/pom.xml b/examples/simple-stateful/pom.xml
index e1cc569..0dc5edd 100644
--- a/examples/simple-stateful/pom.xml
+++ b/examples/simple-stateful/pom.xml
@@ -52,7 +52,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -68,7 +68,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/simple-stateless-callbacks/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple-stateless-callbacks/pom.xml b/examples/simple-stateless-callbacks/pom.xml
index 743de3e..3f3f5c2 100644
--- a/examples/simple-stateless-callbacks/pom.xml
+++ b/examples/simple-stateless-callbacks/pom.xml
@@ -52,7 +52,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -69,7 +69,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/simple-stateless-with-descriptor/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple-stateless-with-descriptor/pom.xml b/examples/simple-stateless-with-descriptor/pom.xml
index e3650f0..15320d5 100644
--- a/examples/simple-stateless-with-descriptor/pom.xml
+++ b/examples/simple-stateless-with-descriptor/pom.xml
@@ -52,7 +52,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -69,13 +69,13 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-jee-accessors</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/simple-stateless/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple-stateless/pom.xml b/examples/simple-stateless/pom.xml
index 70e884c..1f5cc09 100644
--- a/examples/simple-stateless/pom.xml
+++ b/examples/simple-stateless/pom.xml
@@ -52,7 +52,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -69,7 +69,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/simple-webservice-without-interface/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple-webservice-without-interface/pom.xml b/examples/simple-webservice-without-interface/pom.xml
index 15ee618..a2a511e 100644
--- a/examples/simple-webservice-without-interface/pom.xml
+++ b/examples/simple-webservice-without-interface/pom.xml
@@ -52,7 +52,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
     </dependency>
@@ -67,7 +67,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/simple-webservice/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple-webservice/pom.xml b/examples/simple-webservice/pom.xml
index 34a9f7d..e12cdfc 100644
--- a/examples/simple-webservice/pom.xml
+++ b/examples/simple-webservice/pom.xml
@@ -52,7 +52,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
     </dependency>
@@ -67,7 +67,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/spring-data-proxy-meta/pom.xml
----------------------------------------------------------------------
diff --git a/examples/spring-data-proxy-meta/pom.xml b/examples/spring-data-proxy-meta/pom.xml
index 2df60c5..f52dcf8 100644
--- a/examples/spring-data-proxy-meta/pom.xml
+++ b/examples/spring-data-proxy-meta/pom.xml
@@ -49,7 +49,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -67,7 +67,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/spring-data-proxy/pom.xml
----------------------------------------------------------------------
diff --git a/examples/spring-data-proxy/pom.xml b/examples/spring-data-proxy/pom.xml
index 6ece58f..76ce0e5 100644
--- a/examples/spring-data-proxy/pom.xml
+++ b/examples/spring-data-proxy/pom.xml
@@ -49,7 +49,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -67,7 +67,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/struts/pom.xml
----------------------------------------------------------------------
diff --git a/examples/struts/pom.xml b/examples/struts/pom.xml
index 6740e76..fdbb48c 100644
--- a/examples/struts/pom.xml
+++ b/examples/struts/pom.xml
@@ -83,7 +83,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/telephone-stateful/pom.xml
----------------------------------------------------------------------
diff --git a/examples/telephone-stateful/pom.xml b/examples/telephone-stateful/pom.xml
index 95becae..10250f6 100644
--- a/examples/telephone-stateful/pom.xml
+++ b/examples/telephone-stateful/pom.xml
@@ -52,7 +52,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -81,7 +81,7 @@
     -->
     <!-- START SNIPPET: openejbdep -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-ejbd</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/testcase-injection/pom.xml
----------------------------------------------------------------------
diff --git a/examples/testcase-injection/pom.xml b/examples/testcase-injection/pom.xml
index 25279db..253e9fa 100644
--- a/examples/testcase-injection/pom.xml
+++ b/examples/testcase-injection/pom.xml
@@ -52,7 +52,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -69,7 +69,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/testing-security-2/pom.xml
----------------------------------------------------------------------
diff --git a/examples/testing-security-2/pom.xml b/examples/testing-security-2/pom.xml
index 22200f2..895684d 100644
--- a/examples/testing-security-2/pom.xml
+++ b/examples/testing-security-2/pom.xml
@@ -57,7 +57,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -74,7 +74,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/testing-security-3/pom.xml
----------------------------------------------------------------------
diff --git a/examples/testing-security-3/pom.xml b/examples/testing-security-3/pom.xml
index f9625fa..86aaf69 100644
--- a/examples/testing-security-3/pom.xml
+++ b/examples/testing-security-3/pom.xml
@@ -57,7 +57,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -74,7 +74,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>provided</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/testing-security-4/pom.xml
----------------------------------------------------------------------
diff --git a/examples/testing-security-4/pom.xml b/examples/testing-security-4/pom.xml
index 0bd55d0..db2ac89 100644
--- a/examples/testing-security-4/pom.xml
+++ b/examples/testing-security-4/pom.xml
@@ -57,7 +57,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -74,7 +74,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>provided</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/testing-security-meta/pom.xml
----------------------------------------------------------------------
diff --git a/examples/testing-security-meta/pom.xml b/examples/testing-security-meta/pom.xml
index 2f1bbb7..d36ded4 100644
--- a/examples/testing-security-meta/pom.xml
+++ b/examples/testing-security-meta/pom.xml
@@ -57,7 +57,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -73,7 +73,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/testing-security/pom.xml
----------------------------------------------------------------------
diff --git a/examples/testing-security/pom.xml b/examples/testing-security/pom.xml
index 5200ef0..724d663 100644
--- a/examples/testing-security/pom.xml
+++ b/examples/testing-security/pom.xml
@@ -57,7 +57,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -73,7 +73,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/testing-transactions-bmt/pom.xml
----------------------------------------------------------------------
diff --git a/examples/testing-transactions-bmt/pom.xml b/examples/testing-transactions-bmt/pom.xml
index 82492a1..94c8af5 100644
--- a/examples/testing-transactions-bmt/pom.xml
+++ b/examples/testing-transactions-bmt/pom.xml
@@ -52,7 +52,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -69,7 +69,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/testing-transactions/pom.xml
----------------------------------------------------------------------
diff --git a/examples/testing-transactions/pom.xml b/examples/testing-transactions/pom.xml
index 3502672..c5f7492 100644
--- a/examples/testing-transactions/pom.xml
+++ b/examples/testing-transactions/pom.xml
@@ -52,7 +52,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -69,7 +69,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/tomee-jersey-eclipselink/pom.xml
----------------------------------------------------------------------
diff --git a/examples/tomee-jersey-eclipselink/pom.xml b/examples/tomee-jersey-eclipselink/pom.xml
index 5494189..813c4b2 100644
--- a/examples/tomee-jersey-eclipselink/pom.xml
+++ b/examples/tomee-jersey-eclipselink/pom.xml
@@ -34,7 +34,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/transaction-rollback/pom.xml
----------------------------------------------------------------------
diff --git a/examples/transaction-rollback/pom.xml b/examples/transaction-rollback/pom.xml
index 2911dbd..e691b04 100644
--- a/examples/transaction-rollback/pom.xml
+++ b/examples/transaction-rollback/pom.xml
@@ -52,7 +52,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -66,7 +66,7 @@
 
     <!-- openejb container for running tests -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/troubleshooting/pom.xml
----------------------------------------------------------------------
diff --git a/examples/troubleshooting/pom.xml b/examples/troubleshooting/pom.xml
index 6959dcd..7455267 100644
--- a/examples/troubleshooting/pom.xml
+++ b/examples/troubleshooting/pom.xml
@@ -52,7 +52,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -65,7 +65,7 @@
     </dependency>
     <!-- openejb container for running tests -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/webservice-attachments/pom.xml
----------------------------------------------------------------------
diff --git a/examples/webservice-attachments/pom.xml b/examples/webservice-attachments/pom.xml
index 29e05c1..5be9398 100644
--- a/examples/webservice-attachments/pom.xml
+++ b/examples/webservice-attachments/pom.xml
@@ -52,7 +52,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
     </dependency>
@@ -67,7 +67,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/webservice-handlerchain/pom.xml
----------------------------------------------------------------------
diff --git a/examples/webservice-handlerchain/pom.xml b/examples/webservice-handlerchain/pom.xml
index 66c51b5..101ce2c 100644
--- a/examples/webservice-handlerchain/pom.xml
+++ b/examples/webservice-handlerchain/pom.xml
@@ -52,7 +52,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
     </dependency>
@@ -67,7 +67,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/webservice-holder/pom.xml
----------------------------------------------------------------------
diff --git a/examples/webservice-holder/pom.xml b/examples/webservice-holder/pom.xml
index 08203c4..ec4895c 100644
--- a/examples/webservice-holder/pom.xml
+++ b/examples/webservice-holder/pom.xml
@@ -52,7 +52,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
     </dependency>
@@ -67,7 +67,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/webservice-inheritance/pom.xml
----------------------------------------------------------------------
diff --git a/examples/webservice-inheritance/pom.xml b/examples/webservice-inheritance/pom.xml
index de0b177..9500a30 100644
--- a/examples/webservice-inheritance/pom.xml
+++ b/examples/webservice-inheritance/pom.xml
@@ -52,7 +52,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
     </dependency>
@@ -67,7 +67,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/webservice-security/pom.xml
----------------------------------------------------------------------
diff --git a/examples/webservice-security/pom.xml b/examples/webservice-security/pom.xml
index 5ba8351..d328090 100644
--- a/examples/webservice-security/pom.xml
+++ b/examples/webservice-security/pom.xml
@@ -52,7 +52,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
     </dependency>
@@ -67,7 +67,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/webservice-ws-security/pom.xml
----------------------------------------------------------------------
diff --git a/examples/webservice-ws-security/pom.xml b/examples/webservice-ws-security/pom.xml
index 723c2e9..e1fcb7d 100644
--- a/examples/webservice-ws-security/pom.xml
+++ b/examples/webservice-ws-security/pom.xml
@@ -38,7 +38,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
     </dependency>
@@ -54,7 +54,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/webservice-ws-with-resources-config/pom.xml
----------------------------------------------------------------------
diff --git a/examples/webservice-ws-with-resources-config/pom.xml b/examples/webservice-ws-with-resources-config/pom.xml
index 4e4432d..a8b8f09 100644
--- a/examples/webservice-ws-with-resources-config/pom.xml
+++ b/examples/webservice-ws-with-resources-config/pom.xml
@@ -36,7 +36,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>provided</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/itests/failover-ejb/pom.xml
----------------------------------------------------------------------
diff --git a/itests/failover-ejb/pom.xml b/itests/failover-ejb/pom.xml
index e965c7c..40fd15b 100644
--- a/itests/failover-ejb/pom.xml
+++ b/itests/failover-ejb/pom.xml
@@ -20,7 +20,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>itests</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -30,9 +30,8 @@
   <name>OpenEJB :: iTests :: Failover EJB</name>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
-      <version>6.0-4</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/itests/failover/pom.xml
----------------------------------------------------------------------
diff --git a/itests/failover/pom.xml b/itests/failover/pom.xml
index 74e07fb..5385bb9 100644
--- a/itests/failover/pom.xml
+++ b/itests/failover/pom.xml
@@ -20,7 +20,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>itests</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -43,18 +43,18 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-standalone</artifactId>
       <version>${project.version}</version>
       <type>zip</type>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-client</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -64,7 +64,7 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-tomee-common</artifactId>
       <version>7.0.0-SNAPSHOT</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/itests/failover/src/test/java/org/apache/openejb/itest/failover/DiscoveryHostTest.java
----------------------------------------------------------------------
diff --git a/itests/failover/src/test/java/org/apache/openejb/itest/failover/DiscoveryHostTest.java b/itests/failover/src/test/java/org/apache/openejb/itest/failover/DiscoveryHostTest.java
index 224c04b..abefb68 100644
--- a/itests/failover/src/test/java/org/apache/openejb/itest/failover/DiscoveryHostTest.java
+++ b/itests/failover/src/test/java/org/apache/openejb/itest/failover/DiscoveryHostTest.java
@@ -48,7 +48,7 @@ public class DiscoveryHostTest {
         // To run in an IDE, uncomment and update this line
         //System.setProperty("version", OpenEjbVersion.get().getVersion());
 
-        final File zip = Repository.getArtifact("org.apache.openejb", "openejb-standalone", "zip");
+        final File zip = Repository.getArtifact("org.apache.tomee", "openejb-standalone", "zip");
         final File app = Repository.getArtifact("org.apache.openejb.itests", "failover-ejb", "jar");
 
         final File dir = Files.tmpdir();

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/itests/failover/src/test/java/org/apache/openejb/itest/failover/RandomConnectionStrategyTest.java
----------------------------------------------------------------------
diff --git a/itests/failover/src/test/java/org/apache/openejb/itest/failover/RandomConnectionStrategyTest.java b/itests/failover/src/test/java/org/apache/openejb/itest/failover/RandomConnectionStrategyTest.java
index 6586771..401eabc 100644
--- a/itests/failover/src/test/java/org/apache/openejb/itest/failover/RandomConnectionStrategyTest.java
+++ b/itests/failover/src/test/java/org/apache/openejb/itest/failover/RandomConnectionStrategyTest.java
@@ -72,7 +72,7 @@ public class RandomConnectionStrategyTest {
 //        System.setProperty("version", OpenEjbVersion.get().getVersion());
         System.setProperty("openejb.client.connection.strategy", "roundrobin");
 
-        final File zip = Repository.getArtifact("org.apache.openejb", "openejb-standalone", "zip");
+        final File zip = Repository.getArtifact("org.apache.tomee", "openejb-standalone", "zip");
         final File app = Repository.getArtifact("org.apache.openejb.itests", "failover-ejb", "jar");
 
         final File dir = Files.tmpdir();

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayCaseInsensitiveTest.java
----------------------------------------------------------------------
diff --git a/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayCaseInsensitiveTest.java b/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayCaseInsensitiveTest.java
index 8219137..b4a37ec 100644
--- a/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayCaseInsensitiveTest.java
+++ b/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayCaseInsensitiveTest.java
@@ -75,7 +75,7 @@ public class ReconnectDelayCaseInsensitiveTest {
 
         final Duration reconnectDelay = new Duration("1 second");
 
-        final File zip = Repository.getArtifact("org.apache.openejb", "openejb-standalone", "zip");
+        final File zip = Repository.getArtifact("org.apache.tomee", "openejb-standalone", "zip");
         final File app = Repository.getArtifact("org.apache.openejb.itests", "failover-ejb", "jar");
 
         final File dir = Files.tmpdir();

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayListSelfTest.java
----------------------------------------------------------------------
diff --git a/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayListSelfTest.java b/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayListSelfTest.java
index 8886904..0bc701a 100644
--- a/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayListSelfTest.java
+++ b/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayListSelfTest.java
@@ -75,7 +75,7 @@ public class ReconnectDelayListSelfTest {
 
         final Duration reconnectDelay = new Duration("1 second");
 
-        final File zip = Repository.getArtifact("org.apache.openejb", "openejb-standalone", "zip");
+        final File zip = Repository.getArtifact("org.apache.tomee", "openejb-standalone", "zip");
         final File app = Repository.getArtifact("org.apache.openejb.itests", "failover-ejb", "jar");
 
         final File dir = Files.tmpdir();

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayTest.java
----------------------------------------------------------------------
diff --git a/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayTest.java b/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayTest.java
index 0eb0bda..093b1ab 100644
--- a/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayTest.java
+++ b/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayTest.java
@@ -57,7 +57,7 @@ public class ReconnectDelayTest {
 
         final Duration reconnectDelay = new Duration("1 second");
 
-        final File zip = Repository.getArtifact("org.apache.openejb", "openejb-standalone", "zip");
+        final File zip = Repository.getArtifact("org.apache.tomee", "openejb-standalone", "zip");
         final File app = Repository.getArtifact("org.apache.openejb.itests", "failover-ejb", "jar");
 
         final File dir = Files.tmpdir();

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/itests/failover/src/test/java/org/apache/openejb/itest/failover/RoundRobinConnectionStrategyTest.java
----------------------------------------------------------------------
diff --git a/itests/failover/src/test/java/org/apache/openejb/itest/failover/RoundRobinConnectionStrategyTest.java b/itests/failover/src/test/java/org/apache/openejb/itest/failover/RoundRobinConnectionStrategyTest.java
index df2059b..a05bfbd 100644
--- a/itests/failover/src/test/java/org/apache/openejb/itest/failover/RoundRobinConnectionStrategyTest.java
+++ b/itests/failover/src/test/java/org/apache/openejb/itest/failover/RoundRobinConnectionStrategyTest.java
@@ -74,7 +74,7 @@ public class RoundRobinConnectionStrategyTest {
 //        System.setProperty("version", OpenEjbVersion.get().getVersion());
         System.setProperty("openejb.client.connection.strategy", "roundrobin");
 
-        final File zip = Repository.getArtifact("org.apache.openejb", "openejb-standalone", "zip");
+        final File zip = Repository.getArtifact("org.apache.tomee", "openejb-standalone", "zip");
         final File app = Repository.getArtifact("org.apache.openejb.itests", "failover-ejb", "jar");
 
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/itests/failover/src/test/java/org/apache/openejb/itest/failover/StickyConnectionStrategyTest.java
----------------------------------------------------------------------
diff --git a/itests/failover/src/test/java/org/apache/openejb/itest/failover/StickyConnectionStrategyTest.java b/itests/failover/src/test/java/org/apache/openejb/itest/failover/StickyConnectionStrategyTest.java
index 4328513..4a9870d 100644
--- a/itests/failover/src/test/java/org/apache/openejb/itest/failover/StickyConnectionStrategyTest.java
+++ b/itests/failover/src/test/java/org/apache/openejb/itest/failover/StickyConnectionStrategyTest.java
@@ -75,7 +75,7 @@ public class StickyConnectionStrategyTest {
         // To run in an IDE, uncomment and update this line
         System.setProperty("version", OpenEjbVersion.get().getVersion());
 
-        final File zip = Repository.getArtifact("org.apache.openejb", "openejb-standalone", "zip");
+        final File zip = Repository.getArtifact("org.apache.tomee", "openejb-standalone", "zip");
         final File app = Repository.getArtifact("org.apache.openejb.itests", "failover-ejb", "jar");
 
         final File dir = Files.tmpdir();

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/itests/legacy-client/pom.xml
----------------------------------------------------------------------
diff --git a/itests/legacy-client/pom.xml b/itests/legacy-client/pom.xml
index 3a13a6d..215b6c9 100644
--- a/itests/legacy-client/pom.xml
+++ b/itests/legacy-client/pom.xml
@@ -21,7 +21,7 @@
 
   <parent>
     <artifactId>itests</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
 
@@ -53,12 +53,12 @@
       <exclusions>
         <exclusion>
           <artifactId>openejb-client</artifactId>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
         </exclusion>
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-client</artifactId>
       <version>4.5.2</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/itests/legacy-client/src/test/java/org/apache/openejb/itest/legacy/LegacyClientTest.java
----------------------------------------------------------------------
diff --git a/itests/legacy-client/src/test/java/org/apache/openejb/itest/legacy/LegacyClientTest.java b/itests/legacy-client/src/test/java/org/apache/openejb/itest/legacy/LegacyClientTest.java
index a4a047f..7e453e7 100644
--- a/itests/legacy-client/src/test/java/org/apache/openejb/itest/legacy/LegacyClientTest.java
+++ b/itests/legacy-client/src/test/java/org/apache/openejb/itest/legacy/LegacyClientTest.java
@@ -73,9 +73,9 @@ public class LegacyClientTest {
 
     @BeforeClass
     public static void beforeClass() throws Exception {
-        logger.info("Retrieving standalone server: " + Repository.guessVersion("org.apache.openejb", "openejb-standalone") + " - This may take a while...");
+        logger.info("Retrieving standalone server: " + Repository.guessVersion("org.apache.tomee", "openejb-standalone") + " - This may take a while...");
 
-        zip = Repository.getArtifact("org.apache.openejb", "openejb-standalone", "zip");
+        zip = Repository.getArtifact("org.apache.tomee", "openejb-standalone", "zip");
         app = Repository.getArtifact("org.apache.openejb.itests", "failover-ejb", "jar");
 
         final File roothome = new File(dir, rootname);

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/itests/legacy-server/pom.xml
----------------------------------------------------------------------
diff --git a/itests/legacy-server/pom.xml b/itests/legacy-server/pom.xml
index aa66b37..d1d085c 100644
--- a/itests/legacy-server/pom.xml
+++ b/itests/legacy-server/pom.xml
@@ -21,7 +21,7 @@
 
   <parent>
     <artifactId>itests</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/itests/legacy-server/src/test/java/org/apache/openejb/itest/legacy/LegacyServerTest.java
----------------------------------------------------------------------
diff --git a/itests/legacy-server/src/test/java/org/apache/openejb/itest/legacy/LegacyServerTest.java b/itests/legacy-server/src/test/java/org/apache/openejb/itest/legacy/LegacyServerTest.java
index fd4d765..4316325 100644
--- a/itests/legacy-server/src/test/java/org/apache/openejb/itest/legacy/LegacyServerTest.java
+++ b/itests/legacy-server/src/test/java/org/apache/openejb/itest/legacy/LegacyServerTest.java
@@ -72,8 +72,8 @@ public class LegacyServerTest {
         //        System.setProperty("version", OpenEjbVersion.get().getVersion());
         System.setProperty("openejb.client.connection.strategy", "roundrobin");
 
-        logger.info("Retrieving standalone server: " + Repository.guessVersion("org.apache.openejb", "openejb-standalone") + " - This may take a while...");
-        final File zip = Repository.getArtifact("org.apache.openejb", "openejb-standalone", "zip");
+        logger.info("Retrieving standalone server: " + Repository.guessVersion("org.apache.tomee", "openejb-standalone") + " - This may take a while...");
+        final File zip = Repository.getArtifact("org.apache.tomee", "openejb-standalone", "zip");
         final File app = Repository.getArtifact("org.apache.openejb.itests", "failover-ejb", "jar");
 
         final File dir = Files.tmpdir();

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/itests/openejb-itests-app/pom.xml
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-app/pom.xml b/itests/openejb-itests-app/pom.xml
index 246f0a8..abf1ac7 100644
--- a/itests/openejb-itests-app/pom.xml
+++ b/itests/openejb-itests-app/pom.xml
@@ -23,7 +23,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>itests</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -52,15 +52,15 @@
               <bundleDir>META-INF/lib</bundleDir>
             </jarModule>
             <ejbModule>
-              <groupId>org.apache.openejb</groupId>
+              <groupId>org.apache.tomee</groupId>
               <artifactId>openejb-itests-beans</artifactId>
             </ejbModule>
             <ejbModule>
-              <groupId>org.apache.openejb</groupId>
+              <groupId>org.apache.tomee</groupId>
               <artifactId>openejb-itests-interceptor-beans</artifactId>
             </ejbModule>
             <jarModule>
-              <groupId>org.apache.openejb</groupId>
+              <groupId>org.apache.tomee</groupId>
               <artifactId>openejb-itests-client</artifactId>
               <includeInApplicationXml>true</includeInApplicationXml>
             </jarModule>
@@ -71,24 +71,24 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-itests-beans</artifactId>
       <version>${project.version}</version>
       <type>ejb</type>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-itests-interceptor-beans</artifactId>
       <version>${project.version}</version>
       <type>ejb</type>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-itests-client</artifactId>
       <version>${project.version}</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/itests/openejb-itests-beans/pom.xml
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-beans/pom.xml b/itests/openejb-itests-beans/pom.xml
index f229f6f..612b9a7 100644
--- a/itests/openejb-itests-beans/pom.xml
+++ b/itests/openejb-itests-beans/pom.xml
@@ -20,7 +20,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>itests</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
 
@@ -74,7 +74,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <scope>provided</scope>
     </dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/itests/openejb-itests-client/pom.xml
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/pom.xml b/itests/openejb-itests-client/pom.xml
index eafa988..3c2538d 100644
--- a/itests/openejb-itests-client/pom.xml
+++ b/itests/openejb-itests-client/pom.xml
@@ -23,7 +23,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>itests</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -86,16 +86,16 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-itests-beans</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-itests-servlets</artifactId>
       <version>${project.version}</version>
       <optional>true</optional>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/itests/openejb-itests-interceptor-beans/pom.xml
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-interceptor-beans/pom.xml b/itests/openejb-itests-interceptor-beans/pom.xml
index 092196f..4db55e4 100644
--- a/itests/openejb-itests-interceptor-beans/pom.xml
+++ b/itests/openejb-itests-interceptor-beans/pom.xml
@@ -23,7 +23,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <artifactId>itests</artifactId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
@@ -34,11 +34,11 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-itests-beans</artifactId>
       <version>${project.version}</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/itests/openejb-itests-servlets/pom.xml
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-servlets/pom.xml b/itests/openejb-itests-servlets/pom.xml
index 20bbed9..8354ee7 100644
--- a/itests/openejb-itests-servlets/pom.xml
+++ b/itests/openejb-itests-servlets/pom.xml
@@ -20,7 +20,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>itests</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -29,12 +29,12 @@
   <name>OpenEJB :: iTests :: Servlets</name>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-itests-beans</artifactId>
       <version>${project.version}</version>
       <type>ejb</type>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/itests/openejb-itests-web/pom.xml
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-web/pom.xml b/itests/openejb-itests-web/pom.xml
index fb75864..6ef1345 100644
--- a/itests/openejb-itests-web/pom.xml
+++ b/itests/openejb-itests-web/pom.xml
@@ -23,7 +23,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>itests</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -32,13 +32,13 @@
   <name>OpenEJB :: iTests :: Web</name>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-itests-beans</artifactId>
       <version>${project.version}</version>
       <type>ejb</type>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-itests-servlets</artifactId>
       <version>${project.version}</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index 4801aa5..e65b578 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -24,7 +24,7 @@
 
   <parent>
     <artifactId>openejb</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/maven/applicationcomposer-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven/applicationcomposer-maven-plugin/pom.xml b/maven/applicationcomposer-maven-plugin/pom.xml
index b749698..6b01372 100644
--- a/maven/applicationcomposer-maven-plugin/pom.xml
+++ b/maven/applicationcomposer-maven-plugin/pom.xml
@@ -41,7 +41,7 @@
         <artifactId>maven-project</artifactId>
       </dependency>
       <dependency>
-        <groupId>org.apache.openejb</groupId>
+        <groupId>org.apache.tomee</groupId>
         <artifactId>openejb-cxf-rs</artifactId>
         <version>${project.version}</version>
       </dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/maven/jarstxt-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven/jarstxt-maven-plugin/pom.xml b/maven/jarstxt-maven-plugin/pom.xml
index 7df3e74..c9b417f 100644
--- a/maven/jarstxt-maven-plugin/pom.xml
+++ b/maven/jarstxt-maven-plugin/pom.xml
@@ -45,7 +45,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
       <artifactId>maven-plugin-annotations</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-loader</artifactId>
       <version>${project.version}</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/maven/maven-util/pom.xml
----------------------------------------------------------------------
diff --git a/maven/maven-util/pom.xml b/maven/maven-util/pom.xml
index ff3d4aa..ba04795 100644
--- a/maven/maven-util/pom.xml
+++ b/maven/maven-util/pom.xml
@@ -35,11 +35,11 @@
       <artifactId>maven-plugin-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-juli</artifactId>
       <version>${tomee.version}</version>
       <scope>provided</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/maven/openejb-embedded-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven/openejb-embedded-maven-plugin/pom.xml b/maven/openejb-embedded-maven-plugin/pom.xml
index b26a26c..9eac143 100644
--- a/maven/openejb-embedded-maven-plugin/pom.xml
+++ b/maven/openejb-embedded-maven-plugin/pom.xml
@@ -41,7 +41,7 @@
       <artifactId>maven-project</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
     </dependency>
     <dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/maven/pom.xml
----------------------------------------------------------------------
diff --git a/maven/pom.xml b/maven/pom.xml
index c566921..6500919 100644
--- a/maven/pom.xml
+++ b/maven/pom.xml
@@ -22,7 +22,7 @@
 
   <parent>
     <artifactId>openejb</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
 
@@ -80,12 +80,12 @@
         <version>${aether.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.openejb</groupId>
+        <groupId>org.apache.tomee</groupId>
         <artifactId>openejb-core</artifactId>
         <version>${openejb.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.openejb</groupId>
+        <groupId>org.apache.tomee</groupId>
         <artifactId>openejb-client</artifactId>
         <version>${openejb.version}</version>
       </dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/maven/tomee-embedded-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven/tomee-embedded-maven-plugin/pom.xml b/maven/tomee-embedded-maven-plugin/pom.xml
index 0cc8652..1c04e88 100644
--- a/maven/tomee-embedded-maven-plugin/pom.xml
+++ b/maven/tomee-embedded-maven-plugin/pom.xml
@@ -42,7 +42,7 @@
       <artifactId>maven-project</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-embedded</artifactId>
       <version>${tomee.version}</version>
       <exclusions>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/maven/tomee-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven/tomee-maven-plugin/pom.xml b/maven/tomee-maven-plugin/pom.xml
index 5c92d54..73d03ab 100644
--- a/maven/tomee-maven-plugin/pom.xml
+++ b/maven/tomee-maven-plugin/pom.xml
@@ -42,15 +42,15 @@
       <artifactId>maven-project</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-client</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-util</artifactId>
       <version>${tomee.version}</version>
     </dependency>
@@ -77,7 +77,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>apache-tomee</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
----------------------------------------------------------------------
diff --git a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java b/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
index 37f556a..89046f3 100644
--- a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
+++ b/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
@@ -120,7 +120,7 @@ public abstract class AbstractTomEEMojo extends AbstractAddressMojo {
     @Parameter(property = "tomee-plugin.version", defaultValue = "-1")
     protected String tomeeVersion;
 
-    @Parameter(property = "tomee-plugin.groupId", defaultValue = "org.apache.openejb")
+    @Parameter(property = "tomee-plugin.groupId", defaultValue = "org.apache.tomee")
     protected String tomeeGroupId;
 
     @Parameter(property = "tomee-plugin.artifactId", defaultValue = "apache-tomee")
@@ -490,7 +490,7 @@ public abstract class AbstractTomEEMojo extends AbstractAddressMojo {
 
     protected void fixConfig() {
         if (useOpenEJB) {
-            tomeeGroupId = "org.apache.openejb";
+            tomeeGroupId = "org.apache.tomee";
             tomeeArtifactId = "openejb-standalone";
             tomeeClassifier = null;
             tomeeShutdownCommand = "Q";
@@ -1248,7 +1248,7 @@ public abstract class AbstractTomEEMojo extends AbstractAddressMojo {
         }
 
         if ((tomeeClassifier != null && (tomeeClassifier.isEmpty() || tomeeClassifier.equals("ignore")))
-                || ("org.apache.openejb".equals(tomeeGroupId) && "openejb-standalone".equals(tomeeArtifactId))) {
+                || ("org.apache.tomee".equals(tomeeGroupId) && "openejb-standalone".equals(tomeeArtifactId))) {
             tomeeClassifier = null;
         }
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/TomEEMavenPluginRule.java
----------------------------------------------------------------------
diff --git a/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/TomEEMavenPluginRule.java b/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/TomEEMavenPluginRule.java
index f8c8504..9e5ae3a 100644
--- a/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/TomEEMavenPluginRule.java
+++ b/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/TomEEMavenPluginRule.java
@@ -179,7 +179,7 @@ public class TomEEMavenPluginRule implements MethodRule {
         tomEEMojo.skipCurrentProject = true;
 
         // our well known web profile ;)
-        tomEEMojo.tomeeGroupId = "org.apache.openejb";
+        tomEEMojo.tomeeGroupId = "org.apache.tomee";
         tomEEMojo.tomeeArtifactId = "apache-tomee";
         tomEEMojo.tomeeVersion = OpenEjbVersion.get().getVersion();
         tomEEMojo.tomeeClassifier = "webprofile";

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml b/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml
index dd6df2b..0cb0b82 100644
--- a/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml
@@ -32,15 +32,15 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
-      <version>6.0-6</version>
+      <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <!-- to test with TomEE and Arquillian
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-tomee-remote</artifactId>
       <version>[TOMEE]</version>
       <scope>test</scope>
@@ -61,7 +61,7 @@
 
     <!-- to test with OpenEJB embedded and Arquillian
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-openejb-embedded-5</artifactId>
       <version>[OPENEJB]</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 05ada53..6a7f35f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
     <version>15</version>
   </parent>
 
-  <groupId>org.apache.openejb</groupId>
+  <groupId>org.apache.tomee</groupId>
   <artifactId>openejb</artifactId>
   <packaging>pom</packaging>
 
@@ -108,7 +108,7 @@
     <openejb.bundle.activator/>
     <openejb.osgi.import.pkg>*</openejb.osgi.import.pkg>
     <openejb.osgi.import>${openejb.osgi.import.pkg}</openejb.osgi.import>
-    <openejb.osgi.export.pkg>org.apache.openejb</openejb.osgi.export.pkg>
+    <openejb.osgi.export.pkg>org.apache.tomee</openejb.osgi.export.pkg>
     <openejb.osgi.export>${openejb.osgi.export.pkg}*;version=${openejb.osgi.export.version}</openejb.osgi.export>
     <openejb.osgi.fragment/>
     <openejb.osgi.require/>
@@ -778,7 +778,7 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>org.apache.openejb</groupId>
+        <groupId>org.apache.tomee</groupId>
         <artifactId>javaee-api</artifactId>
         <version>${javaee-api.version}</version>
         <classifier>tomcat</classifier>
@@ -894,7 +894,7 @@
         </exclusions>
       </dependency>
       <dependency>
-        <groupId>org.apache.openejb</groupId>
+        <groupId>org.apache.tomee</groupId>
         <artifactId>javaee-api</artifactId>
         <version>${javaee-api.version}</version>
         <exclusions>
@@ -1536,7 +1536,7 @@
         <version>1.6.2</version>
       </dependency>
       <!--  <dependency>
-       <groupId>org.apache.openejb</groupId>
+       <groupId>org.apache.tomee</groupId>
        <artifactId>commons-dbcp-all</artifactId>
        <version>1.3-r699049</version>
      </dependency> -->

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/server/openejb-activemq/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-activemq/pom.xml b/server/openejb-activemq/pom.xml
index f59d904..55e9c70 100644
--- a/server/openejb-activemq/pom.xml
+++ b/server/openejb-activemq/pom.xml
@@ -20,7 +20,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>server</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -29,7 +29,7 @@
   <name>OpenEJB :: Server :: ActiveMQ</name>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-server</artifactId>
       <version>${project.version}</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/server/openejb-axis/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-axis/pom.xml b/server/openejb-axis/pom.xml
index 88ed063..5a71bda 100644
--- a/server/openejb-axis/pom.xml
+++ b/server/openejb-axis/pom.xml
@@ -23,7 +23,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>server</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -61,7 +61,7 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-webservices</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -70,7 +70,7 @@
       <artifactId>axis</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-itests-client</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/server/openejb-bonecp/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-bonecp/pom.xml b/server/openejb-bonecp/pom.xml
index febec50..4f578bf 100644
--- a/server/openejb-bonecp/pom.xml
+++ b/server/openejb-bonecp/pom.xml
@@ -21,7 +21,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>server</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -32,7 +32,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/server/openejb-client/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-client/pom.xml b/server/openejb-client/pom.xml
index eade3d4..6dc4e20 100644
--- a/server/openejb-client/pom.xml
+++ b/server/openejb-client/pom.xml
@@ -23,7 +23,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>server</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -127,7 +127,7 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
     </dependency>
     <dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/server/openejb-common-cli/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-common-cli/pom.xml b/server/openejb-common-cli/pom.xml
index 4169923..20cd72f 100644
--- a/server/openejb-common-cli/pom.xml
+++ b/server/openejb-common-cli/pom.xml
@@ -21,7 +21,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>server</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -36,7 +36,7 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-loader</artifactId>
       <version>${project.version}</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/server/openejb-cxf-rs/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-cxf-rs/pom.xml b/server/openejb-cxf-rs/pom.xml
index b46656b..4889018 100644
--- a/server/openejb-cxf-rs/pom.xml
+++ b/server/openejb-cxf-rs/pom.xml
@@ -19,7 +19,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>server</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/server/openejb-cxf-transport/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-cxf-transport/pom.xml b/server/openejb-cxf-transport/pom.xml
index dfe1e00..cd0076b 100644
--- a/server/openejb-cxf-transport/pom.xml
+++ b/server/openejb-cxf-transport/pom.xml
@@ -19,7 +19,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>server</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/server/openejb-cxf/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-cxf/pom.xml b/server/openejb-cxf/pom.xml
index 5fbf789..19227eb 100644
--- a/server/openejb-cxf/pom.xml
+++ b/server/openejb-cxf/pom.xml
@@ -23,7 +23,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>server</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/server/openejb-daemon/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-daemon/pom.xml b/server/openejb-daemon/pom.xml
index 4f40951..f37b188 100644
--- a/server/openejb-daemon/pom.xml
+++ b/server/openejb-daemon/pom.xml
@@ -20,7 +20,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>server</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -29,7 +29,7 @@
   <name>OpenEJB :: Server :: Daemon</name>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-server</artifactId>
       <version>${project.version}</version>
     </dependency>


[3/4] tomee git commit: org.apache.tomee as main groupId

Posted by rm...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/bval-evaluation-redeployment/WebApp2/pom.xml
----------------------------------------------------------------------
diff --git a/examples/bval-evaluation-redeployment/WebApp2/pom.xml b/examples/bval-evaluation-redeployment/WebApp2/pom.xml
index 780633b..972a687 100644
--- a/examples/bval-evaluation-redeployment/WebApp2/pom.xml
+++ b/examples/bval-evaluation-redeployment/WebApp2/pom.xml
@@ -39,7 +39,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
     </dependency>
     <dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/bval-evaluation-redeployment/pom.xml
----------------------------------------------------------------------
diff --git a/examples/bval-evaluation-redeployment/pom.xml b/examples/bval-evaluation-redeployment/pom.xml
index 6703866..c31e5e7 100644
--- a/examples/bval-evaluation-redeployment/pom.xml
+++ b/examples/bval-evaluation-redeployment/pom.xml
@@ -63,19 +63,19 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>org.apache.openejb</groupId>
+        <groupId>org.apache.tomee</groupId>
         <artifactId>javaee-api</artifactId>
         <version>7.0-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
-        <groupId>org.apache.openejb</groupId>
+        <groupId>org.apache.tomee</groupId>
         <artifactId>openejb-core</artifactId>
         <version>${openejb.test.version}</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
-        <groupId>org.apache.openejb</groupId>
+        <groupId>org.apache.tomee</groupId>
         <artifactId>openejb-cxf-rs</artifactId>
         <version>${openejb.test.version}</version>
         <scope>provided</scope>
@@ -107,7 +107,7 @@
         <version>0.7</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.openejb</groupId>
+        <groupId>org.apache.tomee</groupId>
         <artifactId>arquillian-tomee-remote</artifactId>
         <version>7.0.0-SNAPSHOT</version>
         <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/bval-evaluation-redeployment/runner/pom.xml
----------------------------------------------------------------------
diff --git a/examples/bval-evaluation-redeployment/runner/pom.xml b/examples/bval-evaluation-redeployment/runner/pom.xml
index 922fcc1..746d440 100644
--- a/examples/bval-evaluation-redeployment/runner/pom.xml
+++ b/examples/bval-evaluation-redeployment/runner/pom.xml
@@ -36,7 +36,7 @@
       <artifactId>junit</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-tomee-remote</artifactId>
       <scope>test</scope>
     </dependency>
@@ -49,7 +49,7 @@
       <artifactId>cxf-rt-frontend-jaxrs</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>apache-tomee</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <type>zip</type>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/cdi-alternative-and-stereotypes/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cdi-alternative-and-stereotypes/pom.xml b/examples/cdi-alternative-and-stereotypes/pom.xml
index fecde58..0e13742 100644
--- a/examples/cdi-alternative-and-stereotypes/pom.xml
+++ b/examples/cdi-alternative-and-stereotypes/pom.xml
@@ -52,7 +52,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -68,7 +68,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/cdi-application-scope/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cdi-application-scope/pom.xml b/examples/cdi-application-scope/pom.xml
index 52eaf63..dedd5f2 100644
--- a/examples/cdi-application-scope/pom.xml
+++ b/examples/cdi-application-scope/pom.xml
@@ -39,7 +39,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -51,7 +51,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/cdi-basic/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cdi-basic/pom.xml b/examples/cdi-basic/pom.xml
index d50b1d5..5b5be9d 100644
--- a/examples/cdi-basic/pom.xml
+++ b/examples/cdi-basic/pom.xml
@@ -50,7 +50,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -64,7 +64,7 @@
     <!-- The <scope>test</scope> guarantees that none of your runtime code 
       is dependent on any OpenEJB classes. -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/cdi-ejbcontext-jaas/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cdi-ejbcontext-jaas/pom.xml b/examples/cdi-ejbcontext-jaas/pom.xml
index b59ef6d..15c16a0 100644
--- a/examples/cdi-ejbcontext-jaas/pom.xml
+++ b/examples/cdi-ejbcontext-jaas/pom.xml
@@ -29,7 +29,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -41,7 +41,7 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/cdi-events/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cdi-events/pom.xml b/examples/cdi-events/pom.xml
index 2642238..ee984e9 100644
--- a/examples/cdi-events/pom.xml
+++ b/examples/cdi-events/pom.xml
@@ -52,7 +52,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -68,7 +68,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/cdi-interceptors/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cdi-interceptors/pom.xml b/examples/cdi-interceptors/pom.xml
index 2194056..d179cc0 100644
--- a/examples/cdi-interceptors/pom.xml
+++ b/examples/cdi-interceptors/pom.xml
@@ -46,7 +46,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -62,7 +62,7 @@
     <!-- The <scope>test</scope> guarantees that non of your runtime code is
        dependent on any OpenEJB classes. -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/cdi-produces-disposes/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cdi-produces-disposes/pom.xml b/examples/cdi-produces-disposes/pom.xml
index decdd83..430fc6c 100644
--- a/examples/cdi-produces-disposes/pom.xml
+++ b/examples/cdi-produces-disposes/pom.xml
@@ -52,7 +52,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -69,7 +69,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/cdi-produces-field/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cdi-produces-field/pom.xml b/examples/cdi-produces-field/pom.xml
index de4dffb..f1a0d87 100644
--- a/examples/cdi-produces-field/pom.xml
+++ b/examples/cdi-produces-field/pom.xml
@@ -52,7 +52,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -69,7 +69,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/cdi-realm/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cdi-realm/pom.xml b/examples/cdi-realm/pom.xml
index 54372db..4136384 100644
--- a/examples/cdi-realm/pom.xml
+++ b/examples/cdi-realm/pom.xml
@@ -64,7 +64,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -83,7 +83,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-tomee-remote</artifactId>
       <version>${tomee.version}</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/cdi-request-scope/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cdi-request-scope/pom.xml b/examples/cdi-request-scope/pom.xml
index d4410bd..b662ffa 100644
--- a/examples/cdi-request-scope/pom.xml
+++ b/examples/cdi-request-scope/pom.xml
@@ -39,7 +39,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -51,7 +51,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/cdi-session-scope/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cdi-session-scope/pom.xml b/examples/cdi-session-scope/pom.xml
index 8e83c6e..5c853a9 100644
--- a/examples/cdi-session-scope/pom.xml
+++ b/examples/cdi-session-scope/pom.xml
@@ -67,7 +67,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/change-jaxws-url/pom.xml
----------------------------------------------------------------------
diff --git a/examples/change-jaxws-url/pom.xml b/examples/change-jaxws-url/pom.xml
index 6f24faf..d458786 100644
--- a/examples/change-jaxws-url/pom.xml
+++ b/examples/change-jaxws-url/pom.xml
@@ -83,7 +83,7 @@
         <version>${tomee.version}</version>
         <dependencies>
           <dependency>
-            <groupId>org.apache.openejb</groupId>
+            <groupId>org.apache.tomee</groupId>
             <artifactId>apache-tomee</artifactId>
             <version>${tomee.version}</version>
           </dependency>
@@ -93,7 +93,7 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -105,25 +105,25 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-embedded</artifactId>
       <version>${tomee.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-webservices</artifactId>
       <version>${tomee.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>ziplock</artifactId>
       <version>${tomee.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-tomee-embedded</artifactId>
       <version>${tomee.version}</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/client-resource-lookup-preview/pom.xml
----------------------------------------------------------------------
diff --git a/examples/client-resource-lookup-preview/pom.xml b/examples/client-resource-lookup-preview/pom.xml
index 3551af3..1effbea 100644
--- a/examples/client-resource-lookup-preview/pom.xml
+++ b/examples/client-resource-lookup-preview/pom.xml
@@ -49,7 +49,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -57,13 +57,13 @@
 
     <!-- here what is needed to use client lookup with jms resources -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-client</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-ejbd</artifactId>
       <version>7.0.0-SNAPSHOT</version>
     </dependency>
@@ -82,7 +82,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>ziplock</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/component-interfaces/pom.xml
----------------------------------------------------------------------
diff --git a/examples/component-interfaces/pom.xml b/examples/component-interfaces/pom.xml
index a3c5143..2e254d6 100644
--- a/examples/component-interfaces/pom.xml
+++ b/examples/component-interfaces/pom.xml
@@ -60,7 +60,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -76,7 +76,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/cucumber-jvm/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cucumber-jvm/pom.xml b/examples/cucumber-jvm/pom.xml
index c21629d..885e122 100644
--- a/examples/cucumber-jvm/pom.xml
+++ b/examples/cucumber-jvm/pom.xml
@@ -50,7 +50,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -64,7 +64,7 @@
     <!-- The <scope>test</scope> guarantees that none of your runtime code 
       is dependent on any OpenEJB classes. -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/custom-injection/pom.xml
----------------------------------------------------------------------
diff --git a/examples/custom-injection/pom.xml b/examples/custom-injection/pom.xml
index 636c09d..07bf0d5 100644
--- a/examples/custom-injection/pom.xml
+++ b/examples/custom-injection/pom.xml
@@ -52,7 +52,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -68,7 +68,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/datasource-ciphered-password/pom.xml
----------------------------------------------------------------------
diff --git a/examples/datasource-ciphered-password/pom.xml b/examples/datasource-ciphered-password/pom.xml
index 1a6d2e4..8ffd595 100644
--- a/examples/datasource-ciphered-password/pom.xml
+++ b/examples/datasource-ciphered-password/pom.xml
@@ -49,7 +49,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -65,7 +65,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/datasource-definition/pom.xml
----------------------------------------------------------------------
diff --git a/examples/datasource-definition/pom.xml b/examples/datasource-definition/pom.xml
index 25998c5..9549fd5 100644
--- a/examples/datasource-definition/pom.xml
+++ b/examples/datasource-definition/pom.xml
@@ -87,7 +87,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -114,7 +114,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/datasource-versioning/pom.xml
----------------------------------------------------------------------
diff --git a/examples/datasource-versioning/pom.xml b/examples/datasource-versioning/pom.xml
index bd4c373..1d3a89d 100644
--- a/examples/datasource-versioning/pom.xml
+++ b/examples/datasource-versioning/pom.xml
@@ -122,7 +122,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -134,7 +134,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-tomee-remote</artifactId>
       <version>${version.tomee}</version>
       <scope>test</scope>
@@ -156,7 +156,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/decorators/pom.xml
----------------------------------------------------------------------
diff --git a/examples/decorators/pom.xml b/examples/decorators/pom.xml
index cf0300d..95e3b07 100644
--- a/examples/decorators/pom.xml
+++ b/examples/decorators/pom.xml
@@ -52,7 +52,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -69,7 +69,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/deltaspike-configproperty/pom.xml
----------------------------------------------------------------------
diff --git a/examples/deltaspike-configproperty/pom.xml b/examples/deltaspike-configproperty/pom.xml
index 0bd051c..5437205 100644
--- a/examples/deltaspike-configproperty/pom.xml
+++ b/examples/deltaspike-configproperty/pom.xml
@@ -55,7 +55,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -79,13 +79,13 @@
     <!-- The <scope>test</scope> guarantees that none of your runtime code
       is dependent on any OpenEJB classes. -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-openejb-embedded-5</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>ziplock</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/deltaspike-exception-handling/pom.xml
----------------------------------------------------------------------
diff --git a/examples/deltaspike-exception-handling/pom.xml b/examples/deltaspike-exception-handling/pom.xml
index 0a16696..d654ae6 100644
--- a/examples/deltaspike-exception-handling/pom.xml
+++ b/examples/deltaspike-exception-handling/pom.xml
@@ -53,7 +53,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -77,13 +77,13 @@
     <!-- The <scope>test</scope> guarantees that none of your runtime code
       is dependent on any OpenEJB classes. -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-openejb-embedded-5</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>ziplock</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/deltaspike-fullstack/pom.xml
----------------------------------------------------------------------
diff --git a/examples/deltaspike-fullstack/pom.xml b/examples/deltaspike-fullstack/pom.xml
index 6d19cf5..64d2a5f 100644
--- a/examples/deltaspike-fullstack/pom.xml
+++ b/examples/deltaspike-fullstack/pom.xml
@@ -108,13 +108,13 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>${version.openejb}</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/deltaspike-i18n/pom.xml
----------------------------------------------------------------------
diff --git a/examples/deltaspike-i18n/pom.xml b/examples/deltaspike-i18n/pom.xml
index 97c4d77..86043d8 100644
--- a/examples/deltaspike-i18n/pom.xml
+++ b/examples/deltaspike-i18n/pom.xml
@@ -55,7 +55,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -79,13 +79,13 @@
     <!-- The <scope>test</scope> guarantees that none of your runtime code
       is dependent on any OpenEJB classes. -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-openejb-embedded-5</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>ziplock</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/dynamic-dao-implementation/pom.xml
----------------------------------------------------------------------
diff --git a/examples/dynamic-dao-implementation/pom.xml b/examples/dynamic-dao-implementation/pom.xml
index 779fad5..4558f5f 100644
--- a/examples/dynamic-dao-implementation/pom.xml
+++ b/examples/dynamic-dao-implementation/pom.xml
@@ -49,7 +49,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -66,7 +66,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/dynamic-datasource-routing/pom.xml
----------------------------------------------------------------------
diff --git a/examples/dynamic-datasource-routing/pom.xml b/examples/dynamic-datasource-routing/pom.xml
index 4649064..db550a8 100755
--- a/examples/dynamic-datasource-routing/pom.xml
+++ b/examples/dynamic-datasource-routing/pom.xml
@@ -49,7 +49,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -64,7 +64,7 @@
     The router is dependent of openejb so it needs openejb core with compile scope.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/dynamic-implementation/pom.xml
----------------------------------------------------------------------
diff --git a/examples/dynamic-implementation/pom.xml b/examples/dynamic-implementation/pom.xml
index 549da33..3ab3ce9 100644
--- a/examples/dynamic-implementation/pom.xml
+++ b/examples/dynamic-implementation/pom.xml
@@ -48,13 +48,13 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-api</artifactId>
       <version>7.0.0-SNAPSHOT</version>
     </dependency>
@@ -70,7 +70,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/dynamic-proxy-to-access-mbean/pom.xml
----------------------------------------------------------------------
diff --git a/examples/dynamic-proxy-to-access-mbean/pom.xml b/examples/dynamic-proxy-to-access-mbean/pom.xml
index a06e55f..2921a82 100644
--- a/examples/dynamic-proxy-to-access-mbean/pom.xml
+++ b/examples/dynamic-proxy-to-access-mbean/pom.xml
@@ -56,13 +56,13 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-api</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -79,7 +79,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/ear-testing/business-logic/pom.xml
----------------------------------------------------------------------
diff --git a/examples/ear-testing/business-logic/pom.xml b/examples/ear-testing/business-logic/pom.xml
index e937d93..d1cc544 100644
--- a/examples/ear-testing/business-logic/pom.xml
+++ b/examples/ear-testing/business-logic/pom.xml
@@ -59,7 +59,7 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -75,7 +75,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/ear-testing/business-model/pom.xml
----------------------------------------------------------------------
diff --git a/examples/ear-testing/business-model/pom.xml b/examples/ear-testing/business-model/pom.xml
index ca36076..346cce3 100644
--- a/examples/ear-testing/business-model/pom.xml
+++ b/examples/ear-testing/business-model/pom.xml
@@ -32,7 +32,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <scope>provided</scope>
     </dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/ear-testing/pom.xml
----------------------------------------------------------------------
diff --git a/examples/ear-testing/pom.xml b/examples/ear-testing/pom.xml
index 87ad982..4e1c632 100644
--- a/examples/ear-testing/pom.xml
+++ b/examples/ear-testing/pom.xml
@@ -65,7 +65,7 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>org.apache.openejb</groupId>
+        <groupId>org.apache.tomee</groupId>
         <artifactId>javaee-api</artifactId>
         <version>7.0-SNAPSHOT</version>
       </dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/ejb-examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/ejb-examples/pom.xml b/examples/ejb-examples/pom.xml
index 102261e..752200c 100644
--- a/examples/ejb-examples/pom.xml
+++ b/examples/ejb-examples/pom.xml
@@ -63,7 +63,7 @@
           <tomcatVersion>7.0.27</tomcatVersion>
           <webapps>
             <webappArtifact>
-              <groupId>org.apache.openejb</groupId>
+              <groupId>org.apache.tomee</groupId>
               <artifactId>openejb-tomcat-webapp</artifactId>
               <version>7.0.0-SNAPSHOT</version>
               <contextPath>openejb</contextPath>
@@ -75,7 +75,7 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/ejb-webservice/pom.xml
----------------------------------------------------------------------
diff --git a/examples/ejb-webservice/pom.xml b/examples/ejb-webservice/pom.xml
index 37583ba..56b33a2 100644
--- a/examples/ejb-webservice/pom.xml
+++ b/examples/ejb-webservice/pom.xml
@@ -57,7 +57,7 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/groovy-cdi/pom.xml
----------------------------------------------------------------------
diff --git a/examples/groovy-cdi/pom.xml b/examples/groovy-cdi/pom.xml
index 584d9b1..aa9b847 100644
--- a/examples/groovy-cdi/pom.xml
+++ b/examples/groovy-cdi/pom.xml
@@ -74,7 +74,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -91,13 +91,13 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-openejb-embedded-5</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>ziplock</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/groovy-jpa/pom.xml
----------------------------------------------------------------------
diff --git a/examples/groovy-jpa/pom.xml b/examples/groovy-jpa/pom.xml
index 055c058..73a5ad3 100644
--- a/examples/groovy-jpa/pom.xml
+++ b/examples/groovy-jpa/pom.xml
@@ -75,7 +75,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -92,13 +92,13 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-openejb-embedded-5</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>ziplock</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/groovy-spock/pom.xml
----------------------------------------------------------------------
diff --git a/examples/groovy-spock/pom.xml b/examples/groovy-spock/pom.xml
index 3e7a36e..cbf7163 100644
--- a/examples/groovy-spock/pom.xml
+++ b/examples/groovy-spock/pom.xml
@@ -101,7 +101,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -118,7 +118,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-openejb-embedded-5</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>
@@ -130,7 +130,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>ziplock</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/helloworld-weblogic/pom.xml
----------------------------------------------------------------------
diff --git a/examples/helloworld-weblogic/pom.xml b/examples/helloworld-weblogic/pom.xml
index c370324..a7d47cf 100644
--- a/examples/helloworld-weblogic/pom.xml
+++ b/examples/helloworld-weblogic/pom.xml
@@ -52,7 +52,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -69,7 +69,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/injection-of-connectionfactory/pom.xml
----------------------------------------------------------------------
diff --git a/examples/injection-of-connectionfactory/pom.xml b/examples/injection-of-connectionfactory/pom.xml
index 54723c2..11e7a24 100644
--- a/examples/injection-of-connectionfactory/pom.xml
+++ b/examples/injection-of-connectionfactory/pom.xml
@@ -52,7 +52,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -69,7 +69,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/injection-of-datasource/pom.xml
----------------------------------------------------------------------
diff --git a/examples/injection-of-datasource/pom.xml b/examples/injection-of-datasource/pom.xml
index 15478ae..b0d4e85 100644
--- a/examples/injection-of-datasource/pom.xml
+++ b/examples/injection-of-datasource/pom.xml
@@ -52,7 +52,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -69,7 +69,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/injection-of-ejbs/pom.xml
----------------------------------------------------------------------
diff --git a/examples/injection-of-ejbs/pom.xml b/examples/injection-of-ejbs/pom.xml
index b79147f..770a565 100644
--- a/examples/injection-of-ejbs/pom.xml
+++ b/examples/injection-of-ejbs/pom.xml
@@ -52,7 +52,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -68,7 +68,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/injection-of-entitymanager/pom.xml
----------------------------------------------------------------------
diff --git a/examples/injection-of-entitymanager/pom.xml b/examples/injection-of-entitymanager/pom.xml
index ee2c0c1..dd3161b 100644
--- a/examples/injection-of-entitymanager/pom.xml
+++ b/examples/injection-of-entitymanager/pom.xml
@@ -52,7 +52,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -68,7 +68,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/injection-of-env-entry/pom.xml
----------------------------------------------------------------------
diff --git a/examples/injection-of-env-entry/pom.xml b/examples/injection-of-env-entry/pom.xml
index 9b41f68..cbff1aa 100644
--- a/examples/injection-of-env-entry/pom.xml
+++ b/examples/injection-of-env-entry/pom.xml
@@ -52,7 +52,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -68,7 +68,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/interceptors/pom.xml
----------------------------------------------------------------------
diff --git a/examples/interceptors/pom.xml b/examples/interceptors/pom.xml
index 1dbb282..9c1c28d 100644
--- a/examples/interceptors/pom.xml
+++ b/examples/interceptors/pom.xml
@@ -52,7 +52,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -68,7 +68,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/jpa-eclipselink/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jpa-eclipselink/pom.xml b/examples/jpa-eclipselink/pom.xml
index 33287b0..7cb7967 100644
--- a/examples/jpa-eclipselink/pom.xml
+++ b/examples/jpa-eclipselink/pom.xml
@@ -58,7 +58,7 @@
   <dependencies>
     <!-- spec apis such as javax.persistence -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -71,7 +71,7 @@
     </dependency>
     <!-- openejb container for running tests -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/jpa-enumerated/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jpa-enumerated/pom.xml b/examples/jpa-enumerated/pom.xml
index a9c6664..d8b18f6 100644
--- a/examples/jpa-enumerated/pom.xml
+++ b/examples/jpa-enumerated/pom.xml
@@ -52,7 +52,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -68,7 +68,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/jpa-hibernate/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jpa-hibernate/pom.xml b/examples/jpa-hibernate/pom.xml
index 64e9044..37d2db1 100644
--- a/examples/jpa-hibernate/pom.xml
+++ b/examples/jpa-hibernate/pom.xml
@@ -66,7 +66,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -79,7 +79,7 @@
     </dependency>
     <!-- openejb (with hibernate) container for running tests -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core-hibernate</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <type>pom</type>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/jsf-cdi-and-ejb/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jsf-cdi-and-ejb/pom.xml b/examples/jsf-cdi-and-ejb/pom.xml
index 305f175..2d5dda3 100644
--- a/examples/jsf-cdi-and-ejb/pom.xml
+++ b/examples/jsf-cdi-and-ejb/pom.xml
@@ -104,7 +104,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/jsf-managedBean-and-ejb/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jsf-managedBean-and-ejb/pom.xml b/examples/jsf-managedBean-and-ejb/pom.xml
index 8e22853..63c53ea 100644
--- a/examples/jsf-managedBean-and-ejb/pom.xml
+++ b/examples/jsf-managedBean-and-ejb/pom.xml
@@ -106,7 +106,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/lookup-of-ejbs-with-descriptor/pom.xml
----------------------------------------------------------------------
diff --git a/examples/lookup-of-ejbs-with-descriptor/pom.xml b/examples/lookup-of-ejbs-with-descriptor/pom.xml
index 4bc7b7b..a1cf3f7 100644
--- a/examples/lookup-of-ejbs-with-descriptor/pom.xml
+++ b/examples/lookup-of-ejbs-with-descriptor/pom.xml
@@ -55,7 +55,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -72,7 +72,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/lookup-of-ejbs/pom.xml
----------------------------------------------------------------------
diff --git a/examples/lookup-of-ejbs/pom.xml b/examples/lookup-of-ejbs/pom.xml
index 2419c73..ee7bd7e 100644
--- a/examples/lookup-of-ejbs/pom.xml
+++ b/examples/lookup-of-ejbs/pom.xml
@@ -55,7 +55,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -72,7 +72,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/mbean-auto-registration/pom.xml
----------------------------------------------------------------------
diff --git a/examples/mbean-auto-registration/pom.xml b/examples/mbean-auto-registration/pom.xml
index badb193..60dc84d 100755
--- a/examples/mbean-auto-registration/pom.xml
+++ b/examples/mbean-auto-registration/pom.xml
@@ -49,13 +49,13 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>mbean-annotation-api</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -70,7 +70,7 @@
     The scope test is to avoid to have any openejb binaries delivered by the application.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/moviefun-rest/pom.xml
----------------------------------------------------------------------
diff --git a/examples/moviefun-rest/pom.xml b/examples/moviefun-rest/pom.xml
index 9cbc441..9d56bf6 100644
--- a/examples/moviefun-rest/pom.xml
+++ b/examples/moviefun-rest/pom.xml
@@ -152,7 +152,7 @@
   </dependencyManagement>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -170,7 +170,7 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>${version.openejb}</version>
       <scope>test</scope>
@@ -182,7 +182,7 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-embedded</artifactId>
       <version>${tomee.version}</version>
       <scope>test</scope>
@@ -204,7 +204,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>ziplock</artifactId>
       <version>${tomee.version}</version>
       <scope>test</scope>
@@ -258,7 +258,7 @@
       </activation>
       <dependencies>
         <dependency>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
           <artifactId>arquillian-tomee-embedded</artifactId>
           <version>${tomee.version}</version>
           <scope>test</scope>
@@ -269,7 +269,7 @@
       <id>arquillian-tomee-remote</id>
       <dependencies>
         <dependency>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
           <artifactId>arquillian-tomee-remote</artifactId>
           <version>${tomee.version}</version>
           <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/moviefun/pom.xml
----------------------------------------------------------------------
diff --git a/examples/moviefun/pom.xml b/examples/moviefun/pom.xml
index 6ded4e4..68563bd 100644
--- a/examples/moviefun/pom.xml
+++ b/examples/moviefun/pom.xml
@@ -130,7 +130,7 @@
   </dependencyManagement>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -147,7 +147,7 @@
       <version>1.2</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>
@@ -165,7 +165,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-embedded</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <!--<classifier>uber</classifier> -->
@@ -189,7 +189,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>ziplock</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>
@@ -216,7 +216,7 @@
       </activation>
       <dependencies>
         <dependency>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
           <artifactId>arquillian-tomee-embedded</artifactId>
           <version>${tomee.version}</version>
           <scope>test</scope>
@@ -227,7 +227,7 @@
       <id>arquillian-tomee-remote</id>
       <dependencies>
         <dependency>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
           <artifactId>arquillian-tomee-remote</artifactId>
           <version>${tomee.version}</version>
           <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/movies-complete-meta/pom.xml
----------------------------------------------------------------------
diff --git a/examples/movies-complete-meta/pom.xml b/examples/movies-complete-meta/pom.xml
index a83eb7e..b9fdb95 100644
--- a/examples/movies-complete-meta/pom.xml
+++ b/examples/movies-complete-meta/pom.xml
@@ -52,7 +52,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -69,7 +69,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/movies-complete/pom.xml
----------------------------------------------------------------------
diff --git a/examples/movies-complete/pom.xml b/examples/movies-complete/pom.xml
index 5711b39..5d13974 100644
--- a/examples/movies-complete/pom.xml
+++ b/examples/movies-complete/pom.xml
@@ -52,7 +52,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -69,7 +69,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/mtom/pom.xml
----------------------------------------------------------------------
diff --git a/examples/mtom/pom.xml b/examples/mtom/pom.xml
index 5984943..abb59d4 100644
--- a/examples/mtom/pom.xml
+++ b/examples/mtom/pom.xml
@@ -55,19 +55,19 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf</artifactId>
       <version>${version.openejb}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-junit</artifactId>
       <version>${version.openejb}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-mockito</artifactId>
       <version>${version.openejb}</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/multi-jpa-provider-testing/pom.xml
----------------------------------------------------------------------
diff --git a/examples/multi-jpa-provider-testing/pom.xml b/examples/multi-jpa-provider-testing/pom.xml
index 8d09fcc..2f09770 100644
--- a/examples/multi-jpa-provider-testing/pom.xml
+++ b/examples/multi-jpa-provider-testing/pom.xml
@@ -72,7 +72,7 @@
             </goals>
             <configuration>
               <skip>${maven.test.skip}</skip>
-              <argLine>"-javaagent:${settings.localRepository}/org/apache/openejb/openejb-javaagent/${openejb.version}/openejb-javaagent-${openejb.version}.jar"</argLine>
+              <argLine>"-javaagent:${settings.localRepository}/org/apache/tomee/openejb-javaagent/${openejb.version}/openejb-javaagent-${openejb.version}.jar"</argLine>
               <systemPropertyVariables>
                 <javax.persistence.provider>org.apache.openjpa.persistence.PersistenceProviderImpl</javax.persistence.provider>
               </systemPropertyVariables>
@@ -96,7 +96,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -109,7 +109,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-openejb-embedded-5</artifactId>
       <version>${openejb.version}</version>
       <scope>test</scope>
@@ -138,7 +138,7 @@
       <scope>test</scope>
     </dependency>
     <dependency> <!-- just a facade pom which will bring hibernate for us -->
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core-hibernate</artifactId>
       <version>${openejb.version}</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/multiple-arquillian-adapters/pom.xml
----------------------------------------------------------------------
diff --git a/examples/multiple-arquillian-adapters/pom.xml b/examples/multiple-arquillian-adapters/pom.xml
index b4b8499..c25ef49 100644
--- a/examples/multiple-arquillian-adapters/pom.xml
+++ b/examples/multiple-arquillian-adapters/pom.xml
@@ -137,7 +137,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -159,7 +159,7 @@
 
     <!-- utility test deps -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>ziplock</artifactId>
       <version>${tomee.version}</version>
       <scope>test</scope>
@@ -167,7 +167,7 @@
 
     <!-- additional container part for embedded JAX-RS test -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf-rs</artifactId>
       <version>${openejb.version}</version>
       <scope>test</scope>
@@ -175,19 +175,19 @@
 
     <!-- arquillian adapters -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-openejb-embedded-5</artifactId>
       <version>${openejb.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-tomee-embedded</artifactId>
       <version>${tomee.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-tomee-remote</artifactId>
       <version>${tomee.version}</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/multiple-tomee-arquillian/pom.xml
----------------------------------------------------------------------
diff --git a/examples/multiple-tomee-arquillian/pom.xml b/examples/multiple-tomee-arquillian/pom.xml
index 2cc6d25..7fb57a3 100644
--- a/examples/multiple-tomee-arquillian/pom.xml
+++ b/examples/multiple-tomee-arquillian/pom.xml
@@ -68,7 +68,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -84,13 +84,13 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-tomee-remote</artifactId>
       <version>${tomee.version}</version>
       <scope>test</scope>
@@ -102,7 +102,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>ziplock</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/myfaces-codi-demo/pom.xml
----------------------------------------------------------------------
diff --git a/examples/myfaces-codi-demo/pom.xml b/examples/myfaces-codi-demo/pom.xml
index 1e4bb01..a93ebb2 100644
--- a/examples/myfaces-codi-demo/pom.xml
+++ b/examples/myfaces-codi-demo/pom.xml
@@ -60,7 +60,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/persistence-fragment/pom.xml
----------------------------------------------------------------------
diff --git a/examples/persistence-fragment/pom.xml b/examples/persistence-fragment/pom.xml
index b5f5745..b7e7b0d 100644
--- a/examples/persistence-fragment/pom.xml
+++ b/examples/persistence-fragment/pom.xml
@@ -52,7 +52,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -68,7 +68,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/pojo-webservice/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pojo-webservice/pom.xml b/examples/pojo-webservice/pom.xml
index fb7a257..5f2c25b 100644
--- a/examples/pojo-webservice/pom.xml
+++ b/examples/pojo-webservice/pom.xml
@@ -72,7 +72,7 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/polling-parent/polling-client/pom.xml
----------------------------------------------------------------------
diff --git a/examples/polling-parent/polling-client/pom.xml b/examples/polling-parent/polling-client/pom.xml
index 373482c..230d1ba 100644
--- a/examples/polling-parent/polling-client/pom.xml
+++ b/examples/polling-parent/polling-client/pom.xml
@@ -53,7 +53,7 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
     </dependency>
     <dependency>
@@ -84,7 +84,7 @@
         </configuration>
         <dependencies>
           <dependency>
-            <groupId>org.apache.openejb</groupId>
+            <groupId>org.apache.tomee</groupId>
             <artifactId>javaee-api</artifactId>
             <version>7.0-SNAPSHOT</version>
           </dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/polling-parent/polling-core/pom.xml
----------------------------------------------------------------------
diff --git a/examples/polling-parent/polling-core/pom.xml b/examples/polling-parent/polling-core/pom.xml
index d7ecf72..7596fcc 100644
--- a/examples/polling-parent/polling-core/pom.xml
+++ b/examples/polling-parent/polling-core/pom.xml
@@ -31,11 +31,11 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-api</artifactId>
     </dependency>
     <dependency>
@@ -43,7 +43,7 @@
       <artifactId>junit</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
     </dependency>
     <dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/polling-parent/polling-domain/pom.xml
----------------------------------------------------------------------
diff --git a/examples/polling-parent/polling-domain/pom.xml b/examples/polling-parent/polling-domain/pom.xml
index 0d0594f..f396dd4 100644
--- a/examples/polling-parent/polling-domain/pom.xml
+++ b/examples/polling-parent/polling-domain/pom.xml
@@ -31,7 +31,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
     </dependency>
   </dependencies>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/polling-parent/polling-web/pom.xml
----------------------------------------------------------------------
diff --git a/examples/polling-parent/polling-web/pom.xml b/examples/polling-parent/polling-web/pom.xml
index 00655ff..f6dbe74 100644
--- a/examples/polling-parent/polling-web/pom.xml
+++ b/examples/polling-parent/polling-web/pom.xml
@@ -36,23 +36,23 @@
       <artifactId>junit</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf-rs</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-tomee-embedded</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-webservices</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>ziplock</artifactId>
     </dependency>
     <dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/polling-parent/pom.xml
----------------------------------------------------------------------
diff --git a/examples/polling-parent/pom.xml b/examples/polling-parent/pom.xml
index 1d7d624..c9928e3 100644
--- a/examples/polling-parent/pom.xml
+++ b/examples/polling-parent/pom.xml
@@ -74,13 +74,13 @@
     <dependencies>
       <!-- API -->
       <dependency>
-        <groupId>org.apache.openejb</groupId>
+        <groupId>org.apache.tomee</groupId>
         <artifactId>javaee-api</artifactId>
         <version>7.0-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
-        <groupId>org.apache.openejb</groupId>
+        <groupId>org.apache.tomee</groupId>
         <artifactId>openejb-api</artifactId>
         <version>${version.openejb}</version>
         <scope>provided</scope>
@@ -88,13 +88,13 @@
 
       <!-- impl - for standard code scope test is fine -->
       <dependency>
-        <groupId>org.apache.openejb</groupId>
+        <groupId>org.apache.tomee</groupId>
         <artifactId>openejb-core</artifactId>
         <version>${version.openejb}</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
-        <groupId>org.apache.openejb</groupId>
+        <groupId>org.apache.tomee</groupId>
         <artifactId>openejb-cxf-rs</artifactId>
         <version>${version.openejb}</version>
         <scope>provided</scope>
@@ -102,19 +102,19 @@
 
       <!-- test -->
       <dependency>
-        <groupId>org.apache.openejb</groupId>
+        <groupId>org.apache.tomee</groupId>
         <artifactId>arquillian-tomee-embedded</artifactId>
         <version>${version.tomee}</version>
         <scope>test</scope>
       </dependency>
       <dependency>
-        <groupId>org.apache.openejb</groupId>
+        <groupId>org.apache.tomee</groupId>
         <artifactId>tomee-webservices</artifactId>
         <version>${version.tomee}</version>
         <scope>test</scope>
       </dependency>
       <dependency>
-        <groupId>org.apache.openejb</groupId>
+        <groupId>org.apache.tomee</groupId>
         <artifactId>ziplock</artifactId>
         <version>${version.tomee}</version>
         <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index b762d90..ab849e2 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -22,7 +22,7 @@
 <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/maven-v4_0_0.xsd">
   <parent>
     <artifactId>openejb</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/projectstage-demo/pom.xml
----------------------------------------------------------------------
diff --git a/examples/projectstage-demo/pom.xml b/examples/projectstage-demo/pom.xml
index e5b2d36..a4452e9 100644
--- a/examples/projectstage-demo/pom.xml
+++ b/examples/projectstage-demo/pom.xml
@@ -41,7 +41,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -59,13 +59,13 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-tomee-remote</artifactId>
       <version>${tomee.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>ziplock</artifactId>
       <version>${tomee.version}</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/quartz-app/pom.xml
----------------------------------------------------------------------
diff --git a/examples/quartz-app/pom.xml b/examples/quartz-app/pom.xml
index a3726be..6699c64 100644
--- a/examples/quartz-app/pom.xml
+++ b/examples/quartz-app/pom.xml
@@ -75,12 +75,12 @@
         <version>2.2.1</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.openejb</groupId>
+        <groupId>org.apache.tomee</groupId>
         <artifactId>openejb-core</artifactId>
         <version>${version.openejb}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.openejb</groupId>
+        <groupId>org.apache.tomee</groupId>
         <artifactId>javaee-api</artifactId>
         <version>7.0-SNAPSHOT</version>
       </dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/quartz-app/quartz-beans/pom.xml
----------------------------------------------------------------------
diff --git a/examples/quartz-app/quartz-beans/pom.xml b/examples/quartz-app/quartz-beans/pom.xml
index 71ddfca..d4f8b19 100644
--- a/examples/quartz-app/quartz-beans/pom.xml
+++ b/examples/quartz-app/quartz-beans/pom.xml
@@ -63,7 +63,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <scope>provided</scope>
     </dependency>
@@ -72,7 +72,7 @@
     are used in the JobBean example.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
     </dependency>
   </dependencies>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/quartz-app/quartz-ra/pom.xml
----------------------------------------------------------------------
diff --git a/examples/quartz-app/quartz-ra/pom.xml b/examples/quartz-app/quartz-ra/pom.xml
index fecead7..38a3313 100644
--- a/examples/quartz-app/quartz-ra/pom.xml
+++ b/examples/quartz-app/quartz-ra/pom.xml
@@ -36,7 +36,7 @@
       <artifactId>quartz</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
     </dependency>
   </dependencies>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/realm-in-tomee/pom.xml
----------------------------------------------------------------------
diff --git a/examples/realm-in-tomee/pom.xml b/examples/realm-in-tomee/pom.xml
index fe5977a..55a06e2 100644
--- a/examples/realm-in-tomee/pom.xml
+++ b/examples/realm-in-tomee/pom.xml
@@ -59,7 +59,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/reload-persistence-unit-properties/pom.xml
----------------------------------------------------------------------
diff --git a/examples/reload-persistence-unit-properties/pom.xml b/examples/reload-persistence-unit-properties/pom.xml
index ad990b0..de3c2e3 100644
--- a/examples/reload-persistence-unit-properties/pom.xml
+++ b/examples/reload-persistence-unit-properties/pom.xml
@@ -52,7 +52,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -69,7 +69,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/resources-declared-in-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/examples/resources-declared-in-webapp/pom.xml b/examples/resources-declared-in-webapp/pom.xml
index 88700e4..3e69fb6 100644
--- a/examples/resources-declared-in-webapp/pom.xml
+++ b/examples/resources-declared-in-webapp/pom.xml
@@ -78,7 +78,7 @@
           <tomcatVersion>7.0.27</tomcatVersion>
           <webapps>
             <webappArtifact>
-              <groupId>org.apache.openejb</groupId>
+              <groupId>org.apache.tomee</groupId>
               <artifactId>openejb-tomcat-plus-webapp</artifactId>
               <version>${openejb.version}</version>
               <contextPath>openejb</contextPath>
@@ -91,7 +91,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/resources-jmx-example/pom.xml
----------------------------------------------------------------------
diff --git a/examples/resources-jmx-example/pom.xml b/examples/resources-jmx-example/pom.xml
index 69c05bf..10e8f43 100644
--- a/examples/resources-jmx-example/pom.xml
+++ b/examples/resources-jmx-example/pom.xml
@@ -90,7 +90,7 @@
       </dependency>
       <!-- Java EE6 dependencies -->
       <dependency>
-        <groupId>org.apache.openejb</groupId>
+        <groupId>org.apache.tomee</groupId>
         <artifactId>javaee-api</artifactId>
         <version>7.0-SNAPSHOT</version>
         <scope>provided</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/resources-jmx-example/resources-jmx-ejb/pom.xml
----------------------------------------------------------------------
diff --git a/examples/resources-jmx-example/resources-jmx-ejb/pom.xml b/examples/resources-jmx-example/resources-jmx-ejb/pom.xml
index c84851a..5a1bbe6 100644
--- a/examples/resources-jmx-example/resources-jmx-ejb/pom.xml
+++ b/examples/resources-jmx-example/resources-jmx-ejb/pom.xml
@@ -50,7 +50,7 @@
 	</build>
 	<dependencies>
 		<dependency>
-			<groupId>org.apache.openejb</groupId>
+			<groupId>org.apache.tomee</groupId>
 			<artifactId>javaee-api</artifactId>
 		</dependency>
 		<dependency>
@@ -58,13 +58,13 @@
 			<artifactId>junit</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.openejb</groupId>
+			<groupId>org.apache.tomee</groupId>
 			<artifactId>arquillian-tomee-remote</artifactId>
 			<version>${version.tomee}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.openejb</groupId>
+			<groupId>org.apache.tomee</groupId>
 			<artifactId>openejb-provisionning</artifactId>
 			<version>${version.openejb}</version>
 			<scope>test</scope>
@@ -76,7 +76,7 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.openejb</groupId>
+			<groupId>org.apache.tomee</groupId>
 			<artifactId>ziplock</artifactId>
 			<version>${version.tomee}</version>
 			<scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/rest-applicationcomposer-mockito/pom.xml
----------------------------------------------------------------------
diff --git a/examples/rest-applicationcomposer-mockito/pom.xml b/examples/rest-applicationcomposer-mockito/pom.xml
index f88ac52..8690b61 100644
--- a/examples/rest-applicationcomposer-mockito/pom.xml
+++ b/examples/rest-applicationcomposer-mockito/pom.xml
@@ -55,7 +55,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -73,19 +73,19 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf-rs</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-mockito</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/rest-applicationcomposer/pom.xml
----------------------------------------------------------------------
diff --git a/examples/rest-applicationcomposer/pom.xml b/examples/rest-applicationcomposer/pom.xml
index bb96b82..f6883b0 100644
--- a/examples/rest-applicationcomposer/pom.xml
+++ b/examples/rest-applicationcomposer/pom.xml
@@ -55,7 +55,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -73,13 +73,13 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf-rs</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/rest-cdi/pom.xml
----------------------------------------------------------------------
diff --git a/examples/rest-cdi/pom.xml b/examples/rest-cdi/pom.xml
index b8fbdcd..b856853 100644
--- a/examples/rest-cdi/pom.xml
+++ b/examples/rest-cdi/pom.xml
@@ -54,7 +54,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -72,7 +72,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf-rs</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/rest-example-with-application/pom.xml
----------------------------------------------------------------------
diff --git a/examples/rest-example-with-application/pom.xml b/examples/rest-example-with-application/pom.xml
index 1b06dc4..2db9797 100644
--- a/examples/rest-example-with-application/pom.xml
+++ b/examples/rest-example-with-application/pom.xml
@@ -76,7 +76,7 @@
           <tomcatVersion>7.0.27</tomcatVersion>
           <webapps>
             <webappArtifact>
-              <groupId>org.apache.openejb</groupId>
+              <groupId>org.apache.tomee</groupId>
               <artifactId>tomee-plus-webapp</artifactId>
               <version>${tomee.version}</version>
               <contextPath>openejb</contextPath>
@@ -88,7 +88,7 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>


[4/4] tomee git commit: org.apache.tomee as main groupId

Posted by rm...@apache.org.
org.apache.tomee as main groupId


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/ac1badea
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/ac1badea
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/ac1badea

Branch: refs/heads/master
Commit: ac1badeab28ec08c632c1d945d5fa44f948cd4eb
Parents: 700a106
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Mon May 18 15:18:26 2015 +0200
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Mon May 18 15:18:26 2015 +0200

----------------------------------------------------------------------
 arquillian/arquillian-common/pom.xml            |  4 +-
 .../arquillian-openejb-embedded-5/pom.xml       | 12 ++--
 .../pom.xml                                     |  4 +-
 arquillian/arquillian-tck/pom.xml               |  4 +-
 arquillian/arquillian-tomee-common/pom.xml      | 22 ++++----
 arquillian/arquillian-tomee-embedded/pom.xml    | 14 ++---
 .../arquillian-tomee-moviefun-example/pom.xml   | 10 ++--
 arquillian/arquillian-tomee-remote/pom.xml      | 14 ++---
 .../arquillian-tomee-codi-tests/pom.xml         |  2 +-
 .../arquillian-tomee-config-tests/pom.xml       |  2 +-
 .../arquillian-tomee-jaxrs-tests/pom.xml        |  6 +-
 .../arquillian-tomee-jaxws-tests/pom.xml        |  4 +-
 .../arquillian-tomee-jms-tests/pom.xml          |  2 +-
 .../arquillian-tomee-webprofile-tests/pom.xml   |  2 +-
 arquillian/arquillian-tomee-tests/pom.xml       | 22 ++++----
 .../arquillian-tomee-webapp-remote/pom.xml      | 28 +++++-----
 arquillian/pom.xml                              |  2 +-
 arquillian/ziplock/pom.xml                      |  6 +-
 assembly/openejb-lite/pom.xml                   |  6 +-
 assembly/openejb-standalone/pom.xml             | 34 ++++++------
 assembly/pom.xml                                |  2 +-
 container/mbean-annotation-api/pom.xml          |  2 +-
 container/openejb-api/pom.xml                   |  4 +-
 container/openejb-core/pom.xml                  | 28 +++++-----
 .../org/apache/openejb/config/ServiceUtils.java |  4 +-
 .../openejb/config/sys/WikiGenerator.java       |  4 +-
 .../config/typed/util/ProviderGenerator.java    |  2 +-
 .../core/stateful/StatefulContainerFactory.java |  2 +-
 .../openejb/util/ContainerClassesFilter.java    |  2 +-
 .../java/org/apache/openejb/util/Logger.java    |  2 +-
 .../openejb/DependenceValidationTest.java       | 16 +++---
 container/openejb-javaagent/pom.xml             |  2 +-
 container/openejb-jee-accessors/pom.xml         |  8 +--
 container/openejb-jee/pom.xml                   |  4 +-
 container/openejb-jpa-integration/pom.xml       |  2 +-
 container/openejb-junit/pom.xml                 |  4 +-
 container/openejb-loader/pom.xml                |  2 +-
 .../openejb/loader/ProvisioningUtilTest.java    |  2 +-
 container/pom.xml                               |  2 +-
 examples/access-timeout-meta/pom.xml            |  4 +-
 examples/access-timeout/pom.xml                 |  4 +-
 examples/alternate-descriptors/pom.xml          |  4 +-
 examples/applet/pom.xml                         | 10 ++--
 examples/application-composer/pom.xml           |  4 +-
 examples/applicationcomposer-jaxws-cdi/pom.xml  |  6 +-
 examples/applicationexception/pom.xml           |  4 +-
 examples/arquillian-jpa/pom.xml                 |  6 +-
 examples/async-methods/pom.xml                  |  4 +-
 examples/async-postconstruct/pom.xml            |  4 +-
 .../bean-validation-design-by-contract/pom.xml  |  4 +-
 .../WebApp1/pom.xml                             |  4 +-
 .../WebApp2/pom.xml                             |  2 +-
 examples/bval-evaluation-redeployment/pom.xml   |  8 +--
 .../bval-evaluation-redeployment/runner/pom.xml |  4 +-
 .../cdi-alternative-and-stereotypes/pom.xml     |  4 +-
 examples/cdi-application-scope/pom.xml          |  4 +-
 examples/cdi-basic/pom.xml                      |  4 +-
 examples/cdi-ejbcontext-jaas/pom.xml            |  4 +-
 examples/cdi-events/pom.xml                     |  4 +-
 examples/cdi-interceptors/pom.xml               |  4 +-
 examples/cdi-produces-disposes/pom.xml          |  4 +-
 examples/cdi-produces-field/pom.xml             |  4 +-
 examples/cdi-realm/pom.xml                      |  4 +-
 examples/cdi-request-scope/pom.xml              |  4 +-
 examples/cdi-session-scope/pom.xml              |  2 +-
 examples/change-jaxws-url/pom.xml               | 12 ++--
 examples/client-resource-lookup-preview/pom.xml |  8 +--
 examples/component-interfaces/pom.xml           |  4 +-
 examples/cucumber-jvm/pom.xml                   |  4 +-
 examples/custom-injection/pom.xml               |  4 +-
 examples/datasource-ciphered-password/pom.xml   |  4 +-
 examples/datasource-definition/pom.xml          |  4 +-
 examples/datasource-versioning/pom.xml          |  6 +-
 examples/decorators/pom.xml                     |  4 +-
 examples/deltaspike-configproperty/pom.xml      |  6 +-
 examples/deltaspike-exception-handling/pom.xml  |  6 +-
 examples/deltaspike-fullstack/pom.xml           |  4 +-
 examples/deltaspike-i18n/pom.xml                |  6 +-
 examples/dynamic-dao-implementation/pom.xml     |  4 +-
 examples/dynamic-datasource-routing/pom.xml     |  4 +-
 examples/dynamic-implementation/pom.xml         |  6 +-
 examples/dynamic-proxy-to-access-mbean/pom.xml  |  6 +-
 examples/ear-testing/business-logic/pom.xml     |  4 +-
 examples/ear-testing/business-model/pom.xml     |  2 +-
 examples/ear-testing/pom.xml                    |  2 +-
 examples/ejb-examples/pom.xml                   |  4 +-
 examples/ejb-webservice/pom.xml                 |  2 +-
 examples/groovy-cdi/pom.xml                     |  6 +-
 examples/groovy-jpa/pom.xml                     |  6 +-
 examples/groovy-spock/pom.xml                   |  6 +-
 examples/helloworld-weblogic/pom.xml            |  4 +-
 examples/injection-of-connectionfactory/pom.xml |  4 +-
 examples/injection-of-datasource/pom.xml        |  4 +-
 examples/injection-of-ejbs/pom.xml              |  4 +-
 examples/injection-of-entitymanager/pom.xml     |  4 +-
 examples/injection-of-env-entry/pom.xml         |  4 +-
 examples/interceptors/pom.xml                   |  4 +-
 examples/jpa-eclipselink/pom.xml                |  4 +-
 examples/jpa-enumerated/pom.xml                 |  4 +-
 examples/jpa-hibernate/pom.xml                  |  4 +-
 examples/jsf-cdi-and-ejb/pom.xml                |  2 +-
 examples/jsf-managedBean-and-ejb/pom.xml        |  2 +-
 examples/lookup-of-ejbs-with-descriptor/pom.xml |  4 +-
 examples/lookup-of-ejbs/pom.xml                 |  4 +-
 examples/mbean-auto-registration/pom.xml        |  6 +-
 examples/moviefun-rest/pom.xml                  | 12 ++--
 examples/moviefun/pom.xml                       | 12 ++--
 examples/movies-complete-meta/pom.xml           |  4 +-
 examples/movies-complete/pom.xml                |  4 +-
 examples/mtom/pom.xml                           |  6 +-
 examples/multi-jpa-provider-testing/pom.xml     |  8 +--
 examples/multiple-arquillian-adapters/pom.xml   | 12 ++--
 examples/multiple-tomee-arquillian/pom.xml      |  8 +--
 examples/myfaces-codi-demo/pom.xml              |  2 +-
 examples/persistence-fragment/pom.xml           |  4 +-
 examples/pojo-webservice/pom.xml                |  2 +-
 examples/polling-parent/polling-client/pom.xml  |  4 +-
 examples/polling-parent/polling-core/pom.xml    |  6 +-
 examples/polling-parent/polling-domain/pom.xml  |  2 +-
 examples/polling-parent/polling-web/pom.xml     | 10 ++--
 examples/polling-parent/pom.xml                 | 14 ++---
 examples/pom.xml                                |  2 +-
 examples/projectstage-demo/pom.xml              |  6 +-
 examples/quartz-app/pom.xml                     |  4 +-
 examples/quartz-app/quartz-beans/pom.xml        |  4 +-
 examples/quartz-app/quartz-ra/pom.xml           |  2 +-
 examples/realm-in-tomee/pom.xml                 |  2 +-
 .../reload-persistence-unit-properties/pom.xml  |  4 +-
 examples/resources-declared-in-webapp/pom.xml   |  4 +-
 examples/resources-jmx-example/pom.xml          |  2 +-
 .../resources-jmx-ejb/pom.xml                   |  8 +--
 .../rest-applicationcomposer-mockito/pom.xml    |  8 +--
 examples/rest-applicationcomposer/pom.xml       |  6 +-
 examples/rest-cdi/pom.xml                       |  4 +-
 examples/rest-example-with-application/pom.xml  |  4 +-
 examples/rest-example/pom.xml                   | 10 ++--
 examples/rest-jaas/pom.xml                      |  2 +-
 examples/rest-on-ejb/pom.xml                    |  6 +-
 examples/rest-xml-json/pom.xml                  |  4 +-
 examples/scala-basic/pom.xml                    |  4 +-
 examples/schedule-events/pom.xml                |  4 +-
 examples/schedule-expression/pom.xml            |  4 +-
 examples/schedule-methods-meta/pom.xml          |  4 +-
 examples/schedule-methods/pom.xml               |  4 +-
 examples/server-events/pom.xml                  |  6 +-
 examples/simple-cdi-interceptor/pom.xml         |  4 +-
 examples/simple-cmp2/pom.xml                    |  6 +-
 examples/simple-mdb-and-cdi/pom.xml             |  4 +-
 examples/simple-mdb-with-descriptor/pom.xml     |  4 +-
 examples/simple-mdb/pom.xml                     |  4 +-
 examples/simple-rest/pom.xml                    |  4 +-
 examples/simple-singleton/pom.xml               |  4 +-
 examples/simple-stateful-callbacks/pom.xml      |  4 +-
 examples/simple-stateful/pom.xml                |  4 +-
 examples/simple-stateless-callbacks/pom.xml     |  4 +-
 .../simple-stateless-with-descriptor/pom.xml    |  6 +-
 examples/simple-stateless/pom.xml               |  4 +-
 .../simple-webservice-without-interface/pom.xml |  4 +-
 examples/simple-webservice/pom.xml              |  4 +-
 examples/spring-data-proxy-meta/pom.xml         |  4 +-
 examples/spring-data-proxy/pom.xml              |  4 +-
 examples/struts/pom.xml                         |  2 +-
 examples/telephone-stateful/pom.xml             |  4 +-
 examples/testcase-injection/pom.xml             |  4 +-
 examples/testing-security-2/pom.xml             |  4 +-
 examples/testing-security-3/pom.xml             |  4 +-
 examples/testing-security-4/pom.xml             |  4 +-
 examples/testing-security-meta/pom.xml          |  4 +-
 examples/testing-security/pom.xml               |  4 +-
 examples/testing-transactions-bmt/pom.xml       |  4 +-
 examples/testing-transactions/pom.xml           |  4 +-
 examples/tomee-jersey-eclipselink/pom.xml       |  2 +-
 examples/transaction-rollback/pom.xml           |  4 +-
 examples/troubleshooting/pom.xml                |  4 +-
 examples/webservice-attachments/pom.xml         |  4 +-
 examples/webservice-handlerchain/pom.xml        |  4 +-
 examples/webservice-holder/pom.xml              |  4 +-
 examples/webservice-inheritance/pom.xml         |  4 +-
 examples/webservice-security/pom.xml            |  4 +-
 examples/webservice-ws-security/pom.xml         |  4 +-
 .../webservice-ws-with-resources-config/pom.xml |  2 +-
 itests/failover-ejb/pom.xml                     |  5 +-
 itests/failover/pom.xml                         | 10 ++--
 .../itest/failover/DiscoveryHostTest.java       |  2 +-
 .../failover/RandomConnectionStrategyTest.java  |  2 +-
 .../ReconnectDelayCaseInsensitiveTest.java      |  2 +-
 .../failover/ReconnectDelayListSelfTest.java    |  2 +-
 .../itest/failover/ReconnectDelayTest.java      |  2 +-
 .../RoundRobinConnectionStrategyTest.java       |  2 +-
 .../failover/StickyConnectionStrategyTest.java  |  2 +-
 itests/legacy-client/pom.xml                    |  6 +-
 .../openejb/itest/legacy/LegacyClientTest.java  |  4 +-
 itests/legacy-server/pom.xml                    |  2 +-
 .../openejb/itest/legacy/LegacyServerTest.java  |  4 +-
 itests/openejb-itests-app/pom.xml               | 16 +++---
 itests/openejb-itests-beans/pom.xml             |  4 +-
 itests/openejb-itests-client/pom.xml            |  8 +--
 itests/openejb-itests-interceptor-beans/pom.xml |  6 +-
 itests/openejb-itests-servlets/pom.xml          |  6 +-
 itests/openejb-itests-web/pom.xml               |  6 +-
 itests/pom.xml                                  |  2 +-
 maven/applicationcomposer-maven-plugin/pom.xml  |  2 +-
 maven/jarstxt-maven-plugin/pom.xml              |  2 +-
 maven/maven-util/pom.xml                        |  4 +-
 maven/openejb-embedded-maven-plugin/pom.xml     |  2 +-
 maven/pom.xml                                   |  6 +-
 maven/tomee-embedded-maven-plugin/pom.xml       |  2 +-
 maven/tomee-maven-plugin/pom.xml                |  8 +--
 .../openejb/maven/plugin/AbstractTomEEMojo.java |  6 +-
 .../maven/plugin/TomEEMavenPluginRule.java      |  2 +-
 .../main/resources/archetype-resources/pom.xml  |  8 +--
 pom.xml                                         | 10 ++--
 server/openejb-activemq/pom.xml                 |  4 +-
 server/openejb-axis/pom.xml                     |  6 +-
 server/openejb-bonecp/pom.xml                   |  4 +-
 server/openejb-client/pom.xml                   |  4 +-
 server/openejb-common-cli/pom.xml               |  4 +-
 server/openejb-cxf-rs/pom.xml                   |  2 +-
 server/openejb-cxf-transport/pom.xml            |  2 +-
 server/openejb-cxf/pom.xml                      |  2 +-
 server/openejb-daemon/pom.xml                   |  4 +-
 server/openejb-derbynet/pom.xml                 |  8 +--
 server/openejb-ejbd/pom.xml                     | 20 +++----
 server/openejb-hessian/pom.xml                  |  6 +-
 server/openejb-hsql/pom.xml                     |  8 +--
 server/openejb-http/pom.xml                     | 16 +++---
 server/openejb-multicast/pom.xml                |  4 +-
 server/openejb-rest/pom.xml                     |  2 +-
 server/openejb-server/pom.xml                   | 12 ++--
 server/openejb-ssh/pom.xml                      |  2 +-
 server/openejb-webservices/pom.xml              | 12 ++--
 server/pom.xml                                  |  2 +-
 tck/bval-embedded/pom.xml                       |  6 +-
 tck/bval-tomee/pom.xml                          |  8 +--
 tck/cdi-embedded/pom.xml                        | 14 ++---
 tck/cdi-embedded/src/test/resources/failing.xml |  2 +-
 tck/cdi-tomee-embedded/pom.xml                  | 10 ++--
 tck/cdi-tomee/pom.xml                           | 22 ++++----
 tck/pom.xml                                     |  2 +-
 tck/tck-common/pom.xml                          |  4 +-
 tomee/apache-tomee/pom.xml                      | 16 +++---
 .../main/groovy/commands/SetupCommand.groovy    |  2 +-
 tomee/pom.xml                                   | 38 ++++++-------
 tomee/tomee-catalina/pom.xml                    | 18 +++---
 tomee/tomee-common/pom.xml                      |  6 +-
 tomee/tomee-deb/pom.xml                         | 18 +++---
 tomee/tomee-embedded/pom.xml                    | 22 ++++----
 tomee/tomee-jaxrs/pom.xml                       | 20 +++----
 tomee/tomee-jdbc/pom.xml                        |  4 +-
 tomee/tomee-juli/pom.xml                        |  2 +-
 tomee/tomee-loader/pom.xml                      |  8 +--
 tomee/tomee-mojarra/pom.xml                     |  4 +-
 tomee/tomee-myfaces/pom.xml                     |  4 +-
 tomee/tomee-overlay-runner/pom.xml              | 11 ++--
 tomee/tomee-plume-webapp/pom.xml                | 34 ++++++------
 tomee/tomee-plus-webapp/pom.xml                 | 32 +++++------
 tomee/tomee-util/pom.xml                        |  4 +-
 tomee/tomee-webaccess/pom.xml                   | 18 +++---
 tomee/tomee-webapp/pom.xml                      | 58 ++++++++++----------
 tomee/tomee-webservices/pom.xml                 | 26 ++++-----
 utils/openejb-core-eclipselink/pom.xml          |  4 +-
 utils/openejb-core-hibernate/pom.xml            |  4 +-
 utils/openejb-mockito/pom.xml                   |  4 +-
 utils/openejb-provisionning/pom.xml             |  2 +-
 utils/pom.xml                                   |  2 +-
 utils/webdeployer/pom.xml                       |  6 +-
 266 files changed, 826 insertions(+), 828 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/arquillian/arquillian-common/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-common/pom.xml b/arquillian/arquillian-common/pom.xml
index 271e047..8dc100d 100644
--- a/arquillian/arquillian-common/pom.xml
+++ b/arquillian/arquillian-common/pom.xml
@@ -21,7 +21,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>arquillian</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
 
@@ -32,7 +32,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>${openejb.version}</version>
       <scope>provided</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/arquillian/arquillian-openejb-embedded-5/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-openejb-embedded-5/pom.xml b/arquillian/arquillian-openejb-embedded-5/pom.xml
index 37ffbc4..84ef521 100644
--- a/arquillian/arquillian-openejb-embedded-5/pom.xml
+++ b/arquillian/arquillian-openejb-embedded-5/pom.xml
@@ -21,7 +21,7 @@
          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>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -32,7 +32,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>${openejb.version}</version>
     </dependency>
@@ -118,13 +118,13 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-common</artifactId>
       <version>${tomee.version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-openejb-transaction-provider</artifactId>
       <version>${tomee.version}</version>
     </dependency>
@@ -150,14 +150,14 @@
     </dependency>
 
     <dependency> <!-- shouldn't be a compile/runtime dependency -->
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-http</artifactId>
       <version>${openejb.version}</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf-rs</artifactId>
       <version>${openejb.version}</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/arquillian/arquillian-openejb-transaction-provider/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-openejb-transaction-provider/pom.xml b/arquillian/arquillian-openejb-transaction-provider/pom.xml
index c89010a..6ee23f3 100644
--- a/arquillian/arquillian-openejb-transaction-provider/pom.xml
+++ b/arquillian/arquillian-openejb-transaction-provider/pom.xml
@@ -21,7 +21,7 @@
          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>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -31,7 +31,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>${openejb.version}</version>
       <scope>provided</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/arquillian/arquillian-tck/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tck/pom.xml b/arquillian/arquillian-tck/pom.xml
index c47d6f7..bd34df1 100644
--- a/arquillian/arquillian-tck/pom.xml
+++ b/arquillian/arquillian-tck/pom.xml
@@ -21,7 +21,7 @@
          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>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -61,7 +61,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-tomee-remote</artifactId>
       <version>${tomee.version}</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/arquillian/arquillian-tomee-common/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-common/pom.xml b/arquillian/arquillian-tomee-common/pom.xml
index 5e0ab92..4142687 100644
--- a/arquillian/arquillian-tomee-common/pom.xml
+++ b/arquillian/arquillian-tomee-common/pom.xml
@@ -21,7 +21,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>arquillian</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>arquillian-tomee-common</artifactId>
@@ -37,7 +37,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-common</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -61,14 +61,14 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>${javaee-api.version}</version>
       <type>jar</type>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-util</artifactId>
       <version>${tomee.version}</version>
     </dependency>
@@ -85,14 +85,14 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-jee</artifactId>
       <version>${openejb.version}</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>${openejb.version}</version>
       <type>jar</type>
@@ -100,7 +100,7 @@
       <exclusions>
         <exclusion>
           <artifactId>mbean-annotation-api</artifactId>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
         </exclusion>
         <exclusion>
           <artifactId>commons-lang3</artifactId>
@@ -108,19 +108,19 @@
         </exclusion>
         <exclusion>
           <artifactId>javaee-api-embedded</artifactId>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
         </exclusion>
         <exclusion>
           <artifactId>openejb-api</artifactId>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
         </exclusion>
         <exclusion>
           <artifactId>openejb-javaagent</artifactId>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
         </exclusion>
         <exclusion>
           <artifactId>openejb-jee</artifactId>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
         </exclusion>
         <exclusion>
           <artifactId>commons-cli</artifactId>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/arquillian/arquillian-tomee-embedded/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-embedded/pom.xml b/arquillian/arquillian-tomee-embedded/pom.xml
index 98e8ca9..18bd5a2 100644
--- a/arquillian/arquillian-tomee-embedded/pom.xml
+++ b/arquillian/arquillian-tomee-embedded/pom.xml
@@ -21,7 +21,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>arquillian</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>arquillian-tomee-embedded</artifactId>
@@ -32,13 +32,13 @@
   <dependencies>
 
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-embedded</artifactId>
       <version>${tomee.version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-openejb-transaction-provider</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -113,25 +113,25 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-tomee-common</artifactId>
       <version>${project.version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-webservices</artifactId>
       <version>${tomee.version}</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-common</artifactId>
       <version>${tomee.version}</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/arquillian/arquillian-tomee-moviefun-example/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-moviefun-example/pom.xml b/arquillian/arquillian-tomee-moviefun-example/pom.xml
index f08a812..489eed6 100644
--- a/arquillian/arquillian-tomee-moviefun-example/pom.xml
+++ b/arquillian/arquillian-tomee-moviefun-example/pom.xml
@@ -16,7 +16,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <artifactId>arquillian</artifactId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
@@ -104,7 +104,7 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <scope>provided</scope>
     </dependency>
@@ -249,7 +249,7 @@
       <artifactId>log4j</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-embedded</artifactId>
       <version>${tomee.version}</version>
       <!--<classifier>uber</classifier>-->
@@ -284,7 +284,7 @@
       </activation>
       <dependencies>
         <dependency>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
           <artifactId>arquillian-tomee-embedded</artifactId>
           <version>${tomee.version}</version>
           <scope>test</scope>
@@ -295,7 +295,7 @@
       <id>arquillian-tomee-remote</id>
       <dependencies>
         <dependency>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
           <artifactId>arquillian-tomee-remote</artifactId>
           <version>${tomee.version}</version>
           <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/arquillian/arquillian-tomee-remote/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-remote/pom.xml b/arquillian/arquillian-tomee-remote/pom.xml
index d8d9035..f6f6522 100644
--- a/arquillian/arquillian-tomee-remote/pom.xml
+++ b/arquillian/arquillian-tomee-remote/pom.xml
@@ -21,7 +21,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>arquillian</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>arquillian-tomee-remote</artifactId>
@@ -31,7 +31,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-openejb-transaction-provider</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -89,7 +89,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>apache-tomee</artifactId>
       <type>zip</type>
       <version>7.0.0-SNAPSHOT</version>
@@ -112,14 +112,14 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-client</artifactId>
       <version>${openejb.version}</version>
       <type>jar</type>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-tomee-common</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <type>jar</type>
@@ -127,7 +127,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-common</artifactId>
       <version>${tomee.version}</version>
       <type>jar</type>
@@ -146,7 +146,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-common</artifactId>
       <version>7.0.0-SNAPSHOT</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/arquillian/arquillian-tomee-tests/arquillian-tomee-codi-tests/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-codi-tests/pom.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-codi-tests/pom.xml
index 6c90260..fb4cca9 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-codi-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-codi-tests/pom.xml
@@ -22,7 +22,7 @@
 
   <parent>
     <artifactId>arquillian-tomee-tests</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/arquillian/arquillian-tomee-tests/arquillian-tomee-config-tests/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-config-tests/pom.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-config-tests/pom.xml
index 2d7c3f3..36a6ddc 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-config-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-config-tests/pom.xml
@@ -22,7 +22,7 @@
 
   <parent>
     <artifactId>arquillian-tomee-tests</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/pom.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/pom.xml
index b507500..028145f 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/pom.xml
@@ -22,7 +22,7 @@
 
   <parent>
     <artifactId>arquillian-tomee-tests</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
 
@@ -31,13 +31,13 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-jaxrs</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-webapp</artifactId>
       <version>${tomee.version}</version>
       <type>war</type>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/pom.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/pom.xml
index 57865b9..e89430f 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/pom.xml
@@ -22,7 +22,7 @@
 
   <parent>
     <artifactId>arquillian-tomee-tests</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
 
@@ -31,7 +31,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-webservices</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/pom.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/pom.xml
index 170dcaa..54734e0 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/pom.xml
@@ -22,7 +22,7 @@
 
   <parent>
     <artifactId>arquillian-tomee-tests</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/pom.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/pom.xml
index eecaf52..d3e8509 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/pom.xml
@@ -22,7 +22,7 @@
 
   <parent>
     <artifactId>arquillian-tomee-tests</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/arquillian/arquillian-tomee-tests/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-tests/pom.xml b/arquillian/arquillian-tomee-tests/pom.xml
index 090ef28..e402332 100644
--- a/arquillian/arquillian-tomee-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/pom.xml
@@ -14,7 +14,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>arquillian</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>arquillian-tomee-tests</artifactId>
@@ -33,7 +33,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
     </dependency>
 
@@ -58,7 +58,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>ziplock</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -114,14 +114,14 @@
       <version>${project.version}</version>
     </dependency>
     <dependency> <!-- tomee-embedded needs it + dependencies but tomee-*-remote doesn't need dependencies so to avoid conflicts bringing it back here -->
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
     </dependency>
 
     <!-- just to get it in the correct order -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>apache-tomee</artifactId>
       <version>${tomee.version}</version>
       <classifier>webprofile</classifier>
@@ -404,21 +404,21 @@
 
         <!-- just to get it in the correct order -->
         <dependency>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
           <artifactId>apache-tomee</artifactId>
           <version>${tomee.version}</version>
           <classifier>webprofile</classifier>
           <type>zip</type>
         </dependency>
         <dependency>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
           <artifactId>apache-tomee</artifactId>
           <version>${tomee.version}</version>
           <classifier>plus</classifier>
           <type>zip</type>
         </dependency>
         <dependency>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
           <artifactId>apache-tomee</artifactId>
           <version>${tomee.version}</version>
           <classifier>plume</classifier>
@@ -426,19 +426,19 @@
         </dependency>
 
         <dependency>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
           <artifactId>tomee-webapp</artifactId>
           <version>${tomee.version}</version>
           <type>war</type>
         </dependency>
         <dependency>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
           <artifactId>tomee-plus-webapp</artifactId>
           <version>${tomee.version}</version>
           <type>war</type>
         </dependency>
         <dependency>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
           <artifactId>tomee-plume-webapp</artifactId>
           <version>${tomee.version}</version>
           <type>war</type>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/arquillian/arquillian-tomee-webapp-remote/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-webapp-remote/pom.xml b/arquillian/arquillian-tomee-webapp-remote/pom.xml
index 596172d..09083c8 100644
--- a/arquillian/arquillian-tomee-webapp-remote/pom.xml
+++ b/arquillian/arquillian-tomee-webapp-remote/pom.xml
@@ -21,7 +21,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>arquillian</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>arquillian-tomee-webapp-remote</artifactId>
@@ -31,7 +31,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-openejb-transaction-provider</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -108,18 +108,18 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-client</artifactId>
       <version>${openejb.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>${openejb.version}</version>
       <exclusions>
         <exclusion>
           <artifactId>mbean-annotation-api</artifactId>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
         </exclusion>
         <exclusion>
           <artifactId>commons-lang3</artifactId>
@@ -127,19 +127,19 @@
         </exclusion>
         <exclusion>
           <artifactId>javaee-api-embedded</artifactId>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
         </exclusion>
         <exclusion>
           <artifactId>openejb-api</artifactId>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
         </exclusion>
         <exclusion>
           <artifactId>openejb-javaagent</artifactId>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
         </exclusion>
         <exclusion>
           <artifactId>openejb-jee</artifactId>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
         </exclusion>
         <exclusion>
           <artifactId>commons-cli</artifactId>
@@ -251,7 +251,7 @@
         </exclusion>
         <exclusion>
           <artifactId>javaee-api</artifactId>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
         </exclusion>
         <exclusion>
           <artifactId>openejb-bval</artifactId>
@@ -259,17 +259,17 @@
         </exclusion>
         <exclusion>
           <artifactId>mbean-annotation-api</artifactId>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
         </exclusion>
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-tomee-common</artifactId>
       <version>${tomee.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>tomee-common</artifactId>
       <version>${tomee.version}</version>
     </dependency>
@@ -291,7 +291,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-common</artifactId>
       <version>${tomee.version}</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/arquillian/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/pom.xml b/arquillian/pom.xml
index dfd0434..273d193 100644
--- a/arquillian/pom.xml
+++ b/arquillian/pom.xml
@@ -22,7 +22,7 @@
 
   <parent>
     <artifactId>openejb</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/arquillian/ziplock/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/ziplock/pom.xml b/arquillian/ziplock/pom.xml
index 82ca776..18cb8f8 100644
--- a/arquillian/ziplock/pom.xml
+++ b/arquillian/ziplock/pom.xml
@@ -21,7 +21,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>arquillian</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>ziplock</artifactId>
@@ -44,12 +44,12 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-jee</artifactId>
       <version>${openejb.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>${javaee-api.version}</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/assembly/openejb-lite/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/openejb-lite/pom.xml b/assembly/openejb-lite/pom.xml
index 28781a7..801dada 100644
--- a/assembly/openejb-lite/pom.xml
+++ b/assembly/openejb-lite/pom.xml
@@ -22,7 +22,7 @@
 <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/maven-v4_0_0.xsd">
   <parent>
     <artifactId>assembly</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -69,11 +69,11 @@
   <dependencies>
     <dependency>
 
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>${project.version}</version>
       <exclusions>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/assembly/openejb-standalone/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/openejb-standalone/pom.xml b/assembly/openejb-standalone/pom.xml
index 4620a71..427dec2 100644
--- a/assembly/openejb-standalone/pom.xml
+++ b/assembly/openejb-standalone/pom.xml
@@ -22,7 +22,7 @@
 <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/maven-v4_0_0.xsd">
   <parent>
     <artifactId>assembly</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -118,17 +118,17 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-loader</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
     </dependency>
     <dependency>
@@ -136,50 +136,50 @@
       <artifactId>geronimo-javamail_1.4_mail</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-client</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-server</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-ejbd</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-multicast</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-hsql</artifactId>
       <version>${project.version}</version>
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-http</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf</artifactId>
       <version>${project.version}</version>
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf-rs</artifactId>
       <version>${project.version}</version>
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-daemon</artifactId>
       <version>${project.version}</version>
       <optional>true</optional>
@@ -190,13 +190,13 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-itests-client</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-itests-beans</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
@@ -211,12 +211,12 @@
       </properties>
       <dependencies>
         <dependency>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
           <artifactId>openejb-itests-client</artifactId>
           <version>${project.version}</version>
         </dependency>
         <dependency>
-          <groupId>org.apache.openejb</groupId>
+          <groupId>org.apache.tomee</groupId>
           <artifactId>openejb-itests-beans</artifactId>
           <version>${project.version}</version>
         </dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index a4ee8f1..d6f7461 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -21,7 +21,7 @@
 <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/maven-v4_0_0.xsd">
   <parent>
     <artifactId>openejb</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/container/mbean-annotation-api/pom.xml
----------------------------------------------------------------------
diff --git a/container/mbean-annotation-api/pom.xml b/container/mbean-annotation-api/pom.xml
index 1a5a2a1..59ca677 100644
--- a/container/mbean-annotation-api/pom.xml
+++ b/container/mbean-annotation-api/pom.xml
@@ -20,7 +20,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>container</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>mbean-annotation-api</artifactId>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/container/openejb-api/pom.xml
----------------------------------------------------------------------
diff --git a/container/openejb-api/pom.xml b/container/openejb-api/pom.xml
index 889fb5d..b2c9cb3 100644
--- a/container/openejb-api/pom.xml
+++ b/container/openejb-api/pom.xml
@@ -22,7 +22,7 @@
 <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/maven-v4_0_0.xsd">
   <parent>
     <artifactId>container</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
 
@@ -37,7 +37,7 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
     </dependency>
   </dependencies>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/container/openejb-core/pom.xml
----------------------------------------------------------------------
diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml
index 53373ea..47badbf 100644
--- a/container/openejb-core/pom.xml
+++ b/container/openejb-core/pom.xml
@@ -24,7 +24,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>container</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -270,7 +270,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>org.apache.openejb</groupId>
+                  <groupId>org.apache.tomee</groupId>
                   <artifactId>openejb-javaagent</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}</outputDirectory>
@@ -419,17 +419,17 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>mbean-annotation-api</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-jpa-integration</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
     </dependency>
 
@@ -449,32 +449,32 @@
       <groupId>org.apache.commons</groupId>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-api</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-loader</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-javaagent</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-jee</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-jee-accessors</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-itests-app</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
@@ -486,19 +486,19 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-itests-beans</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-itests-interceptor-beans</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-itests-client</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/container/openejb-core/src/main/java/org/apache/openejb/config/ServiceUtils.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/ServiceUtils.java b/container/openejb-core/src/main/java/org/apache/openejb/config/ServiceUtils.java
index 6ae97e2..f37d025 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/ServiceUtils.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/ServiceUtils.java
@@ -40,13 +40,13 @@ public class ServiceUtils {
      * Default service provider package.  This value is choosen as follows:
      * </p>
      * 1. System property "openejb.provider.default" </br>
-     * 2. If in a full server containing a "conf" directory "org.apache.openejb" </br>
+     * 2. If in a full server containing a "conf" directory "org.apache.tomee" </br>
      * 3. Embedded mode "org.apache.openejb.embedded" </br>
      */
     public static final String DEFAULT_PROVIDER_URL;
 
     static {
-        String defaultValue = "org.apache.openejb";
+        String defaultValue = "org.apache.tomee";
         try {
             final SystemInstance system = SystemInstance.get();
             if (system.getProperty("openejb.embedded") != null) {

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/container/openejb-core/src/main/java/org/apache/openejb/config/sys/WikiGenerator.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/sys/WikiGenerator.java b/container/openejb-core/src/main/java/org/apache/openejb/config/sys/WikiGenerator.java
index 69d6c8f..40881d3 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/sys/WikiGenerator.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/sys/WikiGenerator.java
@@ -37,8 +37,8 @@ public class WikiGenerator {
         System.out.println();
         System.out.println();
 
-        new WikiGenerator("org.apache.openejb", new PrintWriter(System.out)).generate();
-//        new WikiGenerator("org.apache.openejb", new PrintWriter(new File("/Users/dblevins/work/all/website/content/containers-and-resources.mdtext"))).generate();
+        new WikiGenerator("org.apache.tomee", new PrintWriter(System.out)).generate();
+//        new WikiGenerator("org.apache.tomee", new PrintWriter(new File("/Users/dblevins/work/all/website/content/containers-and-resources.mdtext"))).generate();
 
         System.out.println();
         System.out.println();

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/container/openejb-core/src/main/java/org/apache/openejb/config/typed/util/ProviderGenerator.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/typed/util/ProviderGenerator.java b/container/openejb-core/src/main/java/org/apache/openejb/config/typed/util/ProviderGenerator.java
index 2e85cb6..2756873 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/typed/util/ProviderGenerator.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/typed/util/ProviderGenerator.java
@@ -49,7 +49,7 @@ public class ProviderGenerator extends Resource {
 
         final Set<String> seen = new HashSet<String>();
 
-        final List<ServiceProvider> providers = manager.load("org.apache.openejb");
+        final List<ServiceProvider> providers = manager.load("org.apache.tomee");
         for (final ServiceProvider provider : providers) {
             final List<String> types = provider.getTypes();
             final String name = guessBuilder(types);

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainerFactory.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainerFactory.java b/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainerFactory.java
index 4e3092c..409c824 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainerFactory.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainerFactory.java
@@ -157,7 +157,7 @@ public class StatefulContainerFactory {
         if (classLoader == null) getClass().getClassLoader();
         */
         ClassLoader classLoader = StatefulContainerFactory.class.getClassLoader();
-        if (!((String) cache).startsWith("org.apache.openejb")) { // user impl?
+        if (!((String) cache).startsWith("org.apache.tomee")) { // user impl?
             classLoader = Thread.currentThread().getContextClassLoader();
         }
         cache = serviceRecipe.create(classLoader);

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/container/openejb-core/src/main/java/org/apache/openejb/util/ContainerClassesFilter.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/ContainerClassesFilter.java b/container/openejb-core/src/main/java/org/apache/openejb/util/ContainerClassesFilter.java
index 371e8d8..9b31f9d 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/ContainerClassesFilter.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/ContainerClassesFilter.java
@@ -46,7 +46,7 @@ public class ContainerClassesFilter implements Filter {
         excluded.add("org.apache.oro");
         excluded.add("org.apache.ws");
         excluded.add("org.apache.jcp");
-        excluded.add("org.apache.openejb");
+        excluded.add("org.apache.tomee");
         excluded.add("org.apache.tomee");
         excluded.add("org.apache.tomcat");
         excluded.add("org.apache.juli");

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java b/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
index 4680cba..b32026b 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
@@ -32,7 +32,7 @@ import java.util.ResourceBundle;
 
 public class Logger {
     private static final String SUFFIX = ".Messages";
-    private static final String OPENEJB = "org.apache.openejb";
+    private static final String OPENEJB = "org.apache.tomee";
     private static LogStreamFactory logStreamFactory;
 
     // don't return the instance since it needs to stay private but export which one is used to allow integration with other libs (as tomcat ;))

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/container/openejb-core/src/test/java/org/apache/openejb/DependenceValidationTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/DependenceValidationTest.java b/container/openejb-core/src/test/java/org/apache/openejb/DependenceValidationTest.java
index c817978..37d70e9 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/DependenceValidationTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/DependenceValidationTest.java
@@ -57,19 +57,19 @@ public class DependenceValidationTest extends TestCase {
 
         // Nothing may depend on the Assembler except the config code and events
         final String dynamicAssembler = "org.apache.openejb.assembler.dynamic";
-        assertNotDependentOn("org.apache.openejb", "org.apache.openejb.assembler.classic", "org.apache.openejb.config.typed.util", "org.apache.openejb.assembler", "org.apache.openejb.assembler.classic.util", "org.apache.openejb.config", "org.apache.openejb.assembler.dynamic", "org.apache.openejb.assembler.classic.cmd", "org.apache.openejb.assembler.monitoring", "org.apache.openejb.cdi", "org.apache.openejb.junit", "org.apache.openejb.assembler.classic.event", "org.apache.openejb.web", "org.apache.openejb.testng", "org.apache.openejb.testing");
+        assertNotDependentOn("org.apache.tomee", "org.apache.openejb.assembler.classic", "org.apache.openejb.config.typed.util", "org.apache.openejb.assembler", "org.apache.openejb.assembler.classic.util", "org.apache.openejb.config", "org.apache.openejb.assembler.dynamic", "org.apache.openejb.assembler.classic.cmd", "org.apache.openejb.assembler.monitoring", "org.apache.openejb.cdi", "org.apache.openejb.junit", "org.apache.openejb.assembler.classic.event", "org.apache.openejb.web", "org.apache.openejb.testng", "org.apache.openejb.testing");
 
         // Nothing may depend on the Dynamic Assembler
-        assertNotDependentOn("org.apache.openejb", dynamicAssembler);
+        assertNotDependentOn("org.apache.tomee", dynamicAssembler);
 
         // Nothing may depend on the JAXB Tree except the Config code
-        assertNotDependentOn("org.apache.openejb", "org.apache.openejb.jee",
+        assertNotDependentOn("org.apache.tomee", "org.apache.openejb.jee",
                 "org.apache.openejb.config", "org.apache.openejb.config.rules", "org.apache.openejb.config.sys",
                 "org.apache.openejb.cdi", "org.apache.openejb.junit", "org.apache.openejb.testng", "org.apache.openejb.testing",
                 "org.apache.openejb.service");
 
         // Nothing may depend on the Config code except it's subpackages
-        assertNotDependentOn("org.apache.openejb", "org.apache.openejb.config",
+        assertNotDependentOn("org.apache.tomee", "org.apache.openejb.config",
                 "org.apache.openejb.config.event", "org.apache.openejb.config.typed.util", "org.apache.openejb.config.rules",
                 "org.apache.openejb.config.sys", "org.apache.openejb.assembler", "org.apache.openejb.cdi", "org.apache.openejb.junit",
                 "org.apache.openejb.testng", "org.apache.openejb.testing", dynamicAssembler, "org.apache.openejb.service");
@@ -78,11 +78,11 @@ public class DependenceValidationTest extends TestCase {
         assertNotDependentOn("org.apache.openejb.assembler.classic", "org.apache.openejb.config");
 
         // Nothing should be dependent on any one particular container implementation   (except the Dynamic Assembler)
-        assertNotDependentOn("org.apache.openejb", "org.apache.openejb.core.singleton", dynamicAssembler);
-        assertNotDependentOn("org.apache.openejb", "org.apache.openejb.core.stateless", dynamicAssembler);
-        assertNotDependentOn("org.apache.openejb", "org.apache.openejb.core.stateful", dynamicAssembler);
+        assertNotDependentOn("org.apache.tomee", "org.apache.openejb.core.singleton", dynamicAssembler);
+        assertNotDependentOn("org.apache.tomee", "org.apache.openejb.core.stateless", dynamicAssembler);
+        assertNotDependentOn("org.apache.tomee", "org.apache.openejb.core.stateful", dynamicAssembler);
         /* TODO: This needs fixing... containers are supposed to be pluggable
-        // assertNotDependentOn("org.apache.openejb", "org.apache.openejb.core.entity", dynamicAssembler);
+        // assertNotDependentOn("org.apache.tomee", "org.apache.openejb.core.entity", dynamicAssembler);
          */
     }
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/container/openejb-javaagent/pom.xml
----------------------------------------------------------------------
diff --git a/container/openejb-javaagent/pom.xml b/container/openejb-javaagent/pom.xml
index 7a8ccdb..06451dd 100644
--- a/container/openejb-javaagent/pom.xml
+++ b/container/openejb-javaagent/pom.xml
@@ -19,7 +19,7 @@
 <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/maven-v4_0_0.xsd">
   <parent>
     <artifactId>container</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/container/openejb-jee-accessors/pom.xml
----------------------------------------------------------------------
diff --git a/container/openejb-jee-accessors/pom.xml b/container/openejb-jee-accessors/pom.xml
index b18dd56..842c119 100644
--- a/container/openejb-jee-accessors/pom.xml
+++ b/container/openejb-jee-accessors/pom.xml
@@ -22,7 +22,7 @@
 <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/maven-v4_0_0.xsd">
   <parent>
     <artifactId>container</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -40,17 +40,17 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-jee</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-loader</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <scope>provided</scope>
     </dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/container/openejb-jee/pom.xml
----------------------------------------------------------------------
diff --git a/container/openejb-jee/pom.xml b/container/openejb-jee/pom.xml
index 3656405..94e859c 100644
--- a/container/openejb-jee/pom.xml
+++ b/container/openejb-jee/pom.xml
@@ -22,7 +22,7 @@
 <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/maven-v4_0_0.xsd">
   <parent>
     <artifactId>container</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -54,7 +54,7 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <scope>provided</scope>
     </dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/container/openejb-jpa-integration/pom.xml
----------------------------------------------------------------------
diff --git a/container/openejb-jpa-integration/pom.xml b/container/openejb-jpa-integration/pom.xml
index a788b10..c5f88fa 100644
--- a/container/openejb-jpa-integration/pom.xml
+++ b/container/openejb-jpa-integration/pom.xml
@@ -22,7 +22,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>container</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/container/openejb-junit/pom.xml
----------------------------------------------------------------------
diff --git a/container/openejb-junit/pom.xml b/container/openejb-junit/pom.xml
index 1a91a97..1887ce7 100644
--- a/container/openejb-junit/pom.xml
+++ b/container/openejb-junit/pom.xml
@@ -19,7 +19,7 @@
 <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/maven-v4_0_0.xsd">
   <parent>
     <artifactId>container</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
 
@@ -35,7 +35,7 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>${project.version}</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/container/openejb-loader/pom.xml
----------------------------------------------------------------------
diff --git a/container/openejb-loader/pom.xml b/container/openejb-loader/pom.xml
index 541c912..1e9f9cf 100644
--- a/container/openejb-loader/pom.xml
+++ b/container/openejb-loader/pom.xml
@@ -23,7 +23,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>container</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/container/openejb-loader/src/test/java/org/apache/openejb/loader/ProvisioningUtilTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-loader/src/test/java/org/apache/openejb/loader/ProvisioningUtilTest.java b/container/openejb-loader/src/test/java/org/apache/openejb/loader/ProvisioningUtilTest.java
index c4fc872..b0702e3 100644
--- a/container/openejb-loader/src/test/java/org/apache/openejb/loader/ProvisioningUtilTest.java
+++ b/container/openejb-loader/src/test/java/org/apache/openejb/loader/ProvisioningUtilTest.java
@@ -49,7 +49,7 @@ public class ProvisioningUtilTest {
 
     @Test
     public void mvnUrl() throws MalformedURLException {
-        final String url = new MavenResolver().quickMvnUrl("org.apache.openejb/apache-tomee/x.y.z-SNAPSHOT");
+        final String url = new MavenResolver().quickMvnUrl("org.apache.tomee/apache-tomee/x.y.z-SNAPSHOT");
         assertEquals("https://repository.apache.org/snapshots/org/apache/openejb/apache-tomee/x.y.z-SNAPSHOT/apache-tomee-x.y.z-SNAPSHOT.jar", url);
     }
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/container/pom.xml
----------------------------------------------------------------------
diff --git a/container/pom.xml b/container/pom.xml
index e2bc5d4..6a0ec6d 100644
--- a/container/pom.xml
+++ b/container/pom.xml
@@ -19,7 +19,7 @@
 <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/maven-v4_0_0.xsd">
   <parent>
     <artifactId>openejb</artifactId>
-    <groupId>org.apache.openejb</groupId>
+    <groupId>org.apache.tomee</groupId>
     <version>7.0.0-SNAPSHOT</version>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/access-timeout-meta/pom.xml
----------------------------------------------------------------------
diff --git a/examples/access-timeout-meta/pom.xml b/examples/access-timeout-meta/pom.xml
index bb9ac6a..59e0026 100644
--- a/examples/access-timeout-meta/pom.xml
+++ b/examples/access-timeout-meta/pom.xml
@@ -52,7 +52,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -68,7 +68,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/access-timeout/pom.xml
----------------------------------------------------------------------
diff --git a/examples/access-timeout/pom.xml b/examples/access-timeout/pom.xml
index 44f6392..6c34f3c 100644
--- a/examples/access-timeout/pom.xml
+++ b/examples/access-timeout/pom.xml
@@ -52,7 +52,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -68,7 +68,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/alternate-descriptors/pom.xml
----------------------------------------------------------------------
diff --git a/examples/alternate-descriptors/pom.xml b/examples/alternate-descriptors/pom.xml
index 1b7e47f..9b6065e 100644
--- a/examples/alternate-descriptors/pom.xml
+++ b/examples/alternate-descriptors/pom.xml
@@ -57,7 +57,7 @@
   
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -89,7 +89,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/applet/pom.xml
----------------------------------------------------------------------
diff --git a/examples/applet/pom.xml b/examples/applet/pom.xml
index 0fbafab..86699dc 100644
--- a/examples/applet/pom.xml
+++ b/examples/applet/pom.xml
@@ -36,13 +36,13 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
-      <version>6.0-2</version>
+      <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-client</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>
@@ -110,14 +110,14 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>org.apache.openejb</groupId>
+                  <groupId>org.apache.tomee</groupId>
                   <artifactId>openejb-client</artifactId>
                   <version>7.0.0-SNAPSHOT</version>
                   <outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
                   <destFileName>openejb-client.jar</destFileName>
                 </artifactItem>
                 <artifactItem>
-                  <groupId>org.apache.openejb</groupId>
+                  <groupId>org.apache.tomee</groupId>
                   <artifactId>javaee-api</artifactId>
                   <version>7.0-SNAPSHOT</version>
                   <outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/application-composer/pom.xml
----------------------------------------------------------------------
diff --git a/examples/application-composer/pom.xml b/examples/application-composer/pom.xml
index f6a92aa..2039f95 100644
--- a/examples/application-composer/pom.xml
+++ b/examples/application-composer/pom.xml
@@ -52,7 +52,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -69,7 +69,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/applicationcomposer-jaxws-cdi/pom.xml
----------------------------------------------------------------------
diff --git a/examples/applicationcomposer-jaxws-cdi/pom.xml b/examples/applicationcomposer-jaxws-cdi/pom.xml
index e0b09a1..18e1f41 100644
--- a/examples/applicationcomposer-jaxws-cdi/pom.xml
+++ b/examples/applicationcomposer-jaxws-cdi/pom.xml
@@ -53,7 +53,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -67,13 +67,13 @@
     <!-- The <scope>test</scope> guarantees that none of your runtime code
       is dependent on any OpenEJB classes. -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>ziplock</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/applicationexception/pom.xml
----------------------------------------------------------------------
diff --git a/examples/applicationexception/pom.xml b/examples/applicationexception/pom.xml
index 800cc87..3309bf8 100644
--- a/examples/applicationexception/pom.xml
+++ b/examples/applicationexception/pom.xml
@@ -63,7 +63,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -80,7 +80,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/arquillian-jpa/pom.xml
----------------------------------------------------------------------
diff --git a/examples/arquillian-jpa/pom.xml b/examples/arquillian-jpa/pom.xml
index 2b37f5f..2355a9e 100644
--- a/examples/arquillian-jpa/pom.xml
+++ b/examples/arquillian-jpa/pom.xml
@@ -49,7 +49,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -61,12 +61,12 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>arquillian-tomee-remote</artifactId>
       <version>${tomee.version}</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/async-methods/pom.xml
----------------------------------------------------------------------
diff --git a/examples/async-methods/pom.xml b/examples/async-methods/pom.xml
index bfe4ce1..a3fc179 100644
--- a/examples/async-methods/pom.xml
+++ b/examples/async-methods/pom.xml
@@ -52,7 +52,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -68,7 +68,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/async-postconstruct/pom.xml
----------------------------------------------------------------------
diff --git a/examples/async-postconstruct/pom.xml b/examples/async-postconstruct/pom.xml
index e48ac84..35caec5 100644
--- a/examples/async-postconstruct/pom.xml
+++ b/examples/async-postconstruct/pom.xml
@@ -52,7 +52,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -68,7 +68,7 @@
     code is dependent on any OpenEJB classes.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/bean-validation-design-by-contract/pom.xml
----------------------------------------------------------------------
diff --git a/examples/bean-validation-design-by-contract/pom.xml b/examples/bean-validation-design-by-contract/pom.xml
index 9285dc9..94c05f6 100755
--- a/examples/bean-validation-design-by-contract/pom.xml
+++ b/examples/bean-validation-design-by-contract/pom.xml
@@ -49,7 +49,7 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
@@ -64,7 +64,7 @@
     The scope test is to avoid to have any openejb binaries delivered by the application.
     -->
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-core</artifactId>
       <version>7.0.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/tomee/blob/ac1badea/examples/bval-evaluation-redeployment/WebApp1/pom.xml
----------------------------------------------------------------------
diff --git a/examples/bval-evaluation-redeployment/WebApp1/pom.xml b/examples/bval-evaluation-redeployment/WebApp1/pom.xml
index 23db3bc..fa7cbfe 100644
--- a/examples/bval-evaluation-redeployment/WebApp1/pom.xml
+++ b/examples/bval-evaluation-redeployment/WebApp1/pom.xml
@@ -39,7 +39,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>javaee-api</artifactId>
     </dependency>
     <dependency>
@@ -47,7 +47,7 @@
       <artifactId>jackson-jaxrs-json-provider</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
+      <groupId>org.apache.tomee</groupId>
       <artifactId>openejb-cxf-rs</artifactId>
       <scope>provided</scope>
     </dependency>