You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dw...@apache.org on 2008/04/23 19:44:33 UTC
svn commit: r650954 - in /geronimo/server/branches/2.1/plugins:
axis2/axis2-ejb/src/main/plan/ axis2/axis2/src/main/plan/
connector/transaction/src/main/plan/ cxf/cxf-ejb/src/main/plan/
cxf/cxf/src/main/plan/ derby/src/main/plan/ j2ee/jsr88-war-configu...
Author: dwoods
Date: Wed Apr 23 10:44:28 2008
New Revision: 650954
URL: http://svn.apache.org/viewvc?rev=650954&view=rev
Log:
Continue work started by jlaskowski in r647717 - Make plans more dynamic with their versions resolved at build time. Didn't update any junit or testsuite files.
Modified:
geronimo/server/branches/2.1/plugins/axis2/axis2-ejb/src/main/plan/plan.xml
geronimo/server/branches/2.1/plugins/axis2/axis2/src/main/plan/plan.xml
geronimo/server/branches/2.1/plugins/connector/transaction/src/main/plan/plan.xml
geronimo/server/branches/2.1/plugins/cxf/cxf-ejb/src/main/plan/plan.xml
geronimo/server/branches/2.1/plugins/cxf/cxf/src/main/plan/plan.xml
geronimo/server/branches/2.1/plugins/derby/src/main/plan/plan.xml
geronimo/server/branches/2.1/plugins/j2ee/jsr88-war-configurer/src/main/plan/plan.xml
geronimo/server/branches/2.1/plugins/jaxws/jaxws-deployer/src/main/plan/plan.xml
geronimo/server/branches/2.1/plugins/jaxws/jaxws-ejb-deployer/src/main/plan/plan.xml
geronimo/server/branches/2.1/plugins/jetty/jetty6-clustering-builder-wadi/src/main/plan/plan.xml
geronimo/server/branches/2.1/plugins/jetty/jetty6-clustering-wadi/src/main/plan/plan.xml
geronimo/server/branches/2.1/plugins/jetty/jetty6/src/main/plan/plan.xml
geronimo/server/branches/2.1/plugins/monitoring/agent-car-jmx/src/main/plan/plan.xml
geronimo/server/branches/2.1/plugins/spring/src/main/plan/plan.xml
geronimo/server/branches/2.1/plugins/tomcat/tomcat6-clustering-builder-wadi/src/main/plan/plan.xml
geronimo/server/branches/2.1/plugins/tomcat/tomcat6-clustering-wadi/src/main/plan/plan.xml
geronimo/server/branches/2.1/plugins/webservices/webservices-common/src/main/plan/plan.xml
Modified: geronimo/server/branches/2.1/plugins/axis2/axis2-ejb/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/axis2/axis2-ejb/src/main/plan/plan.xml?rev=650954&r1=650953&r2=650954&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/axis2/axis2-ejb/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/plugins/axis2/axis2-ejb/src/main/plan/plan.xml Wed Apr 23 10:44:28 2008
@@ -18,6 +18,6 @@
<!-- $Rev: 573957 $ $Date: 2007-09-09 04:14:57 -0400 (Sun, 09 Sep 2007) $ -->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
</module>
Modified: geronimo/server/branches/2.1/plugins/axis2/axis2/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/axis2/axis2/src/main/plan/plan.xml?rev=650954&r1=650953&r2=650954&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/axis2/axis2/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/plugins/axis2/axis2/src/main/plan/plan.xml Wed Apr 23 10:44:28 2008
@@ -18,6 +18,6 @@
<!-- $Rev$ $Date$ -->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
</module>
Modified: geronimo/server/branches/2.1/plugins/connector/transaction/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/connector/transaction/src/main/plan/plan.xml?rev=650954&r1=650953&r2=650954&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/connector/transaction/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/plugins/connector/transaction/src/main/plan/plan.xml Wed Apr 23 10:44:28 2008
@@ -18,7 +18,7 @@
<!-- $Rev$ $Date$ -->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
<gbean name="ConnectionTracker" class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean">
<attribute name="lazyConnect">true</attribute>
Modified: geronimo/server/branches/2.1/plugins/cxf/cxf-ejb/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/cxf/cxf-ejb/src/main/plan/plan.xml?rev=650954&r1=650953&r2=650954&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/cxf/cxf-ejb/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/plugins/cxf/cxf-ejb/src/main/plan/plan.xml Wed Apr 23 10:44:28 2008
@@ -18,6 +18,6 @@
<!-- $Rev$ $Date$ -->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
</module>
Modified: geronimo/server/branches/2.1/plugins/cxf/cxf/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/cxf/cxf/src/main/plan/plan.xml?rev=650954&r1=650953&r2=650954&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/cxf/cxf/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/plugins/cxf/cxf/src/main/plan/plan.xml Wed Apr 23 10:44:28 2008
@@ -18,6 +18,6 @@
<!-- $Rev$ $Date$ -->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
</module>
Modified: geronimo/server/branches/2.1/plugins/derby/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/derby/src/main/plan/plan.xml?rev=650954&r1=650953&r2=650954&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/derby/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/plugins/derby/src/main/plan/plan.xml Wed Apr 23 10:44:28 2008
@@ -18,6 +18,6 @@
<!-- $Rev: 589946 $ $Date: 2007-10-29 22:53:25 -0400 (Mon, 29 Oct 2007) $ -->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
</module>
Modified: geronimo/server/branches/2.1/plugins/j2ee/jsr88-war-configurer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/j2ee/jsr88-war-configurer/src/main/plan/plan.xml?rev=650954&r1=650953&r2=650954&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/j2ee/jsr88-war-configurer/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/plugins/j2ee/jsr88-war-configurer/src/main/plan/plan.xml Wed Apr 23 10:44:28 2008
@@ -18,7 +18,7 @@
<!-- $Rev$ $Date$ -->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
<gbean name="WARConfigurer" class="org.apache.geronimo.web.deployment.WARConfigurer"/>
Modified: geronimo/server/branches/2.1/plugins/jaxws/jaxws-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/jaxws/jaxws-deployer/src/main/plan/plan.xml?rev=650954&r1=650953&r2=650954&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/jaxws/jaxws-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/plugins/jaxws/jaxws-deployer/src/main/plan/plan.xml Wed Apr 23 10:44:28 2008
@@ -18,5 +18,5 @@
<!-- $Rev$ $Date$ -->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
</module>
Modified: geronimo/server/branches/2.1/plugins/jaxws/jaxws-ejb-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/jaxws/jaxws-ejb-deployer/src/main/plan/plan.xml?rev=650954&r1=650953&r2=650954&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/jaxws/jaxws-ejb-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/plugins/jaxws/jaxws-ejb-deployer/src/main/plan/plan.xml Wed Apr 23 10:44:28 2008
@@ -18,5 +18,5 @@
<!-- $Rev$ $Date$ -->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
</module>
Modified: geronimo/server/branches/2.1/plugins/jetty/jetty6-clustering-builder-wadi/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/jetty/jetty6-clustering-builder-wadi/src/main/plan/plan.xml?rev=650954&r1=650953&r2=650954&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/jetty/jetty6-clustering-builder-wadi/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/plugins/jetty/jetty6-clustering-builder-wadi/src/main/plan/plan.xml Wed Apr 23 10:44:28 2008
@@ -18,7 +18,7 @@
<!-- $Rev$ $Date$ -->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
<gbean name="JettyClusteringBuilder" class="org.apache.geronimo.jetty6.cluster.wadi.builder.WADIJettyClusteringBuilder">
<attribute name="defaultSweepInterval">10</attribute>
@@ -26,7 +26,7 @@
<attribute name="defaultBackingStrategyFactoryName">?name=DefaultBackingStrategyFactory</attribute>
<attribute name="defaultClusterName">?name=DefaultCluster</attribute>
<xml-attribute name="defaultEnvironment">
- <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+ <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
Modified: geronimo/server/branches/2.1/plugins/jetty/jetty6-clustering-wadi/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/jetty/jetty6-clustering-wadi/src/main/plan/plan.xml?rev=650954&r1=650953&r2=650954&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/jetty/jetty6-clustering-wadi/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/plugins/jetty/jetty6-clustering-wadi/src/main/plan/plan.xml Wed Apr 23 10:44:28 2008
@@ -18,5 +18,5 @@
<!-- $Rev$ $Date$ -->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
</module>
Modified: geronimo/server/branches/2.1/plugins/jetty/jetty6/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/jetty/jetty6/src/main/plan/plan.xml?rev=650954&r1=650953&r2=650954&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/jetty/jetty6/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/plugins/jetty/jetty6/src/main/plan/plan.xml Wed Apr 23 10:44:28 2008
@@ -18,7 +18,7 @@
<!-- $Rev$ $Date$ -->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
<!-- david jencks is not convinced that these 2 gbeans should be in this
plan and thinks they might belong in the console plan. Aaron thinks
Modified: geronimo/server/branches/2.1/plugins/monitoring/agent-car-jmx/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/agent-car-jmx/src/main/plan/plan.xml?rev=650954&r1=650953&r2=650954&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/agent-car-jmx/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/plugins/monitoring/agent-car-jmx/src/main/plan/plan.xml Wed Apr 23 10:44:28 2008
@@ -18,7 +18,7 @@
<!-- $Rev$ $Date$ -->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
<environment>
<moduleId>
<groupId>org.apache.geronimo.plugins.monitoring</groupId>
Modified: geronimo/server/branches/2.1/plugins/spring/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/spring/src/main/plan/plan.xml?rev=650954&r1=650953&r2=650954&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/spring/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/plugins/spring/src/main/plan/plan.xml Wed Apr 23 10:44:28 2008
@@ -18,6 +18,6 @@
<!-- $Rev$ $Date$ -->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
</module>
Modified: geronimo/server/branches/2.1/plugins/tomcat/tomcat6-clustering-builder-wadi/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/tomcat/tomcat6-clustering-builder-wadi/src/main/plan/plan.xml?rev=650954&r1=650953&r2=650954&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/tomcat/tomcat6-clustering-builder-wadi/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/plugins/tomcat/tomcat6-clustering-builder-wadi/src/main/plan/plan.xml Wed Apr 23 10:44:28 2008
@@ -18,7 +18,7 @@
<!-- $Rev: 589946 $ $Date: 2007-10-30 13:53:25 +1100 (Tue, 30 Oct 2007) $ -->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
<gbean name="TomcatClusteringBuilder" class="org.apache.geronimo.tomcat.cluster.wadi.builder.WADITomcatClusteringBuilder">
<attribute name="defaultSweepInterval">10</attribute>
@@ -27,7 +27,7 @@
<attribute name="defaultBackingStrategyFactoryName">?name=DefaultBackingStrategyFactory</attribute>
<attribute name="defaultClusterName">?name=DefaultCluster</attribute>
<xml-attribute name="defaultEnvironment">
- <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+ <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
Modified: geronimo/server/branches/2.1/plugins/tomcat/tomcat6-clustering-wadi/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/tomcat/tomcat6-clustering-wadi/src/main/plan/plan.xml?rev=650954&r1=650953&r2=650954&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/tomcat/tomcat6-clustering-wadi/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/plugins/tomcat/tomcat6-clustering-wadi/src/main/plan/plan.xml Wed Apr 23 10:44:28 2008
@@ -18,5 +18,5 @@
<!-- $Rev: 589946 $ $Date: 2007-10-30 13:53:25 +1100 (Tue, 30 Oct 2007) $ -->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
</module>
Modified: geronimo/server/branches/2.1/plugins/webservices/webservices-common/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/webservices/webservices-common/src/main/plan/plan.xml?rev=650954&r1=650953&r2=650954&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/webservices/webservices-common/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/plugins/webservices/webservices-common/src/main/plan/plan.xml Wed Apr 23 10:44:28 2008
@@ -15,6 +15,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
</module>