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/09/29 13:25:33 UTC
svn commit: r1177267 [1/5] - in /openejb/trunk/openejb3/assembly/openejb-tomcat: openejb-tomcat-bundle/tomee7/ openejb-tomcat-bundle/tomee7/src/main/assembly/ openejb-tomcat-bundle/tomee7/src/main/resources/ openejb-tomcat-bundle/tomee7/src/main/resour...

Author: dblevins
Date: Thu Sep 29 11:25:32 2011
New Revision: 1177267

URL: http://svn.apache.org/viewvc?rev=1177267&view=rev
Log:
rebuilt the NOTICE and LICENSE files for the four distros.

Added:
    openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/resources/
    openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/resources/META-INF/
    openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/resources/META-INF/LICENSE
    openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/resources/META-INF/plus/
    openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/resources/META-INF/plus/NOTICE
    openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/resources/META-INF/webprofile/
    openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/resources/META-INF/webprofile/NOTICE
    openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-plus-webapp/src/main/resources/
    openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-plus-webapp/src/main/resources/META-INF/
    openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-plus-webapp/src/main/resources/META-INF/LICENSE
    openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-plus-webapp/src/main/resources/META-INF/NOTICE
    openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/resources/META-INF/LICENSE
    openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/resources/META-INF/NOTICE
Removed:
    openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/webapp/LICENSE.txt
    openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/webapp/NOTICE.txt
Modified:
    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-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-bundle/utils/src/main/groovy/commands/SetupCommand.groovy
    openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-plus-webapp/src/main/assembly/war.xml
    openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/assembly/war.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=1177267&r1=1177266&r2=1177267&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 Thu Sep 29 11:25:32 2011
@@ -102,6 +102,13 @@
   </dependencies>
 
   <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
+
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

Modified: 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=1177267&r1=1177266&r2=1177267&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/assembly/tomee-plus.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/assembly/tomee-plus.xml Thu Sep 29 11:25:32 2011
@@ -34,6 +34,8 @@
         <include>**/*</include>
       </includes>
       <excludes>
+        <exclude>LICENSE</exclude>
+        <exclude>NOTICE</exclude>
         <exclude>**/bin/**/*</exclude>
         <exclude>**/lib/tomcat-annotations-api*.jar</exclude>
       </excludes>
@@ -46,6 +48,20 @@
       </includes>
       <fileMode>0755</fileMode>
     </fileSet>
+    <fileSet>
+      <directory>${basedir}/target/maven-shared-archive-resources/META-INF/</directory>
+      <outputDirectory>/apache-tomee-plus-${project.version}</outputDirectory>
+      <includes>
+        <include>LICENSE</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>${basedir}/src/main/resources/META-INF/plus/</directory>
+      <outputDirectory>/apache-tomee-plus-${project.version}</outputDirectory>
+      <includes>
+        <include>*</include>
+      </includes>
+    </fileSet>
   </fileSets>
 </assembly>
 

Modified: 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=1177267&r1=1177266&r2=1177267&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/assembly/tomee-webprofile.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/assembly/tomee-webprofile.xml Thu Sep 29 11:25:32 2011
@@ -34,6 +34,8 @@
         <include>**/*</include>
       </includes>
       <excludes>
+        <exclude>LICENSE</exclude>
+        <exclude>NOTICE</exclude>
         <exclude>**/bin/**/*</exclude>
         <exclude>**/lib/tomcat-annotations-api*.jar</exclude>
       </excludes>
@@ -46,6 +48,20 @@
       </includes>
       <fileMode>0755</fileMode>
     </fileSet>
+    <fileSet>
+      <directory>${basedir}/target/maven-shared-archive-resources/META-INF/</directory>
+      <outputDirectory>/apache-tomee-webprofile-${project.version}</outputDirectory>
+      <includes>
+        <include>LICENSE</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>${basedir}/src/main/resources/META-INF/webprofile/</directory>
+      <outputDirectory>/apache-tomee-webprofile-${project.version}</outputDirectory>
+      <includes>
+        <include>*</include>
+      </includes>
+    </fileSet>
   </fileSets>
 </assembly>