Author: jmitchell
Date: Wed Jun 21 21:22:16 2006
New Revision: 416239
URL: http://svn.apache.org/viewvc?rev=416239&view=rev
Log:
STR-2891
Added:
struts/action/trunk/core/src/main/resources/LICENSE.txt
- copied unchanged from r416194, struts/action/trunk/core/LICENSE.txt
struts/action/trunk/core/src/main/resources/NOTICE.txt
- copied unchanged from r416194, struts/action/trunk/core/NOTICE.txt
struts/action/trunk/el/src/main/resources/LICENSE.txt
- copied unchanged from r416194, struts/action/trunk/el/LICENSE.txt
struts/action/trunk/extras/src/main/resources/
struts/action/trunk/extras/src/main/resources/LICENSE.txt
- copied unchanged from r416235, struts/action/trunk/extras/LICENSE.txt
struts/action/trunk/extras/src/main/resources/NOTICE.txt
- copied unchanged from r416235, struts/action/trunk/extras/NOTICE.txt
struts/action/trunk/faces/src/main/resources/LICENSE.txt
- copied unchanged from r416194, struts/action/trunk/faces/LICENSE.txt
struts/action/trunk/faces/src/main/resources/NOTICE.txt
- copied unchanged from r416194, struts/action/trunk/faces/NOTICE.txt
struts/action/trunk/mailreader-dao/src/main/resources/
struts/action/trunk/mailreader-dao/src/main/resources/LICENSE.txt
- copied unchanged from r416194,
struts/action/trunk/mailreader-dao/LICENSE.txt
struts/action/trunk/mailreader-dao/src/main/resources/NOTICE.txt
- copied unchanged from r416194,
struts/action/trunk/mailreader-dao/NOTICE.txt
struts/action/trunk/scripting/src/main/resources/
struts/action/trunk/scripting/src/main/resources/LICENSE.txt
- copied unchanged from r416194, struts/action/trunk/scripting/LICENSE.txt
struts/action/trunk/scripting/src/main/resources/NOTICE.txt
- copied unchanged from r416194, struts/action/trunk/scripting/NOTICE.txt
struts/action/trunk/taglib/src/main/resources/LICENSE.txt
- copied unchanged from r416194, struts/action/trunk/taglib/LICENSE.txt
struts/action/trunk/taglib/src/main/resources/NOTICE.txt
- copied unchanged from r416194, struts/action/trunk/taglib/NOTICE.txt
struts/action/trunk/tiles/src/main/resources/LICENSE.txt
- copied unchanged from r416194, struts/action/trunk/tiles/LICENSE.txt
struts/action/trunk/tiles/src/main/resources/NOTICE.txt
- copied unchanged from r416194, struts/action/trunk/tiles/NOTICE.txt
Removed:
struts/action/trunk/core/LICENSE.txt
struts/action/trunk/core/NOTICE.txt
struts/action/trunk/el/LICENSE.txt
struts/action/trunk/extras/LICENSE.txt
struts/action/trunk/extras/NOTICE.txt
struts/action/trunk/faces/LICENSE.txt
struts/action/trunk/faces/NOTICE.txt
struts/action/trunk/mailreader-dao/LICENSE.txt
struts/action/trunk/mailreader-dao/NOTICE.txt
struts/action/trunk/scripting/LICENSE.txt
struts/action/trunk/scripting/NOTICE.txt
struts/action/trunk/taglib/LICENSE.txt
struts/action/trunk/taglib/NOTICE.txt
struts/action/trunk/tiles/LICENSE.txt
struts/action/trunk/tiles/NOTICE.txt
Modified:
struts/action/trunk/core/pom.xml
struts/action/trunk/el/pom.xml
struts/action/trunk/extras/pom.xml
struts/action/trunk/faces/pom.xml
struts/action/trunk/mailreader-dao/pom.xml
struts/action/trunk/scripting/pom.xml
struts/action/trunk/taglib/pom.xml
struts/action/trunk/tiles/pom.xml
Modified: struts/action/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/struts/action/trunk/core/pom.xml?rev=416239&r1=416238&r2=416239&view=diff
==============================================================================
--- struts/action/trunk/core/pom.xml (original)
+++ struts/action/trunk/core/pom.xml Wed Jun 21 21:22:16 2006
@@ -60,12 +60,6 @@
<include>**/*.properties</include>
</includes>
</resource>
- <resource>
- <directory>${basedir}</directory>
- <includes>
- <include>*.txt</include>
- </includes>
- </resource>
</resources>
<testResources>
Modified: struts/action/trunk/el/pom.xml
URL:
http://svn.apache.org/viewvc/struts/action/trunk/el/pom.xml?rev=416239&r1=416238&r2=416239&view=diff
==============================================================================
--- struts/action/trunk/el/pom.xml (original)
+++ struts/action/trunk/el/pom.xml Wed Jun 21 21:22:16 2006
@@ -48,12 +48,6 @@
<resource>
<directory>src/main/resources</directory>
</resource>
- <resource>
- <directory>${basedir}</directory>
- <includes>
- <include>*.txt</include>
- </includes>
- </resource>
</resources>
</build>
Modified: struts/action/trunk/extras/pom.xml
URL:
http://svn.apache.org/viewvc/struts/action/trunk/extras/pom.xml?rev=416239&r1=416238&r2=416239&view=diff
==============================================================================
--- struts/action/trunk/extras/pom.xml (original)
+++ struts/action/trunk/extras/pom.xml Wed Jun 21 21:22:16 2006
@@ -45,16 +45,13 @@
<build>
<resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.properties</include>
- </includes>
- </resource>
- <resource>
- <directory>${basedir}</directory>
- <includes>
- <include>*.txt</include>
</includes>
</resource>
</resources>
Modified: struts/action/trunk/faces/pom.xml
URL:
http://svn.apache.org/viewvc/struts/action/trunk/faces/pom.xml?rev=416239&r1=416238&r2=416239&view=diff
==============================================================================
--- struts/action/trunk/faces/pom.xml (original)
+++ struts/action/trunk/faces/pom.xml Wed Jun 21 21:22:16 2006
@@ -54,13 +54,6 @@
<include>**/*.properties</include>
</includes>
</resource>
- <resource>
- <directory>${basedir}</directory>
- <includes>
- <include>*.txt</include>
- </includes>
- </resource>
-
</resources>
<testResources>
<testResource>
Modified: struts/action/trunk/mailreader-dao/pom.xml
URL:
http://svn.apache.org/viewvc/struts/action/trunk/mailreader-dao/pom.xml?rev=416239&r1=416238&r2=416239&view=diff
==============================================================================
--- struts/action/trunk/mailreader-dao/pom.xml (original)
+++ struts/action/trunk/mailreader-dao/pom.xml Wed Jun 21 21:22:16 2006
@@ -38,12 +38,9 @@
<build>
<resources>
- <resource>
- <directory>${basedir}</directory>
- <includes>
- <include>*.txt</include>
- </includes>
- </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
</resources>
</build>
Modified: struts/action/trunk/scripting/pom.xml
URL:
http://svn.apache.org/viewvc/struts/action/trunk/scripting/pom.xml?rev=416239&r1=416238&r2=416239&view=diff
==============================================================================
--- struts/action/trunk/scripting/pom.xml (original)
+++ struts/action/trunk/scripting/pom.xml Wed Jun 21 21:22:16 2006
@@ -45,12 +45,9 @@
<build>
<resources>
- <resource>
- <directory>${basedir}</directory>
- <includes>
- <include>*.txt</include>
- </includes>
- </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
</resources>
</build>
Modified: struts/action/trunk/taglib/pom.xml
URL:
http://svn.apache.org/viewvc/struts/action/trunk/taglib/pom.xml?rev=416239&r1=416238&r2=416239&view=diff
==============================================================================
--- struts/action/trunk/taglib/pom.xml (original)
+++ struts/action/trunk/taglib/pom.xml Wed Jun 21 21:22:16 2006
@@ -54,12 +54,6 @@
<include>**/*.properties</include>
</includes>
</resource>
- <resource>
- <directory>${basedir}</directory>
- <includes>
- <include>*.txt</include>
- </includes>
- </resource>
</resources>
<testResources>
Modified: struts/action/trunk/tiles/pom.xml
URL:
http://svn.apache.org/viewvc/struts/action/trunk/tiles/pom.xml?rev=416239&r1=416238&r2=416239&view=diff
==============================================================================
--- struts/action/trunk/tiles/pom.xml (original)
+++ struts/action/trunk/tiles/pom.xml Wed Jun 21 21:22:16 2006
@@ -48,12 +48,6 @@
<resource>
<directory>src/main/resources</directory>
</resource>
- <resource>
- <directory>${basedir}</directory>
- <includes>
- <include>*.txt</include>
- </includes>
- </resource>
</resources>
<testResources>
