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:42 UTC

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

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>