You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ke...@apache.org on 2006/08/10 23:18:56 UTC

svn commit: r430532 [1/2] - in /geronimo/branches/1.1.1/modules: activation/ activemq-embedded-rar/ axis-builder/ axis/ client-builder/ client/ common/ connector-builder/ connector/ console-web/ converter/ core/ deploy-config/ deploy-jsr88/ deploy-tool...

Author: kevan
Date: Thu Aug 10 14:18:52 2006
New Revision: 430532

URL: http://svn.apache.org/viewvc?rev=430532&view=rev
Log:
GERONIMO-2308 Update Notice files. Add notice and license files where missing and insure they are included in generated jar files

Added:
    geronimo/branches/1.1.1/modules/directory/LICENSE.txt   (with props)
    geronimo/branches/1.1.1/modules/directory/NOTICE.txt   (with props)
    geronimo/branches/1.1.1/modules/security-builder/NOTICE.txt   (with props)
    geronimo/branches/1.1.1/modules/web-builder/LICENSE.txt   (with props)
    geronimo/branches/1.1.1/modules/web-builder/NOTICE.txt   (with props)
Modified:
    geronimo/branches/1.1.1/modules/activation/NOTICE.txt
    geronimo/branches/1.1.1/modules/activation/project.xml
    geronimo/branches/1.1.1/modules/activemq-embedded-rar/NOTICE.txt
    geronimo/branches/1.1.1/modules/activemq-embedded-rar/project.xml
    geronimo/branches/1.1.1/modules/axis-builder/NOTICE.txt
    geronimo/branches/1.1.1/modules/axis-builder/project.xml
    geronimo/branches/1.1.1/modules/axis/NOTICE.txt
    geronimo/branches/1.1.1/modules/axis/project.xml
    geronimo/branches/1.1.1/modules/client-builder/NOTICE.txt
    geronimo/branches/1.1.1/modules/client-builder/project.xml
    geronimo/branches/1.1.1/modules/client/NOTICE.txt
    geronimo/branches/1.1.1/modules/client/project.xml
    geronimo/branches/1.1.1/modules/common/NOTICE.txt
    geronimo/branches/1.1.1/modules/common/project.xml
    geronimo/branches/1.1.1/modules/connector-builder/NOTICE.txt
    geronimo/branches/1.1.1/modules/connector-builder/project.xml
    geronimo/branches/1.1.1/modules/connector/NOTICE.txt
    geronimo/branches/1.1.1/modules/connector/project.xml
    geronimo/branches/1.1.1/modules/console-web/NOTICE.txt
    geronimo/branches/1.1.1/modules/console-web/project.xml
    geronimo/branches/1.1.1/modules/converter/NOTICE.txt
    geronimo/branches/1.1.1/modules/converter/project.xml
    geronimo/branches/1.1.1/modules/core/NOTICE.txt
    geronimo/branches/1.1.1/modules/core/project.xml
    geronimo/branches/1.1.1/modules/deploy-config/NOTICE.txt
    geronimo/branches/1.1.1/modules/deploy-config/project.xml
    geronimo/branches/1.1.1/modules/deploy-jsr88/NOTICE.txt
    geronimo/branches/1.1.1/modules/deploy-jsr88/project.xml
    geronimo/branches/1.1.1/modules/deploy-tool/NOTICE.txt
    geronimo/branches/1.1.1/modules/deploy-tool/project.xml
    geronimo/branches/1.1.1/modules/deployment/NOTICE.txt
    geronimo/branches/1.1.1/modules/deployment/project.xml
    geronimo/branches/1.1.1/modules/derby/NOTICE.txt
    geronimo/branches/1.1.1/modules/derby/project.xml
    geronimo/branches/1.1.1/modules/directory/project.xml
    geronimo/branches/1.1.1/modules/hot-deploy/NOTICE.txt
    geronimo/branches/1.1.1/modules/hot-deploy/project.xml
    geronimo/branches/1.1.1/modules/installer-processing/NOTICE.txt
    geronimo/branches/1.1.1/modules/installer-processing/project.xml
    geronimo/branches/1.1.1/modules/installer-support/NOTICE.txt
    geronimo/branches/1.1.1/modules/installer-support/project.xml
    geronimo/branches/1.1.1/modules/j2ee-builder/NOTICE.txt
    geronimo/branches/1.1.1/modules/j2ee-builder/project.xml
    geronimo/branches/1.1.1/modules/j2ee-schema/NOTICE.txt
    geronimo/branches/1.1.1/modules/j2ee-schema/project.xml
    geronimo/branches/1.1.1/modules/j2ee/NOTICE.txt
    geronimo/branches/1.1.1/modules/j2ee/project.xml
    geronimo/branches/1.1.1/modules/javamail-transport/NOTICE.txt
    geronimo/branches/1.1.1/modules/javamail-transport/project.xml
    geronimo/branches/1.1.1/modules/jetty-builder/NOTICE.txt
    geronimo/branches/1.1.1/modules/jetty-builder/project.xml
    geronimo/branches/1.1.1/modules/jetty/NOTICE.txt
    geronimo/branches/1.1.1/modules/jetty/project.xml
    geronimo/branches/1.1.1/modules/jmx-remoting/NOTICE.txt
    geronimo/branches/1.1.1/modules/jmx-remoting/project.xml
    geronimo/branches/1.1.1/modules/kernel/NOTICE.txt
    geronimo/branches/1.1.1/modules/kernel/project.xml
    geronimo/branches/1.1.1/modules/mail/NOTICE.txt
    geronimo/branches/1.1.1/modules/mail/project.xml
    geronimo/branches/1.1.1/modules/management/NOTICE.txt
    geronimo/branches/1.1.1/modules/management/project.xml
    geronimo/branches/1.1.1/modules/naming-builder/NOTICE.txt
    geronimo/branches/1.1.1/modules/naming-builder/project.xml
    geronimo/branches/1.1.1/modules/naming/NOTICE.txt
    geronimo/branches/1.1.1/modules/naming/project.xml
    geronimo/branches/1.1.1/modules/scripts/project.xml
    geronimo/branches/1.1.1/modules/scripts/src/resources/NOTICE.txt
    geronimo/branches/1.1.1/modules/security-builder/project.xml
    geronimo/branches/1.1.1/modules/security/NOTICE.txt
    geronimo/branches/1.1.1/modules/security/project.xml
    geronimo/branches/1.1.1/modules/service-builder/NOTICE.txt
    geronimo/branches/1.1.1/modules/service-builder/project.xml
    geronimo/branches/1.1.1/modules/system/NOTICE.txt
    geronimo/branches/1.1.1/modules/system/project.xml
    geronimo/branches/1.1.1/modules/test-ddbean/NOTICE.txt
    geronimo/branches/1.1.1/modules/test-ddbean/project.xml
    geronimo/branches/1.1.1/modules/timer/NOTICE.txt
    geronimo/branches/1.1.1/modules/timer/project.xml
    geronimo/branches/1.1.1/modules/tomcat-builder/NOTICE.txt
    geronimo/branches/1.1.1/modules/tomcat-builder/project.xml
    geronimo/branches/1.1.1/modules/tomcat/NOTICE.txt
    geronimo/branches/1.1.1/modules/tomcat/project.xml
    geronimo/branches/1.1.1/modules/transaction/NOTICE.txt
    geronimo/branches/1.1.1/modules/transaction/project.xml
    geronimo/branches/1.1.1/modules/upgrade/NOTICE.txt
    geronimo/branches/1.1.1/modules/upgrade/project.xml
    geronimo/branches/1.1.1/modules/util/NOTICE.txt
    geronimo/branches/1.1.1/modules/util/project.xml
    geronimo/branches/1.1.1/modules/web-builder/project.xml
    geronimo/branches/1.1.1/modules/webservices/NOTICE.txt
    geronimo/branches/1.1.1/modules/webservices/project.xml

Modified: geronimo/branches/1.1.1/modules/activation/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/activation/NOTICE.txt?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/activation/NOTICE.txt (original)
+++ geronimo/branches/1.1.1/modules/activation/NOTICE.txt Thu Aug 10 14:18:52 2006
@@ -1,3 +1,6 @@
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/branches/1.1.1/modules/activation/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/activation/project.xml?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/activation/project.xml (original)
+++ geronimo/branches/1.1.1/modules/activation/project.xml Thu Aug 10 14:18:52 2006
@@ -59,4 +59,20 @@
         </dependency>
 
     </dependencies>
+
+    <!-- =================== -->
+    <!-- Build Specification -->
+    <!-- =================== -->
+
+    <build>
+        <resources>
+            <resource>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
+        </resources>
+    </build>
 </project>

Modified: geronimo/branches/1.1.1/modules/activemq-embedded-rar/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/activemq-embedded-rar/NOTICE.txt?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/activemq-embedded-rar/NOTICE.txt (original)
+++ geronimo/branches/1.1.1/modules/activemq-embedded-rar/NOTICE.txt Thu Aug 10 14:18:52 2006
@@ -1,3 +1,6 @@
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/branches/1.1.1/modules/activemq-embedded-rar/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/activemq-embedded-rar/project.xml?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/activemq-embedded-rar/project.xml (original)
+++ geronimo/branches/1.1.1/modules/activemq-embedded-rar/project.xml Thu Aug 10 14:18:52 2006
@@ -57,4 +57,19 @@
         </dependency>
     </dependencies>
 
+    <!-- =================== -->
+    <!-- Build Specification -->
+    <!-- =================== -->
+
+    <build>
+        <resources>
+            <resource>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
+        </resources>
+    </build>
 </project>

Modified: geronimo/branches/1.1.1/modules/axis-builder/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/axis-builder/NOTICE.txt?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/axis-builder/NOTICE.txt (original)
+++ geronimo/branches/1.1.1/modules/axis-builder/NOTICE.txt Thu Aug 10 14:18:52 2006
@@ -1,3 +1,6 @@
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/branches/1.1.1/modules/axis-builder/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/axis-builder/project.xml?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/axis-builder/project.xml (original)
+++ geronimo/branches/1.1.1/modules/axis-builder/project.xml Thu Aug 10 14:18:52 2006
@@ -265,6 +265,15 @@
                 <targetPath>META-INF/schema</targetPath>
             </resource>
         </resources>
+        <resources>
+            <resource>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
+        </resources>
     </build>
 
 </project>

Modified: geronimo/branches/1.1.1/modules/axis/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/axis/NOTICE.txt?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/axis/NOTICE.txt (original)
+++ geronimo/branches/1.1.1/modules/axis/NOTICE.txt Thu Aug 10 14:18:52 2006
@@ -1,3 +1,6 @@
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/branches/1.1.1/modules/axis/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/axis/project.xml?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/axis/project.xml (original)
+++ geronimo/branches/1.1.1/modules/axis/project.xml Thu Aug 10 14:18:52 2006
@@ -181,5 +181,14 @@
                 </resource>
             </resources>
         </unitTest>
+        <resources>
+            <resource>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
+        </resources>
     </build>
 </project>

Modified: geronimo/branches/1.1.1/modules/client-builder/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/client-builder/NOTICE.txt?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/client-builder/NOTICE.txt (original)
+++ geronimo/branches/1.1.1/modules/client-builder/NOTICE.txt Thu Aug 10 14:18:52 2006
@@ -1,3 +1,7 @@
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
+
 

Modified: geronimo/branches/1.1.1/modules/client-builder/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/client-builder/project.xml?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/client-builder/project.xml (original)
+++ geronimo/branches/1.1.1/modules/client-builder/project.xml Thu Aug 10 14:18:52 2006
@@ -218,4 +218,20 @@
         </dependency>
     </dependencies>
 
+    <!-- =================== -->
+    <!-- Build Specification -->
+    <!-- =================== -->
+
+    <build>
+        <resources>
+            <resource>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
+        </resources>
+    </build>
+
 </project>

Modified: geronimo/branches/1.1.1/modules/client/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/client/NOTICE.txt?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/client/NOTICE.txt (original)
+++ geronimo/branches/1.1.1/modules/client/NOTICE.txt Thu Aug 10 14:18:52 2006
@@ -1,3 +1,6 @@
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/branches/1.1.1/modules/client/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/client/project.xml?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/client/project.xml (original)
+++ geronimo/branches/1.1.1/modules/client/project.xml Thu Aug 10 14:18:52 2006
@@ -144,5 +144,14 @@
                 <exclude>**/Abstract*.java</exclude>
             </excludes>
         </unitTest>
+        <resources>
+            <resource>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
+        </resources>
     </build>
 </project>

Modified: geronimo/branches/1.1.1/modules/common/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/common/NOTICE.txt?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/common/NOTICE.txt (original)
+++ geronimo/branches/1.1.1/modules/common/NOTICE.txt Thu Aug 10 14:18:52 2006
@@ -1,3 +1,6 @@
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/branches/1.1.1/modules/common/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/common/project.xml?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/common/project.xml (original)
+++ geronimo/branches/1.1.1/modules/common/project.xml Thu Aug 10 14:18:52 2006
@@ -106,6 +106,15 @@
                 </resource>
             </resources>
         </unitTest>
+        <resources>
+            <resource>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
+        </resources>
     </build>
 
 </project>

Modified: geronimo/branches/1.1.1/modules/connector-builder/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/connector-builder/NOTICE.txt?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/connector-builder/NOTICE.txt (original)
+++ geronimo/branches/1.1.1/modules/connector-builder/NOTICE.txt Thu Aug 10 14:18:52 2006
@@ -1,3 +1,6 @@
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/branches/1.1.1/modules/connector-builder/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/connector-builder/project.xml?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/connector-builder/project.xml (original)
+++ geronimo/branches/1.1.1/modules/connector-builder/project.xml Thu Aug 10 14:18:52 2006
@@ -252,4 +252,20 @@
             <version>${xpp3_version}</version>
         </dependency>
     </dependencies>
+
+    <!-- =================== -->
+    <!-- Build Specification -->
+    <!-- =================== -->
+
+    <build>
+        <resources>
+            <resource>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
+        </resources>
+    </build>
 </project>

Modified: geronimo/branches/1.1.1/modules/connector/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/connector/NOTICE.txt?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/connector/NOTICE.txt (original)
+++ geronimo/branches/1.1.1/modules/connector/NOTICE.txt Thu Aug 10 14:18:52 2006
@@ -1,3 +1,6 @@
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/branches/1.1.1/modules/connector/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/connector/project.xml?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/connector/project.xml (original)
+++ geronimo/branches/1.1.1/modules/connector/project.xml Thu Aug 10 14:18:52 2006
@@ -169,4 +169,20 @@
             <url>http://jakarta.apache.org/regexp</url>
         </dependency>
     </dependencies>
+
+    <!-- =================== -->
+    <!-- Build Specification -->
+    <!-- =================== -->
+
+    <build>
+        <resources>
+            <resource>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
+        </resources>
+    </build>
 </project>

Modified: geronimo/branches/1.1.1/modules/console-web/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/console-web/NOTICE.txt?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/console-web/NOTICE.txt (original)
+++ geronimo/branches/1.1.1/modules/console-web/NOTICE.txt Thu Aug 10 14:18:52 2006
@@ -1,3 +1,5 @@
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
-

Modified: geronimo/branches/1.1.1/modules/console-web/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/console-web/project.xml?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/console-web/project.xml (original)
+++ geronimo/branches/1.1.1/modules/console-web/project.xml Thu Aug 10 14:18:52 2006
@@ -66,4 +66,20 @@
             <url>http://jakarta.apache.org/commons/logging</url>
         </dependency>
     </dependencies>
+
+    <!-- =================== -->
+    <!-- Build Specification -->
+    <!-- =================== -->
+
+    <build>
+        <resources>
+            <resource>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
+        </resources>
+    </build>
 </project>

Modified: geronimo/branches/1.1.1/modules/converter/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/converter/NOTICE.txt?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/converter/NOTICE.txt (original)
+++ geronimo/branches/1.1.1/modules/converter/NOTICE.txt Thu Aug 10 14:18:52 2006
@@ -1,3 +1,6 @@
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/branches/1.1.1/modules/converter/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/converter/project.xml?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/converter/project.xml (original)
+++ geronimo/branches/1.1.1/modules/converter/project.xml Thu Aug 10 14:18:52 2006
@@ -76,5 +76,14 @@
                 <include>**/*Test.java</include>
             </includes>
         </unitTest>
+        <resources>
+            <resource>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
+        </resources>
     </build>
 </project>

Modified: geronimo/branches/1.1.1/modules/core/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/core/NOTICE.txt?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/core/NOTICE.txt (original)
+++ geronimo/branches/1.1.1/modules/core/NOTICE.txt Thu Aug 10 14:18:52 2006
@@ -1,3 +1,6 @@
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/branches/1.1.1/modules/core/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/core/project.xml?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/core/project.xml (original)
+++ geronimo/branches/1.1.1/modules/core/project.xml Thu Aug 10 14:18:52 2006
@@ -111,5 +111,14 @@
                 </resource>
             </resources>
         </unitTest>
+        <resources>
+            <resource>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
+        </resources>
     </build>
 </project>

Modified: geronimo/branches/1.1.1/modules/deploy-config/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/deploy-config/NOTICE.txt?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/deploy-config/NOTICE.txt (original)
+++ geronimo/branches/1.1.1/modules/deploy-config/NOTICE.txt Thu Aug 10 14:18:52 2006
@@ -1,3 +1,6 @@
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/branches/1.1.1/modules/deploy-config/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/deploy-config/project.xml?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/deploy-config/project.xml (original)
+++ geronimo/branches/1.1.1/modules/deploy-config/project.xml Thu Aug 10 14:18:52 2006
@@ -71,5 +71,14 @@
                 <include>**/*Test.java</include>
             </includes>
         </unitTest>
+        <resources>
+            <resource>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
+        </resources>
     </build>
 </project>

Modified: geronimo/branches/1.1.1/modules/deploy-jsr88/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/deploy-jsr88/NOTICE.txt?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/deploy-jsr88/NOTICE.txt (original)
+++ geronimo/branches/1.1.1/modules/deploy-jsr88/NOTICE.txt Thu Aug 10 14:18:52 2006
@@ -1,3 +1,6 @@
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/branches/1.1.1/modules/deploy-jsr88/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/deploy-jsr88/project.xml?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/deploy-jsr88/project.xml (original)
+++ geronimo/branches/1.1.1/modules/deploy-jsr88/project.xml Thu Aug 10 14:18:52 2006
@@ -159,5 +159,14 @@
             </resources>
 -->
         </unitTest>
+        <resources>
+            <resource>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
+        </resources>
     </build>
 </project>

Modified: geronimo/branches/1.1.1/modules/deploy-tool/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/deploy-tool/NOTICE.txt?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/deploy-tool/NOTICE.txt (original)
+++ geronimo/branches/1.1.1/modules/deploy-tool/NOTICE.txt Thu Aug 10 14:18:52 2006
@@ -1,3 +1,6 @@
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/branches/1.1.1/modules/deploy-tool/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/deploy-tool/project.xml?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/deploy-tool/project.xml (original)
+++ geronimo/branches/1.1.1/modules/deploy-tool/project.xml Thu Aug 10 14:18:52 2006
@@ -139,5 +139,14 @@
             </resources>
 -->
         </unitTest>
+        <resources>
+            <resource>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
+        </resources>
     </build>
 </project>

Modified: geronimo/branches/1.1.1/modules/deployment/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/deployment/NOTICE.txt?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/deployment/NOTICE.txt (original)
+++ geronimo/branches/1.1.1/modules/deployment/NOTICE.txt Thu Aug 10 14:18:52 2006
@@ -1,3 +1,6 @@
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/branches/1.1.1/modules/deployment/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/deployment/project.xml?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/deployment/project.xml (original)
+++ geronimo/branches/1.1.1/modules/deployment/project.xml Thu Aug 10 14:18:52 2006
@@ -145,5 +145,14 @@
                 </resource>
             </resources>
         </unitTest>
+        <resources>
+            <resource>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
+        </resources>
     </build>
 </project>

Modified: geronimo/branches/1.1.1/modules/derby/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/derby/NOTICE.txt?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/derby/NOTICE.txt (original)
+++ geronimo/branches/1.1.1/modules/derby/NOTICE.txt Thu Aug 10 14:18:52 2006
@@ -1,3 +1,6 @@
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/branches/1.1.1/modules/derby/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/derby/project.xml?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/derby/project.xml (original)
+++ geronimo/branches/1.1.1/modules/derby/project.xml Thu Aug 10 14:18:52 2006
@@ -90,5 +90,14 @@
                 <exclude>**/Abstract*.java</exclude>
             </excludes>
         </unitTest>
+        <resources>
+            <resource>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
+        </resources>
     </build>
 </project>

Added: geronimo/branches/1.1.1/modules/directory/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/directory/LICENSE.txt?rev=430532&view=auto
==============================================================================
--- geronimo/branches/1.1.1/modules/directory/LICENSE.txt (added)
+++ geronimo/branches/1.1.1/modules/directory/LICENSE.txt Thu Aug 10 14:18:52 2006
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

Propchange: geronimo/branches/1.1.1/modules/directory/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.1.1/modules/directory/LICENSE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/branches/1.1.1/modules/directory/LICENSE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/branches/1.1.1/modules/directory/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/directory/NOTICE.txt?rev=430532&view=auto
==============================================================================
--- geronimo/branches/1.1.1/modules/directory/NOTICE.txt (added)
+++ geronimo/branches/1.1.1/modules/directory/NOTICE.txt Thu Aug 10 14:18:52 2006
@@ -0,0 +1,6 @@
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+

Propchange: geronimo/branches/1.1.1/modules/directory/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.1.1/modules/directory/NOTICE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/branches/1.1.1/modules/directory/NOTICE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/branches/1.1.1/modules/directory/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/directory/project.xml?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/directory/project.xml (original)
+++ geronimo/branches/1.1.1/modules/directory/project.xml Thu Aug 10 14:18:52 2006
@@ -351,5 +351,14 @@
                 </resource>
             </resources>
         </unitTest>
+        <resources>
+            <resource>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
+        </resources>
     </build>
 </project>

Modified: geronimo/branches/1.1.1/modules/hot-deploy/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/hot-deploy/NOTICE.txt?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/hot-deploy/NOTICE.txt (original)
+++ geronimo/branches/1.1.1/modules/hot-deploy/NOTICE.txt Thu Aug 10 14:18:52 2006
@@ -1,3 +1,6 @@
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/branches/1.1.1/modules/hot-deploy/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/hot-deploy/project.xml?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/hot-deploy/project.xml (original)
+++ geronimo/branches/1.1.1/modules/hot-deploy/project.xml Thu Aug 10 14:18:52 2006
@@ -111,5 +111,14 @@
                 <include>**/*Test.java</include>
             </includes>
         </unitTest>
+        <resources>
+            <resource>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
+        </resources>
     </build>
 </project>

Modified: geronimo/branches/1.1.1/modules/installer-processing/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/installer-processing/NOTICE.txt?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/installer-processing/NOTICE.txt (original)
+++ geronimo/branches/1.1.1/modules/installer-processing/NOTICE.txt Thu Aug 10 14:18:52 2006
@@ -1,3 +1,6 @@
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/branches/1.1.1/modules/installer-processing/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/installer-processing/project.xml?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/installer-processing/project.xml (original)
+++ geronimo/branches/1.1.1/modules/installer-processing/project.xml Thu Aug 10 14:18:52 2006
@@ -67,5 +67,14 @@
                 </resource>
             </resources>
         </unitTest>
+        <resources>
+            <resource>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
+        </resources>
     </build>
 </project>

Modified: geronimo/branches/1.1.1/modules/installer-support/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/installer-support/NOTICE.txt?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/installer-support/NOTICE.txt (original)
+++ geronimo/branches/1.1.1/modules/installer-support/NOTICE.txt Thu Aug 10 14:18:52 2006
@@ -1,3 +1,6 @@
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/branches/1.1.1/modules/installer-support/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/installer-support/project.xml?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/installer-support/project.xml (original)
+++ geronimo/branches/1.1.1/modules/installer-support/project.xml Thu Aug 10 14:18:52 2006
@@ -73,5 +73,14 @@
                 </resource>
             </resources>
         </unitTest>
+        <resources>
+            <resource>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
+        </resources>
     </build>
 </project>

Modified: geronimo/branches/1.1.1/modules/j2ee-builder/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/j2ee-builder/NOTICE.txt?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/j2ee-builder/NOTICE.txt (original)
+++ geronimo/branches/1.1.1/modules/j2ee-builder/NOTICE.txt Thu Aug 10 14:18:52 2006
@@ -1,3 +1,6 @@
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/branches/1.1.1/modules/j2ee-builder/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/j2ee-builder/project.xml?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/j2ee-builder/project.xml (original)
+++ geronimo/branches/1.1.1/modules/j2ee-builder/project.xml Thu Aug 10 14:18:52 2006
@@ -178,15 +178,14 @@
     <!-- =================== -->
 
     <build>
-<!--
-        <unitTest>
-            <includes>
-                <include>**/*Test.java</include>
-            </includes>
-            <excludes>
-                <exclude>**/Abstract*.java</exclude>
-            </excludes>
-        </unitTest>
--->
+        <resources>
+            <resource>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
+        </resources>
     </build>
 </project>

Modified: geronimo/branches/1.1.1/modules/j2ee-schema/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/j2ee-schema/NOTICE.txt?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/j2ee-schema/NOTICE.txt (original)
+++ geronimo/branches/1.1.1/modules/j2ee-schema/NOTICE.txt Thu Aug 10 14:18:52 2006
@@ -1,3 +1,6 @@
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/branches/1.1.1/modules/j2ee-schema/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/j2ee-schema/project.xml?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/j2ee-schema/project.xml (original)
+++ geronimo/branches/1.1.1/modules/j2ee-schema/project.xml Thu Aug 10 14:18:52 2006
@@ -63,22 +63,19 @@
 
     </dependencies>
 
-<!--
+    <!-- =================== -->
+    <!-- Build Specification -->
+    <!-- =================== -->
+
     <build>
         <resources>
             <resource>
-                <directory>${basedir}/src/j2ee_1_2dtd</directory>
+                <directory>${basedir}</directory>
                 <includes>
-                    <include>**/*.dtd</include>
-                </includes>
-            </resource>
-            <resource>
-                <directory>${basedir}/src/j2ee_1_3dtd</directory>
-                <includes>
-                    <include>**/*.dtd</include>
+                    <include>NOTICE.txt</include>
                 </includes>
+                <targetPath>META-INF</targetPath>
             </resource>
         </resources>
     </build>
--->
 </project>

Modified: geronimo/branches/1.1.1/modules/j2ee/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/j2ee/NOTICE.txt?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/j2ee/NOTICE.txt (original)
+++ geronimo/branches/1.1.1/modules/j2ee/NOTICE.txt Thu Aug 10 14:18:52 2006
@@ -1,3 +1,6 @@
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/branches/1.1.1/modules/j2ee/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/j2ee/project.xml?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/j2ee/project.xml (original)
+++ geronimo/branches/1.1.1/modules/j2ee/project.xml Thu Aug 10 14:18:52 2006
@@ -126,5 +126,14 @@
                 <exclude>**/Abstract*.java</exclude>
             </excludes>
         </unitTest>
+        <resources>
+            <resource>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
+        </resources>
     </build>
 </project>

Modified: geronimo/branches/1.1.1/modules/javamail-transport/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/javamail-transport/NOTICE.txt?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/javamail-transport/NOTICE.txt (original)
+++ geronimo/branches/1.1.1/modules/javamail-transport/NOTICE.txt Thu Aug 10 14:18:52 2006
@@ -1,3 +1,6 @@
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/branches/1.1.1/modules/javamail-transport/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/javamail-transport/project.xml?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/javamail-transport/project.xml (original)
+++ geronimo/branches/1.1.1/modules/javamail-transport/project.xml Thu Aug 10 14:18:52 2006
@@ -49,4 +49,15 @@
             <version>${geronimo_spec_javamail_version}</version>
         </dependency>
     </dependencies>
+    <build>
+        <resources>
+            <resource>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
+        </resources>
+    </build>
 </project>

Modified: geronimo/branches/1.1.1/modules/jetty-builder/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/jetty-builder/NOTICE.txt?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/jetty-builder/NOTICE.txt (original)
+++ geronimo/branches/1.1.1/modules/jetty-builder/NOTICE.txt Thu Aug 10 14:18:52 2006
@@ -1,3 +1,6 @@
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/branches/1.1.1/modules/jetty-builder/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/jetty-builder/project.xml?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/jetty-builder/project.xml (original)
+++ geronimo/branches/1.1.1/modules/jetty-builder/project.xml Thu Aug 10 14:18:52 2006
@@ -348,4 +348,19 @@
         </dependency>
     </dependencies>
 
+    <!-- =================== -->
+    <!-- Build Specification -->
+    <!-- =================== -->
+
+    <build>
+        <resources>
+            <resource>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
+        </resources>
+    </build>
 </project>

Modified: geronimo/branches/1.1.1/modules/jetty/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/jetty/NOTICE.txt?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/jetty/NOTICE.txt (original)
+++ geronimo/branches/1.1.1/modules/jetty/NOTICE.txt Thu Aug 10 14:18:52 2006
@@ -1,3 +1,6 @@
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/branches/1.1.1/modules/jetty/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/jetty/project.xml?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/jetty/project.xml (original)
+++ geronimo/branches/1.1.1/modules/jetty/project.xml Thu Aug 10 14:18:52 2006
@@ -276,6 +276,17 @@
     </dependencies>
 
 
+    <build>
+        <resources>
+            <resource>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
+        </resources>
+    </build>
     <!-- =================== -->
     <!-- Build Specification -->
     <!-- =================== -->

Modified: geronimo/branches/1.1.1/modules/jmx-remoting/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/jmx-remoting/NOTICE.txt?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/jmx-remoting/NOTICE.txt (original)
+++ geronimo/branches/1.1.1/modules/jmx-remoting/NOTICE.txt Thu Aug 10 14:18:52 2006
@@ -1,3 +1,6 @@
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/branches/1.1.1/modules/jmx-remoting/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/jmx-remoting/project.xml?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/jmx-remoting/project.xml (original)
+++ geronimo/branches/1.1.1/modules/jmx-remoting/project.xml Thu Aug 10 14:18:52 2006
@@ -85,5 +85,14 @@
                 <exclude>**/Abstract*.java</exclude>
             </excludes>
         </unitTest>
+        <resources>
+            <resource>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
+        </resources>
     </build>
 </project>

Modified: geronimo/branches/1.1.1/modules/kernel/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/kernel/NOTICE.txt?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/kernel/NOTICE.txt (original)
+++ geronimo/branches/1.1.1/modules/kernel/NOTICE.txt Thu Aug 10 14:18:52 2006
@@ -1,3 +1,6 @@
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/branches/1.1.1/modules/kernel/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/kernel/project.xml?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/kernel/project.xml (original)
+++ geronimo/branches/1.1.1/modules/kernel/project.xml Thu Aug 10 14:18:52 2006
@@ -103,4 +103,19 @@
         </dependency>
     </dependencies>
 
+    <!-- =================== -->
+    <!-- Build Specification -->
+    <!-- =================== -->
+
+    <build>
+        <resources>
+            <resource>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
+        </resources>
+    </build>
 </project>

Modified: geronimo/branches/1.1.1/modules/mail/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/mail/NOTICE.txt?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/mail/NOTICE.txt (original)
+++ geronimo/branches/1.1.1/modules/mail/NOTICE.txt Thu Aug 10 14:18:52 2006
@@ -1,3 +1,6 @@
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/branches/1.1.1/modules/mail/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/mail/project.xml?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/mail/project.xml (original)
+++ geronimo/branches/1.1.1/modules/mail/project.xml Thu Aug 10 14:18:52 2006
@@ -115,5 +115,14 @@
                 </resource>
             </resources>
         </unitTest>
+        <resources>
+            <resource>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
+        </resources>
     </build>
 </project>

Modified: geronimo/branches/1.1.1/modules/management/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/management/NOTICE.txt?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/management/NOTICE.txt (original)
+++ geronimo/branches/1.1.1/modules/management/NOTICE.txt Thu Aug 10 14:18:52 2006
@@ -1,3 +1,6 @@
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/branches/1.1.1/modules/management/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/management/project.xml?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/management/project.xml (original)
+++ geronimo/branches/1.1.1/modules/management/project.xml Thu Aug 10 14:18:52 2006
@@ -64,5 +64,14 @@
                 <include>**/*Test.java</include>
             </includes>
         </unitTest>
+        <resources>
+            <resource>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
+        </resources>
     </build>
 </project>

Modified: geronimo/branches/1.1.1/modules/naming-builder/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/naming-builder/NOTICE.txt?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/naming-builder/NOTICE.txt (original)
+++ geronimo/branches/1.1.1/modules/naming-builder/NOTICE.txt Thu Aug 10 14:18:52 2006
@@ -1,3 +1,6 @@
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/branches/1.1.1/modules/naming-builder/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/naming-builder/project.xml?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/naming-builder/project.xml (original)
+++ geronimo/branches/1.1.1/modules/naming-builder/project.xml Thu Aug 10 14:18:52 2006
@@ -16,7 +16,7 @@
     limitations under the License.
 -->
 
-<!-- $Rev: 385372 $ $Date$ -->
+<!-- $Rev$ $Date$ -->
 
 <project>
     <pomVersion>3</pomVersion>
@@ -162,4 +162,19 @@
         </dependency>
     </dependencies>
 
+    <!-- =================== -->
+    <!-- Build Specification -->
+    <!-- =================== -->
+
+    <build>
+        <resources>
+            <resource>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
+        </resources>
+    </build>
 </project>

Modified: geronimo/branches/1.1.1/modules/naming/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/naming/NOTICE.txt?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/naming/NOTICE.txt (original)
+++ geronimo/branches/1.1.1/modules/naming/NOTICE.txt Thu Aug 10 14:18:52 2006
@@ -1,3 +1,6 @@
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/branches/1.1.1/modules/naming/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/naming/project.xml?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/naming/project.xml (original)
+++ geronimo/branches/1.1.1/modules/naming/project.xml Thu Aug 10 14:18:52 2006
@@ -86,5 +86,14 @@
                 </resource>
             </resources>
         </unitTest>
+        <resources>
+            <resource>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
+        </resources>
     </build>
 </project>

Modified: geronimo/branches/1.1.1/modules/scripts/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/scripts/project.xml?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/scripts/project.xml (original)
+++ geronimo/branches/1.1.1/modules/scripts/project.xml Thu Aug 10 14:18:52 2006
@@ -63,6 +63,15 @@
                 <exclude>**/Abstract*.java</exclude>
             </excludes>
         </unitTest>
+        <resources>
+            <resource>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
+        </resources>
     </build>
 
 </project>

Modified: geronimo/branches/1.1.1/modules/scripts/src/resources/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/scripts/src/resources/NOTICE.txt?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/scripts/src/resources/NOTICE.txt (original)
+++ geronimo/branches/1.1.1/modules/scripts/src/resources/NOTICE.txt Thu Aug 10 14:18:52 2006
@@ -1,7 +1,5 @@
-=========================================================================
-==  NOTICE file corresponding to section 4(d) of the Apache License,   ==
-==  Version 2.0, in this case for the Apache Geronimo distribution.    ==
-=========================================================================
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).

Added: geronimo/branches/1.1.1/modules/security-builder/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/security-builder/NOTICE.txt?rev=430532&view=auto
==============================================================================
--- geronimo/branches/1.1.1/modules/security-builder/NOTICE.txt (added)
+++ geronimo/branches/1.1.1/modules/security-builder/NOTICE.txt Thu Aug 10 14:18:52 2006
@@ -0,0 +1,6 @@
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+

Propchange: geronimo/branches/1.1.1/modules/security-builder/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.1.1/modules/security-builder/NOTICE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/branches/1.1.1/modules/security-builder/NOTICE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/branches/1.1.1/modules/security-builder/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/security-builder/project.xml?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/security-builder/project.xml (original)
+++ geronimo/branches/1.1.1/modules/security-builder/project.xml Thu Aug 10 14:18:52 2006
@@ -125,4 +125,19 @@
 
     </dependencies>
 
+    <!-- =================== -->
+    <!-- Build Specification -->
+    <!-- =================== -->
+
+    <build>
+        <resources>
+            <resource>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
+        </resources>
+    </build>
 </project>

Modified: geronimo/branches/1.1.1/modules/security/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/security/NOTICE.txt?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/security/NOTICE.txt (original)
+++ geronimo/branches/1.1.1/modules/security/NOTICE.txt Thu Aug 10 14:18:52 2006
@@ -1,3 +1,6 @@
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/branches/1.1.1/modules/security/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/security/project.xml?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/security/project.xml (original)
+++ geronimo/branches/1.1.1/modules/security/project.xml Thu Aug 10 14:18:52 2006
@@ -176,5 +176,14 @@
                 <exclude>**/Abstract*.java</exclude>
             </excludes>
         </unitTest>
+        <resources>
+            <resource>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
+        </resources>
     </build>
 </project>

Modified: geronimo/branches/1.1.1/modules/service-builder/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/service-builder/NOTICE.txt?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/service-builder/NOTICE.txt (original)
+++ geronimo/branches/1.1.1/modules/service-builder/NOTICE.txt Thu Aug 10 14:18:52 2006
@@ -1,3 +1,6 @@
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/branches/1.1.1/modules/service-builder/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/service-builder/project.xml?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/service-builder/project.xml (original)
+++ geronimo/branches/1.1.1/modules/service-builder/project.xml Thu Aug 10 14:18:52 2006
@@ -187,5 +187,14 @@
                 </resource>
             </resources>
         </unitTest>
+        <resources>
+            <resource>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
+        </resources>
     </build>
 </project>

Modified: geronimo/branches/1.1.1/modules/system/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/system/NOTICE.txt?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/system/NOTICE.txt (original)
+++ geronimo/branches/1.1.1/modules/system/NOTICE.txt Thu Aug 10 14:18:52 2006
@@ -1,3 +1,6 @@
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/branches/1.1.1/modules/system/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/system/project.xml?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/system/project.xml (original)
+++ geronimo/branches/1.1.1/modules/system/project.xml Thu Aug 10 14:18:52 2006
@@ -93,4 +93,20 @@
         </dependency>
 
     </dependencies>
+
+    <!-- =================== -->
+    <!-- Build Specification -->
+    <!-- =================== -->
+
+    <build>
+        <resources>
+            <resource>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
+        </resources>
+    </build>
 </project>

Modified: geronimo/branches/1.1.1/modules/test-ddbean/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/test-ddbean/NOTICE.txt?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/test-ddbean/NOTICE.txt (original)
+++ geronimo/branches/1.1.1/modules/test-ddbean/NOTICE.txt Thu Aug 10 14:18:52 2006
@@ -1,3 +1,6 @@
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/branches/1.1.1/modules/test-ddbean/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/test-ddbean/project.xml?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/test-ddbean/project.xml (original)
+++ geronimo/branches/1.1.1/modules/test-ddbean/project.xml Thu Aug 10 14:18:52 2006
@@ -92,5 +92,14 @@
                 </resource>
             </resources>
         </unitTest>
+        <resources>
+            <resource>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
+        </resources>
     </build>
 </project>

Modified: geronimo/branches/1.1.1/modules/timer/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/timer/NOTICE.txt?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/timer/NOTICE.txt (original)
+++ geronimo/branches/1.1.1/modules/timer/NOTICE.txt Thu Aug 10 14:18:52 2006
@@ -1,3 +1,6 @@
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/branches/1.1.1/modules/timer/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/timer/project.xml?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/timer/project.xml (original)
+++ geronimo/branches/1.1.1/modules/timer/project.xml Thu Aug 10 14:18:52 2006
@@ -173,4 +173,20 @@
         -->
         
     </dependencies>
+
+    <!-- =================== -->
+    <!-- Build Specification -->
+    <!-- =================== -->
+
+    <build>
+        <resources>
+            <resource>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
+        </resources>
+    </build>
 </project>

Modified: geronimo/branches/1.1.1/modules/tomcat-builder/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/tomcat-builder/NOTICE.txt?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/tomcat-builder/NOTICE.txt (original)
+++ geronimo/branches/1.1.1/modules/tomcat-builder/NOTICE.txt Thu Aug 10 14:18:52 2006
@@ -1,3 +1,6 @@
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/branches/1.1.1/modules/tomcat-builder/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/tomcat-builder/project.xml?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/tomcat-builder/project.xml (original)
+++ geronimo/branches/1.1.1/modules/tomcat-builder/project.xml Thu Aug 10 14:18:52 2006
@@ -505,5 +505,14 @@
                 </resource>
             </resources>
         </unitTest>
+        <resources>
+            <resource>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
+        </resources>
     </build>
 </project>

Modified: geronimo/branches/1.1.1/modules/tomcat/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/tomcat/NOTICE.txt?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/tomcat/NOTICE.txt (original)
+++ geronimo/branches/1.1.1/modules/tomcat/NOTICE.txt Thu Aug 10 14:18:52 2006
@@ -1,8 +1,5 @@
-Apache Geronimo is an effort undergoing incubation at the Apache
-Software Foundation. Incubation is required of all newly accepted
-projects until a further review indicates that the infrastructure,
-communications, and decision making process have stabilized in a
-manner consistent with other successful ASF projects. While incubation
-status is not necessarily a reflection of the completeness or
-stability of the code, it does indicate that the project has yet to be
-fully endorsed by the ASF.
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).

Modified: geronimo/branches/1.1.1/modules/tomcat/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/tomcat/project.xml?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/tomcat/project.xml (original)
+++ geronimo/branches/1.1.1/modules/tomcat/project.xml Thu Aug 10 14:18:52 2006
@@ -390,4 +390,16 @@
             <version>${wadi_version}</version>
         </dependency>
     </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
+        </resources>
+    </build>
 </project>

Modified: geronimo/branches/1.1.1/modules/transaction/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/transaction/NOTICE.txt?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/transaction/NOTICE.txt (original)
+++ geronimo/branches/1.1.1/modules/transaction/NOTICE.txt Thu Aug 10 14:18:52 2006
@@ -1,3 +1,6 @@
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/branches/1.1.1/modules/transaction/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/transaction/project.xml?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/transaction/project.xml (original)
+++ geronimo/branches/1.1.1/modules/transaction/project.xml Thu Aug 10 14:18:52 2006
@@ -117,4 +117,20 @@
             <version>${mx4j_version}</version>
         </dependency>
     </dependencies>
+
+    <!-- =================== -->
+    <!-- Build Specification -->
+    <!-- =================== -->
+
+    <build>
+        <resources>
+            <resource>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
+        </resources>
+    </build>
 </project>

Modified: geronimo/branches/1.1.1/modules/upgrade/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/upgrade/NOTICE.txt?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/upgrade/NOTICE.txt (original)
+++ geronimo/branches/1.1.1/modules/upgrade/NOTICE.txt Thu Aug 10 14:18:52 2006
@@ -1,3 +1,6 @@
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/branches/1.1.1/modules/upgrade/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/upgrade/project.xml?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/upgrade/project.xml (original)
+++ geronimo/branches/1.1.1/modules/upgrade/project.xml Thu Aug 10 14:18:52 2006
@@ -110,6 +110,18 @@
                 </resource>
             </resources>
         </unitTest>
+        <resources>
+            <resource>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
+        </resources>
     </build>
 
 </project>
+
+
+

Modified: geronimo/branches/1.1.1/modules/util/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/util/NOTICE.txt?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/util/NOTICE.txt (original)
+++ geronimo/branches/1.1.1/modules/util/NOTICE.txt Thu Aug 10 14:18:52 2006
@@ -1,3 +1,6 @@
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

Modified: geronimo/branches/1.1.1/modules/util/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1.1/modules/util/project.xml?rev=430532&r1=430531&r2=430532&view=diff
==============================================================================
--- geronimo/branches/1.1.1/modules/util/project.xml (original)
+++ geronimo/branches/1.1.1/modules/util/project.xml Thu Aug 10 14:18:52 2006
@@ -81,6 +81,15 @@
                 <exclude>**/Abstract*.java</exclude>
             </excludes>
         </unitTest>
+        <resources>
+            <resource>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
+        </resources>
     </build>
 
 </project>