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 2008/05/05 15:06:04 UTC
svn commit: r653470 - in /openejb/trunk/openejb3: ./
assembly/openejb-tomcat/openejb-tomcat-catalina/
assembly/openejb-tomcat/openejb-tomcat-common/
assembly/openejb-tomcat/openejb-tomcat-loader/
assembly/openejb-tomcat/openejb-tomcat-webapp/ assembly/...
Author: jlaskowski
Date: Mon May 5 06:06:04 2008
New Revision: 653470
URL: http://svn.apache.org/viewvc?rev=653470&view=rev
Log:
Move tomcat dependency to the central pom and inherit tomcat deps from within submodule's poms.
Upgrade to Tomcat 6.0.16
Rearrange webapp jsps so they are not copied to WEB-INF/classes (why is the project not of war packaging type is beyond my understanding yet)
Added:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/webapp/
- copied from r653301, openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/resources/
Removed:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/resources/
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/webapp/META-INF/
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/pom.xml
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/pom.xml
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/pom.xml
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/assembly/war.xml
openejb/trunk/openejb3/pom.xml
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=653470&r1=653469&r2=653470&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 Mon May 5 06:06:04 2008
@@ -82,8 +82,6 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>catalina</artifactId>
- <version>6.0.13</version>
- <optional>true</optional>
</dependency>
</dependencies>
</project>
Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/pom.xml?rev=653470&r1=653469&r2=653470&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/pom.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/pom.xml Mon May 5 06:06:04 2008
@@ -59,8 +59,6 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>catalina</artifactId>
- <version>6.0.13</version>
- <optional>true</optional>
</dependency>
</dependencies>
</project>
Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/pom.xml?rev=653470&r1=653469&r2=653470&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/pom.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/pom.xml Mon May 5 06:06:04 2008
@@ -38,8 +38,6 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>catalina</artifactId>
- <version>6.0.13</version>
- <optional>true</optional>
</dependency>
</dependencies>
</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=653470&r1=653469&r2=653470&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 Mon May 5 06:06:04 2008
@@ -34,7 +34,8 @@
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
- <execution>
+ <execution>
+ <id>war</id>
<phase>package</phase>
<goals>
<goal>attached</goal>
@@ -42,8 +43,10 @@
</execution>
</executions>
<configuration>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptor>src/main/assembly/war.xml</descriptor>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>src/main/assembly/war.xml</descriptor>
+ </descriptors>
</configuration>
</plugin>
<plugin>
@@ -214,8 +217,6 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>catalina</artifactId>
- <version>6.0.13</version>
- <optional>true</optional>
</dependency>
</dependencies>
</project>
Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/assembly/war.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/assembly/war.xml?rev=653470&r1=653469&r2=653470&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/assembly/war.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/assembly/war.xml Mon May 5 06:06:04 2008
@@ -41,6 +41,10 @@
<include>LICENSE.txt</include>
</includes>
</fileSet>
+ <fileSet>
+ <directory>${basedir}/src/main/webapp</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
<fileSet>
<directory>${basedir}/target/classes</directory>
<outputDirectory>/</outputDirectory>
@@ -60,10 +64,6 @@
<includes>
<include>openejb-tomcat*.jar</include>
</includes>
- <excludes>
- <!-- TODO: Fix the exclusion to pick up the proper version -->
- <exclude>openejb-tomcat-3.0-incubating-SNAPSHOT-test.*</exclude>
- </excludes>
</fileSet>
</fileSets>
<dependencySets>
@@ -75,7 +75,6 @@
<exclude>org.apache.tomcat:annotations-api</exclude>
<exclude>org.apache.tomcat:juli</exclude>
<exclude>org.apache.tomcat:servlet-api</exclude>
- <exclude>org.apache.geronimo.specs:geronimo-servlet_2.5_spec</exclude>
</excludes>
</dependencySet>
<dependencySet>
Modified: openejb/trunk/openejb3/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/pom.xml?rev=653470&r1=653469&r2=653470&view=diff
==============================================================================
--- openejb/trunk/openejb3/pom.xml (original)
+++ openejb/trunk/openejb3/pom.xml Mon May 5 06:06:04 2008
@@ -95,7 +95,6 @@
<!-- This is used by a manifest classpath entry -->
<xbeanVersion>3.4-r636442</xbeanVersion>
-
<!-- OSGi bundles properties -->
<openejb.osgi.import.pkg>*</openejb.osgi.import.pkg>
<openejb.osgi.private.pkg>!*</openejb.osgi.private.pkg>
@@ -104,6 +103,9 @@
<openejb.osgi.export.version>${project.version}</openejb.osgi.export.version>
<openejb.osgi.import>${openejb.osgi.import.pkg}</openejb.osgi.import>
<openejb.osgi.symbolic.name>${groupId}.${artifactId}</openejb.osgi.symbolic.name>
+
+ <!-- Used in assembly/openejb-tomcat* projects -->
+ <tomcatVersion>6.0.16</tomcatVersion>
</properties>
<build>
@@ -856,27 +858,28 @@
<artifactId>commons-collections</artifactId>
<version>3.2</version>
</dependency>
-
<dependency>
<groupId>axis</groupId>
<artifactId>axis</artifactId>
<version>1.4</version>
</dependency>
-
-
<dependency>
<groupId>wsdl4j</groupId>
<artifactId>wsdl4j</artifactId>
<version>1.6.1</version>
</dependency>
-
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
<version>1.1</version>
<scope>test</scope>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>catalina</artifactId>
+ <version>${tomcatVersion}</version>
+ <optional>true</optional>
+ </dependency>
</dependencies>
</dependencyManagement>
<distributionManagement>