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/13 21:30:12 UTC
svn commit: r431210 - in /geronimo/branches/1.1/modules: axis-builder/
client/ common/ converter/ deploy-config/ deploy-jsr88/ deploy-tool/
hot-deploy/ management/ naming/ scripts/ tomcat-builder/ upgrade/ util/
Author: kevan
Date: Sun Aug 13 12:30:12 2006
New Revision: 431210
URL: http://svn.apache.org/viewvc?rev=431210&view=rev
Log:
GERONIMO-2308 Fix bad project.xml updates from previous commit. Only one <resources> should be within a <build>. Thanks to Aaron for tracking this down...
Modified:
geronimo/branches/1.1/modules/axis-builder/project.xml
geronimo/branches/1.1/modules/client/project.xml
geronimo/branches/1.1/modules/common/project.xml
geronimo/branches/1.1/modules/converter/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/hot-deploy/project.xml
geronimo/branches/1.1/modules/management/project.xml
geronimo/branches/1.1/modules/naming/project.xml
geronimo/branches/1.1/modules/scripts/project.xml
geronimo/branches/1.1/modules/tomcat-builder/project.xml
geronimo/branches/1.1/modules/upgrade/project.xml
geronimo/branches/1.1/modules/util/project.xml
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=431210&r1=431209&r2=431210&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/axis-builder/project.xml (original)
+++ geronimo/branches/1.1/modules/axis-builder/project.xml Sun Aug 13 12:30:12 2006
@@ -264,8 +264,6 @@
</includes>
<targetPath>META-INF/schema</targetPath>
</resource>
- </resources>
- <resources>
<resource>
<directory>${basedir}</directory>
<includes>
Modified: geronimo/branches/1.1/modules/client/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/client/project.xml?rev=431210&r1=431209&r2=431210&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/client/project.xml (original)
+++ geronimo/branches/1.1/modules/client/project.xml Sun Aug 13 12:30:12 2006
@@ -135,6 +135,13 @@
<include>**/*.properties</include>
</includes>
</resource>
+ <resource>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
</resources>
<unitTest>
<includes>
@@ -144,14 +151,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/common/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/common/project.xml?rev=431210&r1=431209&r2=431210&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/common/project.xml (original)
+++ geronimo/branches/1.1/modules/common/project.xml Sun Aug 13 12:30:12 2006
@@ -86,6 +86,13 @@
<include>*.properties</include>
</includes>
</resource>
+ <resource>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
</resources>
<unitTest>
@@ -106,15 +113,6 @@
</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/converter/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/converter/project.xml?rev=431210&r1=431209&r2=431210&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/converter/project.xml (original)
+++ geronimo/branches/1.1/modules/converter/project.xml Sun Aug 13 12:30:12 2006
@@ -69,8 +69,6 @@
</dependencies>
<build>
- <resources>
- </resources>
<unitTest>
<includes>
<include>**/*Test.java</include>
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=431210&r1=431209&r2=431210&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/deploy-config/project.xml (original)
+++ geronimo/branches/1.1/modules/deploy-config/project.xml Sun Aug 13 12:30:12 2006
@@ -64,8 +64,6 @@
</dependencies>
<build>
- <resources>
- </resources>
<unitTest>
<includes>
<include>**/*Test.java</include>
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=431210&r1=431209&r2=431210&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/deploy-jsr88/project.xml (original)
+++ geronimo/branches/1.1/modules/deploy-jsr88/project.xml Sun Aug 13 12:30:12 2006
@@ -142,8 +142,6 @@
</dependencies>
<build>
- <resources>
- </resources>
<unitTest>
<includes>
<include>**/*Test.java</include>
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=431210&r1=431209&r2=431210&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/deploy-tool/project.xml (original)
+++ geronimo/branches/1.1/modules/deploy-tool/project.xml Sun Aug 13 12:30:12 2006
@@ -122,8 +122,6 @@
</dependencies>
<build>
- <resources>
- </resources>
<unitTest>
<includes>
<include>**/*Test.java</include>
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=431210&r1=431209&r2=431210&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/hot-deploy/project.xml (original)
+++ geronimo/branches/1.1/modules/hot-deploy/project.xml Sun Aug 13 12:30:12 2006
@@ -104,8 +104,6 @@
</dependencies>
<build>
- <resources>
- </resources>
<unitTest>
<includes>
<include>**/*Test.java</include>
Modified: geronimo/branches/1.1/modules/management/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/management/project.xml?rev=431210&r1=431209&r2=431210&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/management/project.xml (original)
+++ geronimo/branches/1.1/modules/management/project.xml Sun Aug 13 12:30:12 2006
@@ -57,8 +57,6 @@
</dependencies>
<build>
- <resources>
- </resources>
<unitTest>
<includes>
<include>**/*Test.java</include>
Modified: geronimo/branches/1.1/modules/naming/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/naming/project.xml?rev=431210&r1=431209&r2=431210&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/naming/project.xml (original)
+++ geronimo/branches/1.1/modules/naming/project.xml Sun Aug 13 12:30:12 2006
@@ -71,8 +71,6 @@
</dependencies>
<build>
- <resources>
- </resources>
<unitTest>
<includes>
<include>**/*Test.java</include>
Modified: geronimo/branches/1.1/modules/scripts/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/scripts/project.xml?rev=431210&r1=431209&r2=431210&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/scripts/project.xml (original)
+++ geronimo/branches/1.1/modules/scripts/project.xml Sun Aug 13 12:30:12 2006
@@ -54,6 +54,13 @@
<include>**/*</include>
</includes>
</resource>
+ <resource>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
</resources>
<unitTest>
<includes>
@@ -63,15 +70,6 @@
<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/tomcat-builder/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/tomcat-builder/project.xml?rev=431210&r1=431209&r2=431210&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/tomcat-builder/project.xml (original)
+++ geronimo/branches/1.1/modules/tomcat-builder/project.xml Sun Aug 13 12:30:12 2006
@@ -485,6 +485,13 @@
<include>schema/**</include>
</includes>
</resource>
+ <resource>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
</resources>
<unitTest>
<includes>
@@ -505,14 +512,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/upgrade/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/upgrade/project.xml?rev=431210&r1=431209&r2=431210&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/upgrade/project.xml (original)
+++ geronimo/branches/1.1/modules/upgrade/project.xml Sun Aug 13 12:30:12 2006
@@ -96,6 +96,13 @@
<include>**/*.properties</include>
</includes>
</resource>
+ <resource>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
</resources>
<unitTest>
<includes>
@@ -110,15 +117,6 @@
</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/util/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/util/project.xml?rev=431210&r1=431209&r2=431210&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/util/project.xml (original)
+++ geronimo/branches/1.1/modules/util/project.xml Sun Aug 13 12:30:12 2006
@@ -72,6 +72,13 @@
<include>**/*.properties</include>
</includes>
</resource>
+ <resource>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
</resources>
<unitTest>
<includes>
@@ -81,15 +88,6 @@
<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>