geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r432510 [5/5] - in /geronimo/trunk: applications/console/console-standard/ applications/console/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/ configs/ configs/activemq/ configs/axis-deployer/ configs/client-de...
Date Fri, 18 Aug 2006 07:44:12 GMT
Modified: geronimo/trunk/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java (original)
+++ geronimo/trunk/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java Fri Aug 18 00:44:04 2006
@@ -30,6 +30,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import javax.management.ObjectName;
 import javax.naming.Reference;
 import javax.xml.namespace.QName;
@@ -40,6 +41,7 @@
 import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean;
 import org.apache.geronimo.deployment.DeploymentContext;
 import org.apache.geronimo.deployment.ModuleIDBuilder;
+import org.apache.geronimo.deployment.service.GBeanBuilder;
 import org.apache.geronimo.deployment.util.UnpackedJarFile;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.AbstractNameQuery;
@@ -72,14 +74,15 @@
 import org.apache.geronimo.kernel.config.NullConfigurationStore;
 import org.apache.geronimo.kernel.management.State;
 import org.apache.geronimo.kernel.repository.Artifact;
+import org.apache.geronimo.kernel.repository.ArtifactManager;
+import org.apache.geronimo.kernel.repository.ArtifactResolver;
 import org.apache.geronimo.kernel.repository.DefaultArtifactManager;
 import org.apache.geronimo.kernel.repository.DefaultArtifactResolver;
 import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.kernel.repository.ImportType;
 import org.apache.geronimo.kernel.repository.Repository;
-import org.apache.geronimo.kernel.repository.ArtifactManager;
-import org.apache.geronimo.kernel.repository.ArtifactResolver;
 import org.apache.geronimo.security.SecurityServiceImpl;
+import org.apache.geronimo.security.deployment.GeronimoSecurityBuilderImpl;
 import org.apache.geronimo.security.jacc.ApplicationPolicyConfigurationManager;
 import org.apache.geronimo.security.jacc.ComponentPermissions;
 import org.apache.geronimo.system.serverinfo.BasicServerInfo;
@@ -374,7 +377,7 @@
 
         defaultEnvironment.addDependency(baseId, ImportType.ALL);
         defaultEnvironment.setConfigId(webModuleArtifact);
-        builder = new TomcatModuleBuilder(defaultEnvironment, new AbstractNameQuery(containerName), Collections.singleton(webServiceBuilder), null);
+        builder = new TomcatModuleBuilder(defaultEnvironment, new AbstractNameQuery(containerName), Collections.singleton(webServiceBuilder), Collections.singleton(new GeronimoSecurityBuilderImpl()), Collections.singleton(new GBeanBuilder(null, null)), null);
     }
 
     protected void tearDown() throws Exception {

Modified: geronimo/trunk/modules/tomcat/project.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/tomcat/project.xml?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/project.xml (original)
+++ geronimo/trunk/modules/tomcat/project.xml Fri Aug 18 00:44:04 2006
@@ -97,11 +97,6 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>geronimo-j2ee-builder</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
             <artifactId>geronimo-kernel</artifactId>
             <version>${pom.currentVersion}</version>
         </dependency>
@@ -127,6 +122,26 @@
             <groupId>geronimo</groupId>
             <artifactId>geronimo-security-builder</artifactId>
             <version>${pom.currentVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-j2ee-builder</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-deployment</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>xmlbeans</groupId>
+            <artifactId>xbean</artifactId>
+            <version>${xmlbeans_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+            <version>${stax_api_version}</version>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>

Modified: geronimo/trunk/modules/tomcat/src/resources/META-INF/geronimo-dependency.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/tomcat/src/resources/META-INF/geronimo-dependency.xml?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/resources/META-INF/geronimo-dependency.xml (original)
+++ geronimo/trunk/modules/tomcat/src/resources/META-INF/geronimo-dependency.xml Fri Aug 18 00:44:04 2006
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dep:service xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<dep:service xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
   <dep:dependency>
     <dep:groupId>tomcat</dep:groupId>
     <dep:artifactId>catalina</dep:artifactId>

Modified: geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/JACCSecurityTest.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/JACCSecurityTest.java?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/JACCSecurityTest.java (original)
+++ geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/JACCSecurityTest.java Fri Aug 18 00:44:04 2006
@@ -37,7 +37,7 @@
 import org.apache.geronimo.security.deploy.PrincipalInfo;
 import org.apache.geronimo.security.deploy.Role;
 import org.apache.geronimo.security.deploy.Security;
-import org.apache.geronimo.security.deployment.SecurityBuilder;
+import org.apache.geronimo.security.deployment.GeronimoSecurityBuilderImpl;
 import org.apache.geronimo.security.jacc.ComponentPermissions;
 import org.apache.geronimo.tomcat.util.SecurityHolder;
 
@@ -190,7 +190,7 @@
 
     public void buildPrincipalRoleMap(Security security, Map roleDesignates, Map principalRoleMap) {
         Map roleToPrincipalMap = new HashMap();
-        SecurityBuilder.buildRolePrincipalMap(security, roleDesignates, roleToPrincipalMap, getClass().getClassLoader());
+        GeronimoSecurityBuilderImpl.buildRolePrincipalMap(security, roleDesignates, roleToPrincipalMap, getClass().getClassLoader());
         invertMap(roleToPrincipalMap, principalRoleMap);
     }
 

Modified: geronimo/trunk/modules/upgrade/src/java/org/apache/geronimo/upgrade/Upgrade1_0To1_1.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/upgrade/src/java/org/apache/geronimo/upgrade/Upgrade1_0To1_1.java?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/modules/upgrade/src/java/org/apache/geronimo/upgrade/Upgrade1_0To1_1.java (original)
+++ geronimo/trunk/modules/upgrade/src/java/org/apache/geronimo/upgrade/Upgrade1_0To1_1.java Fri Aug 18 00:44:04 2006
@@ -47,50 +47,61 @@
     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.1");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/application-client-1.0", "http://geronimo.apache.org/xml/ns/j2ee/application-client-1.1");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/application", "http://geronimo.apache.org/xml/ns/j2ee/application-1.1");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/application-1.0", "http://geronimo.apache.org/xml/ns/j2ee/application-1.1");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/deployment", "http://geronimo.apache.org/xml/ns/deployment-1.1");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/deployment-1.0", "http://geronimo.apache.org/xml/ns/deployment-1.1");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/connector", "http://geronimo.apache.org/xml/ns/j2ee/connector-1.1");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/connector-1.0", "http://geronimo.apache.org/xml/ns/j2ee/connector-1.1");
+        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/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");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/connector", "http://geronimo.apache.org/xml/ns/j2ee/connector-1.2");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/connector-1.0", "http://geronimo.apache.org/xml/ns/j2ee/connector-1.2");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/connector-1.1", "http://geronimo.apache.org/xml/ns/j2ee/connector-1.2");
         NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/deployment/javabean", "http://geronimo.apache.org/xml/ns/deployment/javabean-1.0");
         NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/loginconfig", "http://geronimo.apache.org/xml/ns/loginconfig-1.0");
         NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/loginconfig-1.0", "http://geronimo.apache.org/xml/ns/loginconfig-1.0");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/naming", "http://geronimo.apache.org/xml/ns/naming-1.1");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/naming-1.0", "http://geronimo.apache.org/xml/ns/naming-1.1");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/security", "http://geronimo.apache.org/xml/ns/security-1.1");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/security-1.0", "http://geronimo.apache.org/xml/ns/security-1.1");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web", "http://geronimo.apache.org/xml/ns/j2ee/web-1.1");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web-1.0", "http://geronimo.apache.org/xml/ns/j2ee/web-1.1");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web-1.0", "http://geronimo.apache.org/xml/ns/j2ee/web-1.1");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/jetty", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/jetty-1.0", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/loginconfig-1.1", "http://geronimo.apache.org/xml/ns/loginconfig-1.0");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/naming", "http://geronimo.apache.org/xml/ns/naming-1.2");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/naming-1.0", "http://geronimo.apache.org/xml/ns/naming-1.2");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/naming-1.1", "http://geronimo.apache.org/xml/ns/naming-1.2");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/security", "http://geronimo.apache.org/xml/ns/security-1.2");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/security-1.0", "http://geronimo.apache.org/xml/ns/security-1.2");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/security-1.1", "http://geronimo.apache.org/xml/ns/security-1.2");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web", "http://geronimo.apache.org/xml/ns/j2ee/web-1.2");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web-1.0", "http://geronimo.apache.org/xml/ns/j2ee/web-1.2");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web-1.1", "http://geronimo.apache.org/xml/ns/j2ee/web-1.2");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web-1.0", "http://geronimo.apache.org/xml/ns/j2ee/web-1.2");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/jetty", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/jetty-1.0", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2");
         NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/jetty/config", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty/config-1.0");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/tomcat", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/tomcat-1.0", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/tomcat", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/tomcat-1.0", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2");
         NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/tomcat/config", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat/config-1.0");
-        NAMESPACE_UPDATES.put("http://www.openejb.org/xml/ns/openejb-jar", "http://www.openejb.org/xml/ns/openejb-jar-2.1");
-        NAMESPACE_UPDATES.put("http://www.openejb.org/xml/ns/openejb-jar-2.0", "http://www.openejb.org/xml/ns/openejb-jar-2.1");
+        NAMESPACE_UPDATES.put("http://www.openejb.org/xml/ns/openejb-jar", "http://www.openejb.org/xml/ns/openejb-jar-2.2");
+        NAMESPACE_UPDATES.put("http://www.openejb.org/xml/ns/openejb-jar-2.0", "http://www.openejb.org/xml/ns/openejb-jar-2.2");
+        NAMESPACE_UPDATES.put("http://www.openejb.org/xml/ns/openejb-jar-2.1", "http://www.openejb.org/xml/ns/openejb-jar-2.2");
         NAMESPACE_UPDATES.put("http://www.openejb.org/xml/ns/pkgen", "http://www.openejb.org/xml/ns/pkgen-2.0");
         NAMESPACE_UPDATES.put("http://www.openejb.org/xml/ns/corba-css-config_1_0", "http://www.openejb.org/xml/ns/corba-css-config-2.0");
         NAMESPACE_UPDATES.put("http://www.openejb.org/xml/ns/corba-tss-config_1_0", "http://www.openejb.org/xml/ns/corba-tss-config-2.0");
     }
 
-    private static final QName ENVIRONMENT_QNAME = new QName("http://geronimo.apache.org/xml/ns/deployment-1.1", "environment");
+    private static final QName ENVIRONMENT_QNAME = new QName("http://geronimo.apache.org/xml/ns/deployment-1.2", "environment");
     private static final String DEFAULT_GROUPID = "default";
     private static final String DEFAULT_VERSION = "1-default";
-    private static final QName CLIENT_ENVIRONMENT_QNAME = new QName("http://geronimo.apache.org/xml/ns/deployment-1.1", "client-environment");
-    private static final QName SERVER_ENVIRONMENT_QNAME = new QName("http://geronimo.apache.org/xml/ns/deployment-1.1", "server-environment");
-    private static final QName PATTERN_QNAME = new QName("http://geronimo.apache.org/xml/ns/naming-1.1", "pattern");
-    private static final QName GROUP_QNAME = new QName("http://geronimo.apache.org/xml/ns/naming-1.1", "groupId");
-    private static final QName ARTIFACT_QNAME = new QName("http://geronimo.apache.org/xml/ns/naming-1.1", "artifactId");
-    private static final QName MODULE_QNAME = new QName("http://geronimo.apache.org/xml/ns/naming-1.1", "module");
-    private static final QName NAME_QNAME = new QName("http://geronimo.apache.org/xml/ns/naming-1.1", "name");
-    private static final QName NAME_QNAME2 = new QName("http://geronimo.apache.org/xml/ns/deployment-1.1", "name");
+    private static final QName CLIENT_ENVIRONMENT_QNAME = new QName("http://geronimo.apache.org/xml/ns/deployment-1.2", "client-environment");
+    private static final QName SERVER_ENVIRONMENT_QNAME = new QName("http://geronimo.apache.org/xml/ns/deployment-1.2", "server-environment");
+    private static final QName PATTERN_QNAME = new QName("http://geronimo.apache.org/xml/ns/naming-1.2", "pattern");
+    private static final QName GROUP_QNAME = new QName("http://geronimo.apache.org/xml/ns/naming-1.2", "groupId");
+    private static final QName ARTIFACT_QNAME = new QName("http://geronimo.apache.org/xml/ns/naming-1.2", "artifactId");
+    private static final QName MODULE_QNAME = new QName("http://geronimo.apache.org/xml/ns/naming-1.2", "module");
+    private static final QName NAME_QNAME = new QName("http://geronimo.apache.org/xml/ns/naming-1.2", "name");
+    private static final QName NAME_QNAME2 = new QName("http://geronimo.apache.org/xml/ns/deployment-1.2", "name");
     private static final QName GBEAN_NAME_QNAME = new QName(null, "gbeanName");
 
     public void upgrade(InputStream source, Writer target) throws IOException, XmlException {

Modified: geronimo/trunk/modules/upgrade/src/test-data/appclient_dep_1_result.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/upgrade/src/test-data/appclient_dep_1_result.xml?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/modules/upgrade/src/test-data/appclient_dep_1_result.xml (original)
+++ geronimo/trunk/modules/upgrade/src/test-data/appclient_dep_1_result.xml Fri Aug 18 00:44:04 2006
@@ -1,5 +1,5 @@
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee">
-  <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2" 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>
       <dep:artifactId>appclient_dep</dep:artifactId>
@@ -31,8 +31,8 @@
   </dep:environment>
   <module>
     <java>appclient_dep_resref_single_client.jar</java>
-    <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.1">
-      <dep:client-environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+    <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.2">
+      <dep:client-environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
         <dep:moduleId>
           <dep:groupId>default</dep:groupId>
           <dep:artifactId>appclient_dep_appclient_dep_client</dep:artifactId>
@@ -74,7 +74,7 @@
         <dep:hidden-classes/>
         <dep:non-overridable-classes/>
       </dep:client-environment>
-      <dep:server-environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+      <dep:server-environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
         <dep:moduleId>
           <dep:groupId>default</dep:groupId>
           <dep:artifactId>bar</dep:artifactId>
@@ -85,22 +85,22 @@
         <dep:hidden-classes/>
         <dep:non-overridable-classes/>
       </dep:server-environment>
-      <resource-ref xmlns="http://geronimo.apache.org/xml/ns/naming-1.1">
+      <resource-ref xmlns="http://geronimo.apache.org/xml/ns/naming-1.2">
         <ref-name>url/URL</ref-name>
         <url>http://${webserverHost}:${webserverPort}/appclient_dep/test.jsp</url>
       </resource-ref>
-      <resource-ref xmlns="http://geronimo.apache.org/xml/ns/naming-1.1">
+      <resource-ref xmlns="http://geronimo.apache.org/xml/ns/naming-1.2">
         <ref-name>jms/myQueueConnectionFactory</ref-name>
         <resource-link>DefaultActiveMQConnectionFactory</resource-link>
       </resource-ref>
-      <resource-ref xmlns="http://geronimo.apache.org/xml/ns/naming-1.1">
+      <resource-ref xmlns="http://geronimo.apache.org/xml/ns/naming-1.2">
         <ref-name>jms/myTopicConnectionFactory</ref-name>
         <resource-link>DefaultActiveMQConnectionFactory</resource-link>
       </resource-ref>
       <resource>
         <external-rar>activemq/activemq-ra/${activemq_version}/rar</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">
+        <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
+          <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
             <dep:moduleId>
               <dep:groupId>default</dep:groupId>
               <dep:artifactId>org.codehaus.activemq.ra_default</dep:artifactId>

Modified: geronimo/trunk/modules/upgrade/src/test-data/appclient_ejb_1_result.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/upgrade/src/test-data/appclient_ejb_1_result.xml?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/modules/upgrade/src/test-data/appclient_ejb_1_result.xml (original)
+++ geronimo/trunk/modules/upgrade/src/test-data/appclient_ejb_1_result.xml Fri Aug 18 00:44:04 2006
@@ -1,5 +1,5 @@
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
-  <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
+  <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
     <dep:moduleId>
       <dep:groupId>default</dep:groupId>
       <dep:artifactId>appclient_ejb_1</dep:artifactId>
@@ -19,8 +19,8 @@
   </dep:environment>
   <module>
     <ejb>appclient_ejb_1_ejb.jar</ejb>
-    <openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1">
-      <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+    <openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.2">
+      <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
         <dep:moduleId>
           <dep:groupId>default</dep:groupId>
           <dep:artifactId>ejb</dep:artifactId>
@@ -56,8 +56,8 @@
   </module>
   <module>
     <java>appclient_ejb_1_client.jar</java>
-    <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.1">
-      <dep:client-environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+    <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.2">
+      <dep:client-environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
         <dep:moduleId>
           <dep:groupId>default</dep:groupId>
           <dep:artifactId>appclient_ejb_1_appclient_ejb_1_client</dep:artifactId>
@@ -75,7 +75,7 @@
         <dep:hidden-classes/>
         <dep:non-overridable-classes/>
       </dep:client-environment>
-      <dep:server-environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+      <dep:server-environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
         <dep:moduleId>
           <dep:groupId>default</dep:groupId>
           <dep:artifactId>bar</dep:artifactId>

Modified: geronimo/trunk/modules/upgrade/src/test-data/assembly_1_result.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/upgrade/src/test-data/assembly_1_result.xml?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/modules/upgrade/src/test-data/assembly_1_result.xml (original)
+++ geronimo/trunk/modules/upgrade/src/test-data/assembly_1_result.xml Fri Aug 18 00:44:04 2006
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
-    <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
+    <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
         <dep:moduleId>
             <dep:groupId>default</dep:groupId>
             <dep:artifactId>assembly_1</dep:artifactId>
@@ -20,8 +20,8 @@
     </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.1">
-            <dep:client-environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+        <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.2">
+            <dep:client-environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <dep:moduleId>
                     <dep:groupId>default</dep:groupId>
                     <dep:artifactId>assembly_1_assembly_1_client</dep:artifactId>
@@ -39,7 +39,7 @@
                 <dep:hidden-classes/>
                 <dep:non-overridable-classes/>
             </dep:client-environment>
-            <dep:server-environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <dep:server-environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <dep:moduleId>
                     <dep:groupId>default</dep:groupId>
                     <dep:artifactId>bar</dep:artifactId>
@@ -52,7 +52,7 @@
             </dep:server-environment>
             <ejb-ref>
                 <ref-name>ejb/TestBean</ref-name>
-                <nam:pattern xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.1">
+                <nam:pattern xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.2">
                   <nam:artifactId>assembly_1_ejb</nam:artifactId>
                   <nam:name>TestBean</nam:name>
                 </nam:pattern>

Modified: geronimo/trunk/modules/upgrade/src/test-data/gbean_1_result.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/upgrade/src/test-data/gbean_1_result.xml?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/modules/upgrade/src/test-data/gbean_1_result.xml (original)
+++ geronimo/trunk/modules/upgrade/src/test-data/gbean_1_result.xml Fri Aug 18 00:44:04 2006
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
-  <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
+  <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
     <dep:moduleId>
       <dep:groupId>default</dep:groupId>
       <dep:artifactId>hello</dep:artifactId>
@@ -26,11 +26,11 @@
     </reference>
     <reference name="ServerInfo">
       <!--CHECK THAT THE TARGET GBEAN IS IN THE ANCESTOR SET OF THIS MODULE AND THAT THE NAME UNIQUELY IDENTIFIES IT-->
-      <dep:name xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">ServerInfo</dep:name>
+      <dep:name xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">ServerInfo</dep:name>
     </reference>
     <reference name="LoginService">
       <!--CHECK THAT THE TARGET GBEAN IS IN THE ANCESTOR SET OF THIS MODULE AND THAT THE NAME UNIQUELY IDENTIFIES IT-->
-      <dep:name xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">JaasLoginService</dep:name>
+      <dep:name xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">JaasLoginService</dep:name>
     </reference>
   </gbean>
   <gbean name="hello-login-chain" class="org.apache.geronimo.security.jaas.JaasLoginModuleUse">

Modified: geronimo/trunk/modules/upgrade/src/test-data/servlet_1_result.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/upgrade/src/test-data/servlet_1_result.xml?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/modules/upgrade/src/test-data/servlet_1_result.xml (original)
+++ geronimo/trunk/modules/upgrade/src/test-data/servlet_1_result.xml Fri Aug 18 00:44:04 2006
@@ -1,5 +1,5 @@
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
-  <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
+  <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
     <dep:moduleId>
       <dep:groupId>default</dep:groupId>
       <dep:artifactId>servlet_1</dep:artifactId>
@@ -19,8 +19,8 @@
   </dep:environment>
   <module>
     <web>servlet_deploy_ejblink_single_web.war</web>
-    <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
-      <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+    <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2">
+      <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
         <dep:moduleId>
           <dep:groupId>default</dep:groupId>
           <dep:artifactId>servlet_1_web_1</dep:artifactId>
@@ -39,8 +39,8 @@
   </module>
   <module>
     <web>servlet_deploy_ejblink_single_web.war</web>
-    <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
-      <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+    <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2">
+      <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
         <dep:moduleId>
           <dep:groupId>default</dep:groupId>
           <dep:artifactId>servlet_1_web_2</dep:artifactId>
@@ -60,8 +60,8 @@
   </module>
     <module>
       <web>servlet_deploy_ejblink_single_web.war</web>
-      <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
-        <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+      <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2">
+        <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
           <dep:moduleId>
             <dep:groupId>default</dep:groupId>
             <dep:artifactId>servlet_1_web_3</dep:artifactId>
@@ -76,8 +76,8 @@
     </module>
     <module>
       <web>servlet_deploy_ejblink_single_web.war</web>
-      <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
-        <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+      <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2">
+        <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
           <dep:moduleId>
             <dep:groupId>default</dep:groupId>
             <dep:artifactId>servlet_1_web_4</dep:artifactId>

Modified: geronimo/trunk/modules/upgrade/src/test-data/transport_1_result.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/upgrade/src/test-data/transport_1_result.xml?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/modules/upgrade/src/test-data/transport_1_result.xml (original)
+++ geronimo/trunk/modules/upgrade/src/test-data/transport_1_result.xml Fri Aug 18 00:44:04 2006
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
-  <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
+  <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
     <dep:moduleId>
       <dep:groupId>default</dep:groupId>
       <dep:artifactId>transport_1</dep:artifactId>
@@ -20,8 +20,8 @@
   </dep:environment>
   <module>
     <java>transport_1_client.jar</java>
-    <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.1">
-      <dep:client-environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+    <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.2">
+      <dep:client-environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
         <dep:moduleId>
           <dep:groupId>default</dep:groupId>
           <dep:artifactId>transport_ejb_vehicle_transport_ejb_vehicle_client</dep:artifactId>
@@ -39,7 +39,7 @@
         <dep:hidden-classes/>
         <dep:non-overridable-classes/>
       </dep:client-environment>
-      <dep:server-environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+      <dep:server-environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
         <dep:moduleId>
           <dep:groupId>default</dep:groupId>
           <dep:artifactId>bar</dep:artifactId>

Modified: geronimo/trunk/modules/upgrade/src/test-data/transport_2_result.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/upgrade/src/test-data/transport_2_result.xml?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/modules/upgrade/src/test-data/transport_2_result.xml (original)
+++ geronimo/trunk/modules/upgrade/src/test-data/transport_2_result.xml Fri Aug 18 00:44:04 2006
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
-  <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
+  <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
     <dep:moduleId>
       <dep:groupId>default</dep:groupId>
       <dep:artifactId>transport_jsp_vehicle</dep:artifactId>

Modified: geronimo/trunk/modules/web-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/web-builder/pom.xml?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/modules/web-builder/pom.xml (original)
+++ geronimo/trunk/modules/web-builder/pom.xml Fri Aug 18 00:44:04 2006
@@ -51,18 +51,6 @@
         
         <dependency>
             <groupId>${pom.groupId}</groupId>
-            <artifactId>geronimo-common</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>geronimo-deploy-config</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
             <artifactId>geronimo-j2ee-builder</artifactId>
             <version>${pom.version}</version>
         </dependency>
@@ -85,11 +73,6 @@
             <version>${pom.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>geronimo-j2ee-schema</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
 
         <dependency>
             <groupId>${pom.groupId}</groupId>
@@ -97,27 +80,17 @@
             <version>${pom.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>geronimo-deployment</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-
+        <!-- might not be needed -->
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>geronimo-j2ee</artifactId>
             <version>${pom.version}</version>
         </dependency>
-        
+
         <!-- Spec Dependencies -->
         
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_2.4_spec</artifactId>
         </dependency>
         
@@ -129,7 +102,7 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
                 <configuration>
-                    <sourceSchemas>geronimo-web-1.1.xsd</sourceSchemas>
+                    <sourceSchemas>geronimo-web-1.2.xsd</sourceSchemas>
                 </configuration>
             </plugin>
             

Modified: geronimo/trunk/modules/web-builder/project.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/web-builder/project.xml?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/modules/web-builder/project.xml (original)
+++ geronimo/trunk/modules/web-builder/project.xml Fri Aug 18 00:44:04 2006
@@ -77,6 +77,9 @@
             <groupId>geronimo</groupId>
             <artifactId>geronimo-j2ee-builder</artifactId>
             <version>${pom.currentVersion}</version>
+            <properties>
+                <xmlbeans>true</xmlbeans>
+            </properties>
         </dependency>
 
         <dependency>

Modified: geronimo/trunk/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java (original)
+++ geronimo/trunk/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java Fri Aug 18 00:44:04 2006
@@ -39,12 +39,16 @@
 import javax.security.jacc.WebResourcePermission;
 import javax.security.jacc.WebRoleRefPermission;
 import javax.security.jacc.WebUserDataPermission;
+import javax.xml.namespace.QName;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.deployment.util.DeploymentUtil;
 import org.apache.geronimo.deployment.ModuleIDBuilder;
+import org.apache.geronimo.deployment.NamespaceDrivenBuilderCollection;
+import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
+import org.apache.geronimo.deployment.xbeans.ServiceDocument;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.j2ee.deployment.EARContext;
@@ -71,6 +75,8 @@
 import org.apache.geronimo.xbeans.j2ee.UrlPatternType;
 import org.apache.geronimo.xbeans.j2ee.WebAppType;
 import org.apache.geronimo.xbeans.j2ee.WebResourceCollectionType;
+import org.apache.geronimo.xbeans.geronimo.j2ee.GerSecurityDocument;
+import org.apache.xmlbeans.XmlObject;
 
 /**
  * @version $Rev$ $Date$
@@ -78,13 +84,17 @@
 public abstract class AbstractWebModuleBuilder implements ModuleBuilder {
     private static final Log log = LogFactory.getLog(AbstractWebModuleBuilder.class);
     private static final String LINE_SEP = System.getProperty("line.separator");
-    
+
     protected static final AbstractNameQuery MANAGED_CONNECTION_FACTORY_PATTERN;
     private static final AbstractNameQuery ADMIN_OBJECT_PATTERN;
     protected static final AbstractNameQuery STATELESS_SESSION_BEAN_PATTERN;
     protected static final AbstractNameQuery STATEFUL_SESSION_BEAN_PATTERN;
     protected static final AbstractNameQuery ENTITY_BEAN_PATTERN;
     protected final Kernel kernel;
+    protected final NamespaceDrivenBuilderCollection securityBuilders;
+    protected final NamespaceDrivenBuilderCollection serviceBuilders;
+    private static final QName SECURITY_QNAME = GerSecurityDocument.type.getDocumentElementName();
+    private static final QName SERVICE_QNAME = ServiceDocument.type.getDocumentElementName();
 
     /**
      * Manifest classpath entries in a war configuration must be resolved relative to the war configuration, not the
@@ -93,8 +103,11 @@
      */
     private static final URI RELATIVE_MODULE_BASE_URI = URI.create("../");
 
-    protected AbstractWebModuleBuilder(Kernel kernel) {
+    protected AbstractWebModuleBuilder(Kernel kernel, Collection securityBuilders, Collection serviceBuilders) {
         this.kernel = kernel;
+        this.securityBuilders = new NamespaceDrivenBuilderCollection(securityBuilders);
+        this.serviceBuilders = new NamespaceDrivenBuilderCollection(serviceBuilders);
+
     }
 
     static {
@@ -225,7 +238,7 @@
                     moduleContext.addFile(targetPath, warFile, entry);
                 }
             }
-            
+
             //always add WEB-INF/classes to the classpath regardless of whether
             //any classes exist
             moduleContext.getConfiguration().addToClassPath("WEB-INF/classes/");
@@ -519,19 +532,19 @@
     private boolean cleanupConfigurationDir(File configurationDir)
     {
         LinkedList cannotBeDeletedList = new LinkedList();
-               
+
         if (!DeploymentUtil.recursiveDelete(configurationDir,cannotBeDeletedList)) {
             // Output a message to help user track down file problem
-            log.warn("Unable to delete " + cannotBeDeletedList.size() + 
-                    " files while recursively deleting directory " 
+            log.warn("Unable to delete " + cannotBeDeletedList.size() +
+                    " files while recursively deleting directory "
                     + configurationDir + LINE_SEP +
                     "The first file that could not be deleted was:" + LINE_SEP + "  "+
                     ( !cannotBeDeletedList.isEmpty() ? cannotBeDeletedList.getFirst() : "") );
             return false;
         }
         return true;
-    }    
-    
+    }
+
     protected void processRoleRefPermissions(ServletType servletType, Set securityRoles, Map rolePermissions) {
         String servletName = servletType.getServletName().getStringValue().trim();
         //WebRoleRefPermissions
@@ -557,6 +570,15 @@
             addPermissionToRole(roleName, new WebRoleRefPermission(servletName, roleName), rolePermissions);
         }
 //        servletData.setAttribute("webRoleRefPermissions", webRoleRefPermissions);
+    }
+
+    protected void buildSubstitutionGroups(XmlObject gerWebApp, boolean hasSecurityRealmName, Module module, EARContext earContext) throws DeploymentException {
+        XmlObject[] securityElements = XmlBeansUtil.selectSubstitutionGroupElements(SECURITY_QNAME, gerWebApp);
+        if (securityElements.length > 0 && !hasSecurityRealmName) {
+            throw new DeploymentException("You have supplied a security configuration for web app " + module.getName() + " but no security-realm-name to allow login");
+        }
+        securityBuilders.build(gerWebApp, earContext, module.getEarContext());
+        serviceBuilders.build(gerWebApp, earContext, module.getEarContext());
     }
 
     class UncheckedItem {

Copied: geronimo/trunk/modules/web-builder/src/schema/geronimo-web-1.2.xsd (from r432067, geronimo/trunk/modules/web-builder/src/schema/geronimo-web-1.1.xsd)
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/web-builder/src/schema/geronimo-web-1.2.xsd?p2=geronimo/trunk/modules/web-builder/src/schema/geronimo-web-1.2.xsd&p1=geronimo/trunk/modules/web-builder/src/schema/geronimo-web-1.1.xsd&r1=432067&r2=432510&rev=432510&view=diff
==============================================================================
--- geronimo/trunk/modules/web-builder/src/schema/geronimo-web-1.1.xsd (original)
+++ geronimo/trunk/modules/web-builder/src/schema/geronimo-web-1.2.xsd Fri Aug 18 00:44:04 2006
@@ -17,19 +17,20 @@
 -->
 
 <xs:schema
-    xmlns:web="http://geronimo.apache.org/xml/ns/j2ee/web-1.1"
-    targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/web-1.1"
-    xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1"
-    xmlns:security="http://geronimo.apache.org/xml/ns/security-1.1"
-    xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.1"
+    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:sys="http://geronimo.apache.org/xml/ns/deployment-1.2"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     elementFormDefault="qualified"
     attributeFormDefault="unqualified"
     version="1.0">
 
-    <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-module-1.1.xsd"/>
+    <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/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"/>
+    <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.2" schemaLocation="geronimo-module-1.2.xsd"/>
 
     <xs:element name="web-app" type="web:web-appType"/>
 
@@ -48,10 +49,10 @@
 
             <xs:sequence minOccurs="0">
                 <xs:element name="security-realm-name" type="xs:string"/>
-                <xs:element ref="security:security" minOccurs="0"/>
+                <xs:element ref="app:security" minOccurs="0"/>
             </xs:sequence>
 
-            <xs:element ref="sys:gbean" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element ref="sys:service" minOccurs="0" maxOccurs="unbounded"/>
 
         </xs:sequence>
     </xs:complexType>

Modified: geronimo/trunk/modules/web-builder/src/schema/xmlconfig.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/web-builder/src/schema/xmlconfig.xml?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/modules/web-builder/src/schema/xmlconfig.xml (original)
+++ geronimo/trunk/modules/web-builder/src/schema/xmlconfig.xml Fri Aug 18 00:44:04 2006
@@ -17,7 +17,7 @@
 -->
 <!-- @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/web-1.1">
+    <xb:namespace uri="http://geronimo.apache.org/xml/ns/j2ee/web-1.2">
         <xb:package>org.apache.geronimo.xbeans.geronimo.web</xb:package>
         <xb:prefix>Ger</xb:prefix>
     </xb:namespace>

Modified: geronimo/trunk/modules/web-builder/src/test-resources/plans/tomcat-post.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/web-builder/src/test-resources/plans/tomcat-post.xml?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/modules/web-builder/src/test-resources/plans/tomcat-post.xml (original)
+++ geronimo/trunk/modules/web-builder/src/test-resources/plans/tomcat-post.xml Fri Aug 18 00:44:04 2006
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<xml-fragment xmlns:tom="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1" xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.1" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<xml-fragment xmlns:tom="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2" xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.2" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
     <dep:environment>
         <dep:moduleId>
             <dep:groupId>test</dep:groupId>

Modified: geronimo/trunk/modules/web-builder/src/test-resources/plans/web-md-post.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/web-builder/src/test-resources/plans/web-md-post.xml?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/modules/web-builder/src/test-resources/plans/web-md-post.xml (original)
+++ geronimo/trunk/modules/web-builder/src/test-resources/plans/web-md-post.xml Fri Aug 18 00:44:04 2006
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xml-fragment xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.1" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<xml-fragment xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
   <dep:environment>
     <dep:moduleId>
       <dep:groupId>geronimo</dep:groupId>

Modified: geronimo/trunk/modules/web-builder/src/test/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverterTest.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/web-builder/src/test/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverterTest.java?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/modules/web-builder/src/test/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverterTest.java (original)
+++ geronimo/trunk/modules/web-builder/src/test/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverterTest.java Fri Aug 18 00:44:04 2006
@@ -54,12 +54,12 @@
     public void testConvertPlan(String prePlanName, String postPlanName) throws Exception {
         URL srcXml = classLoader.getResource(prePlanName);
         URL expectedOutputXml = classLoader.getResource(postPlanName);
-        XmlObject rawPlan = XmlBeansUtil.parse(srcXml);
+        XmlObject rawPlan = XmlBeansUtil.parse(srcXml, getClass().getClassLoader());
         log.debug("RAW PLAN " + rawPlan.toString());
         
         XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
         XmlObject webPlan = new GenericToSpecificPlanConverter("http://geronimo.apache.org/xml/ns/web/tomcat/config-1.0",
-                "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1", "tomcat").convertToSpecificPlan(rawPlan);
+                "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2", "tomcat").convertToSpecificPlan(rawPlan);
 
         log.debug("PROCESSED: " + webPlan.toString());
         log.debug("EXPECTED: " + expected.toString());

Modified: geronimo/trunk/modules/web-builder/src/test/org/apache/geronimo/web/deployment/WebAppDConfigTest.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/web-builder/src/test/org/apache/geronimo/web/deployment/WebAppDConfigTest.java?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/modules/web-builder/src/test/org/apache/geronimo/web/deployment/WebAppDConfigTest.java (original)
+++ geronimo/trunk/modules/web-builder/src/test/org/apache/geronimo/web/deployment/WebAppDConfigTest.java Fri Aug 18 00:44:04 2006
@@ -17,17 +17,15 @@
 
 package org.apache.geronimo.web.deployment;
 
-import java.util.Arrays;
 import java.net.URL;
+import java.util.Arrays;
+
 import javax.enterprise.deploy.model.DDBean;
 import javax.enterprise.deploy.model.DDBeanRoot;
 import javax.enterprise.deploy.spi.DeploymentConfiguration;
 
 import junit.framework.TestCase;
 import org.apache.geronimo.deployment.tools.loader.WebDeployable;
-import org.apache.geronimo.web.deployment.WebAppDConfigRoot;
-import org.apache.geronimo.web.deployment.WebAppDConfigBean;
-import org.apache.geronimo.web.deployment.WARConfiguration;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/trunk/modules/webservices/src/resources2/META-INF/geronimo-dependency.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/webservices/src/resources2/META-INF/geronimo-dependency.xml?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/modules/webservices/src/resources2/META-INF/geronimo-dependency.xml (original)
+++ geronimo/trunk/modules/webservices/src/resources2/META-INF/geronimo-dependency.xml Fri Aug 18 00:44:04 2006
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dep:service xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<dep:service xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
   <dep:dependency>
     <dep:groupId>org.apache.geronimo.specs</dep:groupId>
     <dep:artifactId>geronimo-jaxr_1.0_spec</dep:artifactId>

Modified: geronimo/trunk/plugins/geronimo-dependency-plugin/src/java/org/apache/geronimo/plugin/dependency/GenerateServiceXml.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/plugins/geronimo-dependency-plugin/src/java/org/apache/geronimo/plugin/dependency/GenerateServiceXml.java?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-dependency-plugin/src/java/org/apache/geronimo/plugin/dependency/GenerateServiceXml.java (original)
+++ geronimo/trunk/plugins/geronimo-dependency-plugin/src/java/org/apache/geronimo/plugin/dependency/GenerateServiceXml.java Fri Aug 18 00:44:04 2006
@@ -22,7 +22,8 @@
 import java.io.IOException;
 
 import org.apache.geronimo.deployment.xbeans.ServiceDocument;
-import org.apache.geronimo.deployment.xbeans.ServiceType;
+import org.apache.geronimo.deployment.xbeans.DependenciesType;
+import org.apache.geronimo.deployment.xbeans.DependenciesDocument;
 import org.apache.maven.project.Dependency;
 import org.apache.maven.repository.Artifact;
 import org.apache.xmlbeans.XmlOptions;
@@ -62,8 +63,8 @@
         if (targetDir == null) {
             throw new RuntimeException("No target directory supplied");
         }
-        ServiceDocument serviceDocument = ServiceDocument.Factory.newInstance();
-        ServiceType serviceType = serviceDocument.addNewService();
+        DependenciesDocument serviceDocument = DependenciesDocument.Factory.newInstance();
+        DependenciesType serviceType = serviceDocument.addNewDependencies();
         for (Iterator iterator = artifacts.iterator(); iterator.hasNext();) {
             Artifact artifact = (Artifact) iterator.next();
             Dependency dependency = artifact.getDependency();

Modified: geronimo/trunk/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PlanProcessor.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PlanProcessor.java?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PlanProcessor.java (original)
+++ geronimo/trunk/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PlanProcessor.java Fri Aug 18 00:44:04 2006
@@ -54,7 +54,7 @@
     private static final String KEEP_VERSION_PROPERTY = "geronimo.keep.version";
     private static final String REFERENCE_PROPERTY = "geronimo.reference";
     private static final String ENVIRONMENT_LOCAL_NAME = "environment";
-    private static final QName ENVIRONMENT_QNAME = new QName("http://geronimo.apache.org/xml/ns/deployment-1.1", "environment");
+    private static final QName ENVIRONMENT_QNAME = new QName("http://geronimo.apache.org/xml/ns/deployment-1.2", "environment");
 
     private List artifacts;
     private String sourceDir;



Mime
View raw message