geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r405955 - in /geronimo/branches/1.1: assemblies/j2ee-jetty-server/src/var/config/ assemblies/j2ee-tomcat-server/src/var/config/ assemblies/minimal-jetty-server/src/var/config/ assemblies/minimal-tomcat-server/src/var/config/ assemblies/zzzz...
Date Sat, 13 May 2006 00:12:29 GMT
Author: dain
Date: Fri May 12 17:12:27 2006
New Revision: 405955

URL: http://svn.apache.org/viewcvs?rev=405955&view=rev
Log:
GERONIMO-2012 Reflect configuration -> module change in config.xml
The code supports both the 1.0 and 1.1 schemas

Modified:
    geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/config.xml
    geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/config/config.xml
    geronimo/branches/1.1/assemblies/minimal-jetty-server/src/var/config/config.xml
    geronimo/branches/1.1/assemblies/minimal-tomcat-server/src/var/config/config.xml
    geronimo/branches/1.1/assemblies/zzzzj2ee-installer/src/var/config/config.xml
    geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/ConfigurationOverride.java
    geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/ServerOverride.java
    geronimo/branches/1.1/modules/system/src/schema/local-attribute.xsd

Modified: geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/config.xml?rev=405955&r1=405954&r2=405955&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/config.xml (original)
+++ geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/config.xml Fri May 12
17:12:27 2006
@@ -7,7 +7,7 @@
 <!-- ======================================================== -->
 
 <attributes xmlns="http://geronimo.apache.org/xml/ns/attributes">
-    <configuration name="geronimo/rmi-naming/${pom.currentVersion}/car">
+    <module name="geronimo/rmi-naming/${pom.currentVersion}/car">
         <gbean name="RMIRegistry">
             <attribute name="port">${PlanNamingPort}</attribute>
         </gbean>
@@ -15,10 +15,10 @@
             <!-- Check whether this really works if host name is 0.0.0.0 -->
             <attribute name="namingProviderUrl">rmi://${PlanServerHostname}:${PlanNamingPort}</attribute>
         </gbean>
-    </configuration>
-    <configuration name="geronimo/j2ee-server/${pom.currentVersion}/car">
-    </configuration>
-    <configuration name="geronimo/j2ee-security/${pom.currentVersion}/car">
+    </module>
+    <module name="geronimo/j2ee-server/${pom.currentVersion}/car">
+    </module>
+    <module name="geronimo/j2ee-security/${pom.currentVersion}/car">
         <gbean name="geronimo.remoting:target=JaasLoginServiceRemotingServer">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanRemoteLoginPort}</attribute>
@@ -29,15 +29,15 @@
             <attribute name="port">${PlanJMXPort}</attribute>
             <attribute name="urlPath">/jndi/rmi://${PlanServerHostname}:${PlanNamingPort}/JMXConnector</attribute>
         </gbean>
-    </configuration>
-    <configuration name="geronimo/axis/${pom.currentVersion}/car"/>
-    <configuration name="geronimo/openejb/${pom.currentVersion}/car">
+    </module>
+    <module name="geronimo/axis/${pom.currentVersion}/car"/>
+    <module name="geronimo/openejb/${pom.currentVersion}/car">
         <gbean name="EJBNetworkService">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanOpenEJBPort}</attribute>
         </gbean>
-    </configuration>
-    <configuration name="geronimo/j2ee-corba/${pom.currentVersion}/car" load="false">
+    </module>
+    <module name="geronimo/j2ee-corba/${pom.currentVersion}/car" load="false">
         <gbean name="NameServer">
             <attribute name="dbDir">var/cosnaming.db</attribute>
             <attribute name="port">${PlanCOSNamingPort}</attribute>
@@ -48,28 +48,28 @@
         <gbean name="UnprotectedServer">
             <attribute name="args">-ORBInitRef, NameService=corbaloc::${PlanCOSNamingHost}:${PlanCOSNamingPort}/NameService</attribute>
         </gbean>
-    </configuration>
-    <configuration name="geronimo/system-database/${pom.currentVersion}/car">
+    </module>
+    <module name="geronimo/system-database/${pom.currentVersion}/car">
         <gbean name="DerbyNetwork">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanDerbyPort}</attribute>
         </gbean>
-    </configuration>
-    <configuration name="geronimo/activemq-broker/${pom.currentVersion}/car">
+    </module>
+    <module name="geronimo/activemq-broker/${pom.currentVersion}/car">
         <gbean name="ActiveMQ.tcp.default">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanActiveMQPort}</attribute>
         </gbean>
-    </configuration>
-    <configuration name="geronimo/activemq/${pom.currentVersion}/car"/>
-    <configuration name="geronimo/directory/${pom.currentVersion}/car" load="false">
+    </module>
+    <module name="geronimo/activemq/${pom.currentVersion}/car"/>
+    <module name="geronimo/directory/${pom.currentVersion}/car" load="false">
         <gbean name="geronimo.server:name=DirectoryService">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanLdapPort}</attribute>
         </gbean>
-    </configuration>
-    <configuration name="geronimo/ldap-realm/${pom.currentVersion}/car" load="false"/>
-    <configuration name="geronimo/jetty/${pom.currentVersion}/car">
+    </module>
+    <module name="geronimo/ldap-realm/${pom.currentVersion}/car" load="false"/>
+    <module name="geronimo/jetty/${pom.currentVersion}/car">
         <gbean name="JettyWebConnector">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanHTTPPortPrimary}</attribute>
@@ -83,44 +83,44 @@
             <attribute name="host">0.0.0.0</attribute>
             <attribute name="port">8009</attribute>
         </gbean>
-    </configuration>
+    </module>
     <!-- n.b. be sure the gbean deployer is explicitly loaded before j2ee-deployer so
that defaultEnvironment
     overrides work properly -->
-    <configuration name="geronimo/geronimo-gbean-deployer/${pom.currentVersion}/car"/>
-    <configuration name="geronimo/j2ee-deployer/${pom.currentVersion}/car">
+    <module name="geronimo/geronimo-gbean-deployer/${pom.currentVersion}/car"/>
+    <module name="geronimo/j2ee-deployer/${pom.currentVersion}/car">
         <gbean name="WebBuilder">
             <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1</attribute>
         </gbean>
-    </configuration>
-    <configuration name="geronimo/openejb-deployer/${pom.currentVersion}/car">
+    </module>
+    <module name="geronimo/openejb-deployer/${pom.currentVersion}/car">
         <gbean name="EJBBuilder">
             <attribute name="listener">?name=JettyWebContainer</attribute>
         </gbean>
-    </configuration>
-    <configuration name="geronimo/client-deployer/${pom.currentVersion}/car"/>
-    <configuration name="geronimo/axis-deployer/${pom.currentVersion}/car"/>
-    <configuration name="geronimo/javamail/${pom.currentVersion}/car" load="false">
+    </module>
+    <module name="geronimo/client-deployer/${pom.currentVersion}/car"/>
+    <module name="geronimo/axis-deployer/${pom.currentVersion}/car"/>
+    <module name="geronimo/javamail/${pom.currentVersion}/car" load="false">
         <gbean name="SMTPTransport">
             <attribute name="host">localhost</attribute>
             <attribute name="port">25</attribute>
         </gbean>
-    </configuration>
+    </module>
 
-    <configuration name="geronimo/sharedlib/${pom.currentVersion}/car">
+    <module name="geronimo/sharedlib/${pom.currentVersion}/car">
         <gbean name="SharedLib">
             <attribute name="classesDirs">var/shared/classes</attribute>
             <attribute name="libDirs">var/shared/lib</attribute>
         </gbean>
-    </configuration>
+    </module>
 
-    <configuration name="geronimo/jetty-deployer/${pom.currentVersion}/car"/>
-    <configuration name="geronimo/welcome-jetty/${pom.currentVersion}/car"/>
-    <configuration name="geronimo/ldap-demo-jetty/${pom.currentVersion}/car" load="false"/>
-    <configuration name="geronimo/servlets-examples-jetty/${pom.currentVersion}/car" load="false"/>
-    <configuration name="geronimo/jsp-examples-jetty/${pom.currentVersion}/car" load="false"/>
-    <configuration name="geronimo/webconsole-jetty/${pom.currentVersion}/car"/>
-    <configuration name="geronimo/uddi-jetty/${pom.currentVersion}/car" load="false"/>
-    <configuration name="geronimo/daytrader-derby-jetty/${pom.currentVersion}/car" load="false"/>
-    <configuration name="geronimo/remote-deploy-jetty/${pom.currentVersion}/car" />
-    <configuration name="geronimo/hot-deployer/${pom.currentVersion}/car" />
+    <module name="geronimo/jetty-deployer/${pom.currentVersion}/car"/>
+    <module name="geronimo/welcome-jetty/${pom.currentVersion}/car"/>
+    <module name="geronimo/ldap-demo-jetty/${pom.currentVersion}/car" load="false"/>
+    <module name="geronimo/servlets-examples-jetty/${pom.currentVersion}/car" load="false"/>
+    <module name="geronimo/jsp-examples-jetty/${pom.currentVersion}/car" load="false"/>
+    <module name="geronimo/webconsole-jetty/${pom.currentVersion}/car"/>
+    <module name="geronimo/uddi-jetty/${pom.currentVersion}/car" load="false"/>
+    <module name="geronimo/daytrader-derby-jetty/${pom.currentVersion}/car" load="false"/>
+    <module name="geronimo/remote-deploy-jetty/${pom.currentVersion}/car" />
+    <module name="geronimo/hot-deployer/${pom.currentVersion}/car" />
 </attributes>

Modified: geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/config/config.xml?rev=405955&r1=405954&r2=405955&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/config/config.xml (original)
+++ geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/config/config.xml Fri May
12 17:12:27 2006
@@ -7,7 +7,7 @@
 <!-- ======================================================== -->
 
 <attributes xmlns="http://geronimo.apache.org/xml/ns/attributes">
-    <configuration name="geronimo/rmi-naming/${pom.currentVersion}/car">
+    <module name="geronimo/rmi-naming/${pom.currentVersion}/car">
         <gbean name="RMIRegistry">
             <attribute name="port">${PlanNamingPort}</attribute>
         </gbean>
@@ -15,10 +15,10 @@
             <!-- Check whether this really works if host name is 0.0.0.0 -->
             <attribute name="namingProviderUrl">rmi://${PlanServerHostname}:${PlanNamingPort}</attribute>
         </gbean>
-    </configuration>
-    <configuration name="geronimo/j2ee-server/${pom.currentVersion}/car">
-    </configuration>
-    <configuration name="geronimo/j2ee-security/${pom.currentVersion}/car">
+    </module>
+    <module name="geronimo/j2ee-server/${pom.currentVersion}/car">
+    </module>
+    <module name="geronimo/j2ee-security/${pom.currentVersion}/car">
         <gbean name="geronimo.remoting:target=JaasLoginServiceRemotingServer">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanRemoteLoginPort}</attribute>
@@ -29,15 +29,15 @@
           <attribute name="port">${PlanJMXPort}</attribute>
           <attribute name="urlPath">/jndi/rmi://${PlanServerHostname}:${PlanNamingPort}/JMXConnector</attribute>
         </gbean>
-    </configuration>
-    <configuration name="geronimo/axis/${pom.currentVersion}/car"/>
-    <configuration name="geronimo/openejb/${pom.currentVersion}/car">
+    </module>
+    <module name="geronimo/axis/${pom.currentVersion}/car"/>
+    <module name="geronimo/openejb/${pom.currentVersion}/car">
         <gbean name="EJBNetworkService">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanOpenEJBPort}</attribute>
         </gbean>
-    </configuration>
-    <configuration name="geronimo/j2ee-corba/${pom.currentVersion}/car" load="false">
+    </module>
+    <module name="geronimo/j2ee-corba/${pom.currentVersion}/car" load="false">
         <gbean name="NameServer">
             <attribute name="dbDir">var/cosnaming.db</attribute>
             <attribute name="port">${PlanCOSNamingPort}</attribute>
@@ -48,28 +48,28 @@
         <gbean name="UnprotectedServer">
             <attribute name="args">-ORBInitRef, NameService=corbaloc::${PlanCOSNamingHost}:${PlanCOSNamingPort}/NameService</attribute>
         </gbean>
-    </configuration>
-    <configuration name="geronimo/system-database/${pom.currentVersion}/car">
+    </module>
+    <module name="geronimo/system-database/${pom.currentVersion}/car">
         <gbean name="DerbyNetwork">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanDerbyPort}</attribute>
         </gbean>
-    </configuration>
-    <configuration name="geronimo/activemq-broker/${pom.currentVersion}/car">
+    </module>
+    <module name="geronimo/activemq-broker/${pom.currentVersion}/car">
         <gbean name="ActiveMQ.tcp.default">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanActiveMQPort}</attribute>
         </gbean>
-    </configuration>
-    <configuration name="geronimo/activemq/${pom.currentVersion}/car"/>
-    <configuration name="geronimo/directory/${pom.currentVersion}/car" load="false">
+    </module>
+    <module name="geronimo/activemq/${pom.currentVersion}/car"/>
+    <module name="geronimo/directory/${pom.currentVersion}/car" load="false">
         <gbean name="geronimo.server:name=DirectoryService">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanLdapPort}</attribute>
         </gbean>
-    </configuration>
-    <configuration name="geronimo/ldap-realm/${pom.currentVersion}/car" load="false"/>
-    <configuration name="geronimo/tomcat/${pom.currentVersion}/car">
+    </module>
+    <module name="geronimo/ldap-realm/${pom.currentVersion}/car" load="false"/>
+    <module name="geronimo/tomcat/${pom.currentVersion}/car">
         <gbean name="TomcatResources"/>
         <gbean name="TomcatWebConnector">
             <attribute name="host">${PlanServerHostname}</attribute>
@@ -85,44 +85,44 @@
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanHTTPSPortPrimary}</attribute>
         </gbean>
-    </configuration>
+    </module>
     <!-- n.b. be sure the gbean deployer is explicitly loaded before j2ee-deployer so
that defaultEnvironment
     overrides work properly -->
-    <configuration name="geronimo/geronimo-gbean-deployer/${pom.currentVersion}/car"/>
-    <configuration name="geronimo/j2ee-deployer/${pom.currentVersion}/car">
+    <module name="geronimo/geronimo-gbean-deployer/${pom.currentVersion}/car"/>
+    <module name="geronimo/j2ee-deployer/${pom.currentVersion}/car">
         <gbean name="WebBuilder">
             <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1</attribute>
         </gbean>
-    </configuration>
-    <configuration name="geronimo/openejb-deployer/${pom.currentVersion}/car">
+    </module>
+    <module name="geronimo/openejb-deployer/${pom.currentVersion}/car">
         <gbean name="EJBBuilder">
             <attribute name="listener">?name=TomcatWebContainer</attribute>
         </gbean>
-    </configuration>
-    <configuration name="geronimo/client-deployer/${pom.currentVersion}/car"/>
-    <configuration name="geronimo/axis-deployer/${pom.currentVersion}/car"/>
-    <configuration name="geronimo/javamail/${pom.currentVersion}/car" load="false">
+    </module>
+    <module name="geronimo/client-deployer/${pom.currentVersion}/car"/>
+    <module name="geronimo/axis-deployer/${pom.currentVersion}/car"/>
+    <module name="geronimo/javamail/${pom.currentVersion}/car" load="false">
         <gbean name="SMTPTransport">
             <attribute name="host">localhost</attribute>
             <attribute name="port">25</attribute>
         </gbean>
-    </configuration>
+    </module>
 
-    <configuration name="geronimo/sharedlib/${pom.currentVersion}/car">
+    <module name="geronimo/sharedlib/${pom.currentVersion}/car">
         <gbean name="SharedLib">
             <attribute name="classesDirs">var/shared/classes</attribute>
             <attribute name="libDirs">var/shared/lib</attribute>
         </gbean>
-    </configuration>
+    </module>
 
-    <configuration name="geronimo/tomcat-deployer/${pom.currentVersion}/car"/>
-    <configuration name="geronimo/welcome-tomcat/${pom.currentVersion}/car"/>
-    <configuration name="geronimo/ldap-demo-tomcat/${pom.currentVersion}/car" load="false"/>
-    <configuration name="geronimo/servlets-examples-tomcat/${pom.currentVersion}/car"
load="false"/>
-    <configuration name="geronimo/jsp-examples-tomcat/${pom.currentVersion}/car" load="false"/>
-    <configuration name="geronimo/webconsole-tomcat/${pom.currentVersion}/car"/>
-    <configuration name="geronimo/uddi-tomcat/${pom.currentVersion}/car" load="false"/>
-    <configuration name="geronimo/daytrader-derby-tomcat/${pom.currentVersion}/car" load="false"/>
-    <configuration name="geronimo/remote-deploy-tomcat/${pom.currentVersion}/car" />
-    <configuration name="geronimo/hot-deployer/${pom.currentVersion}/car" />
+    <module name="geronimo/tomcat-deployer/${pom.currentVersion}/car"/>
+    <module name="geronimo/welcome-tomcat/${pom.currentVersion}/car"/>
+    <module name="geronimo/ldap-demo-tomcat/${pom.currentVersion}/car" load="false"/>
+    <module name="geronimo/servlets-examples-tomcat/${pom.currentVersion}/car" load="false"/>
+    <module name="geronimo/jsp-examples-tomcat/${pom.currentVersion}/car" load="false"/>
+    <module name="geronimo/webconsole-tomcat/${pom.currentVersion}/car"/>
+    <module name="geronimo/uddi-tomcat/${pom.currentVersion}/car" load="false"/>
+    <module name="geronimo/daytrader-derby-tomcat/${pom.currentVersion}/car" load="false"/>
+    <module name="geronimo/remote-deploy-tomcat/${pom.currentVersion}/car" />
+    <module name="geronimo/hot-deployer/${pom.currentVersion}/car" />
 </attributes>

Modified: geronimo/branches/1.1/assemblies/minimal-jetty-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/minimal-jetty-server/src/var/config/config.xml?rev=405955&r1=405954&r2=405955&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/minimal-jetty-server/src/var/config/config.xml (original)
+++ geronimo/branches/1.1/assemblies/minimal-jetty-server/src/var/config/config.xml Fri May
12 17:12:27 2006
@@ -7,7 +7,7 @@
 <!-- ======================================================== -->
 
 <attributes xmlns="http://geronimo.apache.org/xml/ns/attributes">
-    <configuration name="geronimo/rmi-naming/${pom.currentVersion}/car">
+    <module name="geronimo/rmi-naming/${pom.currentVersion}/car">
         <gbean name="RMIRegistry">
             <attribute name="port">${PlanNamingPort}</attribute>
         </gbean>
@@ -15,9 +15,9 @@
             <!-- Check whether this really works if host name is 0.0.0.0 -->
             <attribute name="namingProviderUrl">rmi://${PlanServerHostname}:${PlanNamingPort}</attribute>
         </gbean>
-    </configuration>
-    <configuration name="geronimo/j2ee-server/${pom.currentVersion}/car"/>
-    <configuration name="geronimo/j2ee-security/${pom.currentVersion}/car">
+    </module>
+    <module name="geronimo/j2ee-server/${pom.currentVersion}/car"/>
+    <module name="geronimo/j2ee-security/${pom.currentVersion}/car">
         <gbean name="geronimo.remoting:target=JaasLoginServiceRemotingServer">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanRemoteLoginPort}</attribute>
@@ -28,9 +28,9 @@
             <attribute name="port">${PlanJMXPort}</attribute>
             <attribute name="urlPath">/jndi/rmi://${PlanServerHostname}:${PlanNamingPort}/JMXConnector</attribute>
         </gbean>
-    </configuration>
+    </module>
 
-    <configuration name="geronimo/jetty/${pom.currentVersion}/car">
+    <module name="geronimo/jetty/${pom.currentVersion}/car">
         <gbean name="JettyWebConnector">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanHTTPPortPrimary}</attribute>
@@ -44,28 +44,28 @@
             <attribute name="host">0.0.0.0</attribute>
             <attribute name="port">8009</attribute>
         </gbean>
-    </configuration>
-    <configuration name="geronimo/geronimo-gbean-deployer/${pom.currentVersion}/car"/>
-    <configuration name="geronimo/j2ee-deployer/${pom.currentVersion}/car">
+    </module>
+    <module name="geronimo/geronimo-gbean-deployer/${pom.currentVersion}/car"/>
+    <module name="geronimo/j2ee-deployer/${pom.currentVersion}/car">
         <gbean name="WebBuilder">
             <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1</attribute>
         </gbean>
-    </configuration>
+    </module>
 
-    <configuration name="geronimo/jetty-deployer/${pom.currentVersion}/car"/>
+    <module name="geronimo/jetty-deployer/${pom.currentVersion}/car"/>
 
-    <configuration name="geronimo/unavailable-ejb-deployer/${pom.currentVersion}/car"/>
+    <module name="geronimo/unavailable-ejb-deployer/${pom.currentVersion}/car"/>
 
-    <configuration name="geronimo/unavailable-webservices-deployer/${pom.currentVersion}/car"/>
-    <configuration name="geronimo/unavailable-client-deployer/${pom.currentVersion}/car"/>
+    <module name="geronimo/unavailable-webservices-deployer/${pom.currentVersion}/car"/>
+    <module name="geronimo/unavailable-client-deployer/${pom.currentVersion}/car"/>
 
-    <configuration name="geronimo/sharedlib/${pom.currentVersion}/car">
+    <module name="geronimo/sharedlib/${pom.currentVersion}/car">
         <gbean name="SharedLib">
             <attribute name="classesDirs">var/shared/classes</attribute>
             <attribute name="libDirs">var/shared/lib</attribute>
         </gbean>
-    </configuration>
+    </module>
 
-    <!--<configuration name="geronimo/remote-deploy-jetty/${pom.currentVersion}/car"
/>-->
-    <!--<configuration name="geronimo/hot-deployer/${pom.currentVersion}/car"/>-->
+    <!--<module name="geronimo/remote-deploy-jetty/${pom.currentVersion}/car" />-->
+    <!--<module name="geronimo/hot-deployer/${pom.currentVersion}/car"/>-->
 </attributes>

Modified: geronimo/branches/1.1/assemblies/minimal-tomcat-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/minimal-tomcat-server/src/var/config/config.xml?rev=405955&r1=405954&r2=405955&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/minimal-tomcat-server/src/var/config/config.xml (original)
+++ geronimo/branches/1.1/assemblies/minimal-tomcat-server/src/var/config/config.xml Fri May
12 17:12:27 2006
@@ -7,7 +7,7 @@
 <!-- ======================================================== -->
 
 <attributes xmlns="http://geronimo.apache.org/xml/ns/attributes">
-    <configuration name="geronimo/rmi-naming/${pom.currentVersion}/car">
+    <module name="geronimo/rmi-naming/${pom.currentVersion}/car">
         <gbean name="RMIRegistry">
             <attribute name="port">${PlanNamingPort}</attribute>
         </gbean>
@@ -15,9 +15,9 @@
             <!-- Check whether this really works if host name is 0.0.0.0 -->
             <attribute name="namingProviderUrl">rmi://${PlanServerHostname}:${PlanNamingPort}</attribute>
         </gbean>
-    </configuration>
-    <configuration name="geronimo/j2ee-server/${pom.currentVersion}/car"/>
-    <configuration name="geronimo/j2ee-security/${pom.currentVersion}/car">
+    </module>
+    <module name="geronimo/j2ee-server/${pom.currentVersion}/car"/>
+    <module name="geronimo/j2ee-security/${pom.currentVersion}/car">
         <gbean name="geronimo.remoting:target=JaasLoginServiceRemotingServer">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanRemoteLoginPort}</attribute>
@@ -28,9 +28,9 @@
             <attribute name="port">${PlanJMXPort}</attribute>
             <attribute name="urlPath">/jndi/rmi://${PlanServerHostname}:${PlanNamingPort}/JMXConnector</attribute>
         </gbean>
-    </configuration>
+    </module>
 
-    <configuration name="geronimo/tomcat/${pom.currentVersion}/car">
+    <module name="geronimo/tomcat/${pom.currentVersion}/car">
         <gbean name="TomcatResources"/>
         <gbean name="TomcatWebConnector">
             <attribute name="host">${PlanServerHostname}</attribute>
@@ -46,28 +46,28 @@
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanHTTPSPortPrimary}</attribute>
         </gbean>
-    </configuration>
-    <configuration name="geronimo/geronimo-gbean-deployer/${pom.currentVersion}/car"/>
-    <configuration name="geronimo/j2ee-deployer/${pom.currentVersion}/car">
+    </module>
+    <module name="geronimo/geronimo-gbean-deployer/${pom.currentVersion}/car"/>
+    <module name="geronimo/j2ee-deployer/${pom.currentVersion}/car">
         <gbean name="WebBuilder">
             <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1</attribute>
         </gbean>
-    </configuration>
+    </module>
 
-    <configuration name="geronimo/tomcat-deployer/${pom.currentVersion}/car"/>
+    <module name="geronimo/tomcat-deployer/${pom.currentVersion}/car"/>
 
-    <configuration name="geronimo/unavailable-ejb-deployer/${pom.currentVersion}/car"/>
+    <module name="geronimo/unavailable-ejb-deployer/${pom.currentVersion}/car"/>
 
-    <configuration name="geronimo/unavailable-webservices-deployer/${pom.currentVersion}/car"/>
-    <configuration name="geronimo/unavailable-client-deployer/${pom.currentVersion}/car"/>
+    <module name="geronimo/unavailable-webservices-deployer/${pom.currentVersion}/car"/>
+    <module name="geronimo/unavailable-client-deployer/${pom.currentVersion}/car"/>
 
-    <configuration name="geronimo/sharedlib/${pom.currentVersion}/car">
+    <module name="geronimo/sharedlib/${pom.currentVersion}/car">
         <gbean name="SharedLib">
             <attribute name="classesDirs">var/shared/classes</attribute>
             <attribute name="libDirs">var/shared/lib</attribute>
         </gbean>
-    </configuration>
+    </module>
 
-    <!--<configuration name="geronimo/remote-deploy-tomcat/${pom.currentVersion}/car"/>-->
-    <!--<configuration name="geronimo/hot-deployer/${pom.currentVersion}/car"/>-->
+    <!--<module name="geronimo/remote-deploy-tomcat/${pom.currentVersion}/car"/>-->
+    <!--<module name="geronimo/hot-deployer/${pom.currentVersion}/car"/>-->
 </attributes>

Modified: geronimo/branches/1.1/assemblies/zzzzj2ee-installer/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/zzzzj2ee-installer/src/var/config/config.xml?rev=405955&r1=405954&r2=405955&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/zzzzj2ee-installer/src/var/config/config.xml (original)
+++ geronimo/branches/1.1/assemblies/zzzzj2ee-installer/src/var/config/config.xml Fri May
12 17:12:27 2006
@@ -7,7 +7,7 @@
 <!-- ======================================================== -->
 
 <attributes xmlns="http://geronimo.apache.org/xml/ns/attributes">
-    <configuration name="geronimo/rmi-naming/${pom.currentVersion}/car" load="${J2EE.Features.enable}">
+    <module name="geronimo/rmi-naming/${pom.currentVersion}/car" load="${J2EE.Features.enable}">
         <gbean name="RMIRegistry">
             <attribute name="port">${PlanNamingPort}</attribute>
         </gbean>
@@ -15,14 +15,14 @@
             <!-- Check whether this really works if host name is 0.0.0.0 -->
             <attribute name="namingProviderUrl">rmi://${PlanServerHostname}:${PlanNamingPort}</attribute>
         </gbean>
-    </configuration>
-    <configuration name="geronimo/j2ee-server/${pom.currentVersion}/car" load="${J2EE.Features.enable}">
+    </module>
+    <module name="geronimo/j2ee-server/${pom.currentVersion}/car" load="${J2EE.Features.enable}">
         <gbean name="geronimo:name=EJB,type=NetworkService">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanOpenEJBPort}</attribute>
         </gbean>
-    </configuration>
-    <configuration name="geronimo/j2ee-security/${pom.currentVersion}/car" load="${J2EE.Features.enable}">
+    </module>
+    <module name="geronimo/j2ee-security/${pom.currentVersion}/car" load="${J2EE.Features.enable}">
         <gbean name="geronimo.remoting:target=JaasLoginServiceRemotingServer">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanRemoteLoginPort}</attribute>
@@ -30,8 +30,8 @@
         <gbean name="JMXService">
             <attribute name="url">service:jmx:rmi://${PlanServerHostname}:${PlanJMXPort}/jndi/rmi://${PlanServerHostname}:${PlanNamingPort}/JMXConnector</attribute>
         </gbean>
-    </configuration>
-    <configuration name="geronimo/j2ee-corba/${pom.currentVersion}/car" load="${CORBA.Features.enable}">
+    </module>
+    <module name="geronimo/j2ee-corba/${pom.currentVersion}/car" load="${CORBA.Features.enable}">
         <gbean name="NameServer">
             <attribute name="dbDir">var/cosnaming.db</attribute>
             <attribute name="port">${PlanCOSNamingPort}</attribute>
@@ -42,28 +42,28 @@
         <gbean name="UnprotectedServer">
             <attribute name="args">-ORBInitRef, NameService=corbaloc::${PlanCOSNamingHost}:${PlanCOSNamingPort}/NameService</attribute>
         </gbean>
-    </configuration>
-    <configuration name="geronimo/activemq-broker/${pom.currentVersion}/car" load="${JMS.Features.enable}">
+    </module>
+    <module name="geronimo/activemq-broker/${pom.currentVersion}/car" load="${JMS.Features.enable}">
         <gbean name="ActiveMQ.tcp.default">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanActiveMQPort}</attribute>
         </gbean>
-    </configuration>
-    <configuration name="geronimo/activemq/${pom.currentVersion}/car" load="${JMS.Features.enable}"/>
-    <configuration name="geronimo/system-database/${pom.currentVersion}/car" load="${J2EE.Features.enable}">
+    </module>
+    <module name="geronimo/activemq/${pom.currentVersion}/car" load="${JMS.Features.enable}"/>
+    <module name="geronimo/system-database/${pom.currentVersion}/car" load="${J2EE.Features.enable}">
         <gbean name="DerbyNetwork">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanDerbyPort}</attribute>
         </gbean>
-    </configuration>
-    <configuration name="geronimo/directory/${pom.currentVersion}/car" load="${LDAP.Server.enable}">
+    </module>
+    <module name="geronimo/directory/${pom.currentVersion}/car" load="${LDAP.Server.enable}">
         <gbean name="geronimo.server:name=DirectoryService">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanLdapPort}</attribute>
         </gbean>
-    </configuration>
-    <configuration name="geronimo/ldap-realm/${pom.currentVersion}/car" load="${LDAP.Server.enable}"/>
-    <configuration name="geronimo/jetty/${pom.currentVersion}/car" load="${Jetty.Web.Container.enable}">
+    </module>
+    <module name="geronimo/ldap-realm/${pom.currentVersion}/car" load="${LDAP.Server.enable}"/>
+    <module name="geronimo/jetty/${pom.currentVersion}/car" load="${Jetty.Web.Container.enable}">
         <gbean name="JettyWebConnector">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanHTTPPortPrimary}</attribute>
@@ -73,16 +73,16 @@
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanHTTPSPortPrimary}</attribute>
         </gbean>
-    </configuration>
-    <configuration name="geronimo/welcome-jetty/${pom.currentVersion}/car" load="${Jetty.Welcome.Application.enable}"/>
-    <configuration name="geronimo/servlets-examples-jetty/${pom.currentVersion}/car" load="${Jetty.Sample.Applications.enable}"/>
-    <configuration name="geronimo/jsp-examples-jetty/${pom.currentVersion}/car" load="${Jetty.Sample.Applications.enable}"/>
-    <configuration name="geronimo/ldap-demo-jetty/${pom.currentVersion}/car" load="${Jetty.Sample.Applications.enable}"/>
-    <configuration name="geronimo/webconsole-jetty/${pom.currentVersion}/car" load="${Jetty.Web.Management.Console.enable}"/>
-    <configuration name="geronimo/uddi-jetty/${pom.currentVersion}/car" load="${Jetty.UDDI.Server.enable}"/>
-    <configuration name="geronimo/remote-deploy-jetty/${pom.currentVersion}/car" load="${Jetty.Web.Container.enable}"/>
-    <configuration name="geronimo/daytrader-derby-jetty/${pom.currentVersion}/car" load="${Daytrader.for.Jetty.enable}"/>
-    <configuration name="geronimo/tomcat/${pom.currentVersion}/car" load="${Tomcat.Web.Container.enable}">
+    </module>
+    <module name="geronimo/welcome-jetty/${pom.currentVersion}/car" load="${Jetty.Welcome.Application.enable}"/>
+    <module name="geronimo/servlets-examples-jetty/${pom.currentVersion}/car" load="${Jetty.Sample.Applications.enable}"/>
+    <module name="geronimo/jsp-examples-jetty/${pom.currentVersion}/car" load="${Jetty.Sample.Applications.enable}"/>
+    <module name="geronimo/ldap-demo-jetty/${pom.currentVersion}/car" load="${Jetty.Sample.Applications.enable}"/>
+    <module name="geronimo/webconsole-jetty/${pom.currentVersion}/car" load="${Jetty.Web.Management.Console.enable}"/>
+    <module name="geronimo/uddi-jetty/${pom.currentVersion}/car" load="${Jetty.UDDI.Server.enable}"/>
+    <module name="geronimo/remote-deploy-jetty/${pom.currentVersion}/car" load="${Jetty.Web.Container.enable}"/>
+    <module name="geronimo/daytrader-derby-jetty/${pom.currentVersion}/car" load="${Daytrader.for.Jetty.enable}"/>
+    <module name="geronimo/tomcat/${pom.currentVersion}/car" load="${Tomcat.Web.Container.enable}">
         <gbean name="TomcatResources"/>
         <gbean name="TomcatWebConnector">
             <attribute name="host">${PlanServerHostname}</attribute>
@@ -98,32 +98,31 @@
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanHTTPSPort2}</attribute>
         </gbean>
-    </configuration>
-    <configuration name="geronimo/welcome-tomcat/${pom.currentVersion}/car" load="${Tomcat.Welcome.Application.enable}"/>
-    <configuration name="geronimo/servlets-examples-tomcat/${pom.currentVersion}/car"
load="${Tomcat.Sample.Applications.enable}"/>
-    <configuration name="geronimo/jsp-examples-tomcat/${pom.currentVersion}/car" load="${Tomcat.Sample.Applications.enable}"/>
-    <configuration name="geronimo/ldap-demo-tomcat/${pom.currentVersion}/car" load="${Tomcat.Sample.Applications.enable}"/>
-    <configuration name="geronimo/webconsole-tomcat/${pom.currentVersion}/car" load="${Tomcat.Web.Management.Console.enable}"/>
-    <configuration name="geronimo/uddi-tomcat/${pom.currentVersion}/car" load="${Tomcat.UDDI.Server.enable}"/>
-    <configuration name="geronimo/remote-deploy-tomcat/${pom.currentVersion}/car" load="${Tomcat.Web.Container.enable}"/>
-    <configuration name="geronimo/daytrader-derby-tomcat/${pom.currentVersion}/car" load="${Daytrader.for.Tomcat.enable}"/>
-    <configuration name="geronimo/javamail/${pom.currentVersion}/car" load="false"><!--
load="${SMTP.Transport.enable}"-->
+    </module>
+    <module name="geronimo/welcome-tomcat/${pom.currentVersion}/car" load="${Tomcat.Welcome.Application.enable}"/>
+    <module name="geronimo/servlets-examples-tomcat/${pom.currentVersion}/car" load="${Tomcat.Sample.Applications.enable}"/>
+    <module name="geronimo/jsp-examples-tomcat/${pom.currentVersion}/car" load="${Tomcat.Sample.Applications.enable}"/>
+    <module name="geronimo/ldap-demo-tomcat/${pom.currentVersion}/car" load="${Tomcat.Sample.Applications.enable}"/>
+    <module name="geronimo/webconsole-tomcat/${pom.currentVersion}/car" load="${Tomcat.Web.Management.Console.enable}"/>
+    <module name="geronimo/uddi-tomcat/${pom.currentVersion}/car" load="${Tomcat.UDDI.Server.enable}"/>
+    <module name="geronimo/remote-deploy-tomcat/${pom.currentVersion}/car" load="${Tomcat.Web.Container.enable}"/>
+    <module name="geronimo/daytrader-derby-tomcat/${pom.currentVersion}/car" load="${Daytrader.for.Tomcat.enable}"/>
+    <module name="geronimo/javamail/${pom.currentVersion}/car" load="false"><!--
load="${SMTP.Transport.enable}"-->
         <gbean name="SMTPTransport">
             <attribute name="host">localhost</attribute>
             <attribute name="port">25</attribute>
         </gbean>
-    </configuration>
-    <configuration name="geronimo/geronimo-gbean-deployer/${pom.currentVersion}/car" load="${Server.enable}"/>
-    <configuration name="geronimo/j2ee-deployer/${pom.currentVersion}/car" load="${J2EE.Features.enable}">
+    </module>
+    <module name="geronimo/geronimo-gbean-deployer/${pom.currentVersion}/car" load="${Server.enable}"/>
+    <module name="geronimo/j2ee-deployer/${pom.currentVersion}/car" load="${J2EE.Features.enable}">
         <gbean name="WebBuilder">
             <attribute name="defaultNamespace">${PlanWebBuilderDefaultNamespace}</attribute>
         </gbean>
         <gbean name="EJBBuilder">
             <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=geronimo/jetty/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=GBean,name=${PlanWebServerName}WebContainer</attribute>
         </gbean>
-    </configuration>
-    <configuration name="geronimo/jetty-deployer/${pom.currentVersion}/car" load="${Jetty.Web.Container.enable}"/>
-    <configuration name="geronimo/tomcat-deployer/${pom.currentVersion}/car" load="${Tomcat.Web.Container.enable}"/>
-    <configuration name="geronimo/hot-deployer/${pom.currentVersion}/car" load="${J2EE.Features.enable}"/>
-
+    </module>
+    <module name="geronimo/jetty-deployer/${pom.currentVersion}/car" load="${Jetty.Web.Container.enable}"/>
+    <module name="geronimo/tomcat-deployer/${pom.currentVersion}/car" load="${Tomcat.Web.Container.enable}"/>
+    <module name="geronimo/hot-deployer/${pom.currentVersion}/car" load="${J2EE.Features.enable}"/>
 </attributes>

Modified: geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/ConfigurationOverride.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/ConfigurationOverride.java?rev=405955&r1=405954&r2=405955&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/ConfigurationOverride.java
(original)
+++ geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/ConfigurationOverride.java
Fri May 12 17:12:27 2006
@@ -97,7 +97,7 @@
     }
 
     public void writeXml(PrintWriter out) {
-        out.print("  <configuration name=\"" + name + "\"");
+        out.print("  <module name=\"" + name + "\"");
         if (!load) {
             out.print(" load=\"false\"");
         }
@@ -111,6 +111,6 @@
             gbeanOverride.writeXml(out);
         }
 
-        out.println("  </configuration>");
+        out.println("  </module>");
     }
 }

Modified: geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/ServerOverride.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/ServerOverride.java?rev=405955&r1=405954&r2=405955&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/ServerOverride.java
(original)
+++ geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/ServerOverride.java
Fri May 12 17:12:27 2006
@@ -17,7 +17,11 @@
 package org.apache.geronimo.system.configuration;
 
 import java.io.PrintWriter;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
 import org.apache.geronimo.kernel.InvalidGBeanException;
 import org.apache.geronimo.kernel.repository.Artifact;
@@ -34,7 +38,15 @@
     }
 
     public ServerOverride(Element element) throws InvalidGBeanException {
-        NodeList configs = element.getElementsByTagName("configuration");
+        NodeList configs = element.getElementsByTagName("module");
+        for (int i = 0; i < configs.getLength(); i++) {
+            Element configurationElement = (Element) configs.item(i);
+            ConfigurationOverride configuration = new ConfigurationOverride(configurationElement);
+            addConfiguration(configuration);
+        }
+
+        // The config.xml file in 1.0 use configuration instead of module
+        configs = element.getElementsByTagName("configuration");
         for (int i = 0; i < configs.getLength(); i++) {
             Element configurationElement = (Element) configs.item(i);
             ConfigurationOverride configuration = new ConfigurationOverride(configurationElement);

Modified: geronimo/branches/1.1/modules/system/src/schema/local-attribute.xsd
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/system/src/schema/local-attribute.xsd?rev=405955&r1=405954&r2=405955&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/system/src/schema/local-attribute.xsd (original)
+++ geronimo/branches/1.1/modules/system/src/schema/local-attribute.xsd Fri May 12 17:12:27
2006
@@ -49,9 +49,12 @@
     <xsd:element name="attributes" type="atts:attributesType"/>
 
     <xsd:complexType name="attributesType">
-        <xsd:sequence>
+        <xsd:choice>
+            <xsd:element name="module" type="atts:configurationType" minOccurs="0" maxOccurs="unbounded"
/>
+
+            <!-- The config.xml file in 1.0 use configuration instead of module -->
             <xsd:element name="configuration" type="atts:configurationType" minOccurs="0"
maxOccurs="unbounded" />
-        </xsd:sequence>
+        </xsd:choice>
     </xsd:complexType>
 
     <xsd:complexType name="configurationType">



Mime
View raw message