You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2009/07/21 00:07:26 UTC
svn commit: r796043 - in /geronimo/server/trunk:
framework/modules/geronimo-commands/
framework/modules/geronimo-commands/src/main/filtered-resources/
framework/modules/geronimo-commands/src/main/filtered-resources/org/
framework/modules/geronimo-comma...
Author: djencks
Date: Mon Jul 20 22:07:24 2009
New Revision: 796043
URL: http://svn.apache.org/viewvc?rev=796043&view=rev
Log:
GERONIMO-4737 Move resources that need filtering into filtered-resources directories. Mostly patch from shawn jiang, thanks
Added:
geronimo/server/trunk/framework/modules/geronimo-commands/src/main/filtered-resources/
geronimo/server/trunk/framework/modules/geronimo-commands/src/main/filtered-resources/org/
geronimo/server/trunk/framework/modules/geronimo-commands/src/main/filtered-resources/org/apache/
geronimo/server/trunk/framework/modules/geronimo-commands/src/main/filtered-resources/org/apache/geronimo/
geronimo/server/trunk/framework/modules/geronimo-commands/src/main/filtered-resources/org/apache/geronimo/commands/
geronimo/server/trunk/framework/modules/geronimo-commands/src/main/filtered-resources/org/apache/geronimo/commands/version.properties
- copied unchanged from r795946, geronimo/server/trunk/framework/modules/geronimo-commands/src/main/resources/org/apache/geronimo/commands/version.properties
geronimo/server/trunk/plugins/cxf/geronimo-cxf-tools/src/main/filtered-resources/
- copied from r795946, geronimo/server/trunk/plugins/cxf/geronimo-cxf-tools/src/main/resources/
geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/filtered-resources/
- copied from r795946, geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/resources/
geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/filtered-resources/
geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/filtered-resources/tomcat-base/
geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/filtered-resources/tomcat-base/ROOT/
geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/filtered-resources/tomcat-base/ROOT/WEB-INF/
geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/filtered-resources/tomcat-base/ROOT/WEB-INF/web.xml
- copied unchanged from r795946, geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/resources/tomcat-base/ROOT/WEB-INF/web.xml
geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/filtered-resources/tomcat-base/conf/
geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/filtered-resources/tomcat-base/conf/web.xml
- copied unchanged from r795946, geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/resources/tomcat-base/conf/web.xml
geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/filtered-resources/tomcat-base/server.xml
- copied unchanged from r795946, geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/resources/tomcat-base/server.xml
geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/src/main/filtered-resources/
- copied from r795946, geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/src/main/resources/
geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/src/main/filtered-resources/
- copied from r795946, geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/src/main/resources/
geronimo/server/trunk/testsupport/test-deployment-javaee_5/test-ear-javaee_5/src/main/filtered-resources/
- copied from r795946, geronimo/server/trunk/testsupport/test-deployment-javaee_5/test-ear-javaee_5/src/main/resources/
Removed:
geronimo/server/trunk/framework/modules/geronimo-commands/src/main/resources/org/apache/geronimo/commands/version.properties
geronimo/server/trunk/plugins/cxf/geronimo-cxf-tools/src/main/resources/
geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/resources/
geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/resources/tomcat-base/ROOT/WEB-INF/web.xml
geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/resources/tomcat-base/conf/web.xml
geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/resources/tomcat-base/server.xml
geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/src/main/resources/
geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/src/main/resources/
geronimo/server/trunk/testsupport/test-deployment-javaee_5/test-ear-javaee_5/src/main/resources/
Modified:
geronimo/server/trunk/framework/modules/geronimo-commands/pom.xml
geronimo/server/trunk/plugins/activemq/activemq-console-jetty/pom.xml
geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/pom.xml
geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml
geronimo/server/trunk/plugins/ca-helper/ca-helper-jetty/pom.xml
geronimo/server/trunk/plugins/ca-helper/ca-helper-tomcat/pom.xml
geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml
geronimo/server/trunk/plugins/console/console-jetty/pom.xml
geronimo/server/trunk/plugins/console/console-tomcat/pom.xml
geronimo/server/trunk/plugins/console/plugin-console-jetty/pom.xml
geronimo/server/trunk/plugins/console/plugin-console-tomcat/pom.xml
geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml
geronimo/server/trunk/plugins/cxf/geronimo-cxf-tools/pom.xml
geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/pom.xml
geronimo/server/trunk/plugins/debugviews/debugviews-console-tomcat/pom.xml
geronimo/server/trunk/plugins/debugviews/debugviews-portlets/pom.xml
geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty/pom.xml
geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-tomcat/pom.xml
geronimo/server/trunk/plugins/dojo/dojo-jetty/pom.xml
geronimo/server/trunk/plugins/dojo/dojo-tomcat/pom.xml
geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/pom.xml
geronimo/server/trunk/plugins/mejb/geronimo-mejb/pom.xml
geronimo/server/trunk/plugins/mejb/mejb/pom.xml
geronimo/server/trunk/plugins/monitoring/pom.xml
geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml
geronimo/server/trunk/plugins/openejb/openejb-console-jetty/pom.xml
geronimo/server/trunk/plugins/openejb/openejb-console-tomcat/pom.xml
geronimo/server/trunk/plugins/openejb/openejb-portlets/pom.xml
geronimo/server/trunk/plugins/openjpa/openjpa/pom.xml
geronimo/server/trunk/plugins/plancreator/plancreator-console-jetty/pom.xml
geronimo/server/trunk/plugins/plancreator/plancreator-console-tomcat/pom.xml
geronimo/server/trunk/plugins/plancreator/plancreator-portlets/pom.xml
geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml
geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/pom.xml
geronimo/server/trunk/plugins/system-database/sysdb-portlets/pom.xml
geronimo/server/trunk/plugins/system-database/system-database/pom.xml
geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/pom.xml
geronimo/server/trunk/plugins/tomcat/tomcat6/pom.xml
geronimo/server/trunk/plugins/welcome/welcome-jetty/pom.xml
geronimo/server/trunk/testsuite/pom.xml
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ejb/pom.xml
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/pom.xml
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ejb/pom.xml
geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/pom.xml
geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/pom.xml
geronimo/server/trunk/testsupport/test-deployment-javaee_5/test-ear-javaee_5/pom.xml
Modified: geronimo/server/trunk/framework/modules/geronimo-commands/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-commands/pom.xml?rev=796043&r1=796042&r2=796043&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-commands/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-commands/pom.xml Mon Jul 20 22:07:24 2009
@@ -72,24 +72,7 @@
</dependency>
</dependencies>
- <build>
- <resources>
- <resource>
- <directory>${pom.basedir}/src/main/resources</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
-
- <resource>
- <directory>${pom.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- <includes>
- <include>org/apache/geronimo/commands/version.properties</include>
- </includes>
- </resource>
- </resources>
-
+ <build>
<plugins>
<plugin>
<groupId>org.codehaus.groovy.maven</groupId>
Modified: geronimo/server/trunk/plugins/activemq/activemq-console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-console-jetty/pom.xml?rev=796043&r1=796042&r2=796043&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-console-jetty/pom.xml Mon Jul 20 22:07:24 2009
@@ -151,13 +151,6 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>${pom.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
-
<plugins>
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
Modified: geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/pom.xml?rev=796043&r1=796042&r2=796043&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/pom.xml Mon Jul 20 22:07:24 2009
@@ -142,13 +142,6 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>${pom.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
-
<plugins>
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml?rev=796043&r1=796042&r2=796043&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml Mon Jul 20 22:07:24 2009
@@ -102,12 +102,6 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
<plugins>
<plugin>
<groupId>org.codehaus.mojo.jspc</groupId>
Modified: geronimo/server/trunk/plugins/ca-helper/ca-helper-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/ca-helper/ca-helper-jetty/pom.xml?rev=796043&r1=796042&r2=796043&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/ca-helper/ca-helper-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/ca-helper/ca-helper-jetty/pom.xml Mon Jul 20 22:07:24 2009
@@ -72,13 +72,6 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>${pom.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
-
<plugins>
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
Modified: geronimo/server/trunk/plugins/ca-helper/ca-helper-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/ca-helper/ca-helper-tomcat/pom.xml?rev=796043&r1=796042&r2=796043&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/ca-helper/ca-helper-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/ca-helper/ca-helper-tomcat/pom.xml Mon Jul 20 22:07:24 2009
@@ -72,13 +72,6 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>${pom.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
-
<plugins>
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml?rev=796043&r1=796042&r2=796043&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml Mon Jul 20 22:07:24 2009
@@ -102,13 +102,6 @@
<!-- Build configuration -->
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
-
<plugins>
<!--
Modified: geronimo/server/trunk/plugins/console/console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-jetty/pom.xml?rev=796043&r1=796042&r2=796043&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-jetty/pom.xml Mon Jul 20 22:07:24 2009
@@ -121,13 +121,6 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>${pom.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
-
<plugins>
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
Modified: geronimo/server/trunk/plugins/console/console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-tomcat/pom.xml?rev=796043&r1=796042&r2=796043&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-tomcat/pom.xml Mon Jul 20 22:07:24 2009
@@ -121,13 +121,6 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>${pom.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
-
<plugins>
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
Modified: geronimo/server/trunk/plugins/console/plugin-console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-console-jetty/pom.xml?rev=796043&r1=796042&r2=796043&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/plugin-console-jetty/pom.xml Mon Jul 20 22:07:24 2009
@@ -90,13 +90,6 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>${pom.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
-
<plugins>
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
Modified: geronimo/server/trunk/plugins/console/plugin-console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-console-tomcat/pom.xml?rev=796043&r1=796042&r2=796043&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/plugin-console-tomcat/pom.xml Mon Jul 20 22:07:24 2009
@@ -90,13 +90,6 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>${pom.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
-
<plugins>
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
Modified: geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml?rev=796043&r1=796042&r2=796043&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml Mon Jul 20 22:07:24 2009
@@ -129,12 +129,6 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
<plugins>
<!--
Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf-tools/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf-tools/pom.xml?rev=796043&r1=796042&r2=796043&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf-tools/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf-tools/pom.xml Mon Jul 20 22:07:24 2009
@@ -57,13 +57,6 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>${project.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
-
<plugins>
<plugin>
<groupId>org.apache.geronimo.gshell</groupId>
Modified: geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/pom.xml?rev=796043&r1=796042&r2=796043&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/pom.xml Mon Jul 20 22:07:24 2009
@@ -95,13 +95,6 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>${pom.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
-
<plugins>
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
Modified: geronimo/server/trunk/plugins/debugviews/debugviews-console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-console-tomcat/pom.xml?rev=796043&r1=796042&r2=796043&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/debugviews/debugviews-console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/debugviews/debugviews-console-tomcat/pom.xml Mon Jul 20 22:07:24 2009
@@ -89,13 +89,6 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>${pom.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
-
<plugins>
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
Modified: geronimo/server/trunk/plugins/debugviews/debugviews-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-portlets/pom.xml?rev=796043&r1=796042&r2=796043&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/debugviews/debugviews-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/debugviews/debugviews-portlets/pom.xml Mon Jul 20 22:07:24 2009
@@ -110,12 +110,6 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
<plugins>
<plugin>
<groupId>org.codehaus.mojo.jspc</groupId>
Modified: geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty/pom.xml?rev=796043&r1=796042&r2=796043&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty/pom.xml Mon Jul 20 22:07:24 2009
@@ -64,13 +64,6 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>${pom.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
-
<plugins>
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
Modified: geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-tomcat/pom.xml?rev=796043&r1=796042&r2=796043&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-tomcat/pom.xml Mon Jul 20 22:07:24 2009
@@ -64,13 +64,6 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>${pom.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
-
<plugins>
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
Modified: geronimo/server/trunk/plugins/dojo/dojo-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/dojo/dojo-jetty/pom.xml?rev=796043&r1=796042&r2=796043&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/dojo/dojo-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/dojo/dojo-jetty/pom.xml Mon Jul 20 22:07:24 2009
@@ -65,13 +65,6 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>${pom.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
-
<plugins>
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
Modified: geronimo/server/trunk/plugins/dojo/dojo-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/dojo/dojo-tomcat/pom.xml?rev=796043&r1=796042&r2=796043&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/dojo/dojo-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/dojo/dojo-tomcat/pom.xml Mon Jul 20 22:07:24 2009
@@ -65,13 +65,6 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>${pom.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
-
<plugins>
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/pom.xml?rev=796043&r1=796042&r2=796043&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/pom.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/pom.xml Mon Jul 20 22:07:24 2009
@@ -47,13 +47,6 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>${project.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
-
<plugins>
<plugin>
<groupId>org.apache.geronimo.gshell</groupId>
Modified: geronimo/server/trunk/plugins/mejb/geronimo-mejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/mejb/geronimo-mejb/pom.xml?rev=796043&r1=796042&r2=796043&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/mejb/geronimo-mejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/mejb/geronimo-mejb/pom.xml Mon Jul 20 22:07:24 2009
@@ -34,15 +34,6 @@
<description> Geronimo Management EJB for JSR77 </description>
- <build>
- <resources>
- <resource>
- <directory>${pom.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- </build>
-
<dependencies>
<dependency>
<groupId>org.apache.openejb</groupId>
Modified: geronimo/server/trunk/plugins/mejb/mejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/mejb/mejb/pom.xml?rev=796043&r1=796042&r2=796043&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/mejb/mejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/mejb/mejb/pom.xml Mon Jul 20 22:07:24 2009
@@ -63,13 +63,6 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>${pom.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
-
<plugins>
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
Modified: geronimo/server/trunk/plugins/monitoring/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/pom.xml?rev=796043&r1=796042&r2=796043&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/pom.xml Mon Jul 20 22:07:24 2009
@@ -74,14 +74,7 @@
</profile>
</profiles>
- <build>
- <resources>
- <resource>
- <directory>${pom.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
-
+ <build>
<pluginManagement>
<plugins>
<!-- inheriting configration for war plugin, i,e, precompile JSPs -->
Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml?rev=796043&r1=796042&r2=796043&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml Mon Jul 20 22:07:24 2009
@@ -155,13 +155,4 @@
<!--</dependency>-->
</dependencies>
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- </build>
-
</project>
Modified: geronimo/server/trunk/plugins/openejb/openejb-console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-console-jetty/pom.xml?rev=796043&r1=796042&r2=796043&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-console-jetty/pom.xml Mon Jul 20 22:07:24 2009
@@ -88,13 +88,6 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>${pom.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
-
<plugins>
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
Modified: geronimo/server/trunk/plugins/openejb/openejb-console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-console-tomcat/pom.xml?rev=796043&r1=796042&r2=796043&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-console-tomcat/pom.xml Mon Jul 20 22:07:24 2009
@@ -88,13 +88,6 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>${pom.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
-
<plugins>
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
Modified: geronimo/server/trunk/plugins/openejb/openejb-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-portlets/pom.xml?rev=796043&r1=796042&r2=796043&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-portlets/pom.xml Mon Jul 20 22:07:24 2009
@@ -138,12 +138,6 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
<plugins>
<plugin>
<groupId>org.codehaus.mojo.jspc</groupId>
Modified: geronimo/server/trunk/plugins/openjpa/openjpa/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa/openjpa/pom.xml?rev=796043&r1=796042&r2=796043&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa/openjpa/pom.xml (original)
+++ geronimo/server/trunk/plugins/openjpa/openjpa/pom.xml Mon Jul 20 22:07:24 2009
@@ -76,13 +76,6 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>${pom.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
-
<plugins>
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
Modified: geronimo/server/trunk/plugins/plancreator/plancreator-console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-console-jetty/pom.xml?rev=796043&r1=796042&r2=796043&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-console-jetty/pom.xml Mon Jul 20 22:07:24 2009
@@ -101,13 +101,6 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>${pom.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
-
<plugins>
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
Modified: geronimo/server/trunk/plugins/plancreator/plancreator-console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-console-tomcat/pom.xml?rev=796043&r1=796042&r2=796043&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-console-tomcat/pom.xml Mon Jul 20 22:07:24 2009
@@ -93,13 +93,6 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>${pom.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
-
<plugins>
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
Modified: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/pom.xml?rev=796043&r1=796042&r2=796043&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/pom.xml Mon Jul 20 22:07:24 2009
@@ -146,12 +146,6 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
<plugins>
<plugin>
<groupId>org.codehaus.mojo.jspc</groupId>
Modified: geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml?rev=796043&r1=796042&r2=796043&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml Mon Jul 20 22:07:24 2009
@@ -248,13 +248,6 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>${pom.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
-
<plugins>
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
Modified: geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/pom.xml?rev=796043&r1=796042&r2=796043&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/pom.xml Mon Jul 20 22:07:24 2009
@@ -233,13 +233,6 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>${pom.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
-
<plugins>
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
Modified: geronimo/server/trunk/plugins/system-database/sysdb-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-portlets/pom.xml?rev=796043&r1=796042&r2=796043&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/pom.xml Mon Jul 20 22:07:24 2009
@@ -137,12 +137,6 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
<plugins>
<plugin>
<groupId>org.codehaus.mojo.jspc</groupId>
Modified: geronimo/server/trunk/plugins/system-database/system-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/system-database/pom.xml?rev=796043&r1=796042&r2=796043&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/system-database/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/system-database/pom.xml Mon Jul 20 22:07:24 2009
@@ -91,12 +91,6 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>${pom.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
<plugins>
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
Modified: geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/pom.xml?rev=796043&r1=796042&r2=796043&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/pom.xml Mon Jul 20 22:07:24 2009
@@ -74,13 +74,6 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>${pom.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
-
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: geronimo/server/trunk/plugins/tomcat/tomcat6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat6/pom.xml?rev=796043&r1=796042&r2=796043&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat6/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat6/pom.xml Mon Jul 20 22:07:24 2009
@@ -111,21 +111,6 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>${pom.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </resource>
- <resource>
- <directory>${pom.basedir}/src/main/resources</directory>
- <excludes>
- <exclude>**/*.xml</exclude>
- </excludes>
- </resource>
- </resources>
<plugins>
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
Modified: geronimo/server/trunk/plugins/welcome/welcome-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/welcome/welcome-jetty/pom.xml?rev=796043&r1=796042&r2=796043&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/welcome/welcome-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/welcome/welcome-jetty/pom.xml Mon Jul 20 22:07:24 2009
@@ -80,14 +80,7 @@
</dependency>
</dependencies>
- <build>
- <resources>
- <resource>
- <directory>${pom.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
-
+ <build>
<plugins>
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
Modified: geronimo/server/trunk/testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/pom.xml?rev=796043&r1=796042&r2=796043&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/pom.xml Mon Jul 20 22:07:24 2009
@@ -80,14 +80,7 @@
<version>${version}</version>
</extension>
</extensions>
- -->
-
- <resources>
- <resource>
- <directory>${project.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
+ -->
<pluginManagement>
<plugins>
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ejb/pom.xml?rev=796043&r1=796042&r2=796043&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ejb/pom.xml Mon Jul 20 22:07:24 2009
@@ -54,10 +54,6 @@
<include>**/*.xml</include>
</includes>
</resource>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
</resources>
<plugins>
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/pom.xml?rev=796043&r1=796042&r2=796043&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/pom.xml Mon Jul 20 22:07:24 2009
@@ -37,12 +37,4 @@
<scope>provided</scope>
</dependency>
</dependencies>
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>false</filtering>
- </resource>
- </resources>
- </build>
</project>
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml?rev=796043&r1=796042&r2=796043&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml Mon Jul 20 22:07:24 2009
@@ -78,9 +78,6 @@
<resource>
<directory>src/main/java</directory>
</resource>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
</resources>
<plugins>
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ejb/pom.xml?rev=796043&r1=796042&r2=796043&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ejb/pom.xml Mon Jul 20 22:07:24 2009
@@ -56,10 +56,6 @@
<include>**/*.xml</include>
</includes>
</resource>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
</resources>
<plugins>
Modified: geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/pom.xml?rev=796043&r1=796042&r2=796043&view=diff
==============================================================================
--- geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/pom.xml (original)
+++ geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/pom.xml Mon Jul 20 22:07:24 2009
@@ -61,14 +61,7 @@
</dependency>
</dependencies>
- <build>
- <resources>
- <resource>
- <directory>${pom.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
-
+ <build>
<plugins>
<plugin>
<artifactId>maven-ear-plugin</artifactId>
Modified: geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/pom.xml?rev=796043&r1=796042&r2=796043&view=diff
==============================================================================
--- geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/pom.xml (original)
+++ geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/pom.xml Mon Jul 20 22:07:24 2009
@@ -61,14 +61,7 @@
</dependency>
</dependencies>
- <build>
- <resources>
- <resource>
- <directory>${pom.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
-
+ <build>
<plugins>
<plugin>
<artifactId>maven-ear-plugin</artifactId>
Modified: geronimo/server/trunk/testsupport/test-deployment-javaee_5/test-ear-javaee_5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/test-deployment-javaee_5/test-ear-javaee_5/pom.xml?rev=796043&r1=796042&r2=796043&view=diff
==============================================================================
--- geronimo/server/trunk/testsupport/test-deployment-javaee_5/test-ear-javaee_5/pom.xml (original)
+++ geronimo/server/trunk/testsupport/test-deployment-javaee_5/test-ear-javaee_5/pom.xml Mon Jul 20 22:07:24 2009
@@ -62,13 +62,6 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>${pom.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
-
<plugins>
<plugin>
<artifactId>maven-ear-plugin</artifactId>