Author: olamy
Date: Fri Oct 21 23:06:26 2011
New Revision: 1187590
URL: http://svn.apache.org/viewvc?rev=1187590&view=rev
Log:
fix inclusion of some default *.properties files
Modified:
tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ha/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-catalina/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-coyote/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-el-api/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-jasper/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-servlet-api/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-util/pom.xml
Modified: tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ha/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ha/pom.xml?rev=1187590&r1=1187589&r2=1187590&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ha/pom.xml (original)
+++ tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ha/pom.xml Fri Oct 21 23:06:26
2011
@@ -63,8 +63,17 @@
</dependencies>
<build>
+
+ <resources>
+ <resource>
+ <directory>../../java/</directory>
+ <includes>
+ <include>org/apache/catalina/ha/**/LocalStrings.properties</include>
+ </includes>
+ </resource>
+ </resources>
+
<plugins>
- <!-- See http://maven.apache.org/plugins/maven-antrun-plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
Modified: tomcat/tc7.0.x/trunk/maven/tomcat-catalina/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-catalina/pom.xml?rev=1187590&r1=1187589&r2=1187590&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/maven/tomcat-catalina/pom.xml (original)
+++ tomcat/tc7.0.x/trunk/maven/tomcat-catalina/pom.xml Fri Oct 21 23:06:26 2011
@@ -75,6 +75,15 @@
</dependencies>
<build>
+ <resources>
+ <resource>
+ <directory>../../java/</directory>
+ <includes>
+ <include>org/apache/catalina/**/LocalStrings.properties</include>
+ <include>org/apache/naming/**/LocalStrings.properties</include>
+ </includes>
+ </resource>
+ </resources>
<plugins>
<!-- See http://maven.apache.org/plugins/maven-antrun-plugin -->
<plugin>
Modified: tomcat/tc7.0.x/trunk/maven/tomcat-coyote/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-coyote/pom.xml?rev=1187590&r1=1187589&r2=1187590&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/maven/tomcat-coyote/pom.xml (original)
+++ tomcat/tc7.0.x/trunk/maven/tomcat-coyote/pom.xml Fri Oct 21 23:06:26 2011
@@ -44,8 +44,24 @@
</dependencies>
<build>
+
+ <resources>
+ <resource>
+ <directory>../../java/</directory>
+ <includes>
+ <include>org/apache/coyote/**/LocalStrings.properties</include>
+ <include>org/apache/util/**/LocalStrings.properties</include>
+
<include>org/apache/catalina/util/CharsetMapperDefault.properties</include>
+ </includes>
+ <excludes>
+ <exclude>org/apache/util/file/**</exclude>
+ <exclude>org/apache/util/res/**</exclude>
+ <exclude>org/apache/util/scan/**</exclude>
+ </excludes>
+ </resource>
+ </resources>
+
<plugins>
- <!-- See http://maven.apache.org/plugins/maven-antrun-plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
Modified: tomcat/tc7.0.x/trunk/maven/tomcat-el-api/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-el-api/pom.xml?rev=1187590&r1=1187589&r2=1187590&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/maven/tomcat-el-api/pom.xml (original)
+++ tomcat/tc7.0.x/trunk/maven/tomcat-el-api/pom.xml Fri Oct 21 23:06:26 2011
@@ -31,6 +31,14 @@
<description>Expression language package</description>
<build>
+ <resources>
+ <resource>
+ <directory>../../java/</directory>
+ <includes>
+ <include>javax/el/**/LocalStrings.properties</include>
+ </includes>
+ </resource>
+ </resources>
<plugins>
<!-- See http://maven.apache.org/plugins/maven-antrun-plugin -->
<plugin>
@@ -59,4 +67,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: tomcat/tc7.0.x/trunk/maven/tomcat-jasper/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-jasper/pom.xml?rev=1187590&r1=1187589&r2=1187590&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/maven/tomcat-jasper/pom.xml (original)
+++ tomcat/tc7.0.x/trunk/maven/tomcat-jasper/pom.xml Fri Oct 21 23:06:26 2011
@@ -87,8 +87,17 @@
</dependencies>
<build>
+
+ <resources>
+ <resource>
+ <directory>../../java/</directory>
+ <includes>
+ <include>org/apache/jasper/**/LocalStrings.properties</include>
+ </includes>
+ </resource>
+ </resources>
+
<plugins>
- <!-- See http://maven.apache.org/plugins/maven-antrun-plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
Modified: tomcat/tc7.0.x/trunk/maven/tomcat-servlet-api/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-servlet-api/pom.xml?rev=1187590&r1=1187589&r2=1187590&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/maven/tomcat-servlet-api/pom.xml (original)
+++ tomcat/tc7.0.x/trunk/maven/tomcat-servlet-api/pom.xml Fri Oct 21 23:06:26
2011
@@ -31,6 +31,14 @@
<description>javax.servlet package</description>
<build>
+ <resources>
+ <resource>
+ <directory>../../java/</directory>
+ <includes>
+ <include>javax/servlet/**/LocalStrings.properties</include>
+ </includes>
+ </resource>
+ </resources>
<plugins>
<!-- See http://maven.apache.org/plugins/maven-antrun-plugin -->
<plugin>
Modified: tomcat/tc7.0.x/trunk/maven/tomcat-util/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-util/pom.xml?rev=1187590&r1=1187589&r2=1187590&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/maven/tomcat-util/pom.xml (original)
+++ tomcat/tc7.0.x/trunk/maven/tomcat-util/pom.xml Fri Oct 21 23:06:26 2011
@@ -57,8 +57,15 @@
</dependencies>
<build>
+ <resources>
+ <resource>
+ <directory>../../java/</directory>
+ <includes>
+
<include>org/apache/tomcat/util/file/**/LocalStrings.properties</include>
+ </includes>
+ </resource>
+ </resources>
<plugins>
- <!-- See http://maven.apache.org/plugins/maven-antrun-plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
