You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2011/09/26 00:13:14 UTC
svn commit: r1175600 - in /openejb/trunk/openejb3/assembly/openejb-tomcat:
./ openejb-tomcat-bundle/tomee7/
openejb-tomcat-bundle/tomee7/src/main/assembly/
openejb-tomcat-enterprise-webapp/ openejb-tomcat-plus-webapp/
openejb-tomcat-plus-webapp/src/mai...
Author: rmannibucau
Date: Sun Sep 25 22:13:14 2011
New Revision: 1175600
URL: http://svn.apache.org/viewvc?rev=1175600&view=rev
Log:
fixing tomee webprofile and plus packaging
Added:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/assembly/tomee-plus.xml
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/assembly/tomee-webprofile.xml
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-plus-webapp/
- copied from r1175531, openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-enterprise-webapp/
Removed:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/assembly/tomee.xml
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-enterprise-webapp/
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/pom.xml
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-plus-webapp/pom.xml
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-plus-webapp/src/main/assembly/war.xml
openejb/trunk/openejb3/assembly/openejb-tomcat/pom.xml
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=1175600&r1=1175599&r2=1175600&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 Sun Sep 25 22:13:14 2011
@@ -92,10 +92,16 @@
<type>jar</type>
<scope>compile</scope>
</dependency>
+ <dependency> <!-- to be sure to have it -->
+ <groupId>${project.groupId}</groupId>
+ <artifactId>openejb-tomcat-plus-webapp</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
@@ -120,7 +126,7 @@
</configuration>
</execution>
<execution>
- <id>copy-tomcat-for-enterprise</id>
+ <id>copy-tomcat-for-plus</id>
<phase>prepare-package</phase>
<goals>
<goal>copy</goal>
@@ -132,7 +138,7 @@
<artifactId>apache-tomcat</artifactId>
<version>${tomcat.version}</version>
<type>zip</type>
- <outputDirectory>${enterprise.work-dir}</outputDirectory>
+ <outputDirectory>${plus.work-dir}</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
@@ -177,7 +183,7 @@
</configuration>
</execution>
<execution>
- <id>execute-enterprise-installer</id>
+ <id>execute-plus-installer</id>
<phase>prepare-package</phase>
<goals>
<goal>execute</goal>
@@ -185,8 +191,8 @@
<configuration>
<source>new commands.SetupCommand(this).execute()</source>
<properties>
- <tomee.workdir>${enterprise.work-dir}</tomee.workdir>
- <tomee.webapp>openejb-tomcat-enterprise-webapp</tomee.webapp>
+ <tomee.workdir>${plus.work-dir}</tomee.workdir>
+ <tomee.webapp>openejb-tomcat-plus-webapp</tomee.webapp>
</properties>
<classpath>
<element>
@@ -214,11 +220,11 @@
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
- <id>web-profile</id>
+ <id>webprofile</id>
<phase>package</phase>
<configuration>
<descriptors>
- <descriptor>src/main/assembly/tomee.xml</descriptor>
+ <descriptor>src/main/assembly/tomee-webprofile.xml</descriptor>
</descriptors>
<appendAssemblyId>false</appendAssemblyId>
<finalName>apache-tomee-webprofile-${project.version}</finalName>
@@ -228,14 +234,14 @@
</goals>
</execution>
<execution>
- <id>enterprise</id>
+ <id>plus</id>
<phase>package</phase>
<configuration>
<descriptors>
- <descriptor>src/main/assembly/tomee.xml</descriptor>
+ <descriptor>src/main/assembly/tomee-plus.xml</descriptor>
</descriptors>
<appendAssemblyId>false</appendAssemblyId>
- <finalName>apache-tomee-enterprise-${project.version}</finalName>
+ <finalName>apache-tomee-plus-${project.version}</finalName>
</configuration>
<goals>
<goal>single</goal>
@@ -256,7 +262,7 @@
<http.proxy.nonProxyHosts>${settings.activeProxy.nonProxyHosts}</http.proxy.nonProxyHosts>
<webprofile.work-dir>${project.build.directory}/webprofile-work-dir</webprofile.work-dir>
- <enterprise.work-dir>${project.build.directory}/enterprise-work-dir</enterprise.work-dir>
+ <plus.work-dir>${project.build.directory}/plus-work-dir</plus.work-dir>
</properties>
</project>
Added: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/assembly/tomee-plus.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/assembly/tomee-plus.xml?rev=1175600&view=auto
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/assembly/tomee-plus.xml (added)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/assembly/tomee-plus.xml Sun Sep 25 22:13:14 2011
@@ -0,0 +1,51 @@
+<?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: 576067 $ $Date: 2007-09-16 03:17:08 -0700 (Sun, 16 Sep 2007) $ -->
+
+<assembly>
+ <id>tomee-webprofile</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>${plus.work-dir}/apache-tomcat-${tomcat.version}</directory>
+ <outputDirectory>/apache-tomee-plus-${project.version}</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <excludes>
+ <exclude>**/bin/**/*</exclude>
+ <exclude>**/lib/tomcat-annotations-api*.jar</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>${plus.work-dir}/apache-tomcat-${tomcat.version}</directory>
+ <outputDirectory>/apache-tomee-plus-${project.version}</outputDirectory>
+ <includes>
+ <include>**/bin/**/*</include>
+ </includes>
+ <fileMode>0755</fileMode>
+ </fileSet>
+ </fileSets>
+</assembly>
+
Added: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/assembly/tomee-webprofile.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/assembly/tomee-webprofile.xml?rev=1175600&view=auto
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/assembly/tomee-webprofile.xml (added)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/assembly/tomee-webprofile.xml Sun Sep 25 22:13:14 2011
@@ -0,0 +1,51 @@
+<?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: 576067 $ $Date: 2007-09-16 03:17:08 -0700 (Sun, 16 Sep 2007) $ -->
+
+<assembly>
+ <id>tomee-webprofile</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>${webprofile.work-dir}/apache-tomcat-${tomcat.version}</directory>
+ <outputDirectory>/apache-tomee-webprofile-${project.version}</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <excludes>
+ <exclude>**/bin/**/*</exclude>
+ <exclude>**/lib/tomcat-annotations-api*.jar</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>${webprofile.work-dir}/apache-tomcat-${tomcat.version}</directory>
+ <outputDirectory>/apache-tomee-webprofile-${project.version}</outputDirectory>
+ <includes>
+ <include>**/bin/**/*</include>
+ </includes>
+ <fileMode>0755</fileMode>
+ </fileSet>
+ </fileSets>
+</assembly>
+
Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-plus-webapp/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-plus-webapp/pom.xml?rev=1175600&r1=1175531&r2=1175600&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-plus-webapp/pom.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-plus-webapp/pom.xml Sun Sep 25 22:13:14 2011
@@ -28,8 +28,8 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>openejb-tomcat-enterprise-webapp</artifactId>
- <name>OpenEJB :: Assembly :: Tomcat :: Enterprise Webapp</name>
+ <artifactId>openejb-tomcat-plus-webapp</artifactId>
+ <name>OpenEJB :: Assembly :: Tomcat :: Plus Webapp</name>
<packaging>war</packaging>
<dependencies>
Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-plus-webapp/src/main/assembly/war.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-plus-webapp/src/main/assembly/war.xml?rev=1175600&r1=1175531&r2=1175600&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-plus-webapp/src/main/assembly/war.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-plus-webapp/src/main/assembly/war.xml Sun Sep 25 22:13:14 2011
@@ -75,8 +75,7 @@
<exclude>org.springframework:*</exclude>
<!-- wars -->
- <exclude>org.apache.openejb:openejb-tomcat-webapp</exclude>
- <exclude>org.apache.openejb:openejb-tomcat-enterprise-webapp</exclude>
+ <exclude>*:war</exclude>
</excludes>
</dependencySet>
<dependencySet>
Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/pom.xml?rev=1175600&r1=1175599&r2=1175600&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/pom.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/pom.xml Sun Sep 25 22:13:14 2011
@@ -35,11 +35,11 @@
<module>openejb-tomcat-catalina</module>
<module>openejb-tomcat-common</module>
<module>openejb-tomcat-webapp</module>
+ <module>openejb-tomcat-plus-webapp</module>
<module>openejb-tomcat-bundle</module>
<module>tomee-webservices</module>
<module>tomee-itests</module>
<module>tomee-embedded</module>
- <module>openejb-tomcat-enterprise-webapp</module>
</modules>
<repositories>