geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r561286 - in /geronimo/server/branches/2.0: configs/client-deployer/ configs/client-deployer/src/plan/ configs/j2ee-deployer/src/plan/ configs/jetty6/src/plan/ configs/uddi-jetty6/ configs/uddi-jetty6/src/plan/ configs/uddi-tomcat/ configs/...
Date Tue, 31 Jul 2007 09:39:55 GMT
Author: djencks
Date: Tue Jul 31 02:39:53 2007
New Revision: 561286

URL: http://svn.apache.org/viewvc?view=rev&rev=561286
Log:
GERONIMO-2286 GERONIMO-1874 GERONIMO-3140 Use patterns for external-rar in app client plans and external-path in ear plan external modules.  Allow partial artifacts and use an ArtifactResolver to fill in the missing bits.  Use client_artifact_aliases.properties in the app client builder to help avoid using server side modules when client side modules are intended for runtime.  This is not backward compatible for apps using external-rar or external-path. Port from trunk.

Added:
    geronimo/server/branches/2.0/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/OptionalExplicitDefaultArtifactResolver.java
      - copied unchanged from r561259, geronimo/server/trunk/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/OptionalExplicitDefaultArtifactResolver.java
    geronimo/server/branches/2.0/modules/geronimo-client-builder/src/main/xsd/geronimo-application-client-2.0.xsd
      - copied unchanged from r561259, geronimo/server/trunk/modules/geronimo-client-builder/src/main/xsd/geronimo-application-client-2.0.xsd
    geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/main/xsd/geronimo-application-2.0.xsd
      - copied unchanged from r561259, geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/xsd/geronimo-application-2.0.xsd
Removed:
    geronimo/server/branches/2.0/modules/geronimo-client-builder/src/main/xsd/geronimo-application-client-1.2.xsd
    geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/main/xsd/geronimo-application-1.2.xsd
Modified:
    geronimo/server/branches/2.0/configs/client-deployer/pom.xml
    geronimo/server/branches/2.0/configs/client-deployer/src/plan/plan.xml
    geronimo/server/branches/2.0/configs/j2ee-deployer/src/plan/plan.xml
    geronimo/server/branches/2.0/configs/jetty6/src/plan/plan.xml
    geronimo/server/branches/2.0/configs/uddi-jetty6/pom.xml
    geronimo/server/branches/2.0/configs/uddi-jetty6/src/plan/plan.xml
    geronimo/server/branches/2.0/configs/uddi-tomcat/pom.xml
    geronimo/server/branches/2.0/configs/uddi-tomcat/src/plan/plan.xml
    geronimo/server/branches/2.0/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
    geronimo/server/branches/2.0/modules/geronimo-client-builder/src/main/xsdconfig/xmlconfig.xml
    geronimo/server/branches/2.0/modules/geronimo-client-builder/src/test/java/org/apache/geronimo/client/builder/PlanParsingTest.java
    geronimo/server/branches/2.0/modules/geronimo-client-builder/src/test/resources/plans/plan2.xml
    geronimo/server/branches/2.0/modules/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
    geronimo/server/branches/2.0/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xmlbeans/XmlBeansUtil.java
    geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
    geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/main/xsdconfig/xmlconfig.xml
    geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTestSupport.java
    geronimo/server/branches/2.0/modules/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-1.2.xsd
    geronimo/server/branches/2.0/modules/geronimo-jetty6-clustering-builder-wadi/src/main/xsd/geronimo-clustering-wadi-1.2.xsd
    geronimo/server/branches/2.0/modules/geronimo-naming-builder/src/main/xsd/geronimo-naming-1.2.xsd
    geronimo/server/branches/2.0/modules/geronimo-openejb-builder/src/main/xsd/geronimo-openejb-2.0.xsd
    geronimo/server/branches/2.0/modules/geronimo-security-builder/src/main/xsd/geronimo-security-1.2.xsd
    geronimo/server/branches/2.0/modules/geronimo-security-builder/src/main/xsd/geronimo-security-2.0.xsd
    geronimo/server/branches/2.0/modules/geronimo-security-builder/src/main/xsd/geronimo-subject-info-1.0.xsd
    geronimo/server/branches/2.0/modules/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-1.2.xsd
    geronimo/server/branches/2.0/modules/geronimo-upgrade/src/main/java/org/apache/geronimo/upgrade/Upgrade1_0To1_1.java
    geronimo/server/branches/2.0/modules/geronimo-upgrade/src/test/data/appclient_dep_1_result.xml
    geronimo/server/branches/2.0/modules/geronimo-upgrade/src/test/data/appclient_ejb_1_result.xml
    geronimo/server/branches/2.0/modules/geronimo-upgrade/src/test/data/assembly_1_result.xml
    geronimo/server/branches/2.0/modules/geronimo-upgrade/src/test/data/gbean_1_result.xml
    geronimo/server/branches/2.0/modules/geronimo-upgrade/src/test/data/servlet_1_result.xml
    geronimo/server/branches/2.0/modules/geronimo-upgrade/src/test/data/transport_1_result.xml
    geronimo/server/branches/2.0/modules/geronimo-upgrade/src/test/data/transport_2_result.xml
    geronimo/server/branches/2.0/modules/geronimo-web-2.5-builder/src/main/xsd/geronimo-web-1.2.xsd

Modified: geronimo/server/branches/2.0/configs/client-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/configs/client-deployer/pom.xml?view=diff&rev=561286&r1=561285&r2=561286
==============================================================================
--- geronimo/server/branches/2.0/configs/client-deployer/pom.xml (original)
+++ geronimo/server/branches/2.0/configs/client-deployer/pom.xml Tue Jul 31 02:39:53 2007
@@ -63,7 +63,7 @@
             <version>${version}</version>
         </dependency>
 
-       <dependency>
+        <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-connector-builder</artifactId>
             <version>${version}</version>

Modified: geronimo/server/branches/2.0/configs/client-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/configs/client-deployer/src/plan/plan.xml?view=diff&rev=561286&r1=561285&r2=561286
==============================================================================
--- geronimo/server/branches/2.0/configs/client-deployer/src/plan/plan.xml (original)
+++ geronimo/server/branches/2.0/configs/client-deployer/src/plan/plan.xml Tue Jul 31 02:39:53 2007
@@ -72,6 +72,9 @@
         <reference name="ConnectorModuleBuilder">
             <name>ClientConnectorBuilder</name>
         </reference>
+        <reference name="ClientArtifactResolver">
+            <name>ClientArtifactResolver</name>
+        </reference>
         <xml-attribute name="defaultServerEnvironment">
             <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <dependencies>
@@ -105,6 +108,20 @@
                 </dependencies>
             </environment>
         </xml-attribute>
+    </gbean>
+
+    <gbean name="ClientArtifactResolver" class="org.apache.geronimo.client.builder.OptionalExplicitDefaultArtifactResolver">
+        <reference name="ArtifactManager">
+            <name>ArtifactManager</name>
+        </reference>
+        <reference name="Repositories"></reference>
+        <attribute name="versionMapLocation">var/config/client_artifact_aliases.properties</attribute>
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
+        </reference>
+        <reference name="FallbackArtifactResolver">
+            <name>ArtifactResolver</name>
+        </reference>
     </gbean>
 
     <gbean name="SwitchingClientServiceRefBuilder" class="org.apache.geronimo.naming.deployment.SwitchingServiceRefBuilder">

Modified: geronimo/server/branches/2.0/configs/j2ee-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/configs/j2ee-deployer/src/plan/plan.xml?view=diff&rev=561286&r1=561285&r2=561286
==============================================================================
--- geronimo/server/branches/2.0/configs/j2ee-deployer/src/plan/plan.xml (original)
+++ geronimo/server/branches/2.0/configs/j2ee-deployer/src/plan/plan.xml Tue Jul 31 02:39:53 2007
@@ -63,6 +63,9 @@
                 <name>UnavailableAppClientBuilder</name>
             </pattern>
         </references>
+        <reference name="ArtifactResolvers">
+            <name>ArtifactResolver</name>
+        </reference>
         <xml-attribute name="defaultEnvironment">
             <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <dependencies>

Modified: geronimo/server/branches/2.0/configs/jetty6/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/configs/jetty6/src/plan/plan.xml?view=diff&rev=561286&r1=561285&r2=561286
==============================================================================
--- geronimo/server/branches/2.0/configs/jetty6/src/plan/plan.xml (original)
+++ geronimo/server/branches/2.0/configs/jetty6/src/plan/plan.xml Tue Jul 31 02:39:53 2007
@@ -88,6 +88,7 @@
     </gbean>
 
     <!-- DONT USE THIS ONE -->
+<!--
     <gbean name="JettySSLConnector" class="org.apache.geronimo.jetty6.connector.HTTPSSocketConnector">
         <attribute name="host">${PlanServerHostname}</attribute>
         <attribute name="port">${PlanHTTPSPort}</attribute>
@@ -108,7 +109,8 @@
             <name>KeystoreManager</name>
         </reference>
     </gbean>
-<!-- USE THIS ONE
+-->
+<!-- USE THIS ONE -->
     <gbean name="JettySSLConnector" class="org.apache.geronimo.jetty6.connector.HTTPSSelectChannelConnector">
         <attribute name="host">${PlanServerHostname}</attribute>
         <attribute name="port">${PlanHTTPSPort}</attribute>
@@ -129,6 +131,5 @@
             <name>KeystoreManager</name>
         </reference>
     </gbean>
--->
 
 </module>

Modified: geronimo/server/branches/2.0/configs/uddi-jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/configs/uddi-jetty6/pom.xml?view=diff&rev=561286&r1=561285&r2=561286
==============================================================================
--- geronimo/server/branches/2.0/configs/uddi-jetty6/pom.xml (original)
+++ geronimo/server/branches/2.0/configs/uddi-jetty6/pom.xml Tue Jul 31 02:39:53 2007
@@ -54,6 +54,12 @@
             <artifactId>geronimo-uddi-db</artifactId>
             <version>${version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.applications</groupId>
+            <artifactId>geronimo-uddi-server</artifactId>
+            <version>${version}</version>
+            <type>war</type>
+        </dependency>
 
         <dependency>
             <groupId>org.tranql</groupId>

Modified: geronimo/server/branches/2.0/configs/uddi-jetty6/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/configs/uddi-jetty6/src/plan/plan.xml?view=diff&rev=561286&r1=561285&r2=561286
==============================================================================
--- geronimo/server/branches/2.0/configs/uddi-jetty6/src/plan/plan.xml (original)
+++ geronimo/server/branches/2.0/configs/uddi-jetty6/src/plan/plan.xml Tue Jul 31 02:39:53 2007
@@ -22,7 +22,11 @@
 
     <ext-module>
         <web>uddi-jetty</web>
-        <external-path>org.apache.geronimo.applications/geronimo-uddi-server/${version}/war</external-path>
+        <external-path xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+            <dep:groupId>org.apache.geronimo.applications</dep:groupId>
+            <dep:artifactId>geronimo-uddi-server</dep:artifactId>
+            <dep:type>war</dep:type>
+        </external-path>
         <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-${geronimoSchemaVersion}">
             <context-root>/juddi</context-root>
             <gbean name="UDDIResources" class="org.apache.geronimo.system.util.DirectoryInitializationGBean">
@@ -38,7 +42,11 @@
 
     <ext-module>
         <connector>uddi-db</connector>
-        <external-path>org.tranql/tranql-connector-derby-embed-local/${tranqlVendorsVersion}/rar</external-path>
+        <external-path xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+            <dep:groupId>org.tranql</dep:groupId>
+            <dep:artifactId>tranql-connector-derby-embed-local</dep:artifactId>
+            <dep:type>rar</dep:type>
+        </external-path>
         <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-${geronimoSchemaVersion}">
             <resourceadapter>
                 <outbound-resourceadapter>

Modified: geronimo/server/branches/2.0/configs/uddi-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/configs/uddi-tomcat/pom.xml?view=diff&rev=561286&r1=561285&r2=561286
==============================================================================
--- geronimo/server/branches/2.0/configs/uddi-tomcat/pom.xml (original)
+++ geronimo/server/branches/2.0/configs/uddi-tomcat/pom.xml Tue Jul 31 02:39:53 2007
@@ -54,6 +54,12 @@
             <artifactId>geronimo-uddi-db</artifactId>
             <version>${version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.applications</groupId>
+            <artifactId>geronimo-uddi-server</artifactId>
+            <version>${version}</version>
+            <type>war</type>
+        </dependency>
 
         <dependency>
             <groupId>org.tranql</groupId>

Modified: geronimo/server/branches/2.0/configs/uddi-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/configs/uddi-tomcat/src/plan/plan.xml?view=diff&rev=561286&r1=561285&r2=561286
==============================================================================
--- geronimo/server/branches/2.0/configs/uddi-tomcat/src/plan/plan.xml (original)
+++ geronimo/server/branches/2.0/configs/uddi-tomcat/src/plan/plan.xml Tue Jul 31 02:39:53 2007
@@ -22,7 +22,11 @@
 
     <ext-module>
         <web>uddi-tomcat</web>
-        <external-path>org.apache.geronimo.applications/geronimo-uddi-server/${version}/war</external-path>
+        <external-path xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+            <dep:groupId>org.apache.geronimo.applications</dep:groupId>
+            <dep:artifactId>geronimo-uddi-server</dep:artifactId>
+            <dep:type>war</dep:type>
+        </external-path>
         <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-${geronimoSchemaVersion}">
 
             <context-root>/juddi</context-root>
@@ -39,7 +43,11 @@
 
     <ext-module>
         <connector>uddi-db</connector>
-        <external-path>org.tranql/tranql-connector-derby-embed-local/${tranqlVendorsVersion}/rar</external-path>
+        <external-path xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+            <dep:groupId>org.tranql</dep:groupId>
+            <dep:artifactId>tranql-connector-derby-embed-local</dep:artifactId>
+            <dep:type>rar</dep:type>
+        </external-path>
         <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-${geronimoSchemaVersion}">
             <resourceadapter>
                 <outbound-resourceadapter>

Modified: geronimo/server/branches/2.0/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java?view=diff&rev=561286&r1=561285&r2=561286
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java (original)
+++ geronimo/server/branches/2.0/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java Tue Jul 31 02:39:53 2007
@@ -51,6 +51,7 @@
 import org.apache.geronimo.deployment.util.DeploymentUtil;
 import org.apache.geronimo.deployment.util.NestedJarFile;
 import org.apache.geronimo.deployment.xbeans.EnvironmentType;
+import org.apache.geronimo.deployment.xbeans.PatternType;
 import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.AbstractNameQuery;
@@ -80,6 +81,8 @@
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.kernel.repository.Repository;
+import org.apache.geronimo.kernel.repository.ArtifactResolver;
+import org.apache.geronimo.kernel.repository.MissingDependencyException;
 import org.apache.geronimo.schema.SchemaConversionUtils;
 import org.apache.geronimo.security.deploy.SubjectInfo;
 import org.apache.geronimo.security.deployment.SecurityConfiguration;
@@ -103,6 +106,7 @@
 public class AppClientModuleBuilder implements ModuleBuilder, CorbaGBeanNameSource {
     private static final Log log = LogFactory.getLog(AppClientModuleBuilder.class);
     private static final String LINE_SEP = System.getProperty("line.separator");
+    private static final String GERAPPCLIENT_NAMESPACE = GerApplicationClientDocument.type.getDocumentElementName().getNamespaceURI();
 
     private final Environment defaultClientEnvironment;
     private final Environment defaultServerEnvironment;
@@ -118,39 +122,44 @@
 
     private final Collection<Repository> repositories;
 
-    private static final String GERAPPCLIENT_NAMESPACE = GerApplicationClientDocument.type.getDocumentElementName().getNamespaceURI();
+    private final ArtifactResolver clientArtifactResolver;
 
     public AppClientModuleBuilder(Environment defaultClientEnvironment,
-            Environment defaultServerEnvironment,
-            AbstractNameQuery transactionManagerObjectName,
-            AbstractNameQuery connectionTrackerObjectName,
-            AbstractNameQuery corbaGBeanObjectName,
-            AbstractNameQuery credentialStoreName, Collection<Repository> repositories,
-            ModuleBuilder connectorModuleBuilder,
-            NamespaceDrivenBuilder serviceBuilder,
-            Collection<NamingBuilder> namingBuilders,
-            Collection<ModuleBuilderExtension> moduleBuilderExtensions) {
+                                  Environment defaultServerEnvironment,
+                                  AbstractNameQuery transactionManagerObjectName,
+                                  AbstractNameQuery connectionTrackerObjectName,
+                                  AbstractNameQuery corbaGBeanObjectName,
+                                  AbstractNameQuery credentialStoreName,
+                                  Collection<Repository> repositories,
+                                  ModuleBuilder connectorModuleBuilder,
+                                  NamespaceDrivenBuilder serviceBuilder,
+                                  Collection<NamingBuilder> namingBuilders,
+                                  Collection<ModuleBuilderExtension> moduleBuilderExtensions,
+                                  ArtifactResolver clientArtifactResolver) {
         this(defaultClientEnvironment,
                 defaultServerEnvironment,
                 transactionManagerObjectName,
                 connectionTrackerObjectName,
                 corbaGBeanObjectName,
-                credentialStoreName, repositories, new SingleElementCollection(connectorModuleBuilder),
+                credentialStoreName, repositories, new SingleElementCollection<ModuleBuilder>(connectorModuleBuilder),
                 serviceBuilder == null ? Collections.EMPTY_SET : Collections.singleton(serviceBuilder),
                 namingBuilders == null ? Collections.EMPTY_SET : namingBuilders,
-                moduleBuilderExtensions);
+                moduleBuilderExtensions,
+                clientArtifactResolver);
     }
 
     public AppClientModuleBuilder(AbstractNameQuery transactionManagerObjectName,
-            AbstractNameQuery connectionTrackerObjectName,
-            AbstractNameQuery corbaGBeanObjectName,
-            AbstractNameQuery credentialStoreName, Collection<Repository> repositories,
-            Collection connectorModuleBuilder,
-            Collection<NamespaceDrivenBuilder> serviceBuilder,
-            Collection<NamingBuilder> namingBuilders,
-            Collection<ModuleBuilderExtension> moduleBuilderExtensions,
-            Environment defaultClientEnvironment,
-            Environment defaultServerEnvironment
+                                  AbstractNameQuery connectionTrackerObjectName,
+                                  AbstractNameQuery corbaGBeanObjectName,
+                                  AbstractNameQuery credentialStoreName,
+                                  Collection<Repository> repositories,
+                                  Collection<ModuleBuilder> connectorModuleBuilder,
+                                  Collection<NamespaceDrivenBuilder> serviceBuilder,
+                                  Collection<NamingBuilder> namingBuilders,
+                                  Collection<ModuleBuilderExtension> moduleBuilderExtensions,
+                                  ArtifactResolver clientArtifactResolver,
+                                  Environment defaultClientEnvironment,
+                                  Environment defaultServerEnvironment
     ) {
         this(defaultClientEnvironment,
                 defaultServerEnvironment,
@@ -158,23 +167,25 @@
                 connectionTrackerObjectName,
                 corbaGBeanObjectName,
                 credentialStoreName, repositories,
-                new SingleElementCollection(connectorModuleBuilder),
+                new SingleElementCollection<ModuleBuilder>(connectorModuleBuilder),
                 serviceBuilder,
                 namingBuilders,
-                moduleBuilderExtensions);
+                moduleBuilderExtensions,
+                clientArtifactResolver);
     }
 
     private AppClientModuleBuilder(Environment defaultClientEnvironment,
-            Environment defaultServerEnvironment,
-            AbstractNameQuery transactionManagerObjectName,
-            AbstractNameQuery connectionTrackerObjectName,
-            AbstractNameQuery corbaGBeanObjectName,
-            AbstractNameQuery credentialStoreName,
-            Collection<Repository> repositories,
-            SingleElementCollection connectorModuleBuilder,
-            Collection<NamespaceDrivenBuilder> serviceBuilder,
-            Collection<NamingBuilder> namingBuilders,
-            Collection<ModuleBuilderExtension> moduleBuilderExtensions) {
+                                   Environment defaultServerEnvironment,
+                                   AbstractNameQuery transactionManagerObjectName,
+                                   AbstractNameQuery connectionTrackerObjectName,
+                                   AbstractNameQuery corbaGBeanObjectName,
+                                   AbstractNameQuery credentialStoreName,
+                                   Collection<Repository> repositories,
+                                   SingleElementCollection<ModuleBuilder> connectorModuleBuilder,
+                                   Collection<NamespaceDrivenBuilder> serviceBuilder,
+                                   Collection<NamingBuilder> namingBuilders,
+                                   Collection<ModuleBuilderExtension> moduleBuilderExtensions,
+                                   ArtifactResolver clientArtifactResolver) {
         this.defaultClientEnvironment = defaultClientEnvironment;
         this.defaultServerEnvironment = defaultServerEnvironment;
         this.corbaGBeanObjectName = corbaGBeanObjectName;
@@ -186,6 +197,7 @@
         this.serviceBuilder = new NamespaceDrivenBuilderCollection(serviceBuilder, GBeanBuilder.SERVICE_QNAME);
         this.namingBuilders = new NamingBuilderCollection(namingBuilders, GerAbstractNamingEntryDocument.type.getDocumentElementName());
         this.moduleBuilderExtensions = moduleBuilderExtensions;
+        this.clientArtifactResolver = clientArtifactResolver;
     }
 
 
@@ -303,8 +315,17 @@
             String path;
             JarFile connectorFile;
             if (resource.isSetExternalRar()) {
-                path = resource.getExternalRar().trim();
-                Artifact artifact = Artifact.create(path);
+                PatternType externalRar = resource.getExternalRar();
+                String groupId = trim(externalRar.getGroupId());
+                String artifactId = trim(externalRar.getArtifactId());
+                String version = trim(externalRar.getVersion());
+                String type = trim(externalRar.getType());
+                Artifact artifact = new Artifact(groupId, artifactId, version, type);
+                try {
+                    artifact = clientArtifactResolver.resolveInClassLoader(artifact);
+                } catch (MissingDependencyException e) {
+                    throw new DeploymentException("Could not resolve external rar location in repository: " + artifact, e);
+                }
                 File file = null;
                 for (Repository repository : repositories) {
                     if (repository.contains(artifact)) {
@@ -313,13 +334,14 @@
                     }
                 }
                 if (file == null) {
-                    throw new DeploymentException("Missing rar in repositories: " + path);
+                    throw new DeploymentException("Missing external rar in repositories: " + artifact);
                 }
                 try {
                     connectorFile = new JarFile(file);
                 } catch (IOException e) {
-                    throw new DeploymentException("Could not access rar contents", e);
+                    throw new DeploymentException("Could not access external rar contents for artifact: " + artifact, e);
                 }
+                path = artifact.toString();
             } else {
                 path = resource.getInternalRar();
                 try {
@@ -356,6 +378,13 @@
         }
     }
 
+    private String trim(String s) {
+        if (s == null) {
+            return null;
+        }
+        return s.trim();
+    }
+
     GerApplicationClientType getGeronimoAppClient(Object plan, JarFile moduleFile, boolean standAlone, String targetPath, ApplicationClientType appClient, Environment environment) throws DeploymentException {
         GerApplicationClientType gerAppClient;
         XmlObject rawPlan = null;
@@ -895,6 +924,7 @@
         infoBuilder.addReference("ServiceBuilders", NamespaceDrivenBuilder.class, NameFactory.MODULE_BUILDER);
         infoBuilder.addReference("NamingBuilders", NamingBuilder.class, NameFactory.MODULE_BUILDER);
         infoBuilder.addReference("ModuleBuilderExtensions", ModuleBuilderExtension.class, NameFactory.MODULE_BUILDER);
+        infoBuilder.addReference("ClientArtifactResolver", ArtifactResolver.class, "ArtifactResolver");
 
         infoBuilder.addInterface(ModuleBuilder.class);
 
@@ -907,6 +937,7 @@
                 "ServiceBuilders",
                 "NamingBuilders",
                 "ModuleBuilderExtensions",
+                "ClientArtifactResolver",
                 "defaultClientEnvironment",
                 "defaultServerEnvironment",
         });

Modified: geronimo/server/branches/2.0/modules/geronimo-client-builder/src/main/xsdconfig/xmlconfig.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-client-builder/src/main/xsdconfig/xmlconfig.xml?view=diff&rev=561286&r1=561285&r2=561286
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-client-builder/src/main/xsdconfig/xmlconfig.xml (original)
+++ geronimo/server/branches/2.0/modules/geronimo-client-builder/src/main/xsdconfig/xmlconfig.xml Tue Jul 31 02:39:53 2007
@@ -19,20 +19,9 @@
 <!-- @version $Rev$ $Date$ -->
 <xb:config xmlns:xb="http://www.bea.com/2002/09/xbean/config">
 
-    <xb:namespace uri="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.2">
+    <xb:namespace uri="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
         <xb:package>org.apache.geronimo.xbeans.geronimo.client</xb:package>
         <xb:prefix>Ger</xb:prefix>
     </xb:namespace>
-
-    <!--this should be unnecessary.  Probably needs xmlbeans plugin to reuse the naming classes rather than generating duplicates-->
-<!--    <xb:namespace uri="http://geronimo.apache.org/xml/ns/naming-1.0">-->
-<!--        <xb:package>org.apache.geronimo.xbeans.geronimo.naming</xb:package>-->
-<!--        <xb:prefix>Ger</xb:prefix>-->
-<!--    </xb:namespace>-->
-<!---->
-<!--    <xb:namespace uri="http://geronimo.apache.org/xml/ns/j2ee/connector-1.0">-->
-<!--        <xb:package>org.apache.geronimo.xbeans.geronimo</xb:package>-->
-<!--        <xb:prefix>Ger</xb:prefix>-->
-<!--    </xb:namespace>-->
 
 </xb:config>

Modified: geronimo/server/branches/2.0/modules/geronimo-client-builder/src/test/java/org/apache/geronimo/client/builder/PlanParsingTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-client-builder/src/test/java/org/apache/geronimo/client/builder/PlanParsingTest.java?view=diff&rev=561286&r1=561285&r2=561286
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-client-builder/src/test/java/org/apache/geronimo/client/builder/PlanParsingTest.java (original)
+++ geronimo/server/branches/2.0/modules/geronimo-client-builder/src/test/java/org/apache/geronimo/client/builder/PlanParsingTest.java Tue Jul 31 02:39:53 2007
@@ -25,18 +25,22 @@
 import org.apache.geronimo.xbeans.geronimo.client.GerApplicationClientType;
 import org.apache.geronimo.xbeans.geronimo.naming.GerResourceRefType;
 import org.apache.geronimo.kernel.repository.Environment;
+import org.apache.geronimo.kernel.repository.ArtifactResolver;
+import org.apache.geronimo.kernel.repository.Repository;
 import org.apache.geronimo.deployment.xbeans.EnvironmentType;
 import org.apache.geronimo.deployment.xbeans.ArtifactType;
 import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
+import org.apache.geronimo.j2ee.deployment.ModuleBuilderExtension;
 
 /**
  */
 public class PlanParsingTest extends TestSupport {
 
+    private ArtifactResolver clientArtifactResolver = null;
     private AppClientModuleBuilder builder;
 
     protected void setUp() throws Exception {
-        builder = new AppClientModuleBuilder(new Environment(), null, null, null, null, null, Collections.EMPTY_LIST, null, null, null, Collections.EMPTY_LIST);
+        builder = new AppClientModuleBuilder(new Environment(), null, null, null, null, null, Collections.<Repository>emptyList(), null, null, null, Collections.<ModuleBuilderExtension>emptyList(), clientArtifactResolver);
     }
 
     public void testResourceRef() throws Exception {

Modified: geronimo/server/branches/2.0/modules/geronimo-client-builder/src/test/resources/plans/plan2.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-client-builder/src/test/resources/plans/plan2.xml?view=diff&rev=561286&r1=561285&r2=561286
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-client-builder/src/test/resources/plans/plan2.xml (original)
+++ geronimo/server/branches/2.0/modules/geronimo-client-builder/src/test/resources/plans/plan2.xml Tue Jul 31 02:39:53 2007
@@ -41,7 +41,11 @@
         <nam:resource-link>DefaultDatabase</nam:resource-link>
     </nam:resource-ref>
     <resource>
-        <external-rar>org.tranql/tranql-connector-ra//rar</external-rar>
+        <external-rar xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <dep:groupId>org.tranql</dep:groupId>
+            <dep:artifactId>tranql-connector-ra</dep:artifactId>
+            <dep:type>rar</dep:type>
+        </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:moduleId>

Modified: geronimo/server/branches/2.0/modules/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java?view=diff&rev=561286&r1=561285&r2=561286
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java (original)
+++ geronimo/server/branches/2.0/modules/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java Tue Jul 31 02:39:53 2007
@@ -154,7 +154,8 @@
                     null,
                     serviceBuilder,
                     null,
-                    kernel.getNaming());
+                    kernel.getNaming(),
+                    null);
             ConfigurationData configData = null;
             DeploymentContext context = null;
             ArtifactManager artifactManager = new DefaultArtifactManager();

Modified: geronimo/server/branches/2.0/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xmlbeans/XmlBeansUtil.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xmlbeans/XmlBeansUtil.java?view=diff&rev=561286&r1=561285&r2=561286
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xmlbeans/XmlBeansUtil.java (original)
+++ geronimo/server/branches/2.0/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xmlbeans/XmlBeansUtil.java Tue Jul 31 02:39:53 2007
@@ -47,10 +47,12 @@
     private static final XmlObject[] NO_ELEMENTS = new XmlObject[]{};
 
     static {
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/application-client", "http://geronimo.apache.org/xml/ns/j2ee/application-client-1.2");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/application-client-1.1", "http://geronimo.apache.org/xml/ns/j2ee/application-client-1.2");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/application", "http://geronimo.apache.org/xml/ns/j2ee/application-1.2");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/application-1.1", "http://geronimo.apache.org/xml/ns/j2ee/application-1.2");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/application-client", "http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/application-client-1.1", "http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/application-client-1.2", "http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/application", "http://geronimo.apache.org/xml/ns/j2ee/application-2.0");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/application-1.1", "http://geronimo.apache.org/xml/ns/j2ee/application-2.0");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/application-1.2", "http://geronimo.apache.org/xml/ns/j2ee/application-2.0");
         NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/deployment", "http://geronimo.apache.org/xml/ns/deployment-1.2");
         NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/deployment-1.1", "http://geronimo.apache.org/xml/ns/deployment-1.2");
         NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/connector", "http://geronimo.apache.org/xml/ns/j2ee/connector-1.2");

Modified: geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java?view=diff&rev=561286&r1=561285&r2=561286
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java (original)
+++ geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java Tue Jul 31 02:39:53 2007
@@ -57,6 +57,7 @@
 import org.apache.geronimo.deployment.util.NestedJarFile;
 import org.apache.geronimo.deployment.xbeans.ArtifactType;
 import org.apache.geronimo.deployment.xbeans.EnvironmentType;
+import org.apache.geronimo.deployment.xbeans.PatternType;
 import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.AbstractNameQuery;
@@ -82,6 +83,7 @@
 import org.apache.geronimo.kernel.repository.ArtifactResolver;
 import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.kernel.repository.Repository;
+import org.apache.geronimo.kernel.repository.MissingDependencyException;
 import org.apache.geronimo.management.J2EEResource;
 import org.apache.geronimo.management.J2EEServer;
 import org.apache.geronimo.schema.SchemaConversionUtils;
@@ -126,6 +128,7 @@
     private final AbstractNameQuery nonTransactionalTimerObjectName;
     private final AbstractNameQuery corbaGBeanObjectName;
     private final Naming naming;
+    private final Collection<ArtifactResolver> artifactResolvers;
 
     public EARConfigBuilder(Environment defaultEnvironment,
             AbstractNameQuery transactionManagerAbstractName,
@@ -143,6 +146,7 @@
             Collection securityBuilders,
             Collection serviceBuilders,
             Collection<ModuleBuilderExtension> persistenceUnitBuilders,
+            Collection<ArtifactResolver> artifactResolvers,
             Kernel kernel) {
         this(defaultEnvironment,
                 transactionManagerAbstractName,
@@ -161,7 +165,7 @@
                 securityBuilders,
                 serviceBuilders,
                 persistenceUnitBuilders,
-                kernel.getNaming());
+                kernel.getNaming(), artifactResolvers);
     }
 
     public EARConfigBuilder(Environment defaultEnvironment,
@@ -180,7 +184,8 @@
             NamespaceDrivenBuilder securityBuilder,
             NamespaceDrivenBuilder serviceBuilder,
             ModuleBuilderExtension persistenceUnitBuilder,
-            Naming naming) {
+            Naming naming,
+            Collection<ArtifactResolver> artifactResolvers) {
         this(defaultEnvironment,
                 transactionManagerAbstractName,
                 connectionTrackerAbstractName,
@@ -198,27 +203,29 @@
                 securityBuilder == null ? Collections.EMPTY_SET : Collections.singleton(securityBuilder),
                 serviceBuilder == null ? Collections.EMPTY_SET : Collections.singleton(serviceBuilder),
                 persistenceUnitBuilder == null ? Collections.EMPTY_SET : Collections.singleton(persistenceUnitBuilder),
-                naming);
+                naming,
+                artifactResolvers);
     }
 
     private EARConfigBuilder(Environment defaultEnvironment,
-            AbstractNameQuery transactionManagerAbstractName,
-            AbstractNameQuery connectionTrackerAbstractName,
-            AbstractNameQuery transactionalTimerAbstractName,
-            AbstractNameQuery nonTransactionalTimerAbstractName,
-            AbstractNameQuery corbaGBeanAbstractName,
-            AbstractNameQuery serverName,
-            ConfigurationManager configurationManager,
-            Collection<Repository> repositories,
-            SingleElementCollection ejbConfigBuilder,
-            SingleElementCollection webConfigBuilder,
-            SingleElementCollection connectorConfigBuilder,
-            SingleElementCollection resourceReferenceBuilder,
-            SingleElementCollection appClientConfigBuilder,
-            Collection securityBuilders,
-            Collection serviceBuilders,
-            Collection<ModuleBuilderExtension> persistenceUnitBuilders,
-            Naming naming) {
+             AbstractNameQuery transactionManagerAbstractName,
+             AbstractNameQuery connectionTrackerAbstractName,
+             AbstractNameQuery transactionalTimerAbstractName,
+             AbstractNameQuery nonTransactionalTimerAbstractName,
+             AbstractNameQuery corbaGBeanAbstractName,
+             AbstractNameQuery serverName,
+             ConfigurationManager configurationManager,
+             Collection<Repository> repositories,
+             SingleElementCollection ejbConfigBuilder,
+             SingleElementCollection webConfigBuilder,
+             SingleElementCollection connectorConfigBuilder,
+             SingleElementCollection resourceReferenceBuilder,
+             SingleElementCollection appClientConfigBuilder,
+             Collection securityBuilders,
+             Collection serviceBuilders,
+             Collection<ModuleBuilderExtension> persistenceUnitBuilders,
+             Naming naming,
+             Collection<ArtifactResolver> artifactResolvers) {
         this.configurationManager = configurationManager;
         this.repositories = repositories;
         this.defaultEnvironment = defaultEnvironment;
@@ -239,6 +246,7 @@
         this.corbaGBeanObjectName = corbaGBeanAbstractName;
         this.serverName = serverName;
         this.naming = naming;
+        this.artifactResolvers = artifactResolvers;
     }
 
 
@@ -921,8 +929,17 @@
                         throw new DeploymentException("Invalid moduleFile: " + modulePath, e);
                     }
                 } else {
-                    String path = gerExtModule.getExternalPath().trim();
-                    Artifact artifact = Artifact.create(path);
+                    PatternType patternType = gerExtModule.getExternalPath();
+                    String groupId = trim(patternType.getGroupId());
+                    String artifactId = trim(patternType.getArtifactId());
+                    String version = trim(patternType.getVersion());
+                    String type = trim(patternType.getType());
+                    Artifact artifact = new Artifact(groupId, artifactId, version, type);
+                    try {
+                        artifact = getArtifactResolver().resolveInClassLoader(artifact);
+                    } catch (MissingDependencyException e) {
+                        throw new DeploymentException("Could not resolve external rar location in repository: " + artifact, e);
+                    }
                     File location = null;
                     for (Repository repository : repositories) {
                         if (repository.contains(artifact)) {
@@ -931,7 +948,7 @@
                         }
                     }
                     if (location == null) {
-                        throw new DeploymentException(moduleTypeName + " is missing in repositories: " + path);
+                        throw new DeploymentException(moduleTypeName + " is missing in repositories: " + artifact);
                     }
                     try {
                         moduleFile = new JarFile(location);
@@ -966,6 +983,20 @@
         }
     }
 
+    private ArtifactResolver getArtifactResolver() throws DeploymentException {
+        if (artifactResolvers == null || artifactResolvers.isEmpty()) {
+            throw new DeploymentException("No artifact resolver supplied to resolve external module");
+        }
+        return artifactResolvers.iterator().next();
+    }
+
+    private String trim(String s) {
+        if (s == null) {
+            return null;
+        }
+        return s.trim();
+    }
+
     private boolean isLibraryEntry(ApplicationType application, ZipEntry entry) {
         String libDir = getLibraryDirectory(application);
         if (libDir != null && entry.getName().startsWith(libDir)) {
@@ -1066,6 +1097,7 @@
         infoBuilder.addReference("SecurityBuilders", NamespaceDrivenBuilder.class, NameFactory.MODULE_BUILDER);
         infoBuilder.addReference("ServiceBuilders", NamespaceDrivenBuilder.class, NameFactory.MODULE_BUILDER);
         infoBuilder.addReference("PersistenceUnitBuilders", ModuleBuilderExtension.class, NameFactory.MODULE_BUILDER);
+        infoBuilder.addReference("ArtifactResolvers", ArtifactResolver.class, "ArtifactResolver");
 
         infoBuilder.addAttribute("kernel", Kernel.class, false);
 
@@ -1086,6 +1118,7 @@
                 "SecurityBuilders",
                 "ServiceBuilders",
                 "PersistenceUnitBuilders",
+                "ArtifactResolvers",
                 "kernel"
         });
 

Modified: geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/main/xsdconfig/xmlconfig.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/main/xsdconfig/xmlconfig.xml?view=diff&rev=561286&r1=561285&r2=561286
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/main/xsdconfig/xmlconfig.xml (original)
+++ geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/main/xsdconfig/xmlconfig.xml Tue Jul 31 02:39:53 2007
@@ -16,7 +16,7 @@
 -->
 <xb:config xmlns:xb="http://www.bea.com/2002/09/xbean/config">
 
-    <xb:namespace uri="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
+    <xb:namespace uri="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
         <xb:package>org.apache.geronimo.xbeans.geronimo.j2ee</xb:package>
         <xb:prefix>Ger</xb:prefix>
     </xb:namespace>

Modified: geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTestSupport.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTestSupport.java?view=diff&rev=561286&r1=561285&r2=561286
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTestSupport.java (original)
+++ geronimo/server/branches/2.0/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTestSupport.java Tue Jul 31 02:39:53 2007
@@ -18,6 +18,7 @@
 
 import java.util.Collections;
 import java.util.Map;
+import java.util.Collection;
 import java.util.jar.JarFile;
 
 import org.apache.geronimo.common.DeploymentException;
@@ -115,6 +116,8 @@
     
     protected final AbstractNameQuery corbaGBeanAbstractNameQuery = new AbstractNameQuery(serverName, null);
 
+    protected Collection<ArtifactResolver> artifactResolvers = null;
+
     protected void setUp() throws Exception {
         super.setUp();
         
@@ -142,7 +145,7 @@
                     securityBuilder,
                     serviceBuilder,
                     persistenceUnitBuilder,
-                    naming);
+                    naming, artifactResolvers);
 
             Object plan = configBuilder.getDeploymentPlan(null, earFile, idBuilder);
             context = configBuilder.buildConfiguration(false, configBuilder.getConfigurationID(plan, earFile, idBuilder), plan, earFile, Collections.singleton(configStore), artifactResolver, configStore);
@@ -174,7 +177,7 @@
                 securityBuilder,
                 serviceBuilder,
                 persistenceUnitBuilder,
-                naming);
+                naming, artifactResolvers);
 
         ConfigurationData configurationData = null;
         DeploymentContext context = null;
@@ -212,7 +215,7 @@
                 securityBuilder,
                 serviceBuilder,
                 persistenceUnitBuilder,
-                naming);
+                naming, artifactResolvers);
 
         ConfigurationData configurationData = null;
         DeploymentContext context = null;
@@ -250,7 +253,7 @@
                 securityBuilder,
                 serviceBuilder,
                 persistenceUnitBuilder,
-                naming);
+                naming, artifactResolvers);
 
         ConfigurationData configurationData = null;
         DeploymentContext context = null;
@@ -288,7 +291,7 @@
                 securityBuilder,
                 serviceBuilder,
                 persistenceUnitBuilder,
-                naming);
+                naming, artifactResolvers);
 
         ConfigurationData configurationData = null;
         DeploymentContext context = null;
@@ -326,7 +329,7 @@
                 securityBuilder,
                 serviceBuilder,
                 persistenceUnitBuilder,
-                naming);
+                naming, artifactResolvers);
 
 
         ConfigurationData configurationData = null;
@@ -365,7 +368,7 @@
                 securityBuilder,
                 serviceBuilder,
                 persistenceUnitBuilder,
-                naming);
+                naming, artifactResolvers);
 
         ConfigurationData configurationData = null;
         DeploymentContext context = null;
@@ -403,7 +406,7 @@
                 securityBuilder,
                 serviceBuilder,
                 persistenceUnitBuilder,
-                naming);
+                naming, artifactResolvers);
 
         ConfigurationData configurationData = null;
         DeploymentContext context = null;

Modified: geronimo/server/branches/2.0/modules/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-1.2.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-1.2.xsd?view=diff&rev=561286&r1=561285&r2=561286
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-1.2.xsd (original)
+++ geronimo/server/branches/2.0/modules/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-1.2.xsd Tue Jul 31 02:39:53 2007
@@ -20,7 +20,7 @@
     targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2"
     xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
     xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2"
-    xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-1.2"
+    xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-2.0"
     xmlns:ee="http://java.sun.com/xml/ns/persistence"
     xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
     attributeFormDefault="unqualified" version="1.0">
@@ -59,8 +59,8 @@
     <!--<xs:import namespace="http://geronimo.apache.org/xml/ns/security-1.2" schemaLocation="geronimo-security-1.2.xsd"/>-->
 
     <xs:import
-        namespace="http://geronimo.apache.org/xml/ns/j2ee/application-1.2"
-        schemaLocation="geronimo-application-1.2.xsd">
+        namespace="http://geronimo.apache.org/xml/ns/j2ee/application-2.0"
+        schemaLocation="geronimo-application-2.0.xsd">
         <xs:annotation>
             <xs:documentation>
                 Import Geronimo application deployment plans. The imported plan
@@ -123,7 +123,7 @@
                 <xs:annotation>
                     <xs:documentation>
                         Reference to abstract clustering element defined in
-                        imported "geronimo-application-1.2.xsd"
+                        imported "geronimo-application-2.0.xsd"
                     </xs:documentation>
                 </xs:annotation>
             </xs:element>

Modified: geronimo/server/branches/2.0/modules/geronimo-jetty6-clustering-builder-wadi/src/main/xsd/geronimo-clustering-wadi-1.2.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-jetty6-clustering-builder-wadi/src/main/xsd/geronimo-clustering-wadi-1.2.xsd?view=diff&rev=561286&r1=561285&r2=561286
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-jetty6-clustering-builder-wadi/src/main/xsd/geronimo-clustering-wadi-1.2.xsd (original)
+++ geronimo/server/branches/2.0/modules/geronimo-jetty6-clustering-builder-wadi/src/main/xsd/geronimo-clustering-wadi-1.2.xsd Tue Jul 31 02:39:53 2007
@@ -21,13 +21,13 @@
     targetNamespace="http://geronimo.apache.org/xml/ns/clustering-wadi-1.2"
     xmlns:clust-wadi="http://geronimo.apache.org/xml/ns/clustering-wadi-1.2"
     xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
-    xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-1.2"
+    xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-2.0"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     elementFormDefault="qualified"
     attributeFormDefault="unqualified">
 
     <xs:import namespace="http://geronimo.apache.org/xml/ns/naming-1.2" schemaLocation="geronimo-naming-1.2.xsd"/>
-    <xs:import namespace="http://geronimo.apache.org/xml/ns/j2ee/application-1.2" schemaLocation="geronimo-application-1.2.xsd"/>
+    <xs:import namespace="http://geronimo.apache.org/xml/ns/j2ee/application-2.0" schemaLocation="geronimo-application-2.0.xsd"/>
 
     <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
 

Modified: geronimo/server/branches/2.0/modules/geronimo-naming-builder/src/main/xsd/geronimo-naming-1.2.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-naming-builder/src/main/xsd/geronimo-naming-1.2.xsd?view=diff&rev=561286&r1=561285&r2=561286
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-naming-builder/src/main/xsd/geronimo-naming-1.2.xsd (original)
+++ geronimo/server/branches/2.0/modules/geronimo-naming-builder/src/main/xsd/geronimo-naming-1.2.xsd Tue Jul 31 02:39:53 2007
@@ -27,7 +27,7 @@
             This is a partial XML Schema Definition for common naming elements
             for resolving EJB, Web, services, or resource references. This
             schema will never be used directly but its elements are used in
-            geronimo-application-client-1.2.xsd, geronimo-connector-1.2.xsd,
+            geronimo-application-client-2.0.xsd, geronimo-connector-1.2.xsd,
             geronimo-web-1.2.xsd, geronimo-tomcat-1.2.xsd, and
             geronimo-jetty-1.2.xsd. All the schema's or plans using elements of
             this schema must specify the top level element with one of the

Modified: geronimo/server/branches/2.0/modules/geronimo-openejb-builder/src/main/xsd/geronimo-openejb-2.0.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-openejb-builder/src/main/xsd/geronimo-openejb-2.0.xsd?view=diff&rev=561286&r1=561285&r2=561286
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-openejb-builder/src/main/xsd/geronimo-openejb-2.0.xsd (original)
+++ geronimo/server/branches/2.0/modules/geronimo-openejb-builder/src/main/xsd/geronimo-openejb-2.0.xsd Tue Jul 31 02:39:53 2007
@@ -22,7 +22,7 @@
     xmlns:openejb="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0"
     targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0"
     xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
-    xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-1.2"
+    xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-2.0"
     xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2"
     xmlns:ee="http://java.sun.com/xml/ns/persistence"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
@@ -31,7 +31,7 @@
     version="1.0">
 
     <xs:import namespace="http://geronimo.apache.org/xml/ns/naming-1.2" schemaLocation="geronimo-naming-1.2.xsd"/>
-    <xs:import namespace="http://geronimo.apache.org/xml/ns/j2ee/application-1.2" schemaLocation="geronimo-application-1.2.xsd"/>
+    <xs:import namespace="http://geronimo.apache.org/xml/ns/j2ee/application-2.0" schemaLocation="geronimo-application-2.0.xsd"/>
     <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.2" schemaLocation="geronimo-module-1.2.xsd"/>
     <xs:import namespace="http://java.sun.com/xml/ns/persistence" schemaLocation="persistence-1.0.xsd"/>
 

Modified: geronimo/server/branches/2.0/modules/geronimo-security-builder/src/main/xsd/geronimo-security-1.2.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-security-builder/src/main/xsd/geronimo-security-1.2.xsd?view=diff&rev=561286&r1=561285&r2=561286
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-security-builder/src/main/xsd/geronimo-security-1.2.xsd (original)
+++ geronimo/server/branches/2.0/modules/geronimo-security-builder/src/main/xsd/geronimo-security-1.2.xsd Tue Jul 31 02:39:53 2007
@@ -22,7 +22,7 @@
     xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
     xmlns:geronimo="http://geronimo.apache.org/xml/ns/security-1.2"
     targetNamespace="http://geronimo.apache.org/xml/ns/security-1.2"
-    xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-1.2"
+    xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-2.0"
     elementFormDefault="qualified" attributeFormDefault="unqualified"
     version="1.0">
 
@@ -30,7 +30,7 @@
         <xsd:documentation>
             This is a partial XML Schema Definition for common security
             elements. This schema will never be used directly but its elements
-            are used in geronimo-application-client-1.2.xsd,
+            are used in geronimo-application-client-2.0.xsd,
             geronimo-connector-1.2.xsd, geronimo-web-1.2.xsd,
             geronimo-tomcat-1.2.xsd, and geronimo-jetty-1.2.xsd. All the schemas
             or plans using elements of this schema must specify the top level
@@ -44,8 +44,8 @@
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace"
         schemaLocation="http://www.w3.org/2001/xml.xsd" />
     <xsd:import
-        namespace="http://geronimo.apache.org/xml/ns/j2ee/application-1.2"
-        schemaLocation="geronimo-application-1.2.xsd">
+        namespace="http://geronimo.apache.org/xml/ns/j2ee/application-2.0"
+        schemaLocation="geronimo-application-2.0.xsd">
         <xsd:annotation>
             <xsd:documentation>
                 Import Geronimo enterprise application deployment plans. The
@@ -91,7 +91,7 @@
                 <xsd:annotation>
                     <xsd:documentation>
                         Extension of abstract-securityType element defined in
-                        geronimo-application-1.2.xsd.
+                        geronimo-application-2.0.xsd.
                     </xsd:documentation>
                 </xsd:annotation>
 

Modified: geronimo/server/branches/2.0/modules/geronimo-security-builder/src/main/xsd/geronimo-security-2.0.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-security-builder/src/main/xsd/geronimo-security-2.0.xsd?view=diff&rev=561286&r1=561285&r2=561286
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-security-builder/src/main/xsd/geronimo-security-2.0.xsd (original)
+++ geronimo/server/branches/2.0/modules/geronimo-security-builder/src/main/xsd/geronimo-security-2.0.xsd Tue Jul 31 02:39:53 2007
@@ -24,14 +24,14 @@
         xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
         xmlns:geronimo="http://geronimo.apache.org/xml/ns/security-2.0"
         targetNamespace="http://geronimo.apache.org/xml/ns/security-2.0"
-        xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-1.2"
+        xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-2.0"
         xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2"
         elementFormDefault="qualified"
         attributeFormDefault="unqualified"
         version="2.0">
 
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-    <xsd:import namespace="http://geronimo.apache.org/xml/ns/j2ee/application-1.2" schemaLocation="geronimo-application-1.2.xsd"/>
+    <xsd:import namespace="http://geronimo.apache.org/xml/ns/j2ee/application-2.0" schemaLocation="geronimo-application-2.0.xsd"/>
     <xsd:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.2"  schemaLocation="geronimo-module-1.2.xsd"/>
 
     <xsd:element name="security" type="geronimo:securityType" substitutionGroup="app:security"/>

Modified: geronimo/server/branches/2.0/modules/geronimo-security-builder/src/main/xsd/geronimo-subject-info-1.0.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-security-builder/src/main/xsd/geronimo-subject-info-1.0.xsd?view=diff&rev=561286&r1=561285&r2=561286
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-security-builder/src/main/xsd/geronimo-subject-info-1.0.xsd (original)
+++ geronimo/server/branches/2.0/modules/geronimo-security-builder/src/main/xsd/geronimo-subject-info-1.0.xsd Tue Jul 31 02:39:53 2007
@@ -24,13 +24,13 @@
     xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
     xmlns:geronimo="http://geronimo.apache.org/xml/ns/subject-info-1.0"
     targetNamespace="http://geronimo.apache.org/xml/ns/subject-info-1.0"
-    xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-1.2"
+    xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-2.0"
     elementFormDefault="qualified"
     attributeFormDefault="unqualified"
     version="2.0">
     
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-    <xsd:import namespace="http://geronimo.apache.org/xml/ns/j2ee/application-1.2" schemaLocation="geronimo-application-1.2.xsd"/>
+    <xsd:import namespace="http://geronimo.apache.org/xml/ns/j2ee/application-2.0" schemaLocation="geronimo-application-2.0.xsd"/>
 
     <xsd:element name="security" type="geronimo:securityType"  substitutionGroup="app:security"/>
     <xsd:element name="default-subject" type="geronimo:default-subjectType"/>

Modified: geronimo/server/branches/2.0/modules/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-1.2.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-1.2.xsd?view=diff&rev=561286&r1=561285&r2=561286
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-1.2.xsd (original)
+++ geronimo/server/branches/2.0/modules/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-1.2.xsd Tue Jul 31 02:39:53 2007
@@ -19,7 +19,7 @@
 <xs:schema xmlns:tomcat="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2"
     targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2"
     xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
-    xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-1.2"
+    xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-2.0"
     xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2"
     xmlns:ee="http://java.sun.com/xml/ns/persistence"
     xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
@@ -54,8 +54,8 @@
         </xs:annotation>
     </xs:import>
     <xs:import
-        namespace="http://geronimo.apache.org/xml/ns/j2ee/application-1.2"
-        schemaLocation="geronimo-application-1.2.xsd">
+        namespace="http://geronimo.apache.org/xml/ns/j2ee/application-2.0"
+        schemaLocation="geronimo-application-2.0.xsd">
         <xs:annotation>
             <xs:documentation>
                 Import Geronimo application deployment plans. The imported plan

Modified: geronimo/server/branches/2.0/modules/geronimo-upgrade/src/main/java/org/apache/geronimo/upgrade/Upgrade1_0To1_1.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-upgrade/src/main/java/org/apache/geronimo/upgrade/Upgrade1_0To1_1.java?view=diff&rev=561286&r1=561285&r2=561286
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-upgrade/src/main/java/org/apache/geronimo/upgrade/Upgrade1_0To1_1.java (original)
+++ geronimo/server/branches/2.0/modules/geronimo-upgrade/src/main/java/org/apache/geronimo/upgrade/Upgrade1_0To1_1.java Tue Jul 31 02:39:53 2007
@@ -46,12 +46,12 @@
     private static final Map NAMESPACE_UPDATES = new HashMap();
 
     static {
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/application-client", "http://geronimo.apache.org/xml/ns/j2ee/application-client-1.2");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/application-client-1.0", "http://geronimo.apache.org/xml/ns/j2ee/application-client-1.2");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/application-client-1.1", "http://geronimo.apache.org/xml/ns/j2ee/application-client-1.2");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/application", "http://geronimo.apache.org/xml/ns/j2ee/application-1.2");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/application-1.0", "http://geronimo.apache.org/xml/ns/j2ee/application-1.2");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/application-1.1", "http://geronimo.apache.org/xml/ns/j2ee/application-1.2");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/application-client", "http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/application-client-1.1", "http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/application-client-1.2", "http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/application", "http://geronimo.apache.org/xml/ns/j2ee/application-2.0");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/application-1.1", "http://geronimo.apache.org/xml/ns/j2ee/application-2.0");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/application-1.2", "http://geronimo.apache.org/xml/ns/j2ee/application-2.0");
         NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/deployment", "http://geronimo.apache.org/xml/ns/deployment-1.2");
         NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/deployment-1.0", "http://geronimo.apache.org/xml/ns/deployment-1.2");
         NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/deployment-1.1", "http://geronimo.apache.org/xml/ns/deployment-1.2");

Modified: geronimo/server/branches/2.0/modules/geronimo-upgrade/src/test/data/appclient_dep_1_result.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-upgrade/src/test/data/appclient_dep_1_result.xml?view=diff&rev=561286&r1=561285&r2=561286
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-upgrade/src/test/data/appclient_dep_1_result.xml (original)
+++ geronimo/server/branches/2.0/modules/geronimo-upgrade/src/test/data/appclient_dep_1_result.xml Tue Jul 31 02:39:53 2007
@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee">
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee">
   <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
     <dep:moduleId>
       <dep:groupId>default</dep:groupId>
@@ -47,7 +47,7 @@
   </dep:environment>
   <module>
     <java>appclient_dep_resref_single_client.jar</java>
-    <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.2">
+    <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
       <dep:client-environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
         <dep:moduleId>
           <dep:groupId>default</dep:groupId>

Modified: geronimo/server/branches/2.0/modules/geronimo-upgrade/src/test/data/appclient_ejb_1_result.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-upgrade/src/test/data/appclient_ejb_1_result.xml?view=diff&rev=561286&r1=561285&r2=561286
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-upgrade/src/test/data/appclient_ejb_1_result.xml (original)
+++ geronimo/server/branches/2.0/modules/geronimo-upgrade/src/test/data/appclient_ejb_1_result.xml Tue Jul 31 02:39:53 2007
@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
   <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
     <dep:moduleId>
       <dep:groupId>default</dep:groupId>
@@ -72,7 +72,7 @@
   </module>
   <module>
     <java>appclient_ejb_1_client.jar</java>
-    <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.2">
+    <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
       <dep:client-environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
         <dep:moduleId>
           <dep:groupId>default</dep:groupId>

Modified: geronimo/server/branches/2.0/modules/geronimo-upgrade/src/test/data/assembly_1_result.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-upgrade/src/test/data/assembly_1_result.xml?view=diff&rev=561286&r1=561285&r2=561286
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-upgrade/src/test/data/assembly_1_result.xml (original)
+++ geronimo/server/branches/2.0/modules/geronimo-upgrade/src/test/data/assembly_1_result.xml Tue Jul 31 02:39:53 2007
@@ -16,7 +16,7 @@
    limitations under the License.
 -->
 
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
     <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
         <dep:moduleId>
             <dep:groupId>default</dep:groupId>
@@ -37,7 +37,7 @@
     </dep:environment>
     <module>
         <java>assembly_compat_standalone_jar_compat12_13_client.jar</java>
-        <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.2">
+        <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
             <dep:client-environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <dep:moduleId>
                     <dep:groupId>default</dep:groupId>

Modified: geronimo/server/branches/2.0/modules/geronimo-upgrade/src/test/data/gbean_1_result.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-upgrade/src/test/data/gbean_1_result.xml?view=diff&rev=561286&r1=561285&r2=561286
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-upgrade/src/test/data/gbean_1_result.xml (original)
+++ geronimo/server/branches/2.0/modules/geronimo-upgrade/src/test/data/gbean_1_result.xml Tue Jul 31 02:39:53 2007
@@ -16,7 +16,7 @@
    limitations under the License.
 -->
 
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
   <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
     <dep:moduleId>
       <dep:groupId>default</dep:groupId>

Modified: geronimo/server/branches/2.0/modules/geronimo-upgrade/src/test/data/servlet_1_result.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-upgrade/src/test/data/servlet_1_result.xml?view=diff&rev=561286&r1=561285&r2=561286
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-upgrade/src/test/data/servlet_1_result.xml (original)
+++ geronimo/server/branches/2.0/modules/geronimo-upgrade/src/test/data/servlet_1_result.xml Tue Jul 31 02:39:53 2007
@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
   <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
     <dep:moduleId>
       <dep:groupId>default</dep:groupId>

Modified: geronimo/server/branches/2.0/modules/geronimo-upgrade/src/test/data/transport_1_result.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-upgrade/src/test/data/transport_1_result.xml?view=diff&rev=561286&r1=561285&r2=561286
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-upgrade/src/test/data/transport_1_result.xml (original)
+++ geronimo/server/branches/2.0/modules/geronimo-upgrade/src/test/data/transport_1_result.xml Tue Jul 31 02:39:53 2007
@@ -16,7 +16,7 @@
    limitations under the License.
 -->
 
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
   <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
     <dep:moduleId>
       <dep:groupId>default</dep:groupId>
@@ -37,7 +37,7 @@
   </dep:environment>
   <module>
     <java>transport_1_client.jar</java>
-    <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.2">
+    <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
       <dep:client-environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
         <dep:moduleId>
           <dep:groupId>default</dep:groupId>

Modified: geronimo/server/branches/2.0/modules/geronimo-upgrade/src/test/data/transport_2_result.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-upgrade/src/test/data/transport_2_result.xml?view=diff&rev=561286&r1=561285&r2=561286
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-upgrade/src/test/data/transport_2_result.xml (original)
+++ geronimo/server/branches/2.0/modules/geronimo-upgrade/src/test/data/transport_2_result.xml Tue Jul 31 02:39:53 2007
@@ -16,7 +16,7 @@
    limitations under the License.
 -->
 
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
   <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
     <dep:moduleId>
       <dep:groupId>default</dep:groupId>

Modified: geronimo/server/branches/2.0/modules/geronimo-web-2.5-builder/src/main/xsd/geronimo-web-1.2.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-web-2.5-builder/src/main/xsd/geronimo-web-1.2.xsd?view=diff&rev=561286&r1=561285&r2=561286
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-web-2.5-builder/src/main/xsd/geronimo-web-1.2.xsd (original)
+++ geronimo/server/branches/2.0/modules/geronimo-web-2.5-builder/src/main/xsd/geronimo-web-1.2.xsd Tue Jul 31 02:39:53 2007
@@ -23,7 +23,7 @@
     xmlns:web="http://geronimo.apache.org/xml/ns/j2ee/web-1.2"
     targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/web-1.2"
     xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
-    xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-1.2"
+    xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-2.0"
     xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2"
     xmlns:ee="http://java.sun.com/xml/ns/persistence"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
@@ -32,7 +32,7 @@
     version="1.0">
 
     <xs:import namespace="http://geronimo.apache.org/xml/ns/naming-1.2" schemaLocation="geronimo-naming-1.2.xsd"/>
-    <xs:import namespace="http://geronimo.apache.org/xml/ns/j2ee/application-1.2" schemaLocation="geronimo-application-1.2.xsd"/>
+    <xs:import namespace="http://geronimo.apache.org/xml/ns/j2ee/application-2.0" schemaLocation="geronimo-application-2.0.xsd"/>
     <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.2" schemaLocation="geronimo-module-1.2.xsd"/>
     <xs:import namespace="http://java.sun.com/xml/ns/persistence" schemaLocation="persistence-1.0.xsd"/>
 



Mime
View raw message