geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jsis...@apache.org
Subject svn commit: r430618 - in /geronimo/branches/1.1/applications: console-framework/ console-standard/ demo/ ldap-realm-demo/ magicGball/ remote-deploy/ uddi-db/ uddi-server/ welcome/
Date Fri, 11 Aug 2006 01:47:06 GMT
Author: jsisson
Date: Thu Aug 10 18:47:04 2006
New Revision: 430618

URL: http://svn.apache.org/viewvc?rev=430618&view=rev
Log:
GERONIMO-2308 ensure NOTICE.txt file is included in war files (merged from 1.1.1 branch)

Added:
    geronimo/branches/1.1/applications/console-framework/LICENSE.txt
      - copied unchanged from r430614, geronimo/branches/1.1.1/applications/console-framework/LICENSE.txt
    geronimo/branches/1.1/applications/console-framework/NOTICE.txt
      - copied unchanged from r430614, geronimo/branches/1.1.1/applications/console-framework/NOTICE.txt
    geronimo/branches/1.1/applications/console-standard/LICENSE.txt
      - copied unchanged from r430614, geronimo/branches/1.1.1/applications/console-standard/LICENSE.txt
    geronimo/branches/1.1/applications/console-standard/NOTICE.txt
      - copied unchanged from r430614, geronimo/branches/1.1.1/applications/console-standard/NOTICE.txt
    geronimo/branches/1.1/applications/ldap-realm-demo/LICENSE.txt
      - copied unchanged from r430614, geronimo/branches/1.1.1/applications/ldap-realm-demo/LICENSE.txt
    geronimo/branches/1.1/applications/ldap-realm-demo/NOTICE.txt
      - copied unchanged from r430614, geronimo/branches/1.1.1/applications/ldap-realm-demo/NOTICE.txt
    geronimo/branches/1.1/applications/magicGball/NOTICE.txt
      - copied unchanged from r430614, geronimo/branches/1.1.1/applications/magicGball/NOTICE.txt
    geronimo/branches/1.1/applications/uddi-db/LICENSE.txt
      - copied unchanged from r430614, geronimo/branches/1.1.1/applications/uddi-db/LICENSE.txt
    geronimo/branches/1.1/applications/uddi-db/NOTICE.txt
      - copied unchanged from r430614, geronimo/branches/1.1.1/applications/uddi-db/NOTICE.txt
    geronimo/branches/1.1/applications/uddi-server/NOTICE.txt
      - copied unchanged from r430614, geronimo/branches/1.1.1/applications/uddi-server/NOTICE.txt
Removed:
    geronimo/branches/1.1/applications/magicGball/NOTICE
    geronimo/branches/1.1/applications/uddi-server/NOTICE
Modified:
    geronimo/branches/1.1/applications/console-framework/maven.xml
    geronimo/branches/1.1/applications/console-standard/maven.xml
    geronimo/branches/1.1/applications/demo/maven.xml
    geronimo/branches/1.1/applications/ldap-realm-demo/maven.xml
    geronimo/branches/1.1/applications/magicGball/maven.xml
    geronimo/branches/1.1/applications/magicGball/project.xml
    geronimo/branches/1.1/applications/remote-deploy/maven.xml
    geronimo/branches/1.1/applications/uddi-db/project.xml
    geronimo/branches/1.1/applications/uddi-server/maven.xml
    geronimo/branches/1.1/applications/welcome/maven.xml

Modified: geronimo/branches/1.1/applications/console-framework/maven.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/applications/console-framework/maven.xml?rev=430618&r1=430617&r2=430618&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-framework/maven.xml (original)
+++ geronimo/branches/1.1/applications/console-framework/maven.xml Thu Aug 10 18:47:04 2006
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project default="default">
+<project xmlns:ant="jelly:ant" default="default">
 
     <goal name="default">
         <attainGoal name="war:install"/>
@@ -7,6 +7,9 @@
 
     <postGoal name="war:webapp">
       <attainGoal name="preCompile"/>
+      <!-- Copy LICENSE.txt and NOTICE.txt Files -->
+      <ant:copy file="LICENSE.txt" tofile="${maven.war.webapp.dir}/META-INF/LICENSE.txt"
/>
+      <ant:copy file="NOTICE.txt" tofile="${maven.war.webapp.dir}/META-INF/NOTICE.txt"
/>
     </postGoal>
 
 </project>

Modified: geronimo/branches/1.1/applications/console-standard/maven.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/applications/console-standard/maven.xml?rev=430618&r1=430617&r2=430618&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/maven.xml (original)
+++ geronimo/branches/1.1/applications/console-standard/maven.xml Thu Aug 10 18:47:04 2006
@@ -6,6 +6,9 @@
     <postGoal name="war:webapp">
         <attainGoal name="preCompile"/>
         <attainGoal name="substitute"/>
+        <!-- Copy LICENSE.txt and NOTICE.txt Files -->
+        <ant:copy file="LICENSE.txt" tofile="${maven.war.webapp.dir}/META-INF/LICENSE.txt"
/>
+        <ant:copy file="NOTICE.txt" tofile="${maven.war.webapp.dir}/META-INF/NOTICE.txt"
/>
     </postGoal>
 
     <goal name="default">

Modified: geronimo/branches/1.1/applications/demo/maven.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/applications/demo/maven.xml?rev=430618&r1=430617&r2=430618&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/demo/maven.xml (original)
+++ geronimo/branches/1.1/applications/demo/maven.xml Thu Aug 10 18:47:04 2006
@@ -7,6 +7,12 @@
     xmlns:u="jelly:util"
     xmlns:ant="jelly:ant">
 
+    <postGoal name="war:webapp">
+      <!-- Copy LICENSE.txt and NOTICE.txt Files -->
+      <ant:copy file="LICENSE.txt" tofile="${maven.war.webapp.dir}/META-INF/LICENSE.txt"
/>
+      <ant:copy file="NOTICE.txt" tofile="${maven.war.webapp.dir}/META-INF/NOTICE.txt"
/>
+    </postGoal>
+
     <goal name="default">
         <attainGoal name="war:install"/>
     </goal>

Modified: geronimo/branches/1.1/applications/ldap-realm-demo/maven.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/applications/ldap-realm-demo/maven.xml?rev=430618&r1=430617&r2=430618&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/ldap-realm-demo/maven.xml (original)
+++ geronimo/branches/1.1/applications/ldap-realm-demo/maven.xml Thu Aug 10 18:47:04 2006
@@ -20,11 +20,18 @@
 
 <project
     default="default"
-    >
+    xmlns:ant="jelly:ant">
 
     <goal name="default">
         <attainGoal name="war:install"/>
     </goal>
+    
+    <postGoal name="war:webapp">
+      <!-- Copy LICENSE.txt and NOTICE.txt Files -->
+      <ant:copy file="LICENSE.txt" tofile="${maven.war.webapp.dir}/META-INF/LICENSE.txt"
/>
+      <ant:copy file="NOTICE.txt" tofile="${maven.war.webapp.dir}/META-INF/NOTICE.txt"
/>
+    </postGoal>
+
 <!--
     <postGoal name="war:install">
         <attainGoal name="car:install"/>

Modified: geronimo/branches/1.1/applications/magicGball/maven.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/applications/magicGball/maven.xml?rev=430618&r1=430617&r2=430618&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/magicGball/maven.xml (original)
+++ geronimo/branches/1.1/applications/magicGball/maven.xml Thu Aug 10 18:47:04 2006
@@ -43,6 +43,10 @@
 
     <goal name="ejb" prereqs="java:compile">
         <ant:jar destfile="target/${pom.artifactId}-ejb-${geronimo_version}.jar">
+            <metainf dir="${basedir}">
+                <include name="LICENSE.txt"/>
+                <include name="NOTICE.txt"/>
+            </metainf>
             <fileset dir="target/classes">
                 <exclude name="**/*Servlet.class"/>
                 <exclude name="**/*Client.class"/>
@@ -53,6 +57,10 @@
 
     <goal name="client" prereqs="java:compile">
         <ant:jar destfile="target/${pom.artifactId}-client-${geronimo_version}.jar">
+            <metainf dir="${basedir}">
+                <include name="LICENSE.txt"/>
+                <include name="NOTICE.txt"/>
+            </metainf>
             <fileset dir="target/classes">
                 <include name="**/*Client.class"/>
                 <include name="**/MagicGBall.class"/>
@@ -68,6 +76,10 @@
 
     <goal name="ear" prereqs="ejb,war:war,client,filter">
         <ant:jar destfile="target/${pom.artifactId}-${geronimo_version}.ear">
+            <metainf dir="${basedir}">
+                <include name="LICENSE.txt"/>
+                <include name="NOTICE.txt"/>
+            </metainf>
             <fileset dir="target">
                 <include name="${pom.artifactId}-ejb-${geronimo_version}.jar"/>
                 <include name="${pom.artifactId}-client-${geronimo_version}.jar"/>
@@ -196,5 +208,10 @@
         </java>
     </goal>
 
+    <postGoal name="war:webapp">
+      <!-- Copy LICENSE.txt and NOTICE.txt Files -->
+      <ant:copy file="LICENSE.txt" tofile="${maven.war.webapp.dir}/META-INF/LICENSE.txt"
/>
+      <ant:copy file="NOTICE.txt" tofile="${maven.war.webapp.dir}/META-INF/NOTICE.txt"
/>
+    </postGoal>
 
 </project>

Modified: geronimo/branches/1.1/applications/magicGball/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/applications/magicGball/project.xml?rev=430618&r1=430617&r2=430618&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/magicGball/project.xml (original)
+++ geronimo/branches/1.1/applications/magicGball/project.xml Thu Aug 10 18:47:04 2006
@@ -53,6 +53,13 @@
         <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
         <resources>
             <resource>
+              <directory>${basedir}</directory>
+                <includes>
+                  <include>NOTICE.txt</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
+            <resource>
                 <directory>${basedir}/src/java</directory>
                 <includes>
                     <include>**/*.xml</include>

Modified: geronimo/branches/1.1/applications/remote-deploy/maven.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/applications/remote-deploy/maven.xml?rev=430618&r1=430617&r2=430618&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/remote-deploy/maven.xml (original)
+++ geronimo/branches/1.1/applications/remote-deploy/maven.xml Thu Aug 10 18:47:04 2006
@@ -18,9 +18,16 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project default="default">
+<project default="default" xmlns:ant="jelly:ant">
 
     <goal name="default">
         <attainGoal name="war:install"/>
     </goal>
+    
+    <postGoal name="war:webapp">
+      <!-- Copy LICENSE.txt and NOTICE.txt Files -->
+      <ant:copy file="LICENSE.txt" tofile="${maven.war.webapp.dir}/META-INF/LICENSE.txt"
/>
+      <ant:copy file="NOTICE.txt" tofile="${maven.war.webapp.dir}/META-INF/NOTICE.txt"
/>
+    </postGoal>
+    
 </project>

Modified: geronimo/branches/1.1/applications/uddi-db/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/applications/uddi-db/project.xml?rev=430618&r1=430617&r2=430618&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/uddi-db/project.xml (original)
+++ geronimo/branches/1.1/applications/uddi-db/project.xml Thu Aug 10 18:47:04 2006
@@ -35,6 +35,13 @@
 
         <resources>
             <resource>
+              <directory>${basedir}</directory>
+                <includes>
+                  <include>NOTICE.txt</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
+            <resource>
                 <directory>${basedir}/target/resources</directory>
                 <includes>
                     <include>**/*</include>

Modified: geronimo/branches/1.1/applications/uddi-server/maven.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/applications/uddi-server/maven.xml?rev=430618&r1=430617&r2=430618&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/uddi-server/maven.xml (original)
+++ geronimo/branches/1.1/applications/uddi-server/maven.xml Thu Aug 10 18:47:04 2006
@@ -20,6 +20,7 @@
 
 <project
     xmlns:velocity="jelly:velocity"
+    xmlns:ant="jelly:ant"
     default="default"
     >
 
@@ -27,4 +28,10 @@
         <attainGoal name="war:install"/>
     </goal>
 
+    <postGoal name="war:webapp">
+      <!-- Copy LICENSE.txt and NOTICE.txt Files -->
+      <ant:copy file="LICENSE.txt" tofile="${maven.war.webapp.dir}/META-INF/LICENSE.txt"
/>
+      <ant:copy file="NOTICE.txt" tofile="${maven.war.webapp.dir}/META-INF/NOTICE.txt"
/>
+    </postGoal>
+    
 </project>

Modified: geronimo/branches/1.1/applications/welcome/maven.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/applications/welcome/maven.xml?rev=430618&r1=430617&r2=430618&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/welcome/maven.xml (original)
+++ geronimo/branches/1.1/applications/welcome/maven.xml Thu Aug 10 18:47:04 2006
@@ -18,7 +18,7 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project default="default" >
+<project default="default" xmlns:ant="jelly:ant">
 
     <goal name="default">
         <attainGoal name="war:install"/>
@@ -26,6 +26,9 @@
 
     <postGoal name="war:webapp">
       <attainGoal name="preCompile"/>
+      <!-- Copy LICENSE.txt and NOTICE.txt Files -->
+      <ant:copy file="LICENSE.txt" tofile="${maven.war.webapp.dir}/META-INF/LICENSE.txt"
/>
+      <ant:copy file="NOTICE.txt" tofile="${maven.war.webapp.dir}/META-INF/NOTICE.txt"
/>
     </postGoal>
 <!--
     <postGoal name="war:install">



Mime
View raw message