Author: dblevins
Date: Mon Mar 28 21:33:58 2011
New Revision: 1086412
URL: http://svn.apache.org/viewvc?rev=1086412&view=rev
Log:
Quick trim of the tomee6 bundle. TomEE now packaged as
'apache-tomee-4.0.0-SNAPSHOT'
Removed:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee6/
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/pom.xml
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/pom.xml
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/assembly/tomee.xml
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/pom.xml?rev=1086412&r1=1086411&r2=1086412&view=diff
==============================================================================
---
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/pom.xml
(original)
+++
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/pom.xml
Mon Mar 28 21:33:58 2011
@@ -103,24 +103,6 @@
</defaults>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>tomee6</id>
- <phase>package</phase>
- <configuration>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptors>
- <descriptor>src/main/assembly/tomee.xml</descriptor>
- </descriptors>
- </configuration>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</pluginManagement>
</build>
@@ -132,7 +114,6 @@
<modules>
<module>utils</module>
- <module>tomee6</module>
<module>tomee7</module>
</modules>
</project>
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/pom.xml?rev=1086412&r1=1086411&r2=1086412&view=diff
==============================================================================
---
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/pom.xml
(original)
+++
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/pom.xml
Mon Mar 28 21:33:58 2011
@@ -26,7 +26,7 @@
<version>4.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>openejb-tomee-tomcat7</artifactId>
+ <artifactId>apache-tomee</artifactId>
<packaging>jar</packaging>
<name>OpenEJB :: Assembly :: TomEE :: Tomcat 7</name>
@@ -124,6 +124,20 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bin</id>
+ <phase>package</phase>
+ <configuration>
+ <descriptor>src/main/assembly/tomee.xml</descriptor>
+ <appendAssemblyId>false</appendAssemblyId>
+ <finalName>apache-tomee-${project.version}</finalName>
+ </configuration>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/assembly/tomee.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/assembly/tomee.xml?rev=1086412&r1=1086411&r2=1086412&view=diff
==============================================================================
---
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/assembly/tomee.xml
(original)
+++
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/assembly/tomee.xml
Mon Mar 28 21:33:58 2011
@@ -20,7 +20,7 @@
<!-- $Rev: 576067 $ $Date: 2007-09-16 03:17:08 -0700 (Sun, 16 Sep 2007) $ -->
<assembly>
- <id>openejb-tomcat6-bundle</id>
+ <id>bin</id>
<formats>
<format>tar.gz</format>
<format>zip</format>
@@ -29,7 +29,7 @@
<fileSets>
<fileSet>
<directory>${basedir}/target/apache-tomcat-7.0.11</directory>
- <outputDirectory>/apache-tomee-tomcat-7.0.11</outputDirectory>
+ <outputDirectory>/apache-tomee-${version}</outputDirectory>
<includes>
<include>**/*</include>
</includes>
@@ -39,7 +39,7 @@
</fileSet>
<fileSet>
<directory>${basedir}/target/apache-tomcat-7.0.11</directory>
- <outputDirectory>/apache-tomee-tomcat-7.0.11</outputDirectory>
+ <outputDirectory>/apache-tomee-${version}</outputDirectory>
<includes>
<include>**/bin/**/*</include>
</includes>
