geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke...@apache.org
Subject svn commit: r431522 - in /geronimo/branches/1.1: etc/ modules/activation/ modules/activemq-embedded-rar/ modules/axis-builder/ modules/axis/ modules/client-builder/ modules/client/ modules/common/ modules/connector-builder/ modules/connector/ modules/c...
Date Tue, 15 Aug 2006 03:59:01 GMT
Author: kevan
Date: Mon Aug 14 20:58:59 2006
New Revision: 431522

URL: http://svn.apache.org/viewvc?rev=431522&view=rev
Log:
GERONIMO-2308 Fix multiple build problems caused by accidental overriding of <resource>
specifications in etc/project.xml. Move NOTICE.txt <resource> to etc/project.xml and
remove from most <module>/project.xml files

Modified:
    geronimo/branches/1.1/etc/project.xml
    geronimo/branches/1.1/modules/activation/project.xml
    geronimo/branches/1.1/modules/activemq-embedded-rar/project.xml
    geronimo/branches/1.1/modules/axis-builder/project.xml
    geronimo/branches/1.1/modules/axis/project.xml
    geronimo/branches/1.1/modules/client-builder/project.xml
    geronimo/branches/1.1/modules/client/project.xml
    geronimo/branches/1.1/modules/common/project.xml
    geronimo/branches/1.1/modules/connector-builder/project.xml
    geronimo/branches/1.1/modules/connector/project.xml
    geronimo/branches/1.1/modules/console-web/project.xml
    geronimo/branches/1.1/modules/converter/project.xml
    geronimo/branches/1.1/modules/core/project.xml
    geronimo/branches/1.1/modules/deploy-config/project.xml
    geronimo/branches/1.1/modules/deploy-jsr88/project.xml
    geronimo/branches/1.1/modules/deploy-tool/project.xml
    geronimo/branches/1.1/modules/deployment/project.xml
    geronimo/branches/1.1/modules/derby/project.xml
    geronimo/branches/1.1/modules/directory/project.xml
    geronimo/branches/1.1/modules/hot-deploy/project.xml
    geronimo/branches/1.1/modules/installer-processing/project.xml
    geronimo/branches/1.1/modules/installer-support/project.xml
    geronimo/branches/1.1/modules/j2ee-builder/project.xml
    geronimo/branches/1.1/modules/j2ee-schema/project.xml
    geronimo/branches/1.1/modules/j2ee/project.xml
    geronimo/branches/1.1/modules/javamail-transport/project.xml
    geronimo/branches/1.1/modules/jetty-builder/project.xml
    geronimo/branches/1.1/modules/jetty/project.xml
    geronimo/branches/1.1/modules/jmx-remoting/project.xml
    geronimo/branches/1.1/modules/kernel/project.xml
    geronimo/branches/1.1/modules/mail/project.xml
    geronimo/branches/1.1/modules/management/project.xml
    geronimo/branches/1.1/modules/naming-builder/project.xml
    geronimo/branches/1.1/modules/naming/project.xml
    geronimo/branches/1.1/modules/scripts/project.xml
    geronimo/branches/1.1/modules/security-builder/project.xml
    geronimo/branches/1.1/modules/security/project.xml
    geronimo/branches/1.1/modules/service-builder/project.xml
    geronimo/branches/1.1/modules/system/project.xml
    geronimo/branches/1.1/modules/test-ddbean/project.xml
    geronimo/branches/1.1/modules/timer/project.xml
    geronimo/branches/1.1/modules/tomcat/project.xml
    geronimo/branches/1.1/modules/transaction/project.xml
    geronimo/branches/1.1/modules/web-builder/project.xml
    geronimo/branches/1.1/modules/webservices/project.xml

Modified: geronimo/branches/1.1/etc/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/etc/project.xml?rev=431522&r1=431521&r2=431522&view=diff
==============================================================================
--- geronimo/branches/1.1/etc/project.xml (original)
+++ geronimo/branches/1.1/etc/project.xml Mon Aug 14 20:58:59 2006
@@ -381,6 +381,13 @@
                     <include>META-INF/geronimo-dependency.xml</include>
                 </includes>
             </resource>
+            <resource>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+            </resource>
         </resources>
 
         <unitTest>

Modified: geronimo/branches/1.1/modules/activation/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/activation/project.xml?rev=431522&r1=431521&r2=431522&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/activation/project.xml (original)
+++ geronimo/branches/1.1/modules/activation/project.xml Mon Aug 14 20:58:59 2006
@@ -60,19 +60,4 @@
 
     </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/modules/activemq-embedded-rar/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/activemq-embedded-rar/project.xml?rev=431522&r1=431521&r2=431522&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/activemq-embedded-rar/project.xml (original)
+++ geronimo/branches/1.1/modules/activemq-embedded-rar/project.xml Mon Aug 14 20:58:59 2006
@@ -57,19 +57,4 @@
         </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/modules/axis-builder/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/axis-builder/project.xml?rev=431522&r1=431521&r2=431522&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/axis-builder/project.xml (original)
+++ geronimo/branches/1.1/modules/axis-builder/project.xml Mon Aug 14 20:58:59 2006
@@ -257,6 +257,7 @@
     <build>
         <resources>
             <!--n.b. this schema is NOT compiled to xmlobjects.  Do not remove!  Used
by SchemaInfoBuilder -->
+            <!-- also, these resources will override those defined in etc/project.xml.
-->
             <resource>
                 <directory>${basedir}/src/schema</directory>
                 <includes>

Modified: geronimo/branches/1.1/modules/axis/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/axis/project.xml?rev=431522&r1=431521&r2=431522&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/axis/project.xml (original)
+++ geronimo/branches/1.1/modules/axis/project.xml Mon Aug 14 20:58:59 2006
@@ -181,14 +181,5 @@
                 </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/modules/client-builder/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/client-builder/project.xml?rev=431522&r1=431521&r2=431522&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/client-builder/project.xml (original)
+++ geronimo/branches/1.1/modules/client-builder/project.xml Mon Aug 14 20:58:59 2006
@@ -218,20 +218,4 @@
         </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/modules/client/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/client/project.xml?rev=431522&r1=431521&r2=431522&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/client/project.xml (original)
+++ geronimo/branches/1.1/modules/client/project.xml Mon Aug 14 20:58:59 2006
@@ -126,6 +126,10 @@
         </dependency>
     </dependencies>
 
+    <!-- 
+     | I don't think this <build> specification is needed (there are no .xml files
and the .properties 
+     | files would be handled by etc/project.properties. ToDo: remove it
+     -->
     <build>
         <resources>
             <resource>

Modified: geronimo/branches/1.1/modules/common/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/common/project.xml?rev=431522&r1=431521&r2=431522&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/common/project.xml (original)
+++ geronimo/branches/1.1/modules/common/project.xml Mon Aug 14 20:58:59 2006
@@ -78,6 +78,10 @@
     <!-- Build Specification -->
     <!-- =================== -->
 
+    <!-- 
+     | I think this whold <build> specification can be removed. The <resources>
and <unit-test> 
+     | already specified in etc/project.xml. ToDo: remove them
+     -->
     <build>
         <resources>
             <resource>

Modified: geronimo/branches/1.1/modules/connector-builder/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/connector-builder/project.xml?rev=431522&r1=431521&r2=431522&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/connector-builder/project.xml (original)
+++ geronimo/branches/1.1/modules/connector-builder/project.xml Mon Aug 14 20:58:59 2006
@@ -253,19 +253,4 @@
         </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/modules/connector/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/connector/project.xml?rev=431522&r1=431521&r2=431522&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/connector/project.xml (original)
+++ geronimo/branches/1.1/modules/connector/project.xml Mon Aug 14 20:58:59 2006
@@ -170,19 +170,4 @@
         </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/modules/console-web/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/console-web/project.xml?rev=431522&r1=431521&r2=431522&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/console-web/project.xml (original)
+++ geronimo/branches/1.1/modules/console-web/project.xml Mon Aug 14 20:58:59 2006
@@ -67,19 +67,4 @@
         </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/modules/converter/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/converter/project.xml?rev=431522&r1=431521&r2=431522&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/converter/project.xml (original)
+++ geronimo/branches/1.1/modules/converter/project.xml Mon Aug 14 20:58:59 2006
@@ -68,20 +68,14 @@
         </dependency>
     </dependencies>
 
+    <!-- 
+     | The following can probably be removed. ToDo...
+      -->
     <build>
         <unitTest>
             <includes>
                 <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/modules/core/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/core/project.xml?rev=431522&r1=431521&r2=431522&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/core/project.xml (original)
+++ geronimo/branches/1.1/modules/core/project.xml Mon Aug 14 20:58:59 2006
@@ -111,14 +111,5 @@
                 </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/modules/deploy-config/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/deploy-config/project.xml?rev=431522&r1=431521&r2=431522&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/deploy-config/project.xml (original)
+++ geronimo/branches/1.1/modules/deploy-config/project.xml Mon Aug 14 20:58:59 2006
@@ -69,14 +69,5 @@
                 <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/modules/deploy-jsr88/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/deploy-jsr88/project.xml?rev=431522&r1=431521&r2=431522&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/deploy-jsr88/project.xml (original)
+++ geronimo/branches/1.1/modules/deploy-jsr88/project.xml Mon Aug 14 20:58:59 2006
@@ -157,14 +157,5 @@
             </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/modules/deploy-tool/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/deploy-tool/project.xml?rev=431522&r1=431521&r2=431522&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/deploy-tool/project.xml (original)
+++ geronimo/branches/1.1/modules/deploy-tool/project.xml Mon Aug 14 20:58:59 2006
@@ -137,14 +137,5 @@
             </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/modules/deployment/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/deployment/project.xml?rev=431522&r1=431521&r2=431522&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/deployment/project.xml (original)
+++ geronimo/branches/1.1/modules/deployment/project.xml Mon Aug 14 20:58:59 2006
@@ -145,14 +145,5 @@
                 </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/modules/derby/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/derby/project.xml?rev=431522&r1=431521&r2=431522&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/derby/project.xml (original)
+++ geronimo/branches/1.1/modules/derby/project.xml Mon Aug 14 20:58:59 2006
@@ -90,14 +90,5 @@
                 <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/modules/directory/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/directory/project.xml?rev=431522&r1=431521&r2=431522&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/directory/project.xml (original)
+++ geronimo/branches/1.1/modules/directory/project.xml Mon Aug 14 20:58:59 2006
@@ -351,14 +351,5 @@
                 </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/modules/hot-deploy/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/hot-deploy/project.xml?rev=431522&r1=431521&r2=431522&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/hot-deploy/project.xml (original)
+++ geronimo/branches/1.1/modules/hot-deploy/project.xml Mon Aug 14 20:58:59 2006
@@ -109,14 +109,5 @@
                 <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/modules/installer-processing/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/installer-processing/project.xml?rev=431522&r1=431521&r2=431522&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/installer-processing/project.xml (original)
+++ geronimo/branches/1.1/modules/installer-processing/project.xml Mon Aug 14 20:58:59 2006
@@ -67,14 +67,5 @@
                 </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/modules/installer-support/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/installer-support/project.xml?rev=431522&r1=431521&r2=431522&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/installer-support/project.xml (original)
+++ geronimo/branches/1.1/modules/installer-support/project.xml Mon Aug 14 20:58:59 2006
@@ -73,14 +73,5 @@
                 </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/modules/j2ee-builder/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/j2ee-builder/project.xml?rev=431522&r1=431521&r2=431522&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/project.xml (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/project.xml Mon Aug 14 20:58:59 2006
@@ -172,20 +172,4 @@
         </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/modules/j2ee-schema/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/j2ee-schema/project.xml?rev=431522&r1=431521&r2=431522&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-schema/project.xml (original)
+++ geronimo/branches/1.1/modules/j2ee-schema/project.xml Mon Aug 14 20:58:59 2006
@@ -63,19 +63,4 @@
 
     </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/modules/j2ee/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/j2ee/project.xml?rev=431522&r1=431521&r2=431522&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee/project.xml (original)
+++ geronimo/branches/1.1/modules/j2ee/project.xml Mon Aug 14 20:58:59 2006
@@ -126,14 +126,5 @@
                 <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/modules/javamail-transport/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/javamail-transport/project.xml?rev=431522&r1=431521&r2=431522&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/javamail-transport/project.xml (original)
+++ geronimo/branches/1.1/modules/javamail-transport/project.xml Mon Aug 14 20:58:59 2006
@@ -49,15 +49,4 @@
             <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/modules/jetty-builder/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/jetty-builder/project.xml?rev=431522&r1=431521&r2=431522&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty-builder/project.xml (original)
+++ geronimo/branches/1.1/modules/jetty-builder/project.xml Mon Aug 14 20:58:59 2006
@@ -348,19 +348,4 @@
         </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/modules/jetty/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/jetty/project.xml?rev=431522&r1=431521&r2=431522&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty/project.xml (original)
+++ geronimo/branches/1.1/modules/jetty/project.xml Mon Aug 14 20:58:59 2006
@@ -275,50 +275,4 @@
         </dependency>
     </dependencies>
 
-
-    <build>
-        <resources>
-            <resource>
-                <directory>${basedir}</directory>
-                <includes>
-                    <include>NOTICE.txt</include>
-                </includes>
-                <targetPath>META-INF</targetPath>
-            </resource>
-        </resources>
-    </build>
-    <!-- =================== -->
-    <!-- Build Specification -->
-    <!-- =================== -->
-
-    <!--build>
-        <resources>
-            <resource>
-                <directory>${basedir}/src/etc</directory>
-            </resource>
-            <resource>
-                <directory>${basedir}/target/xmlbeans</directory>
-                <includes>schema/**</includes>
-            </resource>
-        </resources>
-        <unitTest>
-            <includes>
-                <include>**/*Test.java</include>
-            </includes>
-            <excludes>
-                <exclude>**/Abstract*.java</exclude>
-            </excludes>
-            <resources>
-                <resource>
-                    <directory>${basedir}/src/schema</directory>
-                    <includes>
-                        <include>*.xsd</include>
-                    </includes>
-                </resource>
-                <resource>
-                    <directory>${basedir}/src/test-resources</directory>
-                </resource>
-            </resources>
-        </unitTest>
-    </build-->
 </project>

Modified: geronimo/branches/1.1/modules/jmx-remoting/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/jmx-remoting/project.xml?rev=431522&r1=431521&r2=431522&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jmx-remoting/project.xml (original)
+++ geronimo/branches/1.1/modules/jmx-remoting/project.xml Mon Aug 14 20:58:59 2006
@@ -85,14 +85,5 @@
                 <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/modules/kernel/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/kernel/project.xml?rev=431522&r1=431521&r2=431522&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/kernel/project.xml (original)
+++ geronimo/branches/1.1/modules/kernel/project.xml Mon Aug 14 20:58:59 2006
@@ -103,19 +103,4 @@
         </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/modules/mail/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/mail/project.xml?rev=431522&r1=431521&r2=431522&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/mail/project.xml (original)
+++ geronimo/branches/1.1/modules/mail/project.xml Mon Aug 14 20:58:59 2006
@@ -115,14 +115,5 @@
                 </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/modules/management/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/management/project.xml?rev=431522&r1=431521&r2=431522&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/management/project.xml (original)
+++ geronimo/branches/1.1/modules/management/project.xml Mon Aug 14 20:58:59 2006
@@ -62,14 +62,5 @@
                 <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/modules/naming-builder/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/naming-builder/project.xml?rev=431522&r1=431521&r2=431522&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/naming-builder/project.xml (original)
+++ geronimo/branches/1.1/modules/naming-builder/project.xml Mon Aug 14 20:58:59 2006
@@ -162,19 +162,4 @@
         </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/modules/naming/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/naming/project.xml?rev=431522&r1=431521&r2=431522&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/naming/project.xml (original)
+++ geronimo/branches/1.1/modules/naming/project.xml Mon Aug 14 20:58:59 2006
@@ -84,14 +84,5 @@
                 </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/modules/scripts/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/scripts/project.xml?rev=431522&r1=431521&r2=431522&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/scripts/project.xml (original)
+++ geronimo/branches/1.1/modules/scripts/project.xml Mon Aug 14 20:58:59 2006
@@ -46,30 +46,4 @@
         <!-- Module Dependencies -->
     </dependencies>
 
-    <build>
-        <resources>
-            <resource>
-                <directory>${basedir}/src/resources</directory>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-            <resource>
-                <directory>${basedir}</directory>
-                <includes>
-                    <include>NOTICE.txt</include>
-                </includes>
-                <targetPath>META-INF</targetPath>
-            </resource>
-        </resources>
-        <unitTest>
-            <includes>
-                <include>**/*Test.java</include>
-            </includes>
-            <excludes>
-                <exclude>**/Abstract*.java</exclude>
-            </excludes>
-        </unitTest>
-    </build>
-
 </project>

Modified: geronimo/branches/1.1/modules/security-builder/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/security-builder/project.xml?rev=431522&r1=431521&r2=431522&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/security-builder/project.xml (original)
+++ geronimo/branches/1.1/modules/security-builder/project.xml Mon Aug 14 20:58:59 2006
@@ -125,19 +125,4 @@
 
     </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/modules/security/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/security/project.xml?rev=431522&r1=431521&r2=431522&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/security/project.xml (original)
+++ geronimo/branches/1.1/modules/security/project.xml Mon Aug 14 20:58:59 2006
@@ -176,14 +176,5 @@
                 <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/modules/service-builder/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/service-builder/project.xml?rev=431522&r1=431521&r2=431522&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/service-builder/project.xml (original)
+++ geronimo/branches/1.1/modules/service-builder/project.xml Mon Aug 14 20:58:59 2006
@@ -187,14 +187,5 @@
                 </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/modules/system/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/system/project.xml?rev=431522&r1=431521&r2=431522&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/system/project.xml (original)
+++ geronimo/branches/1.1/modules/system/project.xml Mon Aug 14 20:58:59 2006
@@ -94,19 +94,4 @@
 
     </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/modules/test-ddbean/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/test-ddbean/project.xml?rev=431522&r1=431521&r2=431522&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/test-ddbean/project.xml (original)
+++ geronimo/branches/1.1/modules/test-ddbean/project.xml Mon Aug 14 20:58:59 2006
@@ -92,14 +92,5 @@
                 </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/modules/timer/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/timer/project.xml?rev=431522&r1=431521&r2=431522&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/timer/project.xml (original)
+++ geronimo/branches/1.1/modules/timer/project.xml Mon Aug 14 20:58:59 2006
@@ -174,19 +174,4 @@
         
     </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/modules/tomcat/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/tomcat/project.xml?rev=431522&r1=431521&r2=431522&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/tomcat/project.xml (original)
+++ geronimo/branches/1.1/modules/tomcat/project.xml Mon Aug 14 20:58:59 2006
@@ -391,15 +391,4 @@
         </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/modules/transaction/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/transaction/project.xml?rev=431522&r1=431521&r2=431522&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/transaction/project.xml (original)
+++ geronimo/branches/1.1/modules/transaction/project.xml Mon Aug 14 20:58:59 2006
@@ -118,19 +118,4 @@
         </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/modules/web-builder/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/web-builder/project.xml?rev=431522&r1=431521&r2=431522&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/web-builder/project.xml (original)
+++ geronimo/branches/1.1/modules/web-builder/project.xml Mon Aug 14 20:58:59 2006
@@ -203,14 +203,5 @@
                 </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/modules/webservices/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/webservices/project.xml?rev=431522&r1=431521&r2=431522&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/webservices/project.xml (original)
+++ geronimo/branches/1.1/modules/webservices/project.xml Mon Aug 14 20:58:59 2006
@@ -165,20 +165,4 @@
 
     </dependencies>
 
-    <!-- =================== -->
-    <!-- Build Specification -->
-    <!-- =================== -->
-
-    <build>
-        <resources>
-            <resource>
-                <directory>${basedir}</directory>
-                <includes>
-                    <include>NOTICE.txt</include>
-                </includes>
-                <targetPath>META-INF</targetPath>
-            </resource>
-        </resources>
-    </build>
-
 </project>



Mime
View raw message