You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by da...@apache.org on 2006/05/08 22:16:51 UTC
svn commit: r405150 [1/2] - in /geronimo/branches/1.1:
applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/
configs/activemq-broker/src/plan/ configs/axis-deployer/src/plan/
configs/axis/src/plan/ configs/client-cor...
Author: dain
Date: Mon May 8 13:16:26 2006
New Revision: 405150
URL: http://svn.apache.org/viewcvs?rev=405150&view=rev
Log:
GERONIMO-1988 Change "configId" to "moduleId" in xml
Added:
geronimo/branches/1.1/modules/service-builder/src/schema/geronimo-module-1.1.xsd
Removed:
geronimo/branches/1.1/modules/service-builder/src/schema/geronimo-config-1.1.xsd
Modified:
geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java
geronimo/branches/1.1/configs/activemq-broker/src/plan/plan.xml
geronimo/branches/1.1/configs/axis-deployer/src/plan/plan.xml
geronimo/branches/1.1/configs/axis/src/plan/plan.xml
geronimo/branches/1.1/configs/client-corba/src/plan/plan.xml
geronimo/branches/1.1/configs/client-deployer/src/plan/plan.xml
geronimo/branches/1.1/configs/client-security/src/plan/plan.xml
geronimo/branches/1.1/configs/client-system/src/plan/plan.xml
geronimo/branches/1.1/configs/client/src/plan/plan.xml
geronimo/branches/1.1/configs/daytrader-jetty/src/plan/plan.xml
geronimo/branches/1.1/configs/daytrader-tomcat/src/plan/plan.xml
geronimo/branches/1.1/configs/directory/src/plan/plan.xml
geronimo/branches/1.1/configs/geronimo-gbean-deployer/src/plan/plan.xml
geronimo/branches/1.1/configs/hot-deployer/src/plan/plan.xml
geronimo/branches/1.1/configs/j2ee-corba/src/plan/plan.xml
geronimo/branches/1.1/configs/j2ee-deployer/src/plan/plan.xml
geronimo/branches/1.1/configs/j2ee-security/src/plan/plan.xml
geronimo/branches/1.1/configs/j2ee-server/src/plan/plan.xml
geronimo/branches/1.1/configs/j2ee-system/src/plan/plan.xml
geronimo/branches/1.1/configs/javamail/src/plan/plan.xml
geronimo/branches/1.1/configs/jetty-deployer/src/plan/plan.xml
geronimo/branches/1.1/configs/jetty/src/plan/plan.xml
geronimo/branches/1.1/configs/ldap-realm/src/plan/plan.xml
geronimo/branches/1.1/configs/online-deployer/src/plan/plan.xml
geronimo/branches/1.1/configs/openejb-deployer/src/plan/plan.xml
geronimo/branches/1.1/configs/openejb/src/plan/plan.xml
geronimo/branches/1.1/configs/rmi-naming/src/plan/plan.xml
geronimo/branches/1.1/configs/sharedlib/src/plan/plan.xml
geronimo/branches/1.1/configs/shutdown/src/plan/plan.xml
geronimo/branches/1.1/configs/tomcat-deployer/src/plan/plan.xml
geronimo/branches/1.1/configs/tomcat/src/plan/plan.xml
geronimo/branches/1.1/configs/unavailable-client-deployer/src/plan/plan.xml
geronimo/branches/1.1/configs/unavailable-ejb-deployer/src/plan/plan.xml
geronimo/branches/1.1/configs/unavailable-webservices-deployer/src/plan/plan.xml
geronimo/branches/1.1/modules/client-builder/src/schema/geronimo-application-client-1.1.xsd
geronimo/branches/1.1/modules/client-builder/src/test-resources/plans/plan1.xml
geronimo/branches/1.1/modules/client-builder/src/test-resources/plans/plan2.xml
geronimo/branches/1.1/modules/client-builder/src/test/org/apache/geronimo/client/builder/PlanParsingTest.java
geronimo/branches/1.1/modules/connector-builder/src/schema/geronimo-connector-1.1.xsd
geronimo/branches/1.1/modules/connector-builder/src/test-data/connector_1_0/geronimo-ra.xml
geronimo/branches/1.1/modules/connector-builder/src/test-data/connector_1_5/geronimo-ra.xml
geronimo/branches/1.1/modules/connector-builder/src/test-data/connector_1_5_localtx/geronimo-ra.xml
geronimo/branches/1.1/modules/connector-builder/src/test-data/connector_1_5_notx/geronimo-ra.xml
geronimo/branches/1.1/modules/connector-builder/src/test-data/data/external-application-plan.xml
geronimo/branches/1.1/modules/connector-builder/src/test-data/ear/geronimo-application.xml
geronimo/branches/1.1/modules/deploy-tool/src/java/org/apache/geronimo/deployment/PluginBootstrap.java
geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
geronimo/branches/1.1/modules/j2ee-builder/src/schema/geronimo-application-1.1.xsd
geronimo/branches/1.1/modules/j2ee-builder/src/test-ear/META-INF/geronimo-application.xml
geronimo/branches/1.1/modules/j2ee-builder/src/test-ear/test-ejb-jar/META-INF/openejb-jar.xml
geronimo/branches/1.1/modules/j2ee-builder/src/test-ear/test-rar/META-INF/geronimo-ra.xml
geronimo/branches/1.1/modules/j2ee-builder/src/test-ear/test-war/WEB-INF/geronimo-web.xml
geronimo/branches/1.1/modules/j2ee-builder/src/test-ear13/META-INF/geronimo-application.xml
geronimo/branches/1.1/modules/j2ee-builder/src/test-ear13/test-ejb-jar/META-INF/openejb-jar.xml
geronimo/branches/1.1/modules/j2ee-builder/src/test-ear13/test-war/WEB-INF/geronimo-web.xml
geronimo/branches/1.1/modules/j2ee-builder/src/test-plan/test-bad-car.xml
geronimo/branches/1.1/modules/j2ee-builder/src/test-plan/test-bad-ejb-jar.xml
geronimo/branches/1.1/modules/j2ee-builder/src/test-plan/test-bad-rar.xml
geronimo/branches/1.1/modules/j2ee-builder/src/test-plan/test-bad-war.xml
geronimo/branches/1.1/modules/j2ee-builder/src/test-unpacked-ear/META-INF/geronimo-application-alt-dd.xml
geronimo/branches/1.1/modules/j2ee-builder/src/test-unpacked-ear/META-INF/geronimo-application.xml
geronimo/branches/1.1/modules/j2ee-schema/src/test-data/geronimo/ejb-naming-post.xml
geronimo/branches/1.1/modules/j2ee-schema/src/test-data/geronimo/ejb-naming-pre.xml
geronimo/branches/1.1/modules/jetty-builder/src/schema/geronimo-jetty-1.1.xsd
geronimo/branches/1.1/modules/jetty-builder/src/test-resources/deployables/war-spaces-in-context/WEB-INF/geronimo-web.xml
geronimo/branches/1.1/modules/jetty-builder/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml
geronimo/branches/1.1/modules/jetty-builder/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml
geronimo/branches/1.1/modules/jetty-builder/src/test-resources/deployables/war5/WEB-INF/geronimo-jetty.xml
geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan1.xml
geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan1A.xml
geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan1B.xml
geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan1C.xml
geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan2.xml
geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan3.xml
geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan4-converted.xml
geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan4.xml
geronimo/branches/1.1/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/PlanParsingTest.java
geronimo/branches/1.1/modules/naming-builder/src/schema/geronimo-naming-1.1.xsd
geronimo/branches/1.1/modules/security-builder/src/schema/geronimo-login-config-1.1.xsd
geronimo/branches/1.1/modules/service-builder/maven.xml
geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/EnvironmentBuilder.java
geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/jsr88/EnvironmentData.java
geronimo/branches/1.1/modules/service-builder/src/test-resources/services/plan1.xml
geronimo/branches/1.1/modules/service-builder/src/test/org/apache/geronimo/deployment/service/ServiceConfigBuilderTest.java
geronimo/branches/1.1/modules/tomcat-builder/src/schema/geronimo-tomcat-1.1.xsd
geronimo/branches/1.1/modules/tomcat-builder/src/test-resources/deployables/war-spaces-in-context/WEB-INF/geronimo-web.xml
geronimo/branches/1.1/modules/tomcat-builder/src/test-resources/deployables/war4/WEB-INF/geronimo-web.xml
geronimo/branches/1.1/modules/tomcat-builder/src/test-resources/plans/plan1.xml
geronimo/branches/1.1/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java
geronimo/branches/1.1/modules/upgrade/src/test-data/appclient_dep_1_result.xml
geronimo/branches/1.1/modules/upgrade/src/test-data/appclient_ejb_1_result.xml
geronimo/branches/1.1/modules/upgrade/src/test-data/assembly_1_result.xml
geronimo/branches/1.1/modules/upgrade/src/test-data/transport_1_result.xml
geronimo/branches/1.1/modules/upgrade/src/test-data/transport_2_result.xml
geronimo/branches/1.1/modules/web-builder/src/java/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverter.java
geronimo/branches/1.1/modules/web-builder/src/schema/geronimo-web-1.1.xsd
geronimo/branches/1.1/modules/web-builder/src/test-resources/plans/tomcat-post.xml
geronimo/branches/1.1/modules/web-builder/src/test-resources/plans/tomcat-pre.xml
geronimo/branches/1.1/modules/web-builder/src/test-resources/plans/tomcat-pre2.xml
geronimo/branches/1.1/modules/web-builder/src/test-resources/plans/tomcat-pre3.xml
geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/test-resources/plan.xml
geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/test-resources/result.xml
Modified: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java (original)
+++ geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java Mon May 8 13:16:26 2006
@@ -22,8 +22,8 @@
import org.apache.geronimo.console.util.PortletManager;
import org.apache.geronimo.deployment.xbeans.ArtifactType;
import org.apache.geronimo.deployment.xbeans.AttributeType;
-import org.apache.geronimo.deployment.xbeans.ConfigurationDocument;
-import org.apache.geronimo.deployment.xbeans.ConfigurationType;
+import org.apache.geronimo.deployment.xbeans.ModuleDocument;
+import org.apache.geronimo.deployment.xbeans.ModuleType;
import org.apache.geronimo.deployment.xbeans.DependenciesType;
import org.apache.geronimo.deployment.xbeans.EnvironmentType;
import org.apache.geronimo.deployment.xbeans.GbeanType;
@@ -321,10 +321,10 @@
private XmlObject actionGeneratePlan(PortletRequest request, RealmData data) {
normalize(data);
- ConfigurationDocument doc = ConfigurationDocument.Factory.newInstance();
- ConfigurationType root = doc.addNewConfiguration();
+ ModuleDocument doc = ModuleDocument.Factory.newInstance();
+ ModuleType root = doc.addNewModule();
EnvironmentType environment = root.addNewEnvironment();
- ArtifactType configId = environment.addNewConfigId();
+ ArtifactType configId = environment.addNewModuleId();
configId.setGroupId("console");
configId.setArtifactId("realm-"+data.getName());
configId.setVersion("1.0");
Modified: geronimo/branches/1.1/configs/activemq-broker/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/activemq-broker/src/plan/plan.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/activemq-broker/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/activemq-broker/src/plan/plan.xml Mon May 8 13:16:26 2006
@@ -19,7 +19,7 @@
<!-- $Rev$ $Date$ -->
<!-- parentId="${pom.groupId}/system-database/${pom.currentVersion}/car"
-->
-<configuration xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
<!-- management -->
@@ -85,4 +85,4 @@
</attribute>
</gbean>
-</configuration>
+</module>
Modified: geronimo/branches/1.1/configs/axis-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/axis-deployer/src/plan/plan.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/axis-deployer/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/axis-deployer/src/plan/plan.xml Mon May 8 13:16:26 2006
@@ -16,10 +16,10 @@
limitations under the License.
-->
-<configuration xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
>
<gbean name="WebServiceBuilder" class="org.apache.geronimo.axis.builder.AxisBuilder"/>
-</configuration>
+</module>
Modified: geronimo/branches/1.1/configs/axis/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/axis/src/plan/plan.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/axis/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/axis/src/plan/plan.xml Mon May 8 13:16:26 2006
@@ -21,16 +21,16 @@
<!--
Configuration for the main ring of a Geronimo server.
-This configuration should contain those services normally provided
+This module should contain those services normally provided
by the server.
parentId="${pom.groupId}/rmi-naming/${pom.currentVersion}/car"
-->
-<configuration
+<module
xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
>
<gbean name="AxisCLWorkaround" class="org.apache.geronimo.axis.AxisDiscoveryCLWorkaroundGBean"/>
-</configuration>
+</module>
Modified: geronimo/branches/1.1/configs/client-corba/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/client-corba/src/plan/plan.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/client-corba/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/client-corba/src/plan/plan.xml Mon May 8 13:16:26 2006
@@ -21,7 +21,7 @@
<!--
CSSBean examples for app client
-->
-<configuration xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
<gbean name="DyanmicStubClassLoader" class="org.openejb.corba.util.DynamicStubClassLoader"/>
@@ -148,4 +148,4 @@
</xml-attribute>
</gbean>
-</configuration>
+</module>
Modified: geronimo/branches/1.1/configs/client-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/client-deployer/src/plan/plan.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/client-deployer/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/client-deployer/src/plan/plan.xml Mon May 8 13:16:26 2006
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<configuration xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
>
@@ -72,4 +72,4 @@
</xml-attribute>
</gbean>
-</configuration>
+</module>
Modified: geronimo/branches/1.1/configs/client-security/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/client-security/src/plan/plan.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/client-security/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/client-security/src/plan/plan.xml Mon May 8 13:16:26 2006
@@ -22,7 +22,7 @@
Configuration for the security of a Geronimo app client.
-->
-<configuration
+<module
xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
>
@@ -111,4 +111,4 @@
</gbean>
-</configuration>
+</module>
Modified: geronimo/branches/1.1/configs/client-system/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/client-system/src/plan/plan.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/client-system/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/client-system/src/plan/plan.xml Mon May 8 13:16:26 2006
@@ -20,7 +20,7 @@
<!--
Configuration for root app client
-->
-<configuration xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
<!-- ServerInfo service -->
<gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.BasicServerInfo"/>
@@ -109,4 +109,4 @@
</reference>
</gbean>
-</configuration>
+</module>
Modified: geronimo/branches/1.1/configs/client/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/client/src/plan/plan.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/client/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/client/src/plan/plan.xml Mon May 8 13:16:26 2006
@@ -21,11 +21,11 @@
<!--
Configuration for the main ring of a Geronimo app client.
-This configuration should contain those services normally provided
+This module should contain those services normally provided
by the app client.
parentId="${pom.groupId}/client-system/${pom.currentVersion}/car"
-->
-<configuration xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
<!-- Naming properties -->
<gbean name="NamingProperties" class="org.apache.geronimo.system.properties.NamingProperties">
@@ -140,4 +140,4 @@
<name>ConfigurationManager</name>
</reference>
</gbean>
-</configuration>
+</module>
Modified: geronimo/branches/1.1/configs/daytrader-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/daytrader-jetty/src/plan/plan.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/daytrader-jetty/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/daytrader-jetty/src/plan/plan.xml Mon May 8 13:16:26 2006
@@ -506,20 +506,20 @@
<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">
- <configId>
+ <moduleId>
<groupId>${pom.groupId}</groupId>
<artifactId>${pom.artifactId}-streamer-client</artifactId>
<version>${pom.currentVersion}</version>
<type>car</type>
- </configId>
+ </moduleId>
</client-environment>
<server-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <configId>
+ <moduleId>
<groupId>${pom.groupId}</groupId>
<artifactId>${pom.artifactId}-streamer-client-server</artifactId>
<version>${pom.currentVersion}</version>
<type>car</type>
- </configId>
+ </moduleId>
</server-environment>
<resource>
<external-rar>activemq/activemq-ra/${activemq_version}/rar</external-rar>
Modified: geronimo/branches/1.1/configs/daytrader-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/daytrader-tomcat/src/plan/plan.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/daytrader-tomcat/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/daytrader-tomcat/src/plan/plan.xml Mon May 8 13:16:26 2006
@@ -506,20 +506,20 @@
<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">
- <configId>
+ <moduleId>
<groupId>${pom.groupId}</groupId>
<artifactId>${pom.artifactId}-streamer-client</artifactId>
<version>${pom.currentVersion}</version>
<type>car</type>
- </configId>
+ </moduleId>
</client-environment>
<server-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <configId>
+ <moduleId>
<groupId>${pom.groupId}</groupId>
<artifactId>${pom.artifactId}-streamer-client-server</artifactId>
<version>${pom.currentVersion}</version>
<type>car</type>
- </configId>
+ </moduleId>
</server-environment>
<resource>
<external-rar>activemq/activemq-ra/${activemq_version}/rar</external-rar>
Modified: geronimo/branches/1.1/configs/directory/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/directory/src/plan/plan.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/directory/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/directory/src/plan/plan.xml Mon May 8 13:16:26 2006
@@ -21,10 +21,10 @@
<!--
Configuration for the main ring of a Geronimo server.
-This configuration should contain those services normally provided
+This module should contain those services normally provided
by the server.
-->
-<configuration
+<module
xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
>
@@ -41,4 +41,4 @@
<reference name="ServerInfo"><name>ServerInfo</name></reference>
</gbean>
-</configuration>
+</module>
Modified: geronimo/branches/1.1/configs/geronimo-gbean-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/geronimo-gbean-deployer/src/plan/plan.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/geronimo-gbean-deployer/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/geronimo-gbean-deployer/src/plan/plan.xml Mon May 8 13:16:26 2006
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<configuration xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
<!-- Deployer used to process modules and plans -->
<gbean name="Deployer" class="org.apache.geronimo.deployment.Deployer">
<reference name="Store">
@@ -26,7 +26,7 @@
</reference>
</gbean>
- <!-- Builder for handling plans defining Geronimo configurations -->
+ <!-- Builder for handling plans defining Geronimo modules -->
<gbean name="ServiceBuilder" class="org.apache.geronimo.deployment.service.ServiceConfigBuilder">
<!--<attribute name="defaultParentId">geronimo/j2ee-server/${pom.currentVersion}/car</attribute>-->
<reference name="Repository">
@@ -45,4 +45,4 @@
<!--<gbean name="EnvironmentBuilder" class="org.apache.geronimo.deployment.service.EnvironmentBuilder"/>-->
-</configuration>
+</module>
Modified: geronimo/branches/1.1/configs/hot-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/hot-deployer/src/plan/plan.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/hot-deployer/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/hot-deployer/src/plan/plan.xml Mon May 8 13:16:26 2006
@@ -19,10 +19,10 @@
<!-- $Rev$ $Date$ -->
<!--
-Child of the geronimo/j2ee-server/${pom.currentVersion}/car configuration that includes deployment services
+Child of the geronimo/j2ee-server/${pom.currentVersion}/car module that includes deployment services
parentId="geronimo/runtime-deployer/${pom.currentVersion}/car"
-->
-<configuration
+<module
xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
>
@@ -36,4 +36,4 @@
<name>EARBuilder</name>
</dependency>
</gbean>
-</configuration>
+</module>
Modified: geronimo/branches/1.1/configs/j2ee-corba/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/j2ee-corba/src/plan/plan.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/j2ee-corba/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/j2ee-corba/src/plan/plan.xml Mon May 8 13:16:26 2006
@@ -23,15 +23,15 @@
parentId="${pom.groupId}/j2ee-server/${pom.currentVersion}/car"
-->
-<configuration xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
<environment>
- <configId>
+ <moduleId>
<groupId>geronimo</groupId>
<artifactId>j2ee-corba</artifactId>
<version>${geronimo_version}</version>
<type>car</type>
- </configId>
+ </moduleId>
<dependencies>
<dependency>
<groupId>geronimo</groupId>
@@ -575,4 +575,4 @@
</dependency>
</gbean>
-</configuration>
+</module>
Modified: geronimo/branches/1.1/configs/j2ee-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/j2ee-deployer/src/plan/plan.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/j2ee-deployer/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/j2ee-deployer/src/plan/plan.xml Mon May 8 13:16:26 2006
@@ -17,11 +17,11 @@
-->
<!-- $Rev$ $Date$ -->
-<configuration xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
<gbean name="EARBuilder" class="org.apache.geronimo.j2ee.deployment.EARConfigBuilder">
<!--domain set to wildcard so datasources may be deployed independently on client. -->
- <!--a better solution is to get the domain and server from the parent configuration -->
+ <!--a better solution is to get the domain and server from the parent module -->
<attribute name="transactionContextManagerAbstractName">?name=TransactionContextManager</attribute>
<attribute name="connectionTrackerAbstractName">?name=ConnectionTracker</attribute>
<attribute name="transactionalTimerAbstractName">?name=TransactionalThreadPooledTimer</attribute>
@@ -127,4 +127,4 @@
<attribute name="policyProvider">org.apache.geronimo.security.jacc.GeronimoPolicy</attribute>
</gbean>
-</configuration>
+</module>
Modified: geronimo/branches/1.1/configs/j2ee-security/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/j2ee-security/src/plan/plan.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/j2ee-security/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/j2ee-security/src/plan/plan.xml Mon May 8 13:16:26 2006
@@ -22,7 +22,7 @@
Configuration for the security of a Geronimo server.
parentId="${pom.groupId}/rmi-naming/${pom.currentVersion}/car"
-->
-<configuration
+<module
xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
>
@@ -120,4 +120,4 @@
<attribute name="keyPasswords">geronimo=secret</attribute>
<reference name="ServerInfo"><name>ServerInfo</name></reference>
</gbean>
-</configuration>
+</module>
Modified: geronimo/branches/1.1/configs/j2ee-server/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/j2ee-server/src/plan/plan.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/j2ee-server/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/j2ee-server/src/plan/plan.xml Mon May 8 13:16:26 2006
@@ -21,12 +21,12 @@
<!--
Configuration for the main ring of a Geronimo server.
-This configuration should contain those services normally provided
+This module should contain those services normally provided
by the server.
parentId="${pom.groupId}/rmi-naming/${pom.currentVersion}/car"
-->
-<configuration xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
<gbean name="ConnectionTracker"
class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean">
@@ -172,4 +172,4 @@
<!--<gbean name="eis/JAXR" class="org.apache.geronimo.webservices.jaxr.JAXRGBean"/>-->
-</configuration>
+</module>
Modified: geronimo/branches/1.1/configs/j2ee-system/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/j2ee-system/src/plan/plan.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/j2ee-system/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/j2ee-system/src/plan/plan.xml Mon May 8 13:16:26 2006
@@ -19,14 +19,14 @@
<!--
Configuration for the innermost ring of a Geronimo server.
-This configuration should only contain critical services needed to
+This module should only contain critical services needed to
run other Configurations - for example, the ServerInfo, Logging
and Repository services used to load them.
-This configuration should *NOT* be used to provide server or application
+This module should *NOT* be used to provide server or application
specific services - those should be provided by children.
-->
-<configuration xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
<!-- ServerInfo service -->
<gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.BasicServerInfo"/>
@@ -95,4 +95,4 @@
<name>ServerInfo</name>
</reference>
</gbean>
-</configuration>
+</module>
Modified: geronimo/branches/1.1/configs/javamail/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/javamail/src/plan/plan.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/javamail/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/javamail/src/plan/plan.xml Mon May 8 13:16:26 2006
@@ -19,10 +19,10 @@
<!-- $Rev: 57116 $ $Date: 2004-11-09 17:34:38 -0800 (Tue, 09 Nov 2004) $ -->
<!--
-Child of the geronimo/j2ee-server/${pom.currentVersion}/car configuration that includes deployment services
+Child of the geronimo/j2ee-server/${pom.currentVersion}/car module that includes deployment services
parentId="geronimo/runtime-deployer/${pom.currentVersion}/car"
-->
-<configuration
+<module
xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
>
@@ -34,4 +34,4 @@
<attribute name="host">localhost</attribute>
<attribute name="port">25</attribute>
</gbean>
-</configuration>
+</module>
Modified: geronimo/branches/1.1/configs/jetty-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/jetty-deployer/src/plan/plan.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/jetty-deployer/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/jetty-deployer/src/plan/plan.xml Mon May 8 13:16:26 2006
@@ -16,7 +16,7 @@
-->
<!-- $Rev$ $Date$ -->
-<configuration xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
<gbean name="JettyWebBuilder" class="org.apache.geronimo.jetty.deployment.JettyModuleBuilder">
<attribute name="defaultSessionTimeoutSeconds">1800</attribute>
@@ -104,4 +104,4 @@
<attribute name="servletName">dummy</attribute>
</gbean>
-</configuration>
+</module>
Modified: geronimo/branches/1.1/configs/jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/jetty/src/plan/plan.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/jetty/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/jetty/src/plan/plan.xml Mon May 8 13:16:26 2006
@@ -22,7 +22,7 @@
Configuration for Jetty server.
parentId="${pom.groupId}/rmi-naming/${pom.currentVersion}/car"
-->
-<configuration
+<module
xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
>
@@ -107,4 +107,4 @@
</reference>
</gbean>
-</configuration>
+</module>
Modified: geronimo/branches/1.1/configs/ldap-realm/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/ldap-realm/src/plan/plan.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/ldap-realm/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/ldap-realm/src/plan/plan.xml Mon May 8 13:16:26 2006
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<configuration xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
<gbean name="ldap-login"
class="org.apache.geronimo.security.jaas.LoginModuleGBean">
@@ -56,4 +56,4 @@
</gbean>
-</configuration>
+</module>
Modified: geronimo/branches/1.1/configs/online-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/online-deployer/src/plan/plan.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/online-deployer/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/online-deployer/src/plan/plan.xml Mon May 8 13:16:26 2006
@@ -16,6 +16,6 @@
limitations under the License.
-->
-<configuration xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
<environment/>
-</configuration>
+</module>
Modified: geronimo/branches/1.1/configs/openejb-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/openejb-deployer/src/plan/plan.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/openejb-deployer/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/openejb-deployer/src/plan/plan.xml Mon May 8 13:16:26 2006
@@ -18,7 +18,7 @@
<!-- $Rev: 378404 $ $Date: 2006-02-16 19:17:27 -0500 (Thu, 16 Feb 2006) $ -->
-<configuration xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
<gbean name="EJBBuilder" class="org.openejb.deployment.OpenEJBModuleBuilder">
@@ -61,4 +61,4 @@
<gbean name="ServerEJBReferenceBuilder" class="org.openejb.deployment.OpenEJBReferenceBuilder"/>
<gbean name="WebServiceEJBLinkTemplate" class="org.openejb.server.axis.WSContainerGBean"/>
-</configuration>
+</module>
Modified: geronimo/branches/1.1/configs/openejb/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/openejb/src/plan/plan.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/openejb/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/openejb/src/plan/plan.xml Mon May 8 13:16:26 2006
@@ -21,12 +21,12 @@
<!--
Configuration for the main ring of a Geronimo server.
-This configuration should contain those services normally provided
+This module should contain those services normally provided
by the server.
parentId="${pom.groupId}/rmi-naming/${pom.currentVersion}/car"
-->
-<configuration xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
<gbean name="EJBNetworkService" class="org.activeio.xnet.StandardServiceStackGBean">
<attribute name="name">EJB</attribute>
@@ -73,4 +73,4 @@
</reference>
</gbean>
-</configuration>
+</module>
Modified: geronimo/branches/1.1/configs/rmi-naming/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/rmi-naming/src/plan/plan.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/rmi-naming/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/rmi-naming/src/plan/plan.xml Mon May 8 13:16:26 2006
@@ -19,12 +19,12 @@
<!-- $Rev$ $Date$ -->
<!--
-Holds the RMI naming server configuration. This needs to be started
+Holds the RMI naming server module. This needs to be started
after the system GBeans but before the server GBeans.
parentId="${pom.groupId}/j2ee-system/${pom.currentVersion}/car"
-->
-<configuration
+<module
xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
>
@@ -94,4 +94,4 @@
<gbean name="DownloadedPluginRepos" class="org.apache.geronimo.system.plugin.PluginRepositoryDownloader">
<attribute name="repositoryList">http://people.apache.org/~ammulder/plugin-repository-list.txt</attribute>
</gbean>
-</configuration>
+</module>
Modified: geronimo/branches/1.1/configs/sharedlib/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/sharedlib/src/plan/plan.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/sharedlib/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/sharedlib/src/plan/plan.xml Mon May 8 13:16:26 2006
@@ -19,7 +19,7 @@
<!--
Configuration for SharedLib.
-->
-<configuration
+<module
xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
>
@@ -33,4 +33,4 @@
</reference>
</gbean>
-</configuration>
+</module>
Modified: geronimo/branches/1.1/configs/shutdown/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/shutdown/src/plan/plan.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/shutdown/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/shutdown/src/plan/plan.xml Mon May 8 13:16:26 2006
@@ -16,6 +16,6 @@
limitations under the License.
-->
-<configuration xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
<environment/>
-</configuration>
+</module>
Modified: geronimo/branches/1.1/configs/tomcat-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/tomcat-deployer/src/plan/plan.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/tomcat-deployer/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/tomcat-deployer/src/plan/plan.xml Mon May 8 13:16:26 2006
@@ -18,7 +18,7 @@
<!-- $Rev$ $Date$ -->
-<configuration xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
<gbean name="TomcatWebBuilder" class="org.apache.geronimo.tomcat.deployment.TomcatModuleBuilder">
<attribute name="defaultContextPriorityClassloader">false</attribute>
@@ -67,4 +67,4 @@
</xml-attribute>
</gbean>
-</configuration>
+</module>
Modified: geronimo/branches/1.1/configs/tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/tomcat/src/plan/plan.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/tomcat/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/tomcat/src/plan/plan.xml Mon May 8 13:16:26 2006
@@ -21,7 +21,7 @@
<!--
Configuration for Tomcat server.
-->
-<configuration
+<module
xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
>
@@ -215,4 +215,4 @@
-->
</gbean>
-</configuration>
+</module>
Modified: geronimo/branches/1.1/configs/unavailable-client-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/unavailable-client-deployer/src/plan/plan.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/unavailable-client-deployer/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/unavailable-client-deployer/src/plan/plan.xml Mon May 8 13:16:26 2006
@@ -16,10 +16,10 @@
limitations under the License.
-->
-<configuration xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
>
<gbean name="UnavailableAppClientBuilder" class="org.apache.geronimo.j2ee.deployment.UnavailableModuleBuilder" />
-</configuration>
+</module>
Modified: geronimo/branches/1.1/configs/unavailable-ejb-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/unavailable-ejb-deployer/src/plan/plan.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/unavailable-ejb-deployer/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/unavailable-ejb-deployer/src/plan/plan.xml Mon May 8 13:16:26 2006
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<configuration xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
>
@@ -26,4 +26,4 @@
<gbean name="UnavailableServerEJBReferenceBuilder" class="org.apache.geronimo.j2ee.deployment.UnavailableEJBReferenceBuilder" />
-</configuration>
+</module>
Modified: geronimo/branches/1.1/configs/unavailable-webservices-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/unavailable-webservices-deployer/src/plan/plan.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/unavailable-webservices-deployer/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/unavailable-webservices-deployer/src/plan/plan.xml Mon May 8 13:16:26 2006
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<configuration xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
>
@@ -24,4 +24,4 @@
<gbean name="UnavailableServiceReferenceBuilder" class="org.apache.geronimo.j2ee.deployment.UnavailableServiceReferenceBuilder" />
-</configuration>
+</module>
Modified: geronimo/branches/1.1/modules/client-builder/src/schema/geronimo-application-client-1.1.xsd
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/client-builder/src/schema/geronimo-application-client-1.1.xsd?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/client-builder/src/schema/geronimo-application-client-1.1.xsd (original)
+++ geronimo/branches/1.1/modules/client-builder/src/schema/geronimo-application-client-1.1.xsd Mon May 8 13:16:26 2006
@@ -31,7 +31,7 @@
<xs:import namespace="http://geronimo.apache.org/xml/ns/naming-1.1" schemaLocation="geronimo-naming-1.1.xsd"/>
<xs:import namespace="http://geronimo.apache.org/xml/ns/security-1.1" schemaLocation="geronimo-security-1.1.xsd"/>
<xs:import namespace="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1" schemaLocation="geronimo-connector-1.1.xsd"/>
- <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.1" schemaLocation="geronimo-config-1.1.xsd"/>
+ <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.1" schemaLocation="geronimo-module-1.1.xsd"/>
<xs:element name="application-client" type="geronimo:application-clientType"/>
Modified: geronimo/branches/1.1/modules/client-builder/src/test-resources/plans/plan1.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/client-builder/src/test-resources/plans/plan1.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/client-builder/src/test-resources/plans/plan1.xml (original)
+++ geronimo/branches/1.1/modules/client-builder/src/test-resources/plans/plan1.xml Mon May 8 13:16:26 2006
@@ -4,20 +4,20 @@
configId="client"
parentId="org/apache/geronimo/DefaultDatabase">-->
<dep:client-environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <dep:configId>
+ <dep:moduleId>
<dep:groupId>test</dep:groupId>
<dep:artifactId>testclient</dep:artifactId>
<dep:version>1</dep:version>
<dep:type>car</dep:type>
- </dep:configId>
+ </dep:moduleId>
</dep:client-environment>
<dep:server-environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <dep:configId>
+ <dep:moduleId>
<dep:groupId>test</dep:groupId>
<dep:artifactId>testserver</dep:artifactId>
<dep:version>1</dep:version>
<dep:type>car</dep:type>
- </dep:configId>
+ </dep:moduleId>
</dep:server-environment>
<nam:resource-ref xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.1">
<nam:ref-name>jdbc/DB1</nam:ref-name>
Modified: geronimo/branches/1.1/modules/client-builder/src/test-resources/plans/plan2.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/client-builder/src/test-resources/plans/plan2.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/client-builder/src/test-resources/plans/plan2.xml (original)
+++ geronimo/branches/1.1/modules/client-builder/src/test-resources/plans/plan2.xml Mon May 8 13:16:26 2006
@@ -4,20 +4,20 @@
configId="client"
parentId="org/apache/geronimo/DefaultDatabase">-->
<dep:client-environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <dep:configId>
+ <dep:moduleId>
<dep:groupId>test</dep:groupId>
<dep:artifactId>testclient</dep:artifactId>
<dep:version>1</dep:version>
<dep:type>car</dep:type>
- </dep:configId>
+ </dep:moduleId>
</dep:client-environment>
<dep:server-environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <dep:configId>
+ <dep:moduleId>
<dep:groupId>test</dep:groupId>
<dep:artifactId>testserver</dep:artifactId>
<dep:version>1</dep:version>
<dep:type>car</dep:type>
- </dep:configId>
+ </dep:moduleId>
</dep:server-environment>
<nam:resource-ref xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.1">
<nam:ref-name>jdbc/DB1</nam:ref-name>
@@ -27,12 +27,12 @@
<external-rar>tranql/rars/tranql-connector-1.0-SNAPSHOT</external-rar>
<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
<dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <dep:configId>
+ <dep:moduleId>
<dep:groupId>test</dep:groupId>
<dep:artifactId>testclient</dep:artifactId>
<dep:version>1</dep:version>
<dep:type>car</dep:type>
- </dep:configId>
+ </dep:moduleId>
<dep:dependencies>
<dep:dependency>
<dep:groupId>axion</dep:groupId>
Modified: geronimo/branches/1.1/modules/client-builder/src/test/org/apache/geronimo/client/builder/PlanParsingTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/client-builder/src/test/org/apache/geronimo/client/builder/PlanParsingTest.java?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/client-builder/src/test/org/apache/geronimo/client/builder/PlanParsingTest.java (original)
+++ geronimo/branches/1.1/modules/client-builder/src/test/org/apache/geronimo/client/builder/PlanParsingTest.java Mon May 8 13:16:26 2006
@@ -33,11 +33,11 @@
GerApplicationClientDocument appClientDoc = GerApplicationClientDocument.Factory.newInstance();
GerApplicationClientType appClient = appClientDoc.addNewApplicationClient();
EnvironmentType clientEnvironmentType = appClient.addNewClientEnvironment();
- ArtifactType clientId = clientEnvironmentType.addNewConfigId();
+ ArtifactType clientId = clientEnvironmentType.addNewModuleId();
clientId.setGroupId("group");
clientId.setArtifactId("artifact");
EnvironmentType serverEnvironmentType = appClient.addNewServerEnvironment();
- serverEnvironmentType.setConfigId(clientId);
+ serverEnvironmentType.setModuleId(clientId);
GerResourceRefType ref = appClient.addNewResourceRef();
ref.setRefName("ref");
Modified: geronimo/branches/1.1/modules/connector-builder/src/schema/geronimo-connector-1.1.xsd
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/connector-builder/src/schema/geronimo-connector-1.1.xsd?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/connector-builder/src/schema/geronimo-connector-1.1.xsd (original)
+++ geronimo/branches/1.1/modules/connector-builder/src/schema/geronimo-connector-1.1.xsd Mon May 8 13:16:26 2006
@@ -26,7 +26,7 @@
attributeFormDefault="unqualified">
<xs:import namespace="http://geronimo.apache.org/xml/ns/naming-1.1" schemaLocation="geronimo-naming-1.1.xsd"/>
- <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.1" schemaLocation="geronimo-config-1.1.xsd"/>
+ <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.1" schemaLocation="geronimo-module-1.1.xsd"/>
<xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
<xs:annotation>
Modified: geronimo/branches/1.1/modules/connector-builder/src/test-data/connector_1_0/geronimo-ra.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/connector-builder/src/test-data/connector_1_0/geronimo-ra.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/connector-builder/src/test-data/connector_1_0/geronimo-ra.xml (original)
+++ geronimo/branches/1.1/modules/connector-builder/src/test-data/connector_1_0/geronimo-ra.xml Mon May 8 13:16:26 2006
@@ -18,12 +18,12 @@
<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
<environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <configId>
+ <moduleId>
<groupId>geronimo</groupId>
<artifactId>test-ear</artifactId>
<version>1.0</version>
<type>car</type>
- </configId>
+ </moduleId>
</environment>
<resourceadapter>
Modified: geronimo/branches/1.1/modules/connector-builder/src/test-data/connector_1_5/geronimo-ra.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/connector-builder/src/test-data/connector_1_5/geronimo-ra.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/connector-builder/src/test-data/connector_1_5/geronimo-ra.xml (original)
+++ geronimo/branches/1.1/modules/connector-builder/src/test-data/connector_1_5/geronimo-ra.xml Mon May 8 13:16:26 2006
@@ -18,12 +18,12 @@
<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
<environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <configId>
+ <moduleId>
<groupId>geronimo</groupId>
<artifactId>test-ear</artifactId>
<version>1.0</version>
<type>car</type>
- </configId>
+ </moduleId>
</environment>
<resourceadapter>
Modified: geronimo/branches/1.1/modules/connector-builder/src/test-data/connector_1_5_localtx/geronimo-ra.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/connector-builder/src/test-data/connector_1_5_localtx/geronimo-ra.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/connector-builder/src/test-data/connector_1_5_localtx/geronimo-ra.xml (original)
+++ geronimo/branches/1.1/modules/connector-builder/src/test-data/connector_1_5_localtx/geronimo-ra.xml Mon May 8 13:16:26 2006
@@ -18,12 +18,12 @@
<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
<environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <configId>
+ <moduleId>
<groupId>geronimo</groupId>
<artifactId>test-ear</artifactId>
<version>1.0</version>
<type>car</type>
- </configId>
+ </moduleId>
</environment>
<resourceadapter>
Modified: geronimo/branches/1.1/modules/connector-builder/src/test-data/connector_1_5_notx/geronimo-ra.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/connector-builder/src/test-data/connector_1_5_notx/geronimo-ra.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/connector-builder/src/test-data/connector_1_5_notx/geronimo-ra.xml (original)
+++ geronimo/branches/1.1/modules/connector-builder/src/test-data/connector_1_5_notx/geronimo-ra.xml Mon May 8 13:16:26 2006
@@ -18,12 +18,12 @@
<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
<environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <configId>
+ <moduleId>
<groupId>geronimo</groupId>
<artifactId>test-ear</artifactId>
<version>1.0</version>
<type>car</type>
- </configId>
+ </moduleId>
</environment>
<resourceadapter>
Modified: geronimo/branches/1.1/modules/connector-builder/src/test-data/data/external-application-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/connector-builder/src/test-data/data/external-application-plan.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/connector-builder/src/test-data/data/external-application-plan.xml (original)
+++ geronimo/branches/1.1/modules/connector-builder/src/test-data/data/external-application-plan.xml Mon May 8 13:16:26 2006
@@ -19,24 +19,24 @@
<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
<!--parentId="org/apache/geronimo/Server"-->
<environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <configId>
+ <moduleId>
<groupId>geronimo</groupId>
<artifactId>test-ear</artifactId>
<version>1.0</version>
<type>car</type>
- </configId>
+ </moduleId>
</environment>
<module>
<connector>test-rar-10-noger.rar</connector>
<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
<environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <configId>
+ <moduleId>
<groupId>geronimo</groupId>
<artifactId>test-ear</artifactId>
<version>1.0</version>
<type>car</type>
- </configId>
+ </moduleId>
</environment>
<resourceadapter>
@@ -97,12 +97,12 @@
<connector>test-rar-15-noger.rar</connector>
<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
<environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <configId>
+ <moduleId>
<groupId>geronimo</groupId>
<artifactId>test-ear</artifactId>
<version>1.0</version>
<type>car</type>
- </configId>
+ </moduleId>
</environment>
Modified: geronimo/branches/1.1/modules/connector-builder/src/test-data/ear/geronimo-application.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/connector-builder/src/test-data/ear/geronimo-application.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/connector-builder/src/test-data/ear/geronimo-application.xml (original)
+++ geronimo/branches/1.1/modules/connector-builder/src/test-data/ear/geronimo-application.xml Mon May 8 13:16:26 2006
@@ -18,11 +18,11 @@
<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
<environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <configId>
+ <moduleId>
<groupId>geronimo</groupId>
<artifactId>test-ear</artifactId>
<version>1.0</version>
<type>car</type>
- </configId>
+ </moduleId>
</environment>
</application>
Modified: geronimo/branches/1.1/modules/deploy-tool/src/java/org/apache/geronimo/deployment/PluginBootstrap.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/deploy-tool/src/java/org/apache/geronimo/deployment/PluginBootstrap.java?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/deploy-tool/src/java/org/apache/geronimo/deployment/PluginBootstrap.java (original)
+++ geronimo/branches/1.1/modules/deploy-tool/src/java/org/apache/geronimo/deployment/PluginBootstrap.java Mon May 8 13:16:26 2006
@@ -22,8 +22,8 @@
import java.util.jar.JarOutputStream;
import org.apache.geronimo.deployment.service.ServiceConfigBuilder;
-import org.apache.geronimo.deployment.xbeans.ConfigurationDocument;
-import org.apache.geronimo.deployment.xbeans.ConfigurationType;
+import org.apache.geronimo.deployment.xbeans.ModuleDocument;
+import org.apache.geronimo.deployment.xbeans.ModuleType;
import org.apache.geronimo.kernel.Jsr77Naming;
import org.apache.geronimo.kernel.config.ConfigurationAlreadyExistsException;
import org.apache.geronimo.kernel.config.ConfigurationData;
@@ -67,7 +67,7 @@
System.out.println(" Packaging configuration " + plan);
System.out.println();
- ConfigurationType config = ConfigurationDocument.Factory.parse(plan).getConfiguration();
+ ModuleType config = ModuleDocument.Factory.parse(plan).getModule();
Maven1Repository repository = new Maven1Repository(localRepo);
ServiceConfigBuilder builder = new ServiceConfigBuilder(null, Collections.singleton(repository), new Jsr77Naming());
Modified: geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java Mon May 8 13:16:26 2006
@@ -389,7 +389,7 @@
// construct the empty geronimo-application.xml
GerApplicationType gerApplication = GerApplicationType.Factory.newInstance();
EnvironmentType environmentType = gerApplication.addNewEnvironment();
- ArtifactType artifactType = environmentType.addNewConfigId();
+ ArtifactType artifactType = environmentType.addNewModuleId();
artifactType.setGroupId(Artifact.DEFAULT_GROUP_ID);
Modified: geronimo/branches/1.1/modules/j2ee-builder/src/schema/geronimo-application-1.1.xsd
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/schema/geronimo-application-1.1.xsd?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/schema/geronimo-application-1.1.xsd (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/schema/geronimo-application-1.1.xsd Mon May 8 13:16:26 2006
@@ -27,7 +27,7 @@
version="1.0">
<xs:import namespace="http://geronimo.apache.org/xml/ns/security-1.1" schemaLocation="geronimo-security-1.1.xsd"/>
- <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.1" schemaLocation="geronimo-config-1.1.xsd"/>
+ <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.1" schemaLocation="geronimo-module-1.1.xsd"/>
<xs:element name="application" type="geronimo:applicationType"/>
Modified: geronimo/branches/1.1/modules/j2ee-builder/src/test-ear/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/test-ear/META-INF/geronimo-application.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/test-ear/META-INF/geronimo-application.xml (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/test-ear/META-INF/geronimo-application.xml Mon May 8 13:16:26 2006
@@ -18,12 +18,12 @@
<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
<environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <configId>
+ <moduleId>
<groupId>geronimo</groupId>
<artifactId>test-ear</artifactId>
<version>1.0</version>
<type>car</type>
- </configId>
+ </moduleId>
</environment>
<!-- a random gbean just to verify that the deployer doesn't die because of it -->
<gbean xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1" name="foo"
Modified: geronimo/branches/1.1/modules/j2ee-builder/src/test-ear/test-ejb-jar/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/test-ear/test-ejb-jar/META-INF/openejb-jar.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/test-ear/test-ejb-jar/META-INF/openejb-jar.xml (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/test-ear/test-ejb-jar/META-INF/openejb-jar.xml Mon May 8 13:16:26 2006
@@ -19,12 +19,12 @@
xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1">
<environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <configId>
+ <moduleId>
<groupId>geronimo</groupId>
<artifactId>test-ejb</artifactId>
<version>1.0</version>
<type>car</type>
- </configId>
+ </moduleId>
</environment>
<cmp-connection-factory>DefaultDatasource</cmp-connection-factory>
Modified: geronimo/branches/1.1/modules/j2ee-builder/src/test-ear/test-rar/META-INF/geronimo-ra.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/test-ear/test-rar/META-INF/geronimo-ra.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/test-ear/test-rar/META-INF/geronimo-ra.xml (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/test-ear/test-rar/META-INF/geronimo-ra.xml Mon May 8 13:16:26 2006
@@ -18,12 +18,12 @@
<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee">
<environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <configId>
+ <moduleId>
<groupId>geronimo</groupId>
<artifactId>test-rar</artifactId>
<version>1.0</version>
<type>car</type>
- </configId>
+ </moduleId>
</environment>
</connector>
Modified: geronimo/branches/1.1/modules/j2ee-builder/src/test-ear/test-war/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/test-ear/test-war/WEB-INF/geronimo-web.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/test-ear/test-war/WEB-INF/geronimo-web.xml (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/test-ear/test-war/WEB-INF/geronimo-web.xml Mon May 8 13:16:26 2006
@@ -18,12 +18,12 @@
<jetty:web-app xmlns:jetty="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1">
<environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <configId>
+ <moduleId>
<groupId>geronimo</groupId>
<artifactId>test-ear</artifactId>
<version>1.0</version>
<type>car</type>
- </configId>
+ </moduleId>
</environment>
<jetty:context-priority-classloader>false</jetty:context-priority-classloader>
<!--
Modified: geronimo/branches/1.1/modules/j2ee-builder/src/test-ear13/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/test-ear13/META-INF/geronimo-application.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/test-ear13/META-INF/geronimo-application.xml (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/test-ear13/META-INF/geronimo-application.xml Mon May 8 13:16:26 2006
@@ -18,12 +18,12 @@
<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
<environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <configId>
+ <moduleId>
<groupId>geronimo</groupId>
<artifactId>test-ear</artifactId>
<version>1.0</version>
<type>car</type>
- </configId>
+ </moduleId>
</environment>
<!-- a random gbean just to verify that the deployer doesn't die because of it -->
Modified: geronimo/branches/1.1/modules/j2ee-builder/src/test-ear13/test-ejb-jar/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/test-ear13/test-ejb-jar/META-INF/openejb-jar.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/test-ear13/test-ejb-jar/META-INF/openejb-jar.xml (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/test-ear13/test-ejb-jar/META-INF/openejb-jar.xml Mon May 8 13:16:26 2006
@@ -19,12 +19,12 @@
<openejb-jar
xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.0">
<environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <configId>
+ <moduleId>
<groupId>geronimo</groupId>
<artifactId>test-ejb</artifactId>
<version>1.0</version>
<type>car</type>
- </configId>
+ </moduleId>
</environment>
<cmp-connection-factory>DefaultDatasource</cmp-connection-factory>
Modified: geronimo/branches/1.1/modules/j2ee-builder/src/test-ear13/test-war/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/test-ear13/test-war/WEB-INF/geronimo-web.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/test-ear13/test-war/WEB-INF/geronimo-web.xml (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/test-ear13/test-war/WEB-INF/geronimo-web.xml Mon May 8 13:16:26 2006
@@ -18,12 +18,12 @@
<jetty:web-app xmlns:jetty="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1">
<environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <configId>
+ <moduleId>
<groupId>geronimo</groupId>
<artifactId>test-ear</artifactId>
<version>1.0</version>
<type>car</type>
- </configId>
+ </moduleId>
</environment>
<jetty:context-priority-classloader>false</jetty:context-priority-classloader>
<!--
Modified: geronimo/branches/1.1/modules/j2ee-builder/src/test-plan/test-bad-car.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/test-plan/test-bad-car.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/test-plan/test-bad-car.xml (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/test-plan/test-bad-car.xml Mon May 8 13:16:26 2006
@@ -18,12 +18,12 @@
<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
<environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <configId>
+ <moduleId>
<groupId>geronimo</groupId>
<artifactId>test-ear</artifactId>
<version>1.0</version>
<type>car</type>
- </configId>
+ </moduleId>
</environment>
<module>
Modified: geronimo/branches/1.1/modules/j2ee-builder/src/test-plan/test-bad-ejb-jar.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/test-plan/test-bad-ejb-jar.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/test-plan/test-bad-ejb-jar.xml (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/test-plan/test-bad-ejb-jar.xml Mon May 8 13:16:26 2006
@@ -18,12 +18,12 @@
<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
<environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <configId>
+ <moduleId>
<groupId>geronimo</groupId>
<artifactId>test-ear</artifactId>
<version>1.0</version>
<type>car</type>
- </configId>
+ </moduleId>
</environment>
<module>
Modified: geronimo/branches/1.1/modules/j2ee-builder/src/test-plan/test-bad-rar.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/test-plan/test-bad-rar.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/test-plan/test-bad-rar.xml (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/test-plan/test-bad-rar.xml Mon May 8 13:16:26 2006
@@ -18,12 +18,12 @@
<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
<environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <configId>
+ <moduleId>
<groupId>geronimo</groupId>
<artifactId>test-ear</artifactId>
<version>1.0</version>
<type>car</type>
- </configId>
+ </moduleId>
</environment>
<module>
Modified: geronimo/branches/1.1/modules/j2ee-builder/src/test-plan/test-bad-war.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/test-plan/test-bad-war.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/test-plan/test-bad-war.xml (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/test-plan/test-bad-war.xml Mon May 8 13:16:26 2006
@@ -18,12 +18,12 @@
<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
<environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <configId>
+ <moduleId>
<groupId>geronimo</groupId>
<artifactId>test-ear</artifactId>
<version>1.0</version>
<type>car</type>
- </configId>
+ </moduleId>
</environment>
<module>
Modified: geronimo/branches/1.1/modules/j2ee-builder/src/test-unpacked-ear/META-INF/geronimo-application-alt-dd.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/test-unpacked-ear/META-INF/geronimo-application-alt-dd.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/test-unpacked-ear/META-INF/geronimo-application-alt-dd.xml (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/test-unpacked-ear/META-INF/geronimo-application-alt-dd.xml Mon May 8 13:16:26 2006
@@ -18,12 +18,12 @@
<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
<environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <configId>
+ <moduleId>
<groupId>geronimo</groupId>
<artifactId>test-ear</artifactId>
<version>1.0</version>
<type>car</type>
- </configId>
+ </moduleId>
</environment>
<module>
Modified: geronimo/branches/1.1/modules/j2ee-builder/src/test-unpacked-ear/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/test-unpacked-ear/META-INF/geronimo-application.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/test-unpacked-ear/META-INF/geronimo-application.xml (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/test-unpacked-ear/META-INF/geronimo-application.xml Mon May 8 13:16:26 2006
@@ -18,12 +18,12 @@
<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
<environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <configId>
+ <moduleId>
<groupId>geronimo</groupId>
<artifactId>test-ear</artifactId>
<version>1.0</version>
<type>car</type>
- </configId>
+ </moduleId>
</environment>
<!-- a random gbean just to verify that the deployer doesn't die because of it -->
Modified: geronimo/branches/1.1/modules/j2ee-schema/src/test-data/geronimo/ejb-naming-post.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-schema/src/test-data/geronimo/ejb-naming-post.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-schema/src/test-data/geronimo/ejb-naming-post.xml (original)
+++ geronimo/branches/1.1/modules/j2ee-schema/src/test-data/geronimo/ejb-naming-post.xml Mon May 8 13:16:26 2006
@@ -2,12 +2,12 @@
<openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1" xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.1" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
<dep:environment>
- <dep:configId>
+ <dep:moduleId>
<dep:groupId>test</dep:groupId>
<dep:type>car</dep:type>
<dep:artifactId>testclient</dep:artifactId>
<dep:version>1</dep:version>
- </dep:configId>
+ </dep:moduleId>
</dep:environment>
<nam:cmp-connection-factory>
<nam:application>null</nam:application>
Modified: geronimo/branches/1.1/modules/j2ee-schema/src/test-data/geronimo/ejb-naming-pre.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-schema/src/test-data/geronimo/ejb-naming-pre.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-schema/src/test-data/geronimo/ejb-naming-pre.xml (original)
+++ geronimo/branches/1.1/modules/j2ee-schema/src/test-data/geronimo/ejb-naming-pre.xml Mon May 8 13:16:26 2006
@@ -4,12 +4,12 @@
xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1">
<environment>
- <configId>
+ <moduleId>
<groupId>test</groupId>
<type>car</type>
<artifactId>testclient</artifactId>
<version>1</version>
- </configId>
+ </moduleId>
</environment>
<cmp-connection-factory>
Modified: geronimo/branches/1.1/modules/jetty-builder/src/schema/geronimo-jetty-1.1.xsd
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/jetty-builder/src/schema/geronimo-jetty-1.1.xsd?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty-builder/src/schema/geronimo-jetty-1.1.xsd (original)
+++ geronimo/branches/1.1/modules/jetty-builder/src/schema/geronimo-jetty-1.1.xsd Mon May 8 13:16:26 2006
@@ -29,7 +29,7 @@
<xs:import namespace="http://geronimo.apache.org/xml/ns/naming-1.1" schemaLocation="geronimo-naming-1.1.xsd"/>
<xs:import namespace="http://geronimo.apache.org/xml/ns/security-1.1" schemaLocation="geronimo-security-1.1.xsd"/>
- <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.1" schemaLocation="geronimo-config-1.1.xsd"/>
+ <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.1" schemaLocation="geronimo-module-1.1.xsd"/>
<xs:element name="web-app" type="web:web-appType"/>
Modified: geronimo/branches/1.1/modules/jetty-builder/src/test-resources/deployables/war-spaces-in-context/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/jetty-builder/src/test-resources/deployables/war-spaces-in-context/WEB-INF/geronimo-web.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty-builder/src/test-resources/deployables/war-spaces-in-context/WEB-INF/geronimo-web.xml (original)
+++ geronimo/branches/1.1/modules/jetty-builder/src/test-resources/deployables/war-spaces-in-context/WEB-INF/geronimo-web.xml Mon May 8 13:16:26 2006
@@ -6,10 +6,10 @@
xmlns:security="http://geronimo.apache.org/xml/ns/security-1.1"
>
<environment>
- <configId>
+ <moduleId>
<groupId>contextRootTest</groupId>
<artifactId>spacesInContext</artifactId>
- </configId>
+ </moduleId>
</environment>
<context-root>
Modified: geronimo/branches/1.1/modules/jetty-builder/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/jetty-builder/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty-builder/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml (original)
+++ geronimo/branches/1.1/modules/jetty-builder/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml Mon May 8 13:16:26 2006
@@ -19,12 +19,12 @@
<jetty:web-app
xmlns:jetty="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
<environment>
- <configId>
+ <moduleId>
<groupId>foo</groupId>
<artifactId>bar</artifactId>
<version>1</version>
<type>car</type>
- </configId>
+ </moduleId>
</environment>
<jetty:context-root>/test</jetty:context-root>
Modified: geronimo/branches/1.1/modules/jetty-builder/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/jetty-builder/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty-builder/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml (original)
+++ geronimo/branches/1.1/modules/jetty-builder/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml Mon May 8 13:16:26 2006
@@ -20,12 +20,12 @@
xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1"
xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1">
<environment>
- <configId>
+ <moduleId>
<groupId>foo</groupId>
<artifactId>bar</artifactId>
<version>1</version>
<type>car</type>
- </configId>
+ </moduleId>
</environment>
<context-root>/test</context-root>
Modified: geronimo/branches/1.1/modules/jetty-builder/src/test-resources/deployables/war5/WEB-INF/geronimo-jetty.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/jetty-builder/src/test-resources/deployables/war5/WEB-INF/geronimo-jetty.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty-builder/src/test-resources/deployables/war5/WEB-INF/geronimo-jetty.xml (original)
+++ geronimo/branches/1.1/modules/jetty-builder/src/test-resources/deployables/war5/WEB-INF/geronimo-jetty.xml Mon May 8 13:16:26 2006
@@ -20,12 +20,12 @@
xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1"
xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1">
<environment>
- <configId>
+ <moduleId>
<groupId>foo</groupId>
<artifactId>bar</artifactId>
<version>1</version>
<type>car</type>
- </configId>
+ </moduleId>
</environment>
<context-root>/test</context-root>
Modified: geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan1.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan1.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan1.xml (original)
+++ geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan1.xml Mon May 8 13:16:26 2006
@@ -2,12 +2,12 @@
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
<environment>
- <configId>
+ <moduleId>
<groupId>foo</groupId>
<artifactId>bar</artifactId>
<version>1</version>
<type>car</type>
- </configId>
+ </moduleId>
</environment>
<context-priority-classloader>false</context-priority-classloader>
Modified: geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan1A.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan1A.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan1A.xml (original)
+++ geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan1A.xml Mon May 8 13:16:26 2006
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
<environment>
- <configId>
+ <moduleId>
<groupId>foo</groupId>
<artifactId>bar</artifactId>
<version>1</version>
<type>car</type>
- </configId>
+ </moduleId>
</environment>
<context-priority-classloader>false</context-priority-classloader>
<security-realm-name>public-properties-realm</security-realm-name>
Modified: geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan1B.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan1B.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan1B.xml (original)
+++ geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan1B.xml Mon May 8 13:16:26 2006
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
<environment>
- <configId>
+ <moduleId>
<groupId>foo</groupId>
<artifactId>bar</artifactId>
<version>1</version>
<type>car</type>
- </configId>
+ </moduleId>
</environment>
<context-priority-classloader>false</context-priority-classloader>
<security-realm-name>public-properties-realm</security-realm-name>
Modified: geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan1C.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan1C.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan1C.xml (original)
+++ geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan1C.xml Mon May 8 13:16:26 2006
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
<environment>
- <configId>
+ <moduleId>
<groupId>foo</groupId>
<artifactId>bar</artifactId>
<version>1</version>
<type>car</type>
- </configId>
+ </moduleId>
</environment>
<context-priority-classloader>false</context-priority-classloader>
Modified: geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan2.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan2.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan2.xml (original)
+++ geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan2.xml Mon May 8 13:16:26 2006
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1">
<environment>
- <configId>
+ <moduleId>
<groupId>foo</groupId>
<artifactId>bar</artifactId>
<version>1</version>
<type>car</type>
- </configId>
+ </moduleId>
</environment>
<context-priority-classloader>false</context-priority-classloader>
<resource-ref>