You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by xu...@apache.org on 2011/10/12 04:24:53 UTC

svn commit: r1182175 - in /openejb/branches/openejb-3.0.x/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main: assembly/war.xml resources/ resources/META-INF/ webapp/META-INF/ webapp/tomcat/

Author: xuhaihong
Date: Wed Oct 12 02:24:52 2011
New Revision: 1182175

URL: http://svn.apache.org/viewvc?rev=1182175&view=rev
Log:
Move the LICENSE and NOTICE files to correct places, and update the assembly XML file

Added:
    openejb/branches/openejb-3.0.x/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/resources/   (with props)
    openejb/branches/openejb-3.0.x/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/resources/META-INF/
      - copied from r1182171, openejb/branches/openejb-3.0.x/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/webapp/META-INF/
Removed:
    openejb/branches/openejb-3.0.x/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/webapp/META-INF/
    openejb/branches/openejb-3.0.x/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/webapp/tomcat/
Modified:
    openejb/branches/openejb-3.0.x/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/assembly/war.xml

Modified: openejb/branches/openejb-3.0.x/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/assembly/war.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.0.x/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/assembly/war.xml?rev=1182175&r1=1182174&r2=1182175&view=diff
==============================================================================
--- openejb/branches/openejb-3.0.x/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/assembly/war.xml (original)
+++ openejb/branches/openejb-3.0.x/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/assembly/war.xml Wed Oct 12 02:24:52 2011
@@ -49,12 +49,22 @@
       </excludes>
     </fileSet>
     <fileSet>
+      <directory>${basedir}/src/main/webapp</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+    <fileSet>
       <directory>${basedir}/target/classes</directory>
       <outputDirectory>WEB-INF/classes</outputDirectory>
+      <excludes>
+        <exclude>**/LICENSE</exclude>
+        <exclude>**/NOTICE</exclude>
+        <exclude>**/LICENSE.txt</exclude>
+        <exclude>**/NOTICE.txt</exclude>
+      </excludes>
     </fileSet>
     <fileSet>
       <directory>${basedir}/target</directory>
-      <outputDirectory>lib</outputDirectory>
+      <outputDirectory>WEB-INF/lib</outputDirectory>
       <includes>
         <include>openejb-tomcat*.jar</include>
       </includes>
@@ -66,7 +76,7 @@
   </fileSets>
   <dependencySets>
     <dependencySet>
-      <outputDirectory>lib</outputDirectory>
+      <outputDirectory>WEB-INF/lib</outputDirectory>
       <scope>runtime</scope>
       <excludes>
           <exclude>org.apache.tomcat:catalina</exclude>

Propchange: openejb/branches/openejb-3.0.x/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/resources/
------------------------------------------------------------------------------
    bugtraq:number = true