Author: rmannibucau
Date: Thu Aug 4 13:35:40 2011
New Revision: 1153882
URL: http://svn.apache.org/viewvc?rev=1153882&view=rev
Log:
fixing javaee api embedded into tomcat
Modified:
openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml
Modified: openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml?rev=1153882&r1=1153881&r2=1153882&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml Thu Aug 4
13:35:40 2011
@@ -54,19 +54,19 @@
<goal>run</goal>
</goals>
<configuration>
- <tasks>
+ <target>
<mkdir dir="${basedir}/target/classes/empty"/>
- </tasks>
+ </target>
</configuration>
</execution>
<execution>
<id>cleanup-target</id>
<phase>package</phase>
<configuration>
- <tasks>
+ <target>
<delete dir="${basedir}/target/classes"/>
<delete dir="${basedir}/target/archive-tmp"/>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
@@ -294,4 +294,4 @@
</build>
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
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=1153882&r1=1153881&r2=1153882&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
Thu Aug 4 13:35:40 2011
@@ -97,7 +97,7 @@
<dependencies>
<dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>javaee-api</artifactId>
+ <artifactId>javaee-api-embedded</artifactId>
<version>${javaee-api.version}</version>
</dependency>
<dependency>
@@ -109,6 +109,12 @@
<artifactId>openejb-tomcat-loader</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>javaee-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
