You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2010/11/15 19:36:41 UTC
svn commit: r1035392 - in /openejb/branches/openejb-3.1.x:
assembly/openejb-itests-standalone-client/ assembly/openejb-standalone/
assembly/openejb-tomcat/openejb-tomcat-webapp/ container/openejb-core/
container/openejb-spring/ itests/openejb-itests-be...
Author: dblevins
Date: Mon Nov 15 18:36:40 2010
New Revision: 1035392
URL: http://svn.apache.org/viewvc?rev=1035392&view=rev
Log:
Patch from Stephen Connolly, OPENEJB-1399: packaging of openejb-itests-interceptor-beans and openejb-itests-beans is incorrect
Thanks, Stephen!
Modified:
openejb/branches/openejb-3.1.x/assembly/openejb-itests-standalone-client/pom.xml
openejb/branches/openejb-3.1.x/assembly/openejb-standalone/pom.xml
openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml
openejb/branches/openejb-3.1.x/container/openejb-core/pom.xml
openejb/branches/openejb-3.1.x/container/openejb-spring/pom.xml
openejb/branches/openejb-3.1.x/itests/openejb-itests-beans/pom.xml
openejb/branches/openejb-3.1.x/itests/openejb-itests-client/pom.xml
openejb/branches/openejb-3.1.x/itests/openejb-itests-interceptor-beans/pom.xml
openejb/branches/openejb-3.1.x/server/openejb-ejbd/pom.xml
Modified: openejb/branches/openejb-3.1.x/assembly/openejb-itests-standalone-client/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/assembly/openejb-itests-standalone-client/pom.xml?rev=1035392&r1=1035391&r2=1035392&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/assembly/openejb-itests-standalone-client/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/assembly/openejb-itests-standalone-client/pom.xml Mon Nov 15 18:36:40 2010
@@ -85,6 +85,7 @@
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-itests-beans</artifactId>
<version>${version}</version>
+ <type>ejb</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: openejb/branches/openejb-3.1.x/assembly/openejb-standalone/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/assembly/openejb-standalone/pom.xml?rev=1035392&r1=1035391&r2=1035392&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/assembly/openejb-standalone/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/assembly/openejb-standalone/pom.xml Mon Nov 15 18:36:40 2010
@@ -187,6 +187,7 @@
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-itests-beans</artifactId>
<version>${version}</version>
+ <type>ejb</type>
<scope>test</scope>
</dependency>
</dependencies>
@@ -206,6 +207,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-itests-beans</artifactId>
+ <type>ejb</type>
<version>${version}</version>
</dependency>
<dependency>
Modified: openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml?rev=1035392&r1=1035391&r2=1035392&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml Mon Nov 15 18:36:40 2010
@@ -57,36 +57,14 @@
<id>copy</id>
<phase>process-resources</phase>
<goals>
- <goal>copy</goal>
+ <goal>copy-dependencies</goal>
</goals>
<configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-itests-standalone-client</artifactId>
- <version>${version}</version>
- <outputDirectory>${project.build.directory}</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-itests-web</artifactId>
- <version>${version}</version>
- <type>war</type>
- <outputDirectory>${project.build.directory}</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-itests-beans</artifactId>
- <version>${version}</version>
- <outputDirectory>${project.build.directory}</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.1</version>
- <outputDirectory>${project.build.directory}</outputDirectory>
- </artifactItem>
- </artifactItems>
+ <includeGroupIds>org.apache.openejb, junit</includeGroupIds>
+ <includeArtifactIds>openejb-itests-standalone-client,openejb-itests-web,openejb-itests-beans,junit</includeArtifactIds>
+ <includeTypes>jar,war,ejb</includeTypes>
+ <excludeTransitive>true</excludeTransitive>
+ <outputDirectory>${project.build.directory}</outputDirectory>
</configuration>
</execution>
</executions>
@@ -212,6 +190,26 @@
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-itests-beans</artifactId>
<version>${version}</version>
+ <type>ejb</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-itests-standalone-client</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-itests-web</artifactId>
+ <version>${version}</version>
+ <type>war</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.1</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: openejb/branches/openejb-3.1.x/container/openejb-core/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/container/openejb-core/pom.xml?rev=1035392&r1=1035391&r2=1035392&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/container/openejb-core/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/container/openejb-core/pom.xml Mon Nov 15 18:36:40 2010
@@ -240,12 +240,14 @@
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-itests-beans</artifactId>
<version>${version}</version>
+ <type>ejb</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-itests-interceptor-beans</artifactId>
<version>${version}</version>
+ <type>ejb</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: openejb/branches/openejb-3.1.x/container/openejb-spring/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/container/openejb-spring/pom.xml?rev=1035392&r1=1035391&r2=1035392&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/container/openejb-spring/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/container/openejb-spring/pom.xml Mon Nov 15 18:36:40 2010
@@ -104,6 +104,7 @@
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-itests-beans</artifactId>
<version>${version}</version>
+ <type>ejb</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: openejb/branches/openejb-3.1.x/itests/openejb-itests-beans/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/itests/openejb-itests-beans/pom.xml?rev=1035392&r1=1035391&r2=1035392&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/itests/openejb-itests-beans/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/itests/openejb-itests-beans/pom.xml Mon Nov 15 18:36:40 2010
@@ -24,7 +24,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>openejb-itests-beans</artifactId>
- <packaging>jar</packaging>
+ <packaging>ejb</packaging>
<name>OpenEJB :: iTests Beans</name>
<dependencies>
<dependency>
Modified: openejb/branches/openejb-3.1.x/itests/openejb-itests-client/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/itests/openejb-itests-client/pom.xml?rev=1035392&r1=1035391&r2=1035392&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/itests/openejb-itests-client/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/itests/openejb-itests-client/pom.xml Mon Nov 15 18:36:40 2010
@@ -96,6 +96,7 @@
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-itests-beans</artifactId>
<version>${pom.version}</version>
+ <type>ejb</type>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
Modified: openejb/branches/openejb-3.1.x/itests/openejb-itests-interceptor-beans/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/itests/openejb-itests-interceptor-beans/pom.xml?rev=1035392&r1=1035391&r2=1035392&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/itests/openejb-itests-interceptor-beans/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/itests/openejb-itests-interceptor-beans/pom.xml Mon Nov 15 18:36:40 2010
@@ -28,7 +28,7 @@
</parent>
<artifactId>openejb-itests-interceptor-beans</artifactId>
- <packaging>jar</packaging>
+ <packaging>ejb</packaging>
<name>OpenEJB :: iTests Interceptor Beans</name>
<dependencies>
@@ -41,6 +41,7 @@
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-itests-beans</artifactId>
<version>${version}</version>
+ <type>ejb</type>
</dependency>
</dependencies>
</project>
Modified: openejb/branches/openejb-3.1.x/server/openejb-ejbd/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-ejbd/pom.xml?rev=1035392&r1=1035391&r2=1035392&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/server/openejb-ejbd/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/server/openejb-ejbd/pom.xml Mon Nov 15 18:36:40 2010
@@ -125,6 +125,7 @@
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-itests-beans</artifactId>
<version>${version}</version>
+ <type>ejb</type>
<scope>test</scope>
</dependency>
<dependency>