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 2011/04/02 21:12:06 UTC

svn commit: r1088089 - /openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/assembly/war.xml

Author: dblevins
Date: Sat Apr  2 19:12:06 2011
New Revision: 1088089

URL: http://svn.apache.org/viewvc?rev=1088089&view=rev
Log:
Updated excludes to match the new tomcat-catalina artifact id

Modified:
    openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/assembly/war.xml

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=1088089&r1=1088088&r2=1088089&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 Sat Apr  2 19:12:06 2011
@@ -41,10 +41,10 @@
         <include>LICENSE.txt</include>
       </includes>
     </fileSet>
-    <fileSet>
-      <directory>${basedir}/src/main/webapp</directory>
-      <outputDirectory>/</outputDirectory>
-    </fileSet>
+    <fileSet>
+      <directory>${basedir}/src/main/webapp</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
     <fileSet>
       <directory>${basedir}/target/classes</directory>
       <outputDirectory>/</outputDirectory>
@@ -71,10 +71,7 @@
       <outputDirectory>lib</outputDirectory>
       <scope>runtime</scope>
       <excludes>
-          <exclude>org.apache.tomcat:catalina</exclude>
-          <exclude>org.apache.tomcat:annotations-api</exclude>
-          <exclude>org.apache.tomcat:juli</exclude>
-          <exclude>org.apache.tomcat:servlet-api</exclude>
+          <exclude>org.apache.tomcat:tomcat-catalina</exclude>
       </excludes>
     </dependencySet>
     <dependencySet>