You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ak...@apache.org on 2006/10/12 21:09:43 UTC
svn commit: r463384 - in /geronimo/server/trunk: ./
configs/activemq-broker/src/plan/ configs/activemq/src/plan/
configs/axis-deployer/src/plan/ configs/axis/src/plan/
configs/client-corba-sun/src/plan/ configs/client-corba-yoko/src/plan/
configs/clien...
Author: akulshreshtha
Date: Thu Oct 12 12:09:39 2006
New Revision: 463384
URL: http://svn.apache.org/viewvc?view=rev&rev=463384
Log:
GERONIMO-2486 Added a property geronimoSchemaVersion to the namespaces in all the plans
Modified:
geronimo/server/trunk/configs/activemq-broker/src/plan/plan.xml
geronimo/server/trunk/configs/activemq/src/plan/plan.xml
geronimo/server/trunk/configs/axis-deployer/src/plan/plan.xml
geronimo/server/trunk/configs/axis/src/plan/plan.xml
geronimo/server/trunk/configs/client-corba-sun/src/plan/plan.xml
geronimo/server/trunk/configs/client-corba-yoko/src/plan/plan.xml
geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml
geronimo/server/trunk/configs/client-security/src/plan/plan.xml
geronimo/server/trunk/configs/client-system/src/plan/plan.xml
geronimo/server/trunk/configs/client-transaction/src/plan/plan.xml
geronimo/server/trunk/configs/client/src/plan/plan.xml
geronimo/server/trunk/configs/clustering/src/plan/plan.xml
geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml
geronimo/server/trunk/configs/daytrader-jetty/src/plan/plan.xml
geronimo/server/trunk/configs/daytrader-tomcat/src/plan/plan.xml
geronimo/server/trunk/configs/directory/src/plan/plan.xml
geronimo/server/trunk/configs/dojo-jetty/src/plan/plan.xml
geronimo/server/trunk/configs/dojo-tomcat/src/plan/plan.xml
geronimo/server/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml
geronimo/server/trunk/configs/hot-deployer/src/plan/plan.xml
geronimo/server/trunk/configs/j2ee-corba-sun/src/plan/plan.xml
geronimo/server/trunk/configs/j2ee-corba-yoko/src/plan/plan.xml
geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml
geronimo/server/trunk/configs/j2ee-security/src/plan/plan.xml
geronimo/server/trunk/configs/j2ee-server/src/plan/plan.xml
geronimo/server/trunk/configs/j2ee-system/src/plan/plan.xml
geronimo/server/trunk/configs/javamail/src/plan/plan.xml
geronimo/server/trunk/configs/jetty-clustering-builder-wadi/src/plan/plan.xml
geronimo/server/trunk/configs/jetty-clustering-wadi/src/plan/plan.xml
geronimo/server/trunk/configs/jetty-deployer/src/plan/plan.xml
geronimo/server/trunk/configs/jetty/src/plan/plan.xml
geronimo/server/trunk/configs/jsp-examples-jetty/src/plan/plan.xml
geronimo/server/trunk/configs/jsp-examples-tomcat/src/plan/plan.xml
geronimo/server/trunk/configs/ldap-demo-jetty/src/plan/plan.xml
geronimo/server/trunk/configs/ldap-demo-tomcat/src/plan/plan.xml
geronimo/server/trunk/configs/ldap-realm/src/plan/plan.xml
geronimo/server/trunk/configs/online-deployer/src/plan/plan.xml
geronimo/server/trunk/configs/openejb-deployer/src/plan/plan.xml
geronimo/server/trunk/configs/openejb/src/plan/plan.xml
geronimo/server/trunk/configs/remote-deploy-jetty/src/plan/plan.xml
geronimo/server/trunk/configs/remote-deploy-tomcat/src/plan/plan.xml
geronimo/server/trunk/configs/rmi-naming/src/plan/plan.xml
geronimo/server/trunk/configs/servlet-examples-jetty/src/plan/plan.xml
geronimo/server/trunk/configs/servlet-examples-tomcat/src/plan/plan.xml
geronimo/server/trunk/configs/sharedlib/src/plan/plan.xml
geronimo/server/trunk/configs/shutdown/src/plan/plan.xml
geronimo/server/trunk/configs/system-database/src/plan/plan.xml
geronimo/server/trunk/configs/tomcat-deployer/src/plan/plan.xml
geronimo/server/trunk/configs/tomcat/src/plan/plan.xml
geronimo/server/trunk/configs/transaction/src/plan/plan.xml
geronimo/server/trunk/configs/uddi-jetty/src/plan/plan.xml
geronimo/server/trunk/configs/uddi-tomcat/src/plan/plan.xml
geronimo/server/trunk/configs/unavailable-client-deployer/src/plan/plan.xml
geronimo/server/trunk/configs/unavailable-ejb-deployer/src/plan/plan.xml
geronimo/server/trunk/configs/unavailable-webservices-deployer/src/plan/plan.xml
geronimo/server/trunk/configs/upgrade-cli/src/plan/plan.xml
geronimo/server/trunk/configs/upgrade/src/plan/plan.xml
geronimo/server/trunk/configs/wadi-clustering/src/plan/plan.xml
geronimo/server/trunk/configs/webconsole-jetty/src/plan/plan.xml
geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml
geronimo/server/trunk/configs/welcome-jetty/src/plan/plan.xml
geronimo/server/trunk/configs/welcome-tomcat/src/plan/plan.xml
geronimo/server/trunk/pom.xml
Modified: geronimo/server/trunk/configs/activemq-broker/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/activemq-broker/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/activemq-broker/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/activemq-broker/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,7 +17,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="ActiveMQManager" class="org.apache.activemq.gbean.management.ActiveMQManagerGBean"/>
Modified: geronimo/server/trunk/configs/activemq/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/activemq/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/activemq/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/activemq/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,7 +17,7 @@
<!-- $Rev$ $Date$ -->
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-${geronimoSchemaVersion}">
<resourceadapter>
<resourceadapter-instance>
Modified: geronimo/server/trunk/configs/axis-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/axis-deployer/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/axis-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/axis-deployer/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -15,14 +15,14 @@
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}">
<gbean name="WebServiceBuilder" class="org.apache.geronimo.axis.builder.AxisBuilder"/>
<gbean name="AxisServiceRefBuilder" class="org.apache.geronimo.axis.builder.AxisServiceRefBuilder">
<attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee</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>org.apache.geronimo.modules</groupId>
Modified: geronimo/server/trunk/configs/axis/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/axis/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/axis/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/axis/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,7 +17,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="AxisCLWorkaround" class="org.apache.geronimo.axis.AxisDiscoveryCLWorkaroundGBean"/>
Modified: geronimo/server/trunk/configs/client-corba-sun/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-corba-sun/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/client-corba-sun/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/client-corba-sun/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,7 +17,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="DyanmicStubClassLoader" class="org.apache.openejb.corba.util.DynamicStubClassLoaderGBean"/>
<gbean name="ORBConfigAdapter" class="org.apache.openejb.sunorb.SunORBConfigAdapterGBean">
Modified: geronimo/server/trunk/configs/client-corba-yoko/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-corba-yoko/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/client-corba-yoko/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/client-corba-yoko/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,7 +17,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="DyanmicStubClassLoader" class="org.apache.openejb.corba.util.DynamicStubClassLoaderGBean"/>
<gbean name="ORBConfigAdapter" class="org.apache.openejb.yoko.ORBConfigAdapterGBean"/>
Modified: geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -15,7 +15,7 @@
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}">
<gbean name="AppClientBuilder" class="org.apache.geronimo.client.builder.AppClientModuleBuilder">
<attribute name="transactionManagerObjectName">?name=TransactionManager</attribute>
@@ -60,7 +60,7 @@
<name>ClientConnectorBuilder</name>
</reference>
<xml-attribute name="defaultServerEnvironment">
- <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>
@@ -71,7 +71,7 @@
</environment>
</xml-attribute>
<xml-attribute name="defaultClientEnvironment">
- <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>
@@ -95,7 +95,7 @@
<name>GBeanBuilder</name>
</reference>
<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/trunk/configs/client-security/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-security/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/client-security/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/client-security/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,7 +17,7 @@
<!-- $Rev$ $Date$ -->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
<!-- required -->
<gbean name="SecurityService" class="org.apache.geronimo.security.SecurityServiceImpl">
@@ -69,7 +69,7 @@
class="org.apache.geronimo.security.realm.GenericSecurityRealm">
<attribute name="realmName">client-properties-realm</attribute>
<xml-reference name="LoginModuleConfiguration">
- <lc:login-config xmlns:lc="http://geronimo.apache.org/xml/ns/loginconfig-1.1">
+ <lc:login-config xmlns:lc="http://geronimo.apache.org/xml/ns/loginconfig-${geronimoSchemaVersion}">
<lc:login-module control-flag="REQUIRED" server-side="true" wrap-principals="true">
<lc:login-domain-name>client-properties-realm</lc:login-domain-name>
<lc:login-module-class>org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule</lc:login-module-class>
Modified: geronimo/server/trunk/configs/client-system/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-system/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/client-system/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/client-system/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -15,7 +15,7 @@
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}">
<!-- ServerInfo service -->
<gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.BasicServerInfo"/>
Modified: geronimo/server/trunk/configs/client-transaction/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-transaction/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/client-transaction/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/client-transaction/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,7 +17,7 @@
<!-- $Rev$ $Date$ -->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
<!--client connector support-->
<gbean name="ConnectionTracker" class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean">
Modified: geronimo/server/trunk/configs/client/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/client/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/client/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,7 +17,7 @@
<!-- $Rev$ $Date$ -->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
<!-- Naming properties -->
<gbean name="NamingProperties" class="org.apache.geronimo.system.properties.NamingProperties">
Modified: geronimo/server/trunk/configs/clustering/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/clustering/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/clustering/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/clustering/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- Copyright 2006 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- $Rev: 446730 $ $Date: 2006-09-16 06:44:51 +1000 (Sat, 16 Sep 2006) $ -->
-
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
-
- <gbean name="Node" class="org.apache.geronimo.clustering.BasicNode">
- <attribute name="nodeName">${PlanNodeName}</attribute>
- </gbean>
-
-</module>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Copyright 2006 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- $Rev: 446730 $ $Date: 2006-09-16 06:44:51 +1000 (Sat, 16 Sep 2006) $ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+
+ <gbean name="Node" class="org.apache.geronimo.clustering.BasicNode">
+ <attribute name="nodeName">${PlanNodeName}</attribute>
+ </gbean>
+
+</module>
Modified: geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,7 +17,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="ConnectorBuilder" class="org.apache.geronimo.connector.deployment.ConnectorModuleBuilder">
<attribute name="defaultMaxSize">10</attribute>
@@ -30,7 +30,7 @@
<name>GBeanBuilder</name>
</reference>
<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/trunk/configs/daytrader-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/daytrader-jetty/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/daytrader-jetty/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/daytrader-jetty/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,11 +17,11 @@
<!-- $Rev$ $Date$ -->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-${geronimoSchemaVersion}">
<module>
<web>web.war</web>
- <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1">
+ <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-${geronimoSchemaVersion}">
<service-ref>
<service-ref-name>service/Trade</service-ref-name>
<port>
@@ -521,8 +521,8 @@
<module>
<java>streamer.jar</java>
- <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.1">
- <client-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+ <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-${geronimoSchemaVersion}">
+ <client-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
<moduleId>
<groupId>${pom.groupId}</groupId>
<artifactId>${pom.artifactId}-streamer-client</artifactId>
@@ -530,7 +530,7 @@
<type>car</type>
</moduleId>
</client-environment>
- <server-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+ <server-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
<moduleId>
<groupId>${pom.groupId}</groupId>
<artifactId>${pom.artifactId}-streamer-client-server</artifactId>
@@ -540,7 +540,7 @@
</server-environment>
<resource>
<external-rar>geronimo/ge-activemq-rar/${pom.version}/rar</external-rar>
- <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
+ <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-${geronimoSchemaVersion}">
<resourceadapter>
<resourceadapter-instance>
<resourceadapter-name>ActiveMQ RA</resourceadapter-name>
@@ -591,7 +591,7 @@
<ext-module>
<connector>TradeDataSource</connector>
<external-path>tranql/tranql-connector-derby-embed-xa/${tranql_vendors_version}/rar</external-path>
- <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
+ <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-${geronimoSchemaVersion}">
@@ -628,7 +628,7 @@
<ext-module>
<connector>TradeJMS</connector>
<external-path>geronimo/ge-activemq-rar/${pom.version}/rar</external-path>
- <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
+ <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-${geronimoSchemaVersion}">
<resourceadapter>
<!-- how to connect to the JMS Server -->
Modified: geronimo/server/trunk/configs/daytrader-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/daytrader-tomcat/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/daytrader-tomcat/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/daytrader-tomcat/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,11 +17,11 @@
<!-- $Rev$ $Date$ -->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-${geronimoSchemaVersion}">
<module>
<web>web.war</web>
- <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1">
+ <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-${geronimoSchemaVersion}">
<service-ref>
<service-ref-name>service/Trade</service-ref-name>
<port>
@@ -521,8 +521,8 @@
<module>
<java>streamer.jar</java>
- <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.1">
- <client-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+ <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-${geronimoSchemaVersion}">
+ <client-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
<moduleId>
<groupId>${pom.groupId}</groupId>
<artifactId>${pom.artifactId}-streamer-client</artifactId>
@@ -530,7 +530,7 @@
<type>car</type>
</moduleId>
</client-environment>
- <server-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+ <server-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
<moduleId>
<groupId>${pom.groupId}</groupId>
<artifactId>${pom.artifactId}-streamer-client-server</artifactId>
@@ -540,7 +540,7 @@
</server-environment>
<resource>
<external-rar>geronimo/ge-activemq-rar/${pom.version}/rar</external-rar>
- <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
+ <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-${geronimoSchemaVersion}">
<resourceadapter>
<resourceadapter-instance>
<resourceadapter-name>ActiveMQ RA</resourceadapter-name>
@@ -591,7 +591,7 @@
<ext-module>
<connector>TradeDataSource</connector>
<external-path>tranql/tranql-connector-derby-embed-xa/${tranql_vendors_version}/rar</external-path>
- <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
+ <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-${geronimoSchemaVersion}">
@@ -628,7 +628,7 @@
<ext-module>
<connector>TradeJMS</connector>
<external-path>geronimo/ge-activemq-rar/${pom.version}/rar</external-path>
- <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
+ <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-${geronimoSchemaVersion}">
<resourceadapter>
<!-- how to connect to the JMS Server -->
Modified: geronimo/server/trunk/configs/directory/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/directory/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/directory/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/directory/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,7 +17,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="DirectoryService" class="org.apache.geronimo.directory.DirectoryGBean">
<attribute name="providerURL">ou=system</attribute>
Modified: geronimo/server/trunk/configs/dojo-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/dojo-jetty/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/dojo-jetty/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/dojo-jetty/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,7 +17,7 @@
<!-- $Rev$ $Date$ -->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-${geronimoSchemaVersion}">
<context-root>/dojo</context-root>
Modified: geronimo/server/trunk/configs/dojo-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/dojo-tomcat/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/dojo-tomcat/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/dojo-tomcat/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,7 +17,7 @@
<!-- $Rev$ $Date$ -->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-${geronimoSchemaVersion}">
<context-root>/dojo</context-root>
Modified: geronimo/server/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
<!-- Deployer used to process modules and plans -->
<gbean name="Deployer" class="org.apache.geronimo.deployment.Deployer">
Modified: geronimo/server/trunk/configs/hot-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/hot-deployer/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/hot-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/hot-deployer/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,7 +17,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="HotDeployer" class="org.apache.geronimo.deployment.hot.DirectoryHotDeployer">
<reference name="ServerInfo">
Modified: geronimo/server/trunk/configs/j2ee-corba-sun/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-corba-sun/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/j2ee-corba-sun/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/j2ee-corba-sun/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,7 +17,7 @@
<!-- $Rev$ $Date$ -->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
<!-- CORBA -->
<gbean name="DynamicORBStubClassLoader" class="org.apache.openejb.corba.util.DynamicStubClassLoaderGBean">
@@ -64,7 +64,7 @@
<name>NameServer</name>
</reference>
<xml-attribute name="tssConfig">
- <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1">
+ <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-${geronimoSchemaVersion}">
<tss:default-principal>
<sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="guest"/>
</tss:default-principal>
@@ -97,7 +97,7 @@
<name>NameServer</name>
</reference>
<xml-attribute name="tssConfig">
- <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1">
+ <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-${geronimoSchemaVersion}">
<tss:default-principal>
<sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="guest"/>
</tss:default-principal>
@@ -123,7 +123,7 @@
<name>Server</name>
</reference>
<xml-attribute name="tssConfig">
- <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1">
+ <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-${geronimoSchemaVersion}">
<tss:default-principal>
<sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="guest"/>
</tss:default-principal>
@@ -150,7 +150,7 @@
<name>Server</name>
</reference>
<xml-attribute name="tssConfig">
- <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1">
+ <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-${geronimoSchemaVersion}">
<tss:default-principal>
<sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="guest"/>
</tss:default-principal>
@@ -178,7 +178,7 @@
<name>Server</name>
</reference>
<xml-attribute name="tssConfig">
- <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1">
+ <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-${geronimoSchemaVersion}">
<tss:default-principal>
<sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="guest"/>
</tss:default-principal>
@@ -208,7 +208,7 @@
<name>UnprotectedServer</name>
</reference>
<xml-attribute name="tssConfig">
- <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1">
+ <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-${geronimoSchemaVersion}">
<tss:default-principal>
<sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="guest"/>
</tss:default-principal>
@@ -234,7 +234,7 @@
<name>Server</name>
</reference>
<xml-attribute name="tssConfig">
- <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1">
+ <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-${geronimoSchemaVersion}">
<tss:default-principal>
<sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="guest"/>
</tss:default-principal>
Modified: geronimo/server/trunk/configs/j2ee-corba-yoko/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-corba-yoko/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/j2ee-corba-yoko/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/j2ee-corba-yoko/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,7 +17,7 @@
<!-- $Rev$ $Date$ -->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
<!-- CORBA -->
<gbean name="DynamicORBStubClassLoader" class="org.apache.openejb.corba.util.DynamicStubClassLoaderGBean">
@@ -61,7 +61,7 @@
<name>NameServer</name>
</reference>
<xml-attribute name="tssConfig">
- <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1">
+ <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-${geronimoSchemaVersion}">
<tss:default-principal>
<sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="guest"/>
</tss:default-principal>
@@ -94,7 +94,7 @@
<name>NameServer</name>
</reference>
<xml-attribute name="tssConfig">
- <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1">
+ <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-${geronimoSchemaVersion}">
<tss:default-principal>
<sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="guest"/>
</tss:default-principal>
@@ -120,7 +120,7 @@
<name>Server</name>
</reference>
<xml-attribute name="tssConfig">
- <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1">
+ <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-${geronimoSchemaVersion}">
<tss:default-principal>
<sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="guest"/>
</tss:default-principal>
@@ -147,7 +147,7 @@
<name>Server</name>
</reference>
<xml-attribute name="tssConfig">
- <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1">
+ <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-${geronimoSchemaVersion}">
<tss:default-principal>
<sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="guest"/>
</tss:default-principal>
@@ -175,7 +175,7 @@
<name>Server</name>
</reference>
<xml-attribute name="tssConfig">
- <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1">
+ <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-${geronimoSchemaVersion}">
<tss:default-principal>
<sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="guest"/>
</tss:default-principal>
@@ -205,7 +205,7 @@
<name>UnprotectedServer</name>
</reference>
<xml-attribute name="tssConfig">
- <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1">
+ <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-${geronimoSchemaVersion}">
<tss:default-principal>
<sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="guest"/>
</tss:default-principal>
@@ -231,7 +231,7 @@
<name>Server</name>
</reference>
<xml-attribute name="tssConfig">
- <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1">
+ <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-${geronimoSchemaVersion}">
<tss:default-principal>
<sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="guest"/>
</tss:default-principal>
Modified: geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,7 +17,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="EARBuilder" class="org.apache.geronimo.j2ee.deployment.EARConfigBuilder">
<attribute name="transactionManagerAbstractName">?name=TransactionManager</attribute>
@@ -58,7 +58,7 @@
</pattern>
</references>
<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>
@@ -72,7 +72,7 @@
<!-- web switching builder -->
<gbean name="WebBuilder" class="org.apache.geronimo.j2ee.deployment.SwitchingModuleBuilder">
- <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2</attribute>
+ <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-${geronimoSchemaVersion}</attribute>
<references name="ModuleBuilders">
<pattern>
<name>JettyWebBuilder</name>
@@ -94,7 +94,7 @@
</gbean>
<gbean name="NamingBuilders" class="org.apache.geronimo.j2ee.deployment.NamingBuilderCollectionGBean">
- <attribute name="baseElementQNameNamespaceURI">http://geronimo.apache.org/xml/ns/naming-1.2</attribute>
+ <attribute name="baseElementQNameNamespaceURI">http://geronimo.apache.org/xml/ns/naming-${geronimoSchemaVersion}</attribute>
<attribute name="baseElementQNameLocalPart">abstract-naming-entry</attribute>
<references name="NamingBuilders">
<pattern>
Modified: geronimo/server/trunk/configs/j2ee-security/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-security/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/j2ee-security/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/j2ee-security/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,7 +17,7 @@
<!-- $Rev$ $Date$ -->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
<!--runtime dependencies-->
<gbean name="SecurityService" class="org.apache.geronimo.security.SecurityServiceImpl">
Modified: geronimo/server/trunk/configs/j2ee-server/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-server/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/j2ee-server/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/j2ee-server/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,7 +17,7 @@
<!-- $Rev$ $Date$ -->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
<!-- JSR77 Management Objects -->
<gbean name="geronimo.server" class="org.apache.geronimo.j2ee.management.impl.J2EEDomainImpl">
Modified: geronimo/server/trunk/configs/j2ee-system/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-system/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/j2ee-system/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/j2ee-system/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -25,7 +25,7 @@
specific services - those should be provided by children.
-->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
<!-- ServerInfo service -->
<gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.BasicServerInfo"/>
Modified: geronimo/server/trunk/configs/javamail/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/javamail/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/javamail/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/javamail/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,7 +17,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="mail/MailSession" class="org.apache.geronimo.mail.MailGBean">
<attribute name="transportProtocol">smtp</attribute>
Modified: geronimo/server/trunk/configs/jetty-clustering-builder-wadi/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty-clustering-builder-wadi/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/jetty-clustering-builder-wadi/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/jetty-clustering-builder-wadi/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,7 +17,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.clustering.wadi.jetty.WADIJettyClusteringBuilder">
<attribute name="defaultSweepInterval">${PlanDefaultSweepInterval}</attribute>
@@ -27,7 +27,7 @@
<attribute name="defaultBackingStrategyFactoryName">?name=DefaultBackingStrategyFactory</attribute>
<attribute name="defaultDispatcherHolderName">?name=DefaultDispatcherHolder</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/trunk/configs/jetty-clustering-wadi/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty-clustering-wadi/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/jetty-clustering-wadi/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/jetty-clustering-wadi/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,5 +17,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/trunk/configs/jetty-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty-deployer/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/jetty-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/jetty-deployer/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,7 +17,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="JettyWebBuilder" class="org.apache.geronimo.jetty.deployment.JettyModuleBuilder">
<attribute name="defaultSessionTimeoutSeconds">1800</attribute>
@@ -58,7 +58,7 @@
<name>ResourceRefBuilder</name>
</reference>
<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/trunk/configs/jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/jetty/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/jetty/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,7 +17,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/trunk/configs/jsp-examples-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jsp-examples-jetty/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/jsp-examples-jetty/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/jsp-examples-jetty/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,7 +17,7 @@
<!-- $Rev$ $Date$ -->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-${geronimoSchemaVersion}">
<context-root>/jsp-examples</context-root>
<security-realm-name>geronimo-properties-realm</security-realm-name>
Modified: geronimo/server/trunk/configs/jsp-examples-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jsp-examples-tomcat/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/jsp-examples-tomcat/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/jsp-examples-tomcat/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,7 +17,7 @@
<!-- $Rev$ $Date$ -->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-${geronimoSchemaVersion}">
<context-root>/jsp-examples</context-root>
<security-realm-name>geronimo-properties-realm</security-realm-name>
Modified: geronimo/server/trunk/configs/ldap-demo-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/ldap-demo-jetty/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/ldap-demo-jetty/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/ldap-demo-jetty/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,7 +17,7 @@
<!-- $Rev$ $Date$ -->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1" xmlns:sec="http://geronimo.apache.org/xml/ns/security">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-${geronimoSchemaVersion}" xmlns:sec="http://geronimo.apache.org/xml/ns/security">
<context-root>/ldap-demo</context-root>
<security-realm-name>ldap-realm</security-realm-name>
Modified: geronimo/server/trunk/configs/ldap-demo-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/ldap-demo-tomcat/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/ldap-demo-tomcat/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/ldap-demo-tomcat/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,7 +17,7 @@
<!-- $Rev$ $Date$ -->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1" xmlns:sec="http://geronimo.apache.org/xml/ns/security">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-${geronimoSchemaVersion}" xmlns:sec="http://geronimo.apache.org/xml/ns/security">
<context-root>/ldap-demo</context-root>
<security-realm-name>ldap-realm</security-realm-name>
Modified: geronimo/server/trunk/configs/ldap-realm/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/ldap-realm/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/ldap-realm/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/ldap-realm/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,7 +17,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="ldap-login"
class="org.apache.geronimo.security.jaas.LoginModuleGBean">
Modified: geronimo/server/trunk/configs/online-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/online-deployer/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/online-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/online-deployer/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,6 +17,6 @@
<!-- $Rev$ $Date$ -->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
<environment/>
</module>
Modified: geronimo/server/trunk/configs/openejb-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/openejb-deployer/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/openejb-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/openejb-deployer/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,7 +17,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="EJBBuilder" class="org.apache.openejb.deployment.OpenEjbModuleBuilder">
<attribute name="listener">?name=WebContainer</attribute>
@@ -53,7 +53,7 @@
<name>ConnectorBuilder</name>
</reference>
<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>
@@ -77,7 +77,7 @@
<gbean name="OpenEjbRemoteRefBuilder" class="org.apache.openejb.deployment.OpenEjbRemoteRefBuilder">
<attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee</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>org.apache.openejb</groupId>
@@ -94,7 +94,7 @@
<attribute name="host">${PlanClientAddresses}</attribute>
<attribute name="port">${PlanOpenEJBPort}</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>org.apache.openejb</groupId>
Modified: geronimo/server/trunk/configs/openejb/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/openejb/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/openejb/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/openejb/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,7 +17,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="StatelessEjbContainer" class="org.apache.openejb.slsb.DefaultStatelessEjbContainerGBean">
<reference name="TransactionManager">
Modified: geronimo/server/trunk/configs/remote-deploy-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/remote-deploy-jetty/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/remote-deploy-jetty/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/remote-deploy-jetty/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,7 +17,7 @@
<!-- $Rev$ $Date$ -->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1" xmlns:cfg="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-${geronimoSchemaVersion}" xmlns:sec="http://geronimo.apache.org/xml/ns/security-${geronimoSchemaVersion}" xmlns:cfg="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
<context-root>/remote-deploy</context-root>
<security-realm-name>geronimo-properties-realm</security-realm-name>
Modified: geronimo/server/trunk/configs/remote-deploy-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/remote-deploy-tomcat/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/remote-deploy-tomcat/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/remote-deploy-tomcat/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,7 +17,7 @@
<!-- $Rev$ $Date$ -->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1" xmlns:cfg="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-${geronimoSchemaVersion}" xmlns:sec="http://geronimo.apache.org/xml/ns/security-${geronimoSchemaVersion}" xmlns:cfg="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
<context-root>/remote-deploy</context-root>
<security-realm-name>geronimo-properties-realm</security-realm-name>
Modified: geronimo/server/trunk/configs/rmi-naming/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/rmi-naming/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/rmi-naming/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/rmi-naming/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,7 +17,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="RMIRegistry" class="org.apache.geronimo.system.rmi.RMIRegistryService">
<attribute name="port">${PlanNamingPort}</attribute>
Modified: geronimo/server/trunk/configs/servlet-examples-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/servlet-examples-jetty/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/servlet-examples-jetty/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/servlet-examples-jetty/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,7 +17,7 @@
<!-- $Rev$ $Date$ -->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-${geronimoSchemaVersion}">
<context-root>/servlets-examples</context-root>
<security-realm-name>geronimo-properties-realm</security-realm-name>
Modified: geronimo/server/trunk/configs/servlet-examples-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/servlet-examples-tomcat/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/servlet-examples-tomcat/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/servlet-examples-tomcat/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,7 +17,7 @@
<!-- $Rev$ $Date$ -->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-${geronimoSchemaVersion}">
<context-root>/servlets-examples</context-root>
<security-realm-name>geronimo-properties-realm</security-realm-name>
Modified: geronimo/server/trunk/configs/sharedlib/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/sharedlib/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/sharedlib/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/sharedlib/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,7 +17,7 @@
<!-- $Rev$ $Date$ -->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
<!-- The SharedLib Service -->
<gbean name="SharedLib" class="org.apache.geronimo.system.sharedlib.SharedLib">
Modified: geronimo/server/trunk/configs/shutdown/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/shutdown/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/shutdown/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/shutdown/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,6 +17,6 @@
<!-- $Rev$ $Date$ -->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
<environment/>
</module>
Modified: geronimo/server/trunk/configs/system-database/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/system-database/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/system-database/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/system-database/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,7 +17,7 @@
<!-- $Rev$ $Date$ -->
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-${geronimoSchemaVersion}">
<resourceadapter>
<outbound-resourceadapter>
Modified: geronimo/server/trunk/configs/tomcat-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/tomcat-deployer/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/tomcat-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/tomcat-deployer/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,7 +17,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="TomcatWebBuilder" class="org.apache.geronimo.tomcat.deployment.TomcatModuleBuilder">
<attribute name="tomcatContainerName">?name=TomcatWebContainer</attribute>
@@ -42,7 +42,7 @@
<name>ResourceRefBuilder</name>
</reference>
<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/trunk/configs/tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/tomcat/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/tomcat/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/tomcat/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,7 +17,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="TomcatResources" class="org.apache.geronimo.system.util.DirectoryInitializationGBean">
<!-- copies tomcat initialization files into specified location -->
Modified: geronimo/server/trunk/configs/transaction/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/transaction/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/transaction/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/transaction/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,7 +17,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">
<reference name="TransactionManager">
Modified: geronimo/server/trunk/configs/uddi-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/uddi-jetty/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/uddi-jetty/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/uddi-jetty/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,12 +17,12 @@
<!-- $Rev$ $Date$ -->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-${geronimoSchemaVersion}">
<ext-module>
<web>uddi-jetty</web>
<external-path>org.apache.geronimo.applications/geronimo-uddi-server/${pom.version}/war</external-path>
- <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1">
+ <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-${geronimoSchemaVersion}">
<context-root>/juddi</context-root>
<gbean name="UDDIResources" class="org.apache.geronimo.system.util.DirectoryInitializationGBean">
<!-- copies uddi derby db files into specified location -->
@@ -38,7 +38,7 @@
<ext-module>
<connector>uddi-db</connector>
<external-path>tranql/tranql-connector-derby-embed-local/${tranqlVendorsVersion}/rar</external-path>
- <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
+ <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-${geronimoSchemaVersion}">
<resourceadapter>
<outbound-resourceadapter>
<connection-definition>
Modified: geronimo/server/trunk/configs/uddi-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/uddi-tomcat/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/uddi-tomcat/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/uddi-tomcat/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,12 +17,12 @@
<!-- $Rev$ $Date$ -->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-${geronimoSchemaVersion}">
<ext-module>
<web>uddi-tomcat</web>
<external-path>org.apache.geronimo.applications/geronimo-uddi-server/${pom.version}/war</external-path>
- <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1">
+ <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-${geronimoSchemaVersion}">
<context-root>/juddi</context-root>
<gbean name="UDDIResources" class="org.apache.geronimo.system.util.DirectoryInitializationGBean">
@@ -39,7 +39,7 @@
<ext-module>
<connector>uddi-db</connector>
<external-path>tranql/tranql-connector-derby-embed-local/${tranqlVendorsVersion}/rar</external-path>
- <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
+ <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-${geronimoSchemaVersion}">
<resourceadapter>
<outbound-resourceadapter>
<connection-definition>
Modified: geronimo/server/trunk/configs/unavailable-client-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/unavailable-client-deployer/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/unavailable-client-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/unavailable-client-deployer/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,7 +17,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="UnavailableAppClientBuilder" class="org.apache.geronimo.j2ee.deployment.UnavailableModuleBuilder" />
Modified: geronimo/server/trunk/configs/unavailable-ejb-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/unavailable-ejb-deployer/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/unavailable-ejb-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/unavailable-ejb-deployer/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,7 +17,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="UnavailableEJBBuilder" class="org.apache.geronimo.j2ee.deployment.UnavailableModuleBuilder" />
Modified: geronimo/server/trunk/configs/unavailable-webservices-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/unavailable-webservices-deployer/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/unavailable-webservices-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/unavailable-webservices-deployer/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,7 +17,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="UnavailableWebServiceBuilder" class="org.apache.geronimo.j2ee.deployment.UnavailableWebServiceBuilder" />
Modified: geronimo/server/trunk/configs/upgrade-cli/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/upgrade-cli/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/upgrade-cli/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/upgrade-cli/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,7 +17,7 @@
<!-- $Rev$ $Date$ -->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
<!-- ServerInfo service -->
<gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.BasicServerInfo"/>
Modified: geronimo/server/trunk/configs/upgrade/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/upgrade/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/upgrade/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/upgrade/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,7 +17,7 @@
<!-- $Rev$ $Date$ -->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
<!-- Deployer used to process modules and plans -->
<gbean name="Upgrade" class="org.apache.geronimo.upgrade.UpgradeGBean">
Modified: geronimo/server/trunk/configs/wadi-clustering/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/wadi-clustering/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/wadi-clustering/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/wadi-clustering/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -1,51 +1,51 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- Copyright 2006 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- $Rev: 446730 $ $Date: 2006-09-16 06:44:51 +1000 (Sat, 16 Sep 2006) $ -->
-
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
-
- <gbean name="DefaultReplicationManagerFactory" class="org.apache.geronimo.clustering.wadi.BasicReplicationManagerFactoryGBean">
- </gbean>
-
- <gbean name="DefaultReplicaStorageFactory" class="org.apache.geronimo.clustering.wadi.BasicReplicaStorageFactoryGBean">
- </gbean>
-
- <gbean name="DefaultBackingStrategyFactory" class="org.apache.geronimo.clustering.wadi.RoundRobinBackingStrategyFactoryGBean">
- <attribute name="nbReplica">${PlanNbReplica}</attribute>
- </gbean>
-
- <!--
- <gbean name="DefaultDispatcherHolder" class="org.apache.geronimo.clustering.wadi.ActiveClusterDispatcherHolder">
- <attribute name="clusterName">${PlanClusterName}</attribute>
- <attribute name="clusterUri">${PlanClusterUri}</attribute>
- <attribute name="inactiveTime">${PlanInactiveTime}</attribute>
- <reference name="Node">
- <name>Node</name>
- </reference>
- </gbean>
- -->
-
- <gbean name="DefaultDispatcherHolder" class="org.apache.geronimo.clustering.wadi.TribesDispatcherHolder">
- <attribute name="clusterName">${PlanClusterName}</attribute>
- <attribute name="inactiveTime">${PlanInactiveTime}</attribute>
- <reference name="Node">
- <name>Node</name>
- </reference>
- </gbean>
-
-</module>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Copyright 2006 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- $Rev: 446730 $ $Date: 2006-09-16 06:44:51 +1000 (Sat, 16 Sep 2006) $ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+
+ <gbean name="DefaultReplicationManagerFactory" class="org.apache.geronimo.clustering.wadi.BasicReplicationManagerFactoryGBean">
+ </gbean>
+
+ <gbean name="DefaultReplicaStorageFactory" class="org.apache.geronimo.clustering.wadi.BasicReplicaStorageFactoryGBean">
+ </gbean>
+
+ <gbean name="DefaultBackingStrategyFactory" class="org.apache.geronimo.clustering.wadi.RoundRobinBackingStrategyFactoryGBean">
+ <attribute name="nbReplica">${PlanNbReplica}</attribute>
+ </gbean>
+
+ <!--
+ <gbean name="DefaultDispatcherHolder" class="org.apache.geronimo.clustering.wadi.ActiveClusterDispatcherHolder">
+ <attribute name="clusterName">${PlanClusterName}</attribute>
+ <attribute name="clusterUri">${PlanClusterUri}</attribute>
+ <attribute name="inactiveTime">${PlanInactiveTime}</attribute>
+ <reference name="Node">
+ <name>Node</name>
+ </reference>
+ </gbean>
+ -->
+
+ <gbean name="DefaultDispatcherHolder" class="org.apache.geronimo.clustering.wadi.TribesDispatcherHolder">
+ <attribute name="clusterName">${PlanClusterName}</attribute>
+ <attribute name="inactiveTime">${PlanInactiveTime}</attribute>
+ <reference name="Node">
+ <name>Node</name>
+ </reference>
+ </gbean>
+
+</module>
Modified: geronimo/server/trunk/configs/webconsole-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-jetty/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/webconsole-jetty/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/webconsole-jetty/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,11 +17,11 @@
<!-- $Rev$ $Date$ -->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-${geronimoSchemaVersion}">
<module>
<web>framework.war</web>
- <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1">
+ <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-${geronimoSchemaVersion}">
<context-root>/console</context-root>
<security-realm-name>geronimo-properties-realm</security-realm-name>
</web-app>
@@ -29,7 +29,7 @@
<module>
<web>standard.war</web>
- <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1">
+ <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-${geronimoSchemaVersion}">
<context-root>/console-standard</context-root>
<security-realm-name>geronimo-properties-realm</security-realm-name>
<gbean name="PropertiesLoginManager" class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager">
Modified: geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,11 +17,11 @@
<!-- $Rev$ $Date$ -->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-${geronimoSchemaVersion}">
<module>
<web>framework.war</web>
- <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1">
+ <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-${geronimoSchemaVersion}">
<context-root>/console</context-root>
<cross-context/>
<security-realm-name>geronimo-properties-realm</security-realm-name>
@@ -30,7 +30,7 @@
<module>
<web>standard.war</web>
- <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1">
+ <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-${geronimoSchemaVersion}">
<context-root>/console-standard</context-root>
<cross-context/>
<security-realm-name>geronimo-properties-realm</security-realm-name>
@@ -82,4 +82,4 @@
</reference>
</gbean>
-</application>
\ No newline at end of file
+</application>
Modified: geronimo/server/trunk/configs/welcome-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/welcome-jetty/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/welcome-jetty/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/welcome-jetty/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,7 +17,7 @@
<!-- $Rev$ $Date$ -->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-${geronimoSchemaVersion}">
<context-root>/</context-root>
Modified: geronimo/server/trunk/configs/welcome-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/welcome-tomcat/src/plan/plan.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/configs/welcome-tomcat/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/welcome-tomcat/src/plan/plan.xml Thu Oct 12 12:09:39 2006
@@ -17,7 +17,7 @@
<!-- $Rev$ $Date$ -->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-${geronimoSchemaVersion}">
<context-root>/</context-root>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?view=diff&rev=463384&r1=463383&r2=463384
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Thu Oct 12 12:09:39 2006
@@ -45,6 +45,8 @@
</scm>
<properties>
+ <geronimoSchemaVersion>1.2</geronimoSchemaVersion>
+
<!--
Having a single well named property makes automatic updating for the weekly build much easier.
-->