You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2011/07/26 09:16:57 UTC
svn commit: r1151001 - in /openejb/trunk/openejb3: ./ assembly/
assembly/javaee-api-libs/ assembly/javaee-api-libs/src/main/resources/
assembly/openejb-itests-standalone-client/
assembly/openejb-itests-standalone-client/src/main/assembly/ assembly/open...
Author: jlmonteiro
Date: Tue Jul 26 07:16:49 2011
New Revision: 1151001
URL: http://svn.apache.org/viewvc?rev=1151001&view=rev
Log:
OPENEJB-1637: split javaee-api jar
Added:
openejb/trunk/openejb3/deps/javaee-api-embedded/
openejb/trunk/openejb3/deps/javaee-api-embedded/pom.xml
Modified:
openejb/trunk/openejb3/assembly/javaee-api-libs/pom.xml
openejb/trunk/openejb3/assembly/javaee-api-libs/src/main/resources/README.txt
openejb/trunk/openejb3/assembly/openejb-itests-standalone-client/pom.xml
openejb/trunk/openejb3/assembly/openejb-itests-standalone-client/src/main/assembly/client.xml
openejb/trunk/openejb3/assembly/openejb-jetty/openejb-jetty-common/pom.xml
openejb/trunk/openejb3/assembly/openejb-jetty/openejb-jetty-webapp/pom.xml
openejb/trunk/openejb3/assembly/openejb-lite/pom.xml
openejb/trunk/openejb3/assembly/openejb-lite/src/main/assembly/client.xml
openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/pom.xml
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/src/main/java/org/apache/openejb/tomcat/loader/TomcatHelper.java
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml
openejb/trunk/openejb3/assembly/openejb-webapp-common/pom.xml
openejb/trunk/openejb3/assembly/pom.xml
openejb/trunk/openejb3/container/openejb-core/pom.xml
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
openejb/trunk/openejb3/container/openejb-jee/pom.xml
openejb/trunk/openejb3/container/openejb-loader/pom.xml
openejb/trunk/openejb3/container/openejb-osgi/pom.xml
openejb/trunk/openejb3/container/openejb-osgi/src/main/filtered-resources/features.xml
openejb/trunk/openejb3/deps/javaee-api/pom.xml
openejb/trunk/openejb3/deps/mbean-annotation-api/pom.xml
openejb/trunk/openejb3/deps/pom.xml
openejb/trunk/openejb3/itests/openejb-itests-app/pom.xml
openejb/trunk/openejb3/itests/openejb-itests-beans/pom.xml
openejb/trunk/openejb3/itests/openejb-itests-client/pom.xml
openejb/trunk/openejb3/itests/openejb-itests-interceptor-beans/pom.xml
openejb/trunk/openejb3/itests/openejb-itests-servlets/pom.xml
openejb/trunk/openejb3/pom.xml
openejb/trunk/openejb3/server/openejb-client/pom.xml
openejb/trunk/openejb3/server/openejb-ejbd/pom.xml
openejb/trunk/openejb3/server/openejb-http/pom.xml
openejb/trunk/openejb3/server/openejb-server/pom.xml
openejb/trunk/openejb3/server/openejb-telnet/pom.xml
openejb/trunk/openejb3/server/openejb-webadmin/pom.xml
openejb/trunk/openejb3/server/openejb-webservices/pom.xml
Modified: openejb/trunk/openejb3/assembly/javaee-api-libs/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/javaee-api-libs/pom.xml?rev=1151001&r1=1151000&r2=1151001&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/javaee-api-libs/pom.xml (original)
+++ openejb/trunk/openejb3/assembly/javaee-api-libs/pom.xml Tue Jul 26 07:16:49 2011
@@ -27,7 +27,7 @@
<version>4.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>javaee-api-libs</artifactId>
+ <artifactId>javaee-api-embedded-libs</artifactId>
<packaging>pom</packaging>
<name>OpenEJB :: Assembly :: Java EE API Libraries</name>
<build>
@@ -68,7 +68,7 @@
<configuration>
<appendAssemblyId>false</appendAssemblyId>
<descriptor>src/main/assembly/bin.xml</descriptor>
- <finalName>javaee-api-libs-${project.version}</finalName>
+ <finalName>javaee-api-embedded-libs-${project.version}</finalName>
</configuration>
</plugin>
</plugins>
Modified: openejb/trunk/openejb3/assembly/javaee-api-libs/src/main/resources/README.txt
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/javaee-api-libs/src/main/resources/README.txt?rev=1151001&r1=1151000&r2=1151001&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/javaee-api-libs/src/main/resources/README.txt (original)
+++ openejb/trunk/openejb3/assembly/javaee-api-libs/src/main/resources/README.txt Tue Jul 26 07:16:49 2011
@@ -1,10 +1,10 @@
-These are the archives used to create the javaee-api-5.0-x.jar.
+These are the archives used to create the javaee-api-embedded-5.0-x.jar.
-This archive exists as a way to replace the javaee-api.jar for users
+This archive exists as a way to replace the javaee-api-embedded.jar for users
who would rather have the individual API jars rather than one large
jar. This can be useful in situations where one or more spec versions
need to be upgraded or changed.
-Simply delete the javaee-api-5.0-x.jar and unzip this zip in its
+Simply delete the javaee-api-embedded-5.0-x.jar and unzip this zip in its
place. Typically this will be inside the 'lib' directory of the
OpenEJB Standalone server or OpenEJB Webapp.
Modified: openejb/trunk/openejb3/assembly/openejb-itests-standalone-client/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-itests-standalone-client/pom.xml?rev=1151001&r1=1151000&r2=1151001&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-itests-standalone-client/pom.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-itests-standalone-client/pom.xml Tue Jul 26 07:16:49 2011
@@ -58,8 +58,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/trunk/openejb3/assembly/openejb-itests-standalone-client/src/main/assembly/client.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-itests-standalone-client/src/main/assembly/client.xml?rev=1151001&r1=1151000&r2=1151001&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-itests-standalone-client/src/main/assembly/client.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-itests-standalone-client/src/main/assembly/client.xml Tue Jul 26 07:16:49 2011
@@ -53,7 +53,7 @@
<unpack>true</unpack>
<includes>
- <include>org.apache.openejb:javaee-api</include>
+ <include>org.apache.openejb:javaee-api-embedded</include>
<include>org.apache.xbean:xbean-finder-shaded</include>
<include>org.apache.xbean:xbean-asm-shaded</include>
<include>junit:junit</include>
Modified: openejb/trunk/openejb3/assembly/openejb-jetty/openejb-jetty-common/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-jetty/openejb-jetty-common/pom.xml?rev=1151001&r1=1151000&r2=1151001&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-jetty/openejb-jetty-common/pom.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-jetty/openejb-jetty-common/pom.xml Tue Jul 26 07:16:49 2011
@@ -90,8 +90,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>
<scope>provided</scope>
</dependency>
<dependency>
Modified: openejb/trunk/openejb3/assembly/openejb-jetty/openejb-jetty-webapp/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-jetty/openejb-jetty-webapp/pom.xml?rev=1151001&r1=1151000&r2=1151001&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-jetty/openejb-jetty-webapp/pom.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-jetty/openejb-jetty-webapp/pom.xml Tue Jul 26 07:16:49 2011
@@ -97,8 +97,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/trunk/openejb3/assembly/openejb-lite/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-lite/pom.xml?rev=1151001&r1=1151000&r2=1151001&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-lite/pom.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-lite/pom.xml Tue Jul 26 07:16:49 2011
@@ -55,8 +55,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/trunk/openejb3/assembly/openejb-lite/src/main/assembly/client.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-lite/src/main/assembly/client.xml?rev=1151001&r1=1151000&r2=1151001&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-lite/src/main/assembly/client.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-lite/src/main/assembly/client.xml Tue Jul 26 07:16:49 2011
@@ -53,7 +53,7 @@
<unpack>true</unpack>
<includes>
- <include>org.apache.openejb:javaee-api</include>
+ <include>org.apache.openejb:javaee-api-embedded</include>
<include>org.apache.xbean:xbean-finder-shaded</include>
<include>org.apache.xbean:xbean-asm-shaded</include>
<include>junit:junit</include>
Modified: openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml?rev=1151001&r1=1151000&r2=1151001&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml Tue Jul 26 07:16:49 2011
@@ -136,8 +136,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/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/pom.xml?rev=1151001&r1=1151000&r2=1151001&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/pom.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/pom.xml Tue Jul 26 07:16:49 2011
@@ -47,8 +47,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/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/src/main/java/org/apache/openejb/tomcat/loader/TomcatHelper.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/src/main/java/org/apache/openejb/tomcat/loader/TomcatHelper.java?rev=1151001&r1=1151000&r2=1151001&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/src/main/java/org/apache/openejb/tomcat/loader/TomcatHelper.java (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/src/main/java/org/apache/openejb/tomcat/loader/TomcatHelper.java Tue Jul 26 07:16:49 2011
@@ -158,7 +158,7 @@ public class TomcatHelper {
StringBuilder builder = new StringBuilder();
for (File f : libFolder.listFiles()) {
- if (f.getName().startsWith("javaee-api")) continue;
+ if (f.getName().startsWith("javaee-api-embedded")) continue;
if (f.getName().startsWith("myfaces")) continue;
Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml?rev=1151001&r1=1151000&r2=1151001&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml Tue Jul 26 07:16:49 2011
@@ -97,7 +97,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-SNAPSHOT</version>
+ <version>${javaee-api.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.swizzle</groupId>
Modified: openejb/trunk/openejb3/assembly/openejb-webapp-common/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-webapp-common/pom.xml?rev=1151001&r1=1151000&r2=1151001&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-webapp-common/pom.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-webapp-common/pom.xml Tue Jul 26 07:16:49 2011
@@ -43,8 +43,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/trunk/openejb3/assembly/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/pom.xml?rev=1151001&r1=1151000&r2=1151001&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/pom.xml (original)
+++ openejb/trunk/openejb3/assembly/pom.xml Tue Jul 26 07:16:49 2011
@@ -35,7 +35,7 @@
<module>openejb-itests-standalone-client</module>
<module>openejb-tomcat</module>
<module>openejb-jetty</module>
- <module>javaee-api-libs</module>
+ <module>javaee-api-embedded-libs</module>
<module>openejb-standalone</module>
<module>openejb-lite</module>
<module>openejb-logging</module>
Modified: openejb/trunk/openejb3/container/openejb-core/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/pom.xml?rev=1151001&r1=1151000&r2=1151001&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/pom.xml (original)
+++ openejb/trunk/openejb3/container/openejb-core/pom.xml Tue Jul 26 07:16:49 2011
@@ -219,8 +219,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>
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java?rev=1151001&r1=1151000&r2=1151001&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java Tue Jul 26 07:16:49 2011
@@ -335,7 +335,7 @@ public class DeploymentsResolver impleme
urlSet = urlSet.exclude(".*/hsqldb(-[\\d.]+)?.jar(!/)?");
urlSet = urlSet.exclude(".*/idb(-[\\d.]+)?.jar(!/)?");
urlSet = urlSet.exclude(".*/idea_rt.jar(!/)?");
- urlSet = urlSet.exclude(".*/javaee-api-[\\d.-]+.jar(!/)?");
+ urlSet = urlSet.exclude(".*/javaee-api(-embedded)?-[\\d.-]+.jar(!/)?");
urlSet = urlSet.exclude(".*/javassist[^/]*.jar(!/)?");
urlSet = urlSet.exclude(".*/jaxb-(impl|api)(-[\\d.]+)?.jar(!/)?");
urlSet = urlSet.exclude(".*/jboss-[^/]*.jar(!/)?");
Modified: openejb/trunk/openejb3/container/openejb-jee/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/pom.xml?rev=1151001&r1=1151000&r2=1151001&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/pom.xml (original)
+++ openejb/trunk/openejb3/container/openejb-jee/pom.xml Tue Jul 26 07:16:49 2011
@@ -101,8 +101,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>
<scope>provided</scope>
</dependency>
<!--<dependency>-->
Modified: openejb/trunk/openejb3/container/openejb-loader/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-loader/pom.xml?rev=1151001&r1=1151000&r2=1151001&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-loader/pom.xml (original)
+++ openejb/trunk/openejb3/container/openejb-loader/pom.xml Tue Jul 26 07:16:49 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>
Modified: openejb/trunk/openejb3/container/openejb-osgi/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-osgi/pom.xml?rev=1151001&r1=1151000&r2=1151001&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-osgi/pom.xml (original)
+++ openejb/trunk/openejb3/container/openejb-osgi/pom.xml Tue Jul 26 07:16:49 2011
@@ -110,7 +110,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/trunk/openejb3/container/openejb-osgi/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-osgi/src/main/filtered-resources/features.xml?rev=1151001&r1=1151000&r2=1151001&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-osgi/src/main/filtered-resources/features.xml (original)
+++ openejb/trunk/openejb3/container/openejb-osgi/src/main/filtered-resources/features.xml Tue Jul 26 07:16:49 2011
@@ -20,7 +20,7 @@
-->
<features>
<repository>mvn:org.apache.openejb/openejb-core-osgi/${version}/xml/features</repository>
- <feature name="javaee-api" version="5.0-2">
+ <feature name="javaee-api-embedded" version="5.0-2">
<!--
<bundle>mvn:org.apache.axis2/axis2-jaxws-api/1.3</bundle>
<bundle>mvn:org.apache.axis2/axis2-saaj-api/1.3</bundle>
@@ -45,7 +45,7 @@
</feature>
<!--
<feature name="openejb-loader" version="${version}">
- <feature version="5.0-2">javaee-api</feature>
+ <feature version="5.0-2">javaee-api-embedded</feature>
<bundle>mvn:org.apache.openejb/openejb-loader/${version}</bundle>
</feature>
-->
@@ -56,15 +56,15 @@
<bundle>mvn:org.apache.openejb/openejb-javaagent/${version}</bundle>
</feature>
<feature name="openejb-jee" version="${version}">
- <feature version="5.0-2">javaee-api</feature>
+ <feature version="5.0-2">javaee-api-embedded</feature>
<bundle>mvn:org.apache.openejb/openejb-jee/${version}</bundle>
</feature>
<feature name="ejb31-api-experimental" version="${version}">
- <feature version="5.0-2">javaee-api</feature>
+ <feature version="5.0-2">javaee-api-embedded</feature>
<bundle>mvn:org.apache.openejb/ejb31-api-experimental/${version}</bundle>
</feature>
<feature name="openejb-core" version="${version}">
- <feature version="5.0-2">javaee-api</feature>
+ <feature version="5.0-2">javaee-api-embedded</feature>
<feature version="${version}">ejb31-api-experimental</feature>
<feature version="${version}">openejb-api</feature>
<feature version="${version}">openejb-javaagent</feature>
Added: openejb/trunk/openejb3/deps/javaee-api-embedded/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/deps/javaee-api-embedded/pom.xml?rev=1151001&view=auto
==============================================================================
--- openejb/trunk/openejb3/deps/javaee-api-embedded/pom.xml (added)
+++ openejb/trunk/openejb3/deps/javaee-api-embedded/pom.xml Tue Jul 26 07:16:49 2011
@@ -0,0 +1,231 @@
+<?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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>deps</artifactId>
+ <groupId>org.apache.openejb</groupId>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>javaee-api-embedded-embedded</artifactId>
+ <packaging>jar</packaging>
+ <name>OpenEJB :: Dependencies :: JavaEE Embedded API</name>
+ <version>${javaee-api.version}</version>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <filters>
+ <filter>
+ <artifact>org.apache.geronimo.specs:geronimo-ejb_3.1_spec</artifact>
+ <includes>
+ <include>javax/ejb/**</include>
+ </includes>
+ </filter>
+ </filters>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+ <manifestEntries>
+ <Export-Package>javax.xml, javax.xml.ws, javax.xml.ws.handler, javax.xml.ws.handler.soap,
+ javax.xml.ws.spi, javax.xml.ws.http, javax.xml.ws.soap,javax.xml.soap, javax.xml.namespace,
+ javax.xml.registry, javax.xml.registry.infomodel, javax.xml.rpc, javax.xml.rpc.encoding,
+ javax.xml.rpc.handler, javax.xml.rpc.handler.soap, javax.xml.rpc.holders, javax.xml.rpc.server,
+ javax.xml.rpc.soap, javax.xml.stream, javax.xml.stream.events, javax.xml.stream.util,
+ javax.xml.bind, javax.xml.bind.annotation, javax.xml.bind.annotation.adapters,
+ javax.xml.bind.attachment, javax.xml.bind.helpers, javax.xml.bind.util, javax.mail,
+ javax.mail.event, javax.mail.internet, javax.mail.search, javax.mail.util, javax.activation,
+ javax.annotation, javax.annotation.security, javax.ejb, javax.ejb.spi, javax.interceptor,
+ javax.resource, javax.resource.cci, javax.resource.spi, javax.resource.spi.endpoint,
+ javax.resource.spi.security, javax.resource.spi.work, javax.enterprise, javax.enterprise.deploy,
+ javax.enterprise.deploy.model, javax.enterprise.deploy.model.exceptions,
+ javax.enterprise.deploy.shared, javax.enterprise.deploy.shared.factories,
+ javax.enterprise.deploy.spi, javax.enterprise.deploy.spi.exceptions,
+ javax.enterprise.deploy.spi.factories, javax.enterprise.deploy.spi.status, javax.management,
+ javax.management.j2ee, javax.management.j2ee.statistics, javax.security, javax.security.jacc,
+ javax.jms, javax.persistence, javax.persistence.spi, javax.transaction;version="5.0",
+ javax.transaction.xa;version="5.0",
+ javax.jws, javax.jws.soap, org.apache.geronimo, org.apache.geronimo.mail,
+ org.apache.geronimo.mail.handlers, org.apache.geronimo.mail.util
+ </Export-Package>
+ </manifestEntries>
+ </transformer>
+ </transformers>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.4</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <unzip src="${project.build.directory}/javaee-api-embedded-embedded-${project.version}.jar"
+ dest="${project.build.directory}/classes"/>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <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-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>
+ <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>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxrs_1.1_spec</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
Modified: openejb/trunk/openejb3/deps/javaee-api/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/deps/javaee-api/pom.xml?rev=1151001&r1=1151000&r2=1151001&view=diff
==============================================================================
--- openejb/trunk/openejb3/deps/javaee-api/pom.xml (original)
+++ openejb/trunk/openejb3/deps/javaee-api/pom.xml Tue Jul 26 07:16:49 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 Full API</name>
+ <version>${javaee-api.version}</version>
<build>
<plugins>
@@ -72,7 +72,7 @@
javax.management.j2ee, javax.management.j2ee.statistics, javax.security, javax.security.jacc,
javax.jms, javax.persistence, javax.persistence.spi, javax.transaction;version="5.0",
javax.transaction.xa;version="5.0", javax.servlet, javax.servlet.http, javax.servlet.resources,
- javax.jws, javax.jws.soap, org.apache.geronimo, org.apache.geronimo.mail,
+ javax.jws, javax.ws.rs, javax.jws.soap, org.apache.geronimo, org.apache.geronimo.mail,
org.apache.geronimo.mail.handlers, org.apache.geronimo.mail.util
</Export-Package>
</manifestEntries>
@@ -94,7 +94,7 @@
</goals>
<configuration>
<tasks>
- <unzip src="${project.build.directory}/javaee-api-${project.version}.jar"
+ <unzip src="${project.build.directory}/javaee-api-embedded-${project.version}.jar"
dest="${project.build.directory}/classes"/>
</tasks>
</configuration>
@@ -107,139 +107,26 @@
<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-el_2.2_spec</artifactId>
<version>1.0</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>
<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-servlet_3.0_spec</artifactId>
<version>1.0</version>
</dependency>
+
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.2_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>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxrs_1.1_spec</artifactId>
- <version>1.0</version>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>javaee-api-embedded</artifactId>
+ <version>${javaee-api.version}</version>
</dependency>
+
</dependencies>
</project>
Modified: openejb/trunk/openejb3/deps/mbean-annotation-api/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/deps/mbean-annotation-api/pom.xml?rev=1151001&r1=1151000&r2=1151001&view=diff
==============================================================================
--- openejb/trunk/openejb3/deps/mbean-annotation-api/pom.xml (original)
+++ openejb/trunk/openejb3/deps/mbean-annotation-api/pom.xml Tue Jul 26 07:16:49 2011
@@ -1,4 +1,23 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>deps</artifactId>
Modified: openejb/trunk/openejb3/deps/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/deps/pom.xml?rev=1151001&r1=1151000&r2=1151001&view=diff
==============================================================================
--- openejb/trunk/openejb3/deps/pom.xml (original)
+++ openejb/trunk/openejb3/deps/pom.xml Tue Jul 26 07:16:49 2011
@@ -28,6 +28,7 @@
<name>OpenEJB :: Dependencies</name>
<modules>
+ <module>javaee-api-embedded</module>
<module>javaee-api</module>
<module>mbean-annotation-api</module>
</modules>
Modified: openejb/trunk/openejb3/itests/openejb-itests-app/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-app/pom.xml?rev=1151001&r1=1151000&r2=1151001&view=diff
==============================================================================
--- openejb/trunk/openejb3/itests/openejb-itests-app/pom.xml (original)
+++ openejb/trunk/openejb3/itests/openejb-itests-app/pom.xml Tue Jul 26 07:16:49 2011
@@ -71,8 +71,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/trunk/openejb3/itests/openejb-itests-beans/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-beans/pom.xml?rev=1151001&r1=1151000&r2=1151001&view=diff
==============================================================================
--- openejb/trunk/openejb3/itests/openejb-itests-beans/pom.xml (original)
+++ openejb/trunk/openejb3/itests/openejb-itests-beans/pom.xml Tue Jul 26 07:16:49 2011
@@ -29,8 +29,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/trunk/openejb3/itests/openejb-itests-client/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-client/pom.xml?rev=1151001&r1=1151000&r2=1151001&view=diff
==============================================================================
--- openejb/trunk/openejb3/itests/openejb-itests-client/pom.xml (original)
+++ openejb/trunk/openejb3/itests/openejb-itests-client/pom.xml Tue Jul 26 07:16:49 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/trunk/openejb3/itests/openejb-itests-interceptor-beans/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-interceptor-beans/pom.xml?rev=1151001&r1=1151000&r2=1151001&view=diff
==============================================================================
--- openejb/trunk/openejb3/itests/openejb-itests-interceptor-beans/pom.xml (original)
+++ openejb/trunk/openejb3/itests/openejb-itests-interceptor-beans/pom.xml Tue Jul 26 07:16:49 2011
@@ -35,8 +35,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/trunk/openejb3/itests/openejb-itests-servlets/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-servlets/pom.xml?rev=1151001&r1=1151000&r2=1151001&view=diff
==============================================================================
--- openejb/trunk/openejb3/itests/openejb-itests-servlets/pom.xml (original)
+++ openejb/trunk/openejb3/itests/openejb-itests-servlets/pom.xml Tue Jul 26 07:16:49 2011
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-SNAPSHOT</version>
+ <version>${javaee-api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: openejb/trunk/openejb3/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/pom.xml?rev=1151001&r1=1151000&r2=1151001&view=diff
==============================================================================
--- openejb/trunk/openejb3/pom.xml (original)
+++ openejb/trunk/openejb3/pom.xml Tue Jul 26 07:16:49 2011
@@ -116,7 +116,10 @@
<openejb.osgi.dynamic.import>${openejb.osgi.dynamic.import.pkg}</openejb.osgi.dynamic.import>
<openejb.osgi.symbolic.name>${project.groupId}.${project.artifactId}</openejb.osgi.symbolic.name>
- <!-- Used mainly in assembly/openejb-tomcat* projects -->
+ <!-- to change easily the javaee api version -->
+ <javaee-api.version>${javaee-api.version}</javaee-api.version>
+
+ <!-- Used mainly in assembly/openejb-tomcat* projects -->
<tomcat.version>7.0.16</tomcat.version>
<!-- used mainly by jetty modules -->
Modified: openejb/trunk/openejb3/server/openejb-client/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-client/pom.xml?rev=1151001&r1=1151000&r2=1151001&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-client/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-client/pom.xml Tue Jul 26 07:16:49 2011
@@ -71,8 +71,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/trunk/openejb3/server/openejb-ejbd/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-ejbd/pom.xml?rev=1151001&r1=1151000&r2=1151001&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-ejbd/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-ejbd/pom.xml Tue Jul 26 07:16:49 2011
@@ -78,8 +78,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/trunk/openejb3/server/openejb-http/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-http/pom.xml?rev=1151001&r1=1151000&r2=1151001&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-http/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-http/pom.xml Tue Jul 26 07:16:49 2011
@@ -81,8 +81,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/trunk/openejb3/server/openejb-server/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-server/pom.xml?rev=1151001&r1=1151000&r2=1151001&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-server/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-server/pom.xml Tue Jul 26 07:16:49 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/trunk/openejb3/server/openejb-telnet/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-telnet/pom.xml?rev=1151001&r1=1151000&r2=1151001&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-telnet/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-telnet/pom.xml Tue Jul 26 07:16:49 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/trunk/openejb3/server/openejb-webadmin/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-webadmin/pom.xml?rev=1151001&r1=1151000&r2=1151001&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-webadmin/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-webadmin/pom.xml Tue Jul 26 07:16:49 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>org.apache.openejb</groupId>
Modified: openejb/trunk/openejb3/server/openejb-webservices/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-webservices/pom.xml?rev=1151001&r1=1151000&r2=1151001&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-webservices/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-webservices/pom.xml Tue Jul 26 07:16:49 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>