tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject svn commit: r1141558 - in /openejb/branches/openejb-3.2.x: ./ assembly/ assembly/javaee-api-libs/ assembly/openejb-itests-standalone-client/ assembly/openejb-standalone/ assembly/openejb-tomcat/openejb-tomcat-bundle/tomee6/ assembly/openejb-tomcat/open...
Date Thu, 30 Jun 2011 14:59:22 GMT
Author: rmannibucau
Date: Thu Jun 30 14:59:20 2011
New Revision: 1141558

URL: http://svn.apache.org/viewvc?rev=1141558&view=rev
Log:
replacing javaee-api and java-web-api with javaee-api-embedded (without web part of the specs, the old javaee-api) and javaee-api (the full specs jar)

Added:
    openejb/branches/openejb-3.2.x/deps/javaee-api-embedded/   (props changed)
      - copied from r1141523, openejb/branches/openejb-3.2.x/deps/javaee-api/
Removed:
    openejb/branches/openejb-3.2.x/assembly/javaee-api-libs/
    openejb/branches/openejb-3.2.x/deps/javaee-web-api/
Modified:
    openejb/branches/openejb-3.2.x/assembly/openejb-itests-standalone-client/pom.xml
    openejb/branches/openejb-3.2.x/assembly/openejb-standalone/pom.xml
    openejb/branches/openejb-3.2.x/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee6/pom.xml
    openejb/branches/openejb-3.2.x/assembly/openejb-tomcat/openejb-tomcat-catalina/pom.xml
    openejb/branches/openejb-3.2.x/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml
    openejb/branches/openejb-3.2.x/assembly/openejb-webapp-common/pom.xml
    openejb/branches/openejb-3.2.x/assembly/pom.xml
    openejb/branches/openejb-3.2.x/container/openejb-activemq4/   (props changed)
    openejb/branches/openejb-3.2.x/container/openejb-api/   (props changed)
    openejb/branches/openejb-3.2.x/container/openejb-core/pom.xml
    openejb/branches/openejb-3.2.x/container/openejb-jee/pom.xml
    openejb/branches/openejb-3.2.x/container/openejb-loader/pom.xml
    openejb/branches/openejb-3.2.x/container/openejb-osgi/   (props changed)
    openejb/branches/openejb-3.2.x/container/openejb-osgi/pom.xml
    openejb/branches/openejb-3.2.x/container/pom.xml
    openejb/branches/openejb-3.2.x/deps/   (props changed)
    openejb/branches/openejb-3.2.x/deps/javaee-api-embedded/pom.xml
    openejb/branches/openejb-3.2.x/deps/javaee-api/pom.xml
    openejb/branches/openejb-3.2.x/deps/pom.xml
    openejb/branches/openejb-3.2.x/examples/alternate-descriptors/pom.xml
    openejb/branches/openejb-3.2.x/examples/application-composer/pom.xml
    openejb/branches/openejb-3.2.x/examples/applicationexception/pom.xml
    openejb/branches/openejb-3.2.x/examples/component-interfaces/pom.xml
    openejb/branches/openejb-3.2.x/examples/custom-injection/pom.xml
    openejb/branches/openejb-3.2.x/examples/ear-testing/business-logic/pom.xml
    openejb/branches/openejb-3.2.x/examples/ear-testing/business-model/pom.xml
    openejb/branches/openejb-3.2.x/examples/helloworld-weblogic/pom.xml
    openejb/branches/openejb-3.2.x/examples/injection-of-connectionfactory/pom.xml
    openejb/branches/openejb-3.2.x/examples/injection-of-datasource/pom.xml
    openejb/branches/openejb-3.2.x/examples/injection-of-ejbs/pom.xml
    openejb/branches/openejb-3.2.x/examples/injection-of-entitymanager/pom.xml
    openejb/branches/openejb-3.2.x/examples/injection-of-env-entry/pom.xml
    openejb/branches/openejb-3.2.x/examples/interceptors/pom.xml
    openejb/branches/openejb-3.2.x/examples/jpa-eclipselink/pom.xml
    openejb/branches/openejb-3.2.x/examples/jpa-hibernate/pom.xml
    openejb/branches/openejb-3.2.x/examples/lookup-of-ejbs-with-descriptor/pom.xml
    openejb/branches/openejb-3.2.x/examples/lookup-of-ejbs/pom.xml
    openejb/branches/openejb-3.2.x/examples/quartz-app/quartz-beans/pom.xml
    openejb/branches/openejb-3.2.x/examples/simple-cmp2/pom.xml
    openejb/branches/openejb-3.2.x/examples/simple-mdb-with-descriptor/pom.xml
    openejb/branches/openejb-3.2.x/examples/simple-mdb/pom.xml
    openejb/branches/openejb-3.2.x/examples/simple-singleton/pom.xml
    openejb/branches/openejb-3.2.x/examples/simple-stateful/pom.xml
    openejb/branches/openejb-3.2.x/examples/simple-stateless-with-descriptor/pom.xml
    openejb/branches/openejb-3.2.x/examples/simple-stateless/pom.xml
    openejb/branches/openejb-3.2.x/examples/simple-webservice/pom.xml
    openejb/branches/openejb-3.2.x/examples/spring-integration/pom.xml
    openejb/branches/openejb-3.2.x/examples/telephone-stateful/pom.xml
    openejb/branches/openejb-3.2.x/examples/testcase-injection/pom.xml
    openejb/branches/openejb-3.2.x/examples/testing-security-2/pom.xml
    openejb/branches/openejb-3.2.x/examples/testing-security/pom.xml
    openejb/branches/openejb-3.2.x/examples/testing-transactions/pom.xml
    openejb/branches/openejb-3.2.x/examples/transaction-rollback/pom.xml
    openejb/branches/openejb-3.2.x/examples/troubleshooting/pom.xml
    openejb/branches/openejb-3.2.x/examples/webapps/applet/pom.xml
    openejb/branches/openejb-3.2.x/examples/webapps/ejb-examples/pom.xml
    openejb/branches/openejb-3.2.x/examples/webapps/ejb-webservice/pom.xml
    openejb/branches/openejb-3.2.x/examples/webapps/jsf/pom.xml
    openejb/branches/openejb-3.2.x/examples/webapps/moviefun/pom.xml
    openejb/branches/openejb-3.2.x/examples/webapps/struts/pom.xml
    openejb/branches/openejb-3.2.x/examples/webservice-attachments/pom.xml
    openejb/branches/openejb-3.2.x/examples/webservice-inheritance/pom.xml
    openejb/branches/openejb-3.2.x/examples/webservice-security/pom.xml
    openejb/branches/openejb-3.2.x/examples/webservice-ws-security/pom.xml
    openejb/branches/openejb-3.2.x/itests/openejb-itests-app/pom.xml
    openejb/branches/openejb-3.2.x/itests/openejb-itests-beans/pom.xml
    openejb/branches/openejb-3.2.x/itests/openejb-itests-client/pom.xml
    openejb/branches/openejb-3.2.x/itests/openejb-itests-interceptor-beans/pom.xml
    openejb/branches/openejb-3.2.x/itests/openejb-itests-servlets/pom.xml
    openejb/branches/openejb-3.2.x/pom.xml
    openejb/branches/openejb-3.2.x/server/openejb-client/pom.xml
    openejb/branches/openejb-3.2.x/server/openejb-cxf/pom.xml
    openejb/branches/openejb-3.2.x/server/openejb-ejbd/pom.xml
    openejb/branches/openejb-3.2.x/server/openejb-http/pom.xml
    openejb/branches/openejb-3.2.x/server/openejb-server/pom.xml
    openejb/branches/openejb-3.2.x/server/openejb-telnet/pom.xml
    openejb/branches/openejb-3.2.x/server/openejb-webadmin/pom.xml
    openejb/branches/openejb-3.2.x/server/openejb-webservices/pom.xml

Modified: openejb/branches/openejb-3.2.x/assembly/openejb-itests-standalone-client/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/assembly/openejb-itests-standalone-client/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/assembly/openejb-itests-standalone-client/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/assembly/openejb-itests-standalone-client/pom.xml Thu Jun 30 14:59:20 2011
@@ -57,8 +57,8 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>6.0-SNAPSHOT</version>
+      <artifactId>javaee-api-embedded</artifactId>
+      <version>${javaee-api.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.xbean</groupId>

Modified: openejb/branches/openejb-3.2.x/assembly/openejb-standalone/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/assembly/openejb-standalone/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/assembly/openejb-standalone/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/assembly/openejb-standalone/pom.xml Thu Jun 30 14:59:20 2011
@@ -122,8 +122,8 @@
     </dependency>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>6.0-SNAPSHOT</version>
+      <artifactId>javaee-api-embedded</artifactId>
+      <version>${javaee-api.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.javamail</groupId>

Modified: openejb/branches/openejb-3.2.x/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee6/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee6/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee6/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee6/pom.xml Thu Jun 30 14:59:20 2011
@@ -60,7 +60,7 @@
       <exclusions>
         <exclusion>
           <groupId>org.apache.openejb</groupId>
-          <artifactId>javaee-web-api</artifactId>
+          <artifactId>javaee-api</artifactId>
         </exclusion>
       </exclusions>
     </dependency>

Modified: openejb/branches/openejb-3.2.x/assembly/openejb-tomcat/openejb-tomcat-catalina/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/assembly/openejb-tomcat/openejb-tomcat-catalina/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/assembly/openejb-tomcat/openejb-tomcat-catalina/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/assembly/openejb-tomcat/openejb-tomcat-catalina/pom.xml Thu Jun 30 14:59:20 2011
@@ -46,8 +46,8 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>6.0-SNAPSHOT</version>
+      <artifactId>javaee-api-embedded</artifactId>
+      <version>${javaee-api.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.openejb</groupId>

Modified: openejb/branches/openejb-3.2.x/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml Thu Jun 30 14:59:20 2011
@@ -74,8 +74,8 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>6.0-SNAPSHOT</version>
+      <artifactId>javaee-api-embedded</artifactId>
+      <version>${javaee-api.version}</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.swizzle</groupId>

Modified: openejb/branches/openejb-3.2.x/assembly/openejb-webapp-common/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/assembly/openejb-webapp-common/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/assembly/openejb-webapp-common/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/assembly/openejb-webapp-common/pom.xml Thu Jun 30 14:59:20 2011
@@ -42,8 +42,8 @@
     </dependency>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>6.0-SNAPSHOT</version>
+      <artifactId>javaee-api-embedded</artifactId>
+      <version>${javaee-api.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.javamail</groupId>

Modified: openejb/branches/openejb-3.2.x/assembly/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/assembly/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/assembly/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/assembly/pom.xml Thu Jun 30 14:59:20 2011
@@ -38,7 +38,7 @@
     <module>openejb-itests-standalone-client</module>
     <module>openejb-standalone</module>
     <module>openejb-tomcat</module>
-    <module>javaee-api-libs</module>
+    <!-- module>javaee-api-libs</module -->
   </modules>
 </project>
 

Propchange: openejb/branches/openejb-3.2.x/container/openejb-activemq4/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Jun 30 14:59:20 2011
@@ -2,3 +2,5 @@
 target
 .classpath
 .project
+
+openejb-activemq4.iml

Propchange: openejb/branches/openejb-3.2.x/container/openejb-api/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Jun 30 14:59:20 2011
@@ -2,3 +2,5 @@ target
 .settings
 .classpath
 .project
+
+openejb-api.iml

Modified: openejb/branches/openejb-3.2.x/container/openejb-core/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/container/openejb-core/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/container/openejb-core/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/container/openejb-core/pom.xml Thu Jun 30 14:59:20 2011
@@ -214,8 +214,8 @@
     </dependency>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>6.0-SNAPSHOT</version>
+      <artifactId>javaee-api-embedded</artifactId>
+      <version>${javaee-api.version}</version>
     </dependency>
     <dependency>
       <groupId>log4j</groupId>
@@ -619,7 +619,7 @@
                                 <!-- JavaEE API -->
                     <artifactItem>
                       <groupId>org.apache.openejb</groupId>
-                      <artifactId>javaee-api</artifactId>
+                      <artifactId>javaee-api-embedded</artifactId>
                       <overWrite>true</overWrite>
                       <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
                     </artifactItem>

Modified: openejb/branches/openejb-3.2.x/container/openejb-jee/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/container/openejb-jee/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/container/openejb-jee/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/container/openejb-jee/pom.xml Thu Jun 30 14:59:20 2011
@@ -89,7 +89,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>javaee-api-embedded</artifactId>
     </dependency>
     <dependency>
       <groupId>com.sun.xml.bind</groupId>

Modified: openejb/branches/openejb-3.2.x/container/openejb-loader/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/container/openejb-loader/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/container/openejb-loader/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/container/openejb-loader/pom.xml Thu Jun 30 14:59:20 2011
@@ -41,8 +41,8 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>6.0-SNAPSHOT</version>
+      <artifactId>javaee-api-embedded</artifactId>
+      <version>${javaee-api.version}</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

Propchange: openejb/branches/openejb-3.2.x/container/openejb-osgi/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Jun 30 14:59:20 2011
@@ -2,3 +2,5 @@
 target
 .classpath
 .project
+
+openejb-core-osgi.iml

Modified: openejb/branches/openejb-3.2.x/container/openejb-osgi/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/container/openejb-osgi/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/container/openejb-osgi/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/container/openejb-osgi/pom.xml Thu Jun 30 14:59:20 2011
@@ -124,7 +124,7 @@
                 <goals> <goal>add-features-to-repo</goal> </goals>
                 <configuration> <descriptors>
                 <descriptor>file:${basedir}/target/classes/features.xml</descriptor>
-                </descriptors> <features> <feature>javaee-api</feature>
+                </descriptors> <features> <feature>javaee-api-embedded</feature>
                 <feature>openejb-core</feature> </features>
                 <repository>target/features-repo</repository> </configuration>
                 </execution> </executions> </plugin>

Modified: openejb/branches/openejb-3.2.x/container/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/container/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/container/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/container/pom.xml Thu Jun 30 14:59:20 2011
@@ -39,8 +39,8 @@
 		<dependencies>
 		    <dependency>
 		      <groupId>org.apache.openejb</groupId>
-		      <artifactId>javaee-api</artifactId>
-		      <version>6.0-SNAPSHOT</version>
+		      <artifactId>javaee-api-embedded</artifactId>
+          <version>${javaee-api.version}</version>
 		    </dependency>
 		</dependencies>
 	</dependencyManagement>

Propchange: openejb/branches/openejb-3.2.x/deps/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jun 30 14:59:20 2011
@@ -0,0 +1,3 @@
+deps.iml
+deps.ipr
+deps.iws

Propchange: openejb/branches/openejb-3.2.x/deps/javaee-api-embedded/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jun 30 14:59:20 2011
@@ -0,0 +1,2 @@
+javaee-api.iml
+javaee-api-embedded.iml

Modified: openejb/branches/openejb-3.2.x/deps/javaee-api-embedded/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/deps/javaee-api-embedded/pom.xml?rev=1141558&r1=1141523&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/deps/javaee-api-embedded/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/deps/javaee-api-embedded/pom.xml Thu Jun 30 14:59:20 2011
@@ -25,10 +25,10 @@
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>javaee-api</artifactId>
+  <artifactId>javaee-api-embedded</artifactId>
   <packaging>jar</packaging>
-  <name>OpenEJB :: Dependencies :: JavaEE API</name>
-  <version>6.0-SNAPSHOT</version>
+  <name>OpenEJB :: Dependencies :: JavaEE Embedded API</name>
+  <version>${javaee-api.version}</version>
 
   <build>
     <plugins>

Modified: openejb/branches/openejb-3.2.x/deps/javaee-api/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/deps/javaee-api/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/deps/javaee-api/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/deps/javaee-api/pom.xml Thu Jun 30 14:59:20 2011
@@ -27,8 +27,8 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>javaee-api</artifactId>
   <packaging>jar</packaging>
-  <name>OpenEJB :: Dependencies :: JavaEE API</name>
-  <version>6.0-SNAPSHOT</version>
+  <name>OpenEJB :: Dependencies :: JavaEE Full API</name>
+  <version>${javaee-api.version}</version>
 
   <build>
     <plugins>
@@ -94,7 +94,7 @@
             </goals>
             <configuration>
               <tasks>
-                <unzip src="${project.build.directory}/javaee-api-${project.version}.jar"
+                <unzip src="${project.build.directory}/javaee-web-api-${project.version}.jar"
                        dest="${project.build.directory}/classes"/>
               </tasks>
             </configuration>
@@ -107,124 +107,18 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-activation_1.1_spec</artifactId>
-      <version>1.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-annotation_1.1_spec</artifactId>
-      <version>1.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-atinject_1.0_spec</artifactId>
-      <version>1.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-ccpp_1.0_spec</artifactId>
-      <version>1.0-beta</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-ejb_3.1_spec</artifactId>
-      <version>1.0.2</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-interceptor_1.1_spec</artifactId>
-      <version>1.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>
-      <version>1.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
-      <version>1.0.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jacc_1.4_spec</artifactId>
-      <version>1.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jaspic_1.0_spec</artifactId>
-      <version>1.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
-      <version>1.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jaxb_2.2_spec</artifactId>
-      <version>1.0.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jaxr_1.0_spec</artifactId>
-      <version>2.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
-      <version>2.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jaxws_2.2_spec</artifactId>
-      <version>1.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jcdi_1.0_spec</artifactId>
-      <version>1.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jms_1.1_spec</artifactId>
-      <version>1.1.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jpa_2.0_spec</artifactId>
-      <version>1.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jsp_2.2_spec</artifactId>
+      <artifactId>geronimo-el_2.2_spec</artifactId>
       <version>1.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jta_1.1_spec</artifactId>
-      <version>1.1.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-saaj_1.3_spec</artifactId>
-      <version>1.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-stax-api_1.2_spec</artifactId>
+      <artifactId>geronimo-servlet_3.0_spec</artifactId>
       <version>1.0</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-validation_1.0_spec</artifactId>
-      <version>1.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-      <version>1.1.3</version>
+      <groupId>org.apache.openejb</groupId>
+      <artifactId>javaee-api</artifactId>
+      <version>${javaee-api.version}</version>
     </dependency>
   </dependencies>
-
 </project>

Modified: openejb/branches/openejb-3.2.x/deps/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/deps/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/deps/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/deps/pom.xml Thu Jun 30 14:59:20 2011
@@ -28,7 +28,7 @@
   <name>OpenEJB :: Dependencies</name>
 
   <modules>
+    <module>javaee-api-embedded</module>
     <module>javaee-api</module>
-    <module>javaee-web-api</module>
   </modules>
 </project>

Modified: openejb/branches/openejb-3.2.x/examples/alternate-descriptors/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/alternate-descriptors/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/alternate-descriptors/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/alternate-descriptors/pom.xml Thu Jun 30 14:59:20 2011
@@ -57,7 +57,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>javaee-api-embedded</artifactId>
       <version>6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>

Modified: openejb/branches/openejb-3.2.x/examples/application-composer/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/application-composer/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/application-composer/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/application-composer/pom.xml Thu Jun 30 14:59:20 2011
@@ -57,7 +57,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>javaee-api-embedded</artifactId>
       <version>6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>

Modified: openejb/branches/openejb-3.2.x/examples/applicationexception/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/applicationexception/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/applicationexception/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/applicationexception/pom.xml Thu Jun 30 14:59:20 2011
@@ -70,7 +70,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>javaee-api-embedded</artifactId>
       <version>6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>

Modified: openejb/branches/openejb-3.2.x/examples/component-interfaces/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/component-interfaces/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/component-interfaces/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/component-interfaces/pom.xml Thu Jun 30 14:59:20 2011
@@ -65,7 +65,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>javaee-api-embedded</artifactId>
       <version>6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>

Modified: openejb/branches/openejb-3.2.x/examples/custom-injection/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/custom-injection/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/custom-injection/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/custom-injection/pom.xml Thu Jun 30 14:59:20 2011
@@ -57,7 +57,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>javaee-api-embedded</artifactId>
       <version>6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>

Modified: openejb/branches/openejb-3.2.x/examples/ear-testing/business-logic/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/ear-testing/business-logic/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/ear-testing/business-logic/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/ear-testing/business-logic/pom.xml Thu Jun 30 14:59:20 2011
@@ -40,7 +40,7 @@
 
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>javaee-api-embedded</artifactId>
       <version>6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>

Modified: openejb/branches/openejb-3.2.x/examples/ear-testing/business-model/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/ear-testing/business-model/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/ear-testing/business-model/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/ear-testing/business-model/pom.xml Thu Jun 30 14:59:20 2011
@@ -33,7 +33,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>javaee-api-embedded</artifactId>
       <version>6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>

Modified: openejb/branches/openejb-3.2.x/examples/helloworld-weblogic/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/helloworld-weblogic/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/helloworld-weblogic/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/helloworld-weblogic/pom.xml Thu Jun 30 14:59:20 2011
@@ -57,7 +57,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>javaee-api-embedded</artifactId>
       <version>6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>

Modified: openejb/branches/openejb-3.2.x/examples/injection-of-connectionfactory/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/injection-of-connectionfactory/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/injection-of-connectionfactory/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/injection-of-connectionfactory/pom.xml Thu Jun 30 14:59:20 2011
@@ -57,7 +57,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>javaee-api-embedded</artifactId>
       <version>6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>

Modified: openejb/branches/openejb-3.2.x/examples/injection-of-datasource/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/injection-of-datasource/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/injection-of-datasource/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/injection-of-datasource/pom.xml Thu Jun 30 14:59:20 2011
@@ -57,7 +57,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>javaee-api-embedded</artifactId>
       <version>6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>

Modified: openejb/branches/openejb-3.2.x/examples/injection-of-ejbs/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/injection-of-ejbs/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/injection-of-ejbs/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/injection-of-ejbs/pom.xml Thu Jun 30 14:59:20 2011
@@ -57,7 +57,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>javaee-api-embedded</artifactId>
       <version>6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>

Modified: openejb/branches/openejb-3.2.x/examples/injection-of-entitymanager/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/injection-of-entitymanager/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/injection-of-entitymanager/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/injection-of-entitymanager/pom.xml Thu Jun 30 14:59:20 2011
@@ -57,7 +57,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>javaee-api-embedded</artifactId>
       <version>6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>

Modified: openejb/branches/openejb-3.2.x/examples/injection-of-env-entry/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/injection-of-env-entry/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/injection-of-env-entry/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/injection-of-env-entry/pom.xml Thu Jun 30 14:59:20 2011
@@ -57,7 +57,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>javaee-api-embedded</artifactId>
       <version>6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>

Modified: openejb/branches/openejb-3.2.x/examples/interceptors/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/interceptors/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/interceptors/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/interceptors/pom.xml Thu Jun 30 14:59:20 2011
@@ -59,7 +59,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>javaee-api-embedded</artifactId>
       <version>6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>

Modified: openejb/branches/openejb-3.2.x/examples/jpa-eclipselink/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/jpa-eclipselink/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/jpa-eclipselink/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/jpa-eclipselink/pom.xml Thu Jun 30 14:59:20 2011
@@ -1,114 +1,114 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<!-- $Rev: 636494 $ $Date: 2008-03-12 21:24:02 +0100 (Wed, 12 Mar 2008) $ -->
-
-<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">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.superbiz</groupId>
-  <artifactId>jpa-eclipselink</artifactId>
-  <packaging>jar</packaging>
-  <version>1.0-SNAPSHOT</version>
-  <name>OpenEJB :: Examples :: JPA with EclipseLink</name>
-  <properties>
-    <!--
-       - http://docs.codehaus.org/display/MAVENUSER/POM+Element+for+Source+File+Encoding
-       -->
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev: 636494 $ $Date: 2008-03-12 21:24:02 +0100 (Wed, 12 Mar 2008) $ -->
+
+<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">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.superbiz</groupId>
+  <artifactId>jpa-eclipselink</artifactId>
+  <packaging>jar</packaging>
+  <version>1.0-SNAPSHOT</version>
+  <name>OpenEJB :: Examples :: JPA with EclipseLink</name>
+  <properties>
+    <!--
+       - http://docs.codehaus.org/display/MAVENUSER/POM+Element+for+Source+File+Encoding
+       -->
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <openejb.version>3.2.0-SNAPSHOT</openejb.version>
-  </properties>
-  <build>
-    <defaultGoal>install</defaultGoal>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <repositories>
-    <repository>
-      <id>apache-m2-snapshot</id>
-      <name>Apache Snapshot Repository</name>
-      <url>http://repository.apache.org/snapshots</url>
-    </repository>
-    <repository>
-      <id>eclipselink-repo</id>
-      <name>EclipseLink Repository</name>
-      <url>http://www.eclipse.org/downloads/download.php?r=1&amp;nf=1&amp;file=/rt/eclipselink/maven.repo</url>
-    </repository>
-  </repositories>
-  <dependencies>
-
-    <!-- spec apis such as javax.persistence -->
-    <dependency>
-      <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>6.0-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.4</version>
-      <scope>test</scope>
-    </dependency>
-
-    <!-- openejb container for running tests -->
-    <dependency>
-      <groupId>org.apache.openejb</groupId>
-      <artifactId>openejb-core</artifactId>
-      <version>${openejb.version}</version>
-      <scope>test</scope>
-    </dependency>
-
-    <!-- toplink dependencies -->
-    <dependency>
-      <groupId>org.eclipse.persistence</groupId>
-      <artifactId>eclipselink</artifactId>
-      <version>1.1.2</version>
-      <scope>test</scope>
-    </dependency>
-
-  </dependencies>
-
-
-  <!--
-  This section allows you to configure where to publish libraries for sharing.
-  It is not required and may be deleted.  For more information see:
-  http://maven.apache.org/plugins/maven-deploy-plugin/
-  -->
-  <distributionManagement>
-    <repository>
-      <id>localhost</id>
-      <url>file://${basedir}/target/repo/</url>
-    </repository>
-    <snapshotRepository>
-      <id>localhost</id>
-      <url>file://${basedir}/target/snapshot-repo/</url>
-    </snapshotRepository>
-  </distributionManagement>
-
-</project>
+  </properties>
+  <build>
+    <defaultGoal>install</defaultGoal>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.3.2</version>
+        <configuration>
+          <source>1.6</source>
+          <target>1.6</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <repositories>
+    <repository>
+      <id>apache-m2-snapshot</id>
+      <name>Apache Snapshot Repository</name>
+      <url>http://repository.apache.org/snapshots</url>
+    </repository>
+    <repository>
+      <id>eclipselink-repo</id>
+      <name>EclipseLink Repository</name>
+      <url>http://www.eclipse.org/downloads/download.php?r=1&amp;nf=1&amp;file=/rt/eclipselink/maven.repo</url>
+    </repository>
+  </repositories>
+  <dependencies>
+
+    <!-- spec apis such as javax.persistence -->
+    <dependency>
+      <groupId>org.apache.openejb</groupId>
+      <artifactId>javaee-api-embedded</artifactId>
+      <version>6.0-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.4</version>
+      <scope>test</scope>
+    </dependency>
+
+    <!-- openejb container for running tests -->
+    <dependency>
+      <groupId>org.apache.openejb</groupId>
+      <artifactId>openejb-core</artifactId>
+      <version>${openejb.version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <!-- toplink dependencies -->
+    <dependency>
+      <groupId>org.eclipse.persistence</groupId>
+      <artifactId>eclipselink</artifactId>
+      <version>1.1.2</version>
+      <scope>test</scope>
+    </dependency>
+
+  </dependencies>
+
+
+  <!--
+  This section allows you to configure where to publish libraries for sharing.
+  It is not required and may be deleted.  For more information see:
+  http://maven.apache.org/plugins/maven-deploy-plugin/
+  -->
+  <distributionManagement>
+    <repository>
+      <id>localhost</id>
+      <url>file://${basedir}/target/repo/</url>
+    </repository>
+    <snapshotRepository>
+      <id>localhost</id>
+      <url>file://${basedir}/target/snapshot-repo/</url>
+    </snapshotRepository>
+  </distributionManagement>
+
+</project>

Modified: openejb/branches/openejb-3.2.x/examples/jpa-hibernate/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/jpa-hibernate/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/jpa-hibernate/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/jpa-hibernate/pom.xml Thu Jun 30 14:59:20 2011
@@ -59,7 +59,7 @@
     <!-- spec apis such as javax.persistence -->
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>javaee-api-embedded</artifactId>
       <version>6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>

Modified: openejb/branches/openejb-3.2.x/examples/lookup-of-ejbs-with-descriptor/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/lookup-of-ejbs-with-descriptor/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/lookup-of-ejbs-with-descriptor/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/lookup-of-ejbs-with-descriptor/pom.xml Thu Jun 30 14:59:20 2011
@@ -57,7 +57,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>javaee-api-embedded</artifactId>
       <version>6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>

Modified: openejb/branches/openejb-3.2.x/examples/lookup-of-ejbs/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/lookup-of-ejbs/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/lookup-of-ejbs/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/lookup-of-ejbs/pom.xml Thu Jun 30 14:59:20 2011
@@ -57,7 +57,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>javaee-api-embedded</artifactId>
       <version>6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>

Modified: openejb/branches/openejb-3.2.x/examples/quartz-app/quartz-beans/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/quartz-app/quartz-beans/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/quartz-app/quartz-beans/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/quartz-app/quartz-beans/pom.xml Thu Jun 30 14:59:20 2011
@@ -67,7 +67,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>javaee-api-embedded</artifactId>
       <version>6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>

Modified: openejb/branches/openejb-3.2.x/examples/simple-cmp2/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/simple-cmp2/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/simple-cmp2/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/simple-cmp2/pom.xml Thu Jun 30 14:59:20 2011
@@ -59,7 +59,7 @@
     <!-- spec apis such as javax.persistence -->
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>javaee-api-embedded</artifactId>
       <version>6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>

Modified: openejb/branches/openejb-3.2.x/examples/simple-mdb-with-descriptor/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/simple-mdb-with-descriptor/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/simple-mdb-with-descriptor/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/simple-mdb-with-descriptor/pom.xml Thu Jun 30 14:59:20 2011
@@ -57,7 +57,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>javaee-api-embedded</artifactId>
       <version>6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>

Modified: openejb/branches/openejb-3.2.x/examples/simple-mdb/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/simple-mdb/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/simple-mdb/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/simple-mdb/pom.xml Thu Jun 30 14:59:20 2011
@@ -57,7 +57,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>javaee-api-embedded</artifactId>
       <version>6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>

Modified: openejb/branches/openejb-3.2.x/examples/simple-singleton/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/simple-singleton/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/simple-singleton/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/simple-singleton/pom.xml Thu Jun 30 14:59:20 2011
@@ -57,7 +57,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>javaee-api-embedded</artifactId>
       <version>6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>

Modified: openejb/branches/openejb-3.2.x/examples/simple-stateful/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/simple-stateful/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/simple-stateful/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/simple-stateful/pom.xml Thu Jun 30 14:59:20 2011
@@ -57,7 +57,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>javaee-api-embedded</artifactId>
       <version>6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>

Modified: openejb/branches/openejb-3.2.x/examples/simple-stateless-with-descriptor/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/simple-stateless-with-descriptor/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/simple-stateless-with-descriptor/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/simple-stateless-with-descriptor/pom.xml Thu Jun 30 14:59:20 2011
@@ -57,7 +57,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>javaee-api-embedded</artifactId>
       <version>6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>

Modified: openejb/branches/openejb-3.2.x/examples/simple-stateless/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/simple-stateless/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/simple-stateless/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/simple-stateless/pom.xml Thu Jun 30 14:59:20 2011
@@ -57,7 +57,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>javaee-api-embedded</artifactId>
       <version>6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>

Modified: openejb/branches/openejb-3.2.x/examples/simple-webservice/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/simple-webservice/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/simple-webservice/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/simple-webservice/pom.xml Thu Jun 30 14:59:20 2011
@@ -57,7 +57,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>javaee-api-embedded</artifactId>
       <version>6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>

Modified: openejb/branches/openejb-3.2.x/examples/spring-integration/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/spring-integration/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/spring-integration/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/spring-integration/pom.xml Thu Jun 30 14:59:20 2011
@@ -57,7 +57,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>javaee-api-embedded</artifactId>
       <version>6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>

Modified: openejb/branches/openejb-3.2.x/examples/telephone-stateful/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/telephone-stateful/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/telephone-stateful/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/telephone-stateful/pom.xml Thu Jun 30 14:59:20 2011
@@ -57,7 +57,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>javaee-api-embedded</artifactId>
       <version>6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>

Modified: openejb/branches/openejb-3.2.x/examples/testcase-injection/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/testcase-injection/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/testcase-injection/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/testcase-injection/pom.xml Thu Jun 30 14:59:20 2011
@@ -57,7 +57,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>javaee-api-embedded</artifactId>
       <version>6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>

Modified: openejb/branches/openejb-3.2.x/examples/testing-security-2/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/testing-security-2/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/testing-security-2/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/testing-security-2/pom.xml Thu Jun 30 14:59:20 2011
@@ -65,7 +65,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>javaee-api-embedded</artifactId>
       <version>6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>

Modified: openejb/branches/openejb-3.2.x/examples/testing-security/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/testing-security/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/testing-security/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/testing-security/pom.xml Thu Jun 30 14:59:20 2011
@@ -65,7 +65,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>javaee-api-embedded</artifactId>
       <version>6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>

Modified: openejb/branches/openejb-3.2.x/examples/testing-transactions/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/testing-transactions/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/testing-transactions/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/testing-transactions/pom.xml Thu Jun 30 14:59:20 2011
@@ -57,7 +57,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>javaee-api-embedded</artifactId>
       <version>6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>

Modified: openejb/branches/openejb-3.2.x/examples/transaction-rollback/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/transaction-rollback/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/transaction-rollback/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/transaction-rollback/pom.xml Thu Jun 30 14:59:20 2011
@@ -58,7 +58,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>javaee-api-embedded</artifactId>
       <version>6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>

Modified: openejb/branches/openejb-3.2.x/examples/troubleshooting/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/troubleshooting/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/troubleshooting/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/troubleshooting/pom.xml Thu Jun 30 14:59:20 2011
@@ -58,7 +58,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>javaee-api-embedded</artifactId>
       <version>6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>

Modified: openejb/branches/openejb-3.2.x/examples/webapps/applet/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/webapps/applet/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/webapps/applet/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/webapps/applet/pom.xml Thu Jun 30 14:59:20 2011
@@ -34,7 +34,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>javaee-api-embedded</artifactId>
       <version>6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
@@ -83,7 +83,7 @@
                 <jar destfile="${project.build.directory}/${project.build.finalName}/app.jar" basedir="target/classes"/>
                 <signjar jar="${project.build.directory}/${project.build.finalName}/app.jar" alias="mykey" storepass="openejb"/>
                 <signjar jar="${project.build.directory}/${project.build.finalName}/openejb-client.jar" alias="mykey" storepass="openejb"/>
-                <signjar jar="${project.build.directory}/${project.build.finalName}/javaee-api.jar" alias="mykey" storepass="openejb"/>
+                <signjar jar="${project.build.directory}/${project.build.finalName}/javaee-api-embedded.jar" alias="mykey" storepass="openejb"/>
               </tasks>
             </configuration>
           </execution>
@@ -110,10 +110,10 @@
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.apache.openejb</groupId>
-                  <artifactId>javaee-api</artifactId>
+                  <artifactId>javaee-api-embedded</artifactId>
                   <version>6.0-SNAPSHOT</version>
                   <outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
-                  <destFileName>javaee-api.jar</destFileName>
+                  <destFileName>javaee-api-embedded.jar</destFileName>
                 </artifactItem>
               </artifactItems>
             </configuration>

Modified: openejb/branches/openejb-3.2.x/examples/webapps/ejb-examples/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/webapps/ejb-examples/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/webapps/ejb-examples/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/webapps/ejb-examples/pom.xml Thu Jun 30 14:59:20 2011
@@ -34,12 +34,6 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-web-api</artifactId>
-      <version>6.0-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>4.4</version>

Modified: openejb/branches/openejb-3.2.x/examples/webapps/ejb-webservice/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/webapps/ejb-webservice/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/webapps/ejb-webservice/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/webapps/ejb-webservice/pom.xml Thu Jun 30 14:59:20 2011
@@ -30,7 +30,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>javaee-api-embedded</artifactId>
       <version>6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>

Modified: openejb/branches/openejb-3.2.x/examples/webapps/jsf/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/webapps/jsf/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/webapps/jsf/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/webapps/jsf/pom.xml Thu Jun 30 14:59:20 2011
@@ -109,7 +109,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>javaee-api-embedded</artifactId>
       <version>6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>

Modified: openejb/branches/openejb-3.2.x/examples/webapps/moviefun/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/webapps/moviefun/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/webapps/moviefun/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/webapps/moviefun/pom.xml Thu Jun 30 14:59:20 2011
@@ -35,12 +35,6 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-web-api</artifactId>
-      <version>6.0-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>4.4</version>

Modified: openejb/branches/openejb-3.2.x/examples/webapps/struts/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/webapps/struts/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/webapps/struts/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/webapps/struts/pom.xml Thu Jun 30 14:59:20 2011
@@ -44,7 +44,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>javaee-api-embedded</artifactId>
       <version>6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>

Modified: openejb/branches/openejb-3.2.x/examples/webservice-attachments/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/webservice-attachments/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/webservice-attachments/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/webservice-attachments/pom.xml Thu Jun 30 14:59:20 2011
@@ -57,7 +57,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>javaee-api-embedded</artifactId>
       <version>6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>

Modified: openejb/branches/openejb-3.2.x/examples/webservice-inheritance/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/webservice-inheritance/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/webservice-inheritance/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/webservice-inheritance/pom.xml Thu Jun 30 14:59:20 2011
@@ -55,7 +55,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>javaee-api-embedded</artifactId>
       <version>6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>

Modified: openejb/branches/openejb-3.2.x/examples/webservice-security/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/webservice-security/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/webservice-security/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/webservice-security/pom.xml Thu Jun 30 14:59:20 2011
@@ -36,7 +36,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>javaee-api-embedded</artifactId>
       <version>6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>

Modified: openejb/branches/openejb-3.2.x/examples/webservice-ws-security/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/webservice-ws-security/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/webservice-ws-security/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/webservice-ws-security/pom.xml Thu Jun 30 14:59:20 2011
@@ -38,7 +38,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
+      <artifactId>javaee-api-embedded</artifactId>
       <version>6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>

Modified: openejb/branches/openejb-3.2.x/itests/openejb-itests-app/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/itests/openejb-itests-app/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/itests/openejb-itests-app/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/itests/openejb-itests-app/pom.xml Thu Jun 30 14:59:20 2011
@@ -72,8 +72,8 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>6.0-SNAPSHOT</version>
+      <artifactId>javaee-api-embedded</artifactId>
+      <version>${javaee-api.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: openejb/branches/openejb-3.2.x/itests/openejb-itests-beans/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/itests/openejb-itests-beans/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/itests/openejb-itests-beans/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/itests/openejb-itests-beans/pom.xml Thu Jun 30 14:59:20 2011
@@ -30,13 +30,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>javaee-api</artifactId>
-      <version>6.0-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-web-api</artifactId>
-      <version>6.0-SNAPSHOT</version>
+      <version>${javaee-api.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: openejb/branches/openejb-3.2.x/itests/openejb-itests-client/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/itests/openejb-itests-client/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/itests/openejb-itests-client/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/itests/openejb-itests-client/pom.xml Thu Jun 30 14:59:20 2011
@@ -84,8 +84,8 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>6.0-SNAPSHOT</version>
+      <artifactId>javaee-api-embedded</artifactId>
+      <version>${javaee-api.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.openejb</groupId>

Modified: openejb/branches/openejb-3.2.x/itests/openejb-itests-interceptor-beans/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/itests/openejb-itests-interceptor-beans/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/itests/openejb-itests-interceptor-beans/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/itests/openejb-itests-interceptor-beans/pom.xml Thu Jun 30 14:59:20 2011
@@ -34,8 +34,8 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>6.0-SNAPSHOT</version>
+      <artifactId>javaee-api-embedded</artifactId>
+      <version>${javaee-api.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.openejb</groupId>

Modified: openejb/branches/openejb-3.2.x/itests/openejb-itests-servlets/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/itests/openejb-itests-servlets/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/itests/openejb-itests-servlets/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/itests/openejb-itests-servlets/pom.xml Thu Jun 30 14:59:20 2011
@@ -30,13 +30,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>javaee-api</artifactId>
-      <version>6.0-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-web-api</artifactId>
-      <version>6.0-SNAPSHOT</version>
+      <version>${javaee-api.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: openejb/branches/openejb-3.2.x/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/pom.xml Thu Jun 30 14:59:20 2011
@@ -112,6 +112,9 @@
        -->
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
+    <!-- to change easily the javaee api version -->
+    <javaee-api.version>6.0-SNAPSHOT</javaee-api.version>
+
     <bval.version>0.2-incubating</bval.version>
     <org.apache.activemq.version>5.4.2</org.apache.activemq.version>
     <quartz.version>1.8.4</quartz.version>

Modified: openejb/branches/openejb-3.2.x/server/openejb-client/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/server/openejb-client/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/server/openejb-client/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/server/openejb-client/pom.xml Thu Jun 30 14:59:20 2011
@@ -69,8 +69,8 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>6.0-SNAPSHOT</version>
+      <artifactId>javaee-api-embedded</artifactId>
+      <version>${javaee-api.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.javamail</groupId>

Modified: openejb/branches/openejb-3.2.x/server/openejb-cxf/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/server/openejb-cxf/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/server/openejb-cxf/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/server/openejb-cxf/pom.xml Thu Jun 30 14:59:20 2011
@@ -51,8 +51,8 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>6.0-SNAPSHOT</version>
+      <artifactId>javaee-api-embedded</artifactId>
+      <version>${javaee-api.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.openejb</groupId>

Modified: openejb/branches/openejb-3.2.x/server/openejb-ejbd/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/server/openejb-ejbd/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/server/openejb-ejbd/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/server/openejb-ejbd/pom.xml Thu Jun 30 14:59:20 2011
@@ -75,8 +75,8 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>6.0-SNAPSHOT</version>
+      <artifactId>javaee-api-embedded</artifactId>
+      <version>${javaee-api.version}</version>
     </dependency>
     <dependency>
       <groupId>idb</groupId>

Modified: openejb/branches/openejb-3.2.x/server/openejb-http/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/server/openejb-http/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/server/openejb-http/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/server/openejb-http/pom.xml Thu Jun 30 14:59:20 2011
@@ -79,12 +79,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>javaee-api</artifactId>
-      <version>6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-web-api</artifactId>
-      <version>6.0-SNAPSHOT</version>
+      <version>${javaee-api.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.openejb</groupId>

Modified: openejb/branches/openejb-3.2.x/server/openejb-server/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/server/openejb-server/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/server/openejb-server/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/server/openejb-server/pom.xml Thu Jun 30 14:59:20 2011
@@ -60,8 +60,8 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>6.0-SNAPSHOT</version>
+      <artifactId>javaee-api-embedded</artifactId>
+      <version>${javaee-api.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.openejb</groupId>

Modified: openejb/branches/openejb-3.2.x/server/openejb-telnet/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/server/openejb-telnet/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/server/openejb-telnet/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/server/openejb-telnet/pom.xml Thu Jun 30 14:59:20 2011
@@ -32,8 +32,8 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>6.0-SNAPSHOT</version>
+      <artifactId>javaee-api-embedded</artifactId>
+      <version>${javaee-api.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.openejb</groupId>

Modified: openejb/branches/openejb-3.2.x/server/openejb-webadmin/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/server/openejb-webadmin/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/server/openejb-webadmin/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/server/openejb-webadmin/pom.xml Thu Jun 30 14:59:20 2011
@@ -72,8 +72,8 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>6.0-SNAPSHOT</version>
+      <artifactId>javaee-api-embedded</artifactId>
+      <version>${javaee-api.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.openejb</groupId>

Modified: openejb/branches/openejb-3.2.x/server/openejb-webservices/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/server/openejb-webservices/pom.xml?rev=1141558&r1=1141557&r2=1141558&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/server/openejb-webservices/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/server/openejb-webservices/pom.xml Thu Jun 30 14:59:20 2011
@@ -59,8 +59,8 @@
     <!-- spec dependencies -->
     <dependency>
       <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>6.0-SNAPSHOT</version>
+      <artifactId>javaee-api-embedded</artifactId>
+      <version>${javaee-api.version}</version>
     </dependency>
     <dependency>
       <groupId>wsdl4j</groupId>



Mime
View raw message