geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r432510 [1/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
Author: djencks
Date: Fri Aug 18 00:44:04 2006
New Revision: 432510

URL: http://svn.apache.org/viewvc?rev=432510&view=rev
Log:
GERONIMO-1563 pluggable jacc, namespace driven builders.  Required changing most geronimo schema versions

Added:
    geronimo/trunk/modules/client-builder/src/schema/geronimo-application-client-1.2.xsd
      - copied, changed from r432067, geronimo/trunk/modules/client-builder/src/schema/geronimo-application-client-1.1.xsd
    geronimo/trunk/modules/connector-builder/src/schema/geronimo-connector-1.2.xsd
      - copied, changed from r432067, geronimo/trunk/modules/connector-builder/src/schema/geronimo-connector-1.1.xsd
    geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/NamespaceDrivenBuilder.java   (with props)
    geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/NamespaceDrivenBuilderCollection.java   (with props)
    geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/SecurityBuilder.java   (with props)
    geronimo/trunk/modules/j2ee-builder/src/schema/geronimo-application-1.2.xsd
      - copied, changed from r432067, geronimo/trunk/modules/j2ee-builder/src/schema/geronimo-application-1.1.xsd
    geronimo/trunk/modules/jetty-builder/src/schema/geronimo-jetty-1.2.xsd
      - copied, changed from r432067, geronimo/trunk/modules/jetty-builder/src/schema/geronimo-jetty-1.1.xsd
    geronimo/trunk/modules/naming-builder/src/schema/geronimo-naming-1.2.xsd
      - copied, changed from r432067, geronimo/trunk/modules/naming-builder/src/schema/geronimo-naming-1.1.xsd
    geronimo/trunk/modules/security-builder/src/java/org/apache/geronimo/security/deployment/GeronimoSecurityBuilderImpl.java   (with props)
    geronimo/trunk/modules/security-builder/src/schema/geronimo-login-config-1.2.xsd
      - copied, changed from r432067, geronimo/trunk/modules/security-builder/src/schema/geronimo-login-config-1.1.xsd
    geronimo/trunk/modules/security-builder/src/schema/geronimo-security-1.2.xsd
      - copied, changed from r432067, geronimo/trunk/modules/security-builder/src/schema/geronimo-security-1.1.xsd
    geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/SingleGBeanBuilder.java   (with props)
    geronimo/trunk/modules/service-builder/src/schema/geronimo-module-1.2.xsd
      - copied, changed from r432067, geronimo/trunk/modules/service-builder/src/schema/geronimo-module-1.1.xsd
    geronimo/trunk/modules/tomcat-builder/src/schema/geronimo-tomcat-1.2.xsd
      - copied, changed from r432067, geronimo/trunk/modules/tomcat-builder/src/schema/geronimo-tomcat-1.1.xsd
    geronimo/trunk/modules/web-builder/src/schema/geronimo-web-1.2.xsd
      - copied, changed from r432067, geronimo/trunk/modules/web-builder/src/schema/geronimo-web-1.1.xsd
Removed:
    geronimo/trunk/modules/security-builder/src/java/org/apache/geronimo/security/deployment/SecurityBuilder.java
Modified:
    geronimo/trunk/applications/console/console-standard/pom.xml
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java
    geronimo/trunk/configs/activemq/pom.xml
    geronimo/trunk/configs/axis-deployer/pom.xml
    geronimo/trunk/configs/client-deployer/src/plan/plan.xml
    geronimo/trunk/configs/client/pom.xml
    geronimo/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml
    geronimo/trunk/configs/j2ee-deployer/pom.xml
    geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml
    geronimo/trunk/configs/javamail/pom.xml
    geronimo/trunk/configs/jetty-deployer/src/plan/plan.xml
    geronimo/trunk/configs/openejb-deployer/src/plan/plan.xml
    geronimo/trunk/configs/pom.xml
    geronimo/trunk/configs/tomcat-deployer/src/plan/plan.xml
    geronimo/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml
    geronimo/trunk/m2-assemblies/geronimo-jetty-minimal/src/main/var/config/config.xml
    geronimo/trunk/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml
    geronimo/trunk/m2-assemblies/geronimo-tomcat-minimal/src/main/var/config/config.xml
    geronimo/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PlanProcessorMojo.java
    geronimo/trunk/modules/activemq-gbean-management/pom.xml
    geronimo/trunk/modules/activemq-gbean/pom.xml
    geronimo/trunk/modules/activemq-gbean/src/test/java/org/apache/activemq/gbean/ConnectorTest.java
    geronimo/trunk/modules/axis-builder/pom.xml
    geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/WSDescriptorParser.java
    geronimo/trunk/modules/axis-builder/src/test/org/apache/geronimo/axis/builder/ParsingTest.java
    geronimo/trunk/modules/axis-builder/src/test/org/apache/geronimo/axis/builder/ServiceReferenceTest.java
    geronimo/trunk/modules/axis/src/resources2/META-INF/geronimo-dependency.xml
    geronimo/trunk/modules/client-builder/pom.xml
    geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
    geronimo/trunk/modules/client-builder/src/resources2/META-INF/geronimo-dependency.xml
    geronimo/trunk/modules/client-builder/src/schema/xmlconfig.xml
    geronimo/trunk/modules/client-builder/src/test/org/apache/geronimo/client/builder/PlanParsingTest.java
    geronimo/trunk/modules/connector-builder/pom.xml
    geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
    geronimo/trunk/modules/connector-builder/src/schema/xmlconfig.xml
    geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
    geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/PlanParsingTest.java
    geronimo/trunk/modules/deploy-tool/pom.xml
    geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/PluginBootstrap.java
    geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/PluginBootstrap2.java
    geronimo/trunk/modules/deployment/pom.xml
    geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/ConfigurationBuilder.java
    geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java
    geronimo/trunk/modules/deployment/src/test/org/apache/geronimo/deployment/DeploymentContextTest.java
    geronimo/trunk/modules/deployment/src/test/org/apache/geronimo/deployment/SingleFileHotDeployerTest.java
    geronimo/trunk/modules/directory/pom.xml
    geronimo/trunk/modules/directory/src/resources2/META-INF/geronimo-dependency.xml
    geronimo/trunk/modules/j2ee-builder/pom.xml
    geronimo/trunk/modules/j2ee-builder/project.xml
    geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
    geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java
    geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java
    geronimo/trunk/modules/j2ee-builder/src/schema/xmlconfig.xml
    geronimo/trunk/modules/j2ee-builder/src/test-unpacked-ear/META-INF/geronimo-application.xml
    geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java
    geronimo/trunk/modules/j2ee-schema/pom.xml
    geronimo/trunk/modules/j2ee-schema/project.xml
    geronimo/trunk/modules/j2ee-schema/src/java/org/apache/geronimo/schema/GBeanElementConverter.java
    geronimo/trunk/modules/j2ee-schema/src/java/org/apache/geronimo/schema/SchemaConversionUtils.java
    geronimo/trunk/modules/j2ee-schema/src/java/org/apache/geronimo/schema/SecurityElementConverter.java
    geronimo/trunk/modules/j2ee-schema/src/test-data/geronimo/ejb-naming-post.xml
    geronimo/trunk/modules/j2ee-schema/src/test-data/geronimo/gbean-post.xml
    geronimo/trunk/modules/j2ee-schema/src/test-data/geronimo/security-post.xml
    geronimo/trunk/modules/j2ee-schema/src/test-data/geronimo/web-md-post.xml
    geronimo/trunk/modules/j2ee-schema/src/test/org/apache/geronimo/schema/SchemaConversionUtilsTest.java
    geronimo/trunk/modules/jetty-builder/pom.xml
    geronimo/trunk/modules/jetty-builder/project.xml
    geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
    geronimo/trunk/modules/jetty-builder/src/schema/xmlconfig.xml
    geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java
    geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/PlanParsingTest.java
    geronimo/trunk/modules/jetty/project.xml
    geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/InternalJAASJettyRealm.java
    geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyPOJOWebServiceHolder.java
    geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebApplicationHandler.java
    geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/interceptor/SecurityContextBeforeAfter.java
    geronimo/trunk/modules/jetty/src/resources2/META-INF/geronimo-dependency.xml
    geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/SecurityTest.java
    geronimo/trunk/modules/naming-builder/pom.xml
    geronimo/trunk/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/jsr88/HasPattern.java
    geronimo/trunk/modules/naming-builder/src/schema/xmlconfig.xml
    geronimo/trunk/modules/pom.xml
    geronimo/trunk/modules/security-builder/pom.xml
    geronimo/trunk/modules/security-builder/project.xml
    geronimo/trunk/modules/security-builder/src/java/org/apache/geronimo/security/deployment/LoginConfigBuilder.java
    geronimo/trunk/modules/security-builder/src/schema/xmlconfig.xml
    geronimo/trunk/modules/service-builder/pom.xml
    geronimo/trunk/modules/service-builder/project.xml
    geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanBuilder.java
    geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
    geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/xmlbeans/XmlBeansUtil.java
    geronimo/trunk/modules/service-builder/src/schema/xmlconfig.xml
    geronimo/trunk/modules/service-builder/src/test-resources/services/plan1.xml
    geronimo/trunk/modules/service-builder/src/test/org/apache/geronimo/deployment/service/ServiceConfigBuilderTest.java
    geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/repository/AbstractRepository.java
    geronimo/trunk/modules/tomcat-builder/pom.xml
    geronimo/trunk/modules/tomcat-builder/project.xml
    geronimo/trunk/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
    geronimo/trunk/modules/tomcat-builder/src/schema/xmlconfig.xml
    geronimo/trunk/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java
    geronimo/trunk/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
    geronimo/trunk/modules/tomcat/project.xml
    geronimo/trunk/modules/tomcat/src/resources/META-INF/geronimo-dependency.xml
    geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/JACCSecurityTest.java
    geronimo/trunk/modules/upgrade/src/java/org/apache/geronimo/upgrade/Upgrade1_0To1_1.java
    geronimo/trunk/modules/upgrade/src/test-data/appclient_dep_1_result.xml
    geronimo/trunk/modules/upgrade/src/test-data/appclient_ejb_1_result.xml
    geronimo/trunk/modules/upgrade/src/test-data/assembly_1_result.xml
    geronimo/trunk/modules/upgrade/src/test-data/gbean_1_result.xml
    geronimo/trunk/modules/upgrade/src/test-data/servlet_1_result.xml
    geronimo/trunk/modules/upgrade/src/test-data/transport_1_result.xml
    geronimo/trunk/modules/upgrade/src/test-data/transport_2_result.xml
    geronimo/trunk/modules/web-builder/pom.xml
    geronimo/trunk/modules/web-builder/project.xml
    geronimo/trunk/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java
    geronimo/trunk/modules/web-builder/src/schema/xmlconfig.xml
    geronimo/trunk/modules/web-builder/src/test-resources/plans/tomcat-post.xml
    geronimo/trunk/modules/web-builder/src/test-resources/plans/web-md-post.xml
    geronimo/trunk/modules/web-builder/src/test/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverterTest.java
    geronimo/trunk/modules/web-builder/src/test/org/apache/geronimo/web/deployment/WebAppDConfigTest.java
    geronimo/trunk/modules/webservices/src/resources2/META-INF/geronimo-dependency.xml
    geronimo/trunk/plugins/geronimo-dependency-plugin/src/java/org/apache/geronimo/plugin/dependency/GenerateServiceXml.java
    geronimo/trunk/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PlanProcessor.java

Modified: geronimo/trunk/applications/console/console-standard/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/console/console-standard/pom.xml?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/applications/console/console-standard/pom.xml (original)
+++ geronimo/trunk/applications/console/console-standard/pom.xml Fri Aug 18 00:44:04 2006
@@ -18,9 +18,9 @@
 <!-- $Rev$ $Date$ -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    
+
     <modelVersion>4.0.0</modelVersion>
-    
+
     <parent>
         <groupId>org.apache.geronimo.applications.console</groupId>
         <artifactId>console</artifactId>
@@ -31,58 +31,65 @@
     <artifactId>geronimo-console-standard</artifactId>
     <name>Geronimo Applications, Console :: Standard Portlets</name>
     <packaging>war</packaging>
-    
+
     <!--
-    
+
     HACK: Need to explicitly configure SCM for this module since its artifactId
           does not match the directory it lives in.
-    
+
     FIXME: Rename module directory or artifactId.
-    
+
     -->
     <scm>
         <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/trunk/applications/console/console-standard</connection>
         <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/applications/console/console-standard</developerConnection>
         <url>http://svn.apache.org/viewvc/geronimo/trunk/applications/console/console-standard</url>
     </scm>
-    
+
     <dependencies>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-upgrade</artifactId>
             <version>${pom.version}</version>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-converter</artifactId>
             <version>${pom.version}</version>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-derby</artifactId>
             <version>${pom.version}</version>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-connector-builder</artifactId>
             <version>${pom.version}</version>
             <scope>provided</scope>
         </dependency>
-        
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-security-builder</artifactId>
+            <version>${pom.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-deploy-jsr88</artifactId>
             <version>${pom.version}</version>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_2.4_spec</artifactId>

Modified: geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java (original)
+++ geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java Fri Aug 18 00:44:04 2006
@@ -29,6 +29,7 @@
 import org.apache.geronimo.deployment.xbeans.GbeanType;
 import org.apache.geronimo.deployment.xbeans.ReferenceType;
 import org.apache.geronimo.deployment.xbeans.XmlAttributeType;
+import org.apache.geronimo.deployment.xbeans.AbstractServiceType;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.kernel.management.State;
 import org.apache.geronimo.kernel.proxy.GeronimoManagedBean;
@@ -349,7 +350,8 @@
             artifactType.setType(artifact.getType());
         }
         // Build the realm GBean
-        GbeanType realm = root.addNewGbean();
+        GbeanType realm = GbeanType.Factory.newInstance();
+        root.setServiceArray(new AbstractServiceType[]{realm});
         realm.setName(data.getName());
         realm.setClass1("org.apache.geronimo.security.realm.GenericSecurityRealm");
         AttributeType realmName = realm.addNewAttribute();

Modified: geronimo/trunk/configs/activemq/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/activemq/pom.xml?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/configs/activemq/pom.xml (original)
+++ geronimo/trunk/configs/activemq/pom.xml Fri Aug 18 00:44:04 2006
@@ -42,14 +42,6 @@
             <type>car</type>
         </dependency>
         
-        <!-- To enforce build order -->
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>system-database</artifactId>
-            <version>${pom.version}</version>
-            <type>car</type>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>ge-activemq-rar</artifactId>

Modified: geronimo/trunk/configs/axis-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/axis-deployer/pom.xml?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/configs/axis-deployer/pom.xml (original)
+++ geronimo/trunk/configs/axis-deployer/pom.xml Fri Aug 18 00:44:04 2006
@@ -42,9 +42,11 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-axis</artifactId>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>axis</artifactId>
             <version>${pom.version}</version>
+            <type>car</type>
+            <scope>compile</scope>
         </dependency>
 
         <dependency>
@@ -53,11 +55,6 @@
             <version>${pom.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-webservices</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
     </dependencies>
     
 </project>

Modified: geronimo/trunk/configs/client-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/client-deployer/src/plan/plan.xml?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/configs/client-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/client-deployer/src/plan/plan.xml Fri Aug 18 00:44:04 2006
@@ -24,6 +24,12 @@
         <attribute name="transactionManagerObjectName">?name=TransactionManager</attribute>
         <attribute name="connectionTrackerObjectName">?name=ConnectionTracker</attribute>
         <attribute name="corbaGBeanObjectName">?name=Server</attribute>
+        <reference name="SecurityBuilder">
+            <name>SecurityBuilder</name>
+        </reference>
+        <reference name="ServiceBuilders">
+            <name>GBeanBuilder</name>
+        </reference>
         <references name="EJBReferenceBuilder">
             <pattern>
                 <name>ClientEJBReferenceBuilder</name>

Modified: geronimo/trunk/configs/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/client/pom.xml?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/configs/client/pom.xml (original)
+++ geronimo/trunk/configs/client/pom.xml Fri Aug 18 00:44:04 2006
@@ -80,10 +80,16 @@
         
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-j2ee</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <!-- should be transitive dependency of geronimo-j2ee -->
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-management</artifactId>
             <version>${pom.version}</version>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-transaction</artifactId>

Modified: geronimo/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml Fri Aug 18 00:44:04 2006
@@ -16,7 +16,7 @@
     limitations under the License.
 -->
 
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
     <!-- Deployer used to process modules and plans -->
     <gbean name="Deployer" class="org.apache.geronimo.deployment.Deployer">
         <reference name="Store">
@@ -35,6 +35,13 @@
             <!--<pattern><gbean-name>geronimo.maven:name=Repository</gbean-name></pattern>-->
             <!--<pattern><gbean-name>geronimo.server:name=Repository,*</gbean-name></pattern>-->
         </reference>
+        <reference name="ServiceBuilders">
+            <name>GBeanBuilder</name>
+        </reference>
+    </gbean>
+
+    <!-- NamespaceDriveBuilder for handling gbeans -->
+    <gbean name="GBeanBuilder" class="org.apache.geronimo.deployment.service.GBeanBuilder">
         <reference name="XmlAttributeBuilders">
             <!--<module>*</module>-->
             <!--<name>*</name>-->

Modified: geronimo/trunk/configs/j2ee-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/j2ee-deployer/pom.xml?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-deployer/pom.xml (original)
+++ geronimo/trunk/configs/j2ee-deployer/pom.xml Fri Aug 18 00:44:04 2006
@@ -34,7 +34,6 @@
     
     <dependencies>
     
-        <!-- why is this a parent ? -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>
@@ -42,11 +41,11 @@
             <type>car</type>
         </dependency>
 
-        <!-- import the classes ???? -->
+        <!-- import the classes -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-server</artifactId>
-            <version>${pom.version}</version>
+            <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>compile</scope>
         </dependency>
@@ -69,6 +68,11 @@
             <artifactId>geronimo-naming-builder</artifactId>
             <version>${pom.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-naming</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
@@ -81,13 +85,44 @@
             <artifactId>geronimo-web-builder</artifactId>
             <version>${pom.version}</version>
         </dependency>
-        
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.modules</groupId>-->
+            <!--<artifactId>geronimo-webservices</artifactId>-->
+            <!--<version>${pom.version}</version>-->
+        <!--</dependency>-->
+
         <!-- this should get connector -->
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-connector-builder</artifactId>
             <version>${pom.version}</version>
         </dependency>
+        <!-- should include as geronimo-dependency.xml in connector-builder jar -->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.modules</groupId>-->
+            <!--<artifactId>geronimo-connector</artifactId>-->
+            <!--<version>${pom.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.modules</groupId>-->
+            <!--<artifactId>geronimo-management</artifactId>-->
+            <!--<version>${pom.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.modules</groupId>-->
+            <!--<artifactId>geronimo-j2ee</artifactId>-->
+            <!--<version>${pom.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.modules</groupId>-->
+            <!--<artifactId>geronimo-transaction</artifactId>-->
+            <!--<version>${pom.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.modules</groupId>-->
+            <!--<artifactId>geronimo-interceptor</artifactId>-->
+            <!--<version>${pom.version}</version>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
@@ -101,7 +136,15 @@
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
         </dependency>
-        
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.specs</groupId>-->
+            <!--<artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.specs</groupId>-->
+            <!--<artifactId>geronimo-jta_1.0.1B_spec</artifactId>-->
+        <!--</dependency>-->
+
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-security</artifactId>

Modified: geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml Fri Aug 18 00:44:04 2006
@@ -20,8 +20,6 @@
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
 
     <gbean name="EARBuilder" class="org.apache.geronimo.j2ee.deployment.EARConfigBuilder">
-        <!--domain set to wildcard so datasources may be deployed independently on client. -->
-        <!--a better solution is to get the domain and server from the parent module -->
         <attribute name="transactionManagerAbstractName">?name=TransactionManager</attribute>
         <attribute name="connectionTrackerAbstractName">?name=ConnectionTracker</attribute>
         <attribute name="transactionalTimerAbstractName">?name=TransactionalThreadPooledTimer</attribute>
@@ -34,6 +32,12 @@
         <reference name="WebConfigBuilder">
             <name>WebBuilder</name>
         </reference>
+        <reference name="SecurityBuilders">
+            <name>SecurityBuilder</name>
+        </reference>
+        <reference name="ServiceBuilders">
+            <name>GBeanBuilder</name>
+        </reference>
         <references name="EJBConfigBuilder">
             <pattern>
                 <name>EJBBuilder</name>
@@ -106,6 +110,9 @@
         <attribute name="defaultIdleTimeoutMinutes">15</attribute>
         <attribute name="defaultXATransactionCaching">true</attribute>
         <attribute name="defaultXAThreadCaching">false</attribute>
+        <reference name="ServiceBuilders">
+            <name>GBeanBuilder</name>
+        </reference>
         <xml-attribute name="defaultEnvironment">
             <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <dependencies>
@@ -120,11 +127,16 @@
         </xml-attribute>
     </gbean>
 
+    <gbean name="SecurityBuilder" class="org.apache.geronimo.security.deployment.GeronimoSecurityBuilderImpl"/>
+
     <gbean name="LoginConfigurationBuilder" class="org.apache.geronimo.security.deployment.LoginConfigBuilder"/>
+
     <gbean name="SecurityService" class="org.apache.geronimo.security.SecurityServiceImpl">
         <attribute name="policyConfigurationFactory">
             org.apache.geronimo.security.jacc.GeronimoPolicyConfigurationFactory</attribute>
         <attribute name="policyProvider">org.apache.geronimo.security.jacc.GeronimoPolicy</attribute>
     </gbean>
+
+
 
 </module>

Modified: geronimo/trunk/configs/javamail/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/javamail/pom.xml?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/configs/javamail/pom.xml (original)
+++ geronimo/trunk/configs/javamail/pom.xml Fri Aug 18 00:44:04 2006
@@ -42,9 +42,9 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-javamail-transport</artifactId>
-            <version>${pom.version}</version>
+            <groupId>org.apache.geronimo.javamail</groupId>
+            <artifactId>geronimo-javamail_1.3_mail</artifactId>
+            <version>1.0-SNAPSHOT</version>
         </dependency>
         
         <dependency>

Modified: geronimo/trunk/configs/jetty-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/jetty-deployer/src/plan/plan.xml?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/configs/jetty-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/jetty-deployer/src/plan/plan.xml Fri Aug 18 00:44:04 2006
@@ -33,6 +33,12 @@
         <reference name="PojoWebServiceTemplate">
             <name>POJOTemplate</name>
         </reference>
+        <reference name="SecurityBuilders">
+            <name>SecurityBuilder</name>
+        </reference>
+        <reference name="ServiceBuilders">
+            <name>GBeanBuilder</name>
+        </reference>
         <references name="WebServiceBuilder">
             <pattern>
                 <name>WebServiceBuilder</name>

Modified: geronimo/trunk/configs/openejb-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/openejb-deployer/src/plan/plan.xml?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/configs/openejb-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/openejb-deployer/src/plan/plan.xml Fri Aug 18 00:44:04 2006
@@ -28,6 +28,12 @@
         <reference name="WebServiceLinkTemplate">
             <name>WebServiceEJBLinkTemplate</name>
         </reference>
+        <reference name="SecurityBuilders">
+            <name>SecurityBuilder</name>
+        </reference>
+        <reference name="ServiceBuilders">
+            <name>GBeanBuilder</name>
+        </reference>
         <references name="WebServiceBuilder">
             <pattern>
                 <name>WebServiceBuilder</name>

Modified: geronimo/trunk/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/pom.xml?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/configs/pom.xml (original)
+++ geronimo/trunk/configs/pom.xml Fri Aug 18 00:44:04 2006
@@ -109,7 +109,7 @@
             </plugin>
         </plugins>
     </build>
-    
+
     <modules>
         <module>activemq</module>
         <module>activemq-broker</module>

Modified: geronimo/trunk/configs/tomcat-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/tomcat-deployer/src/plan/plan.xml?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/configs/tomcat-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/tomcat-deployer/src/plan/plan.xml Fri Aug 18 00:44:04 2006
@@ -22,6 +22,12 @@
 
     <gbean name="TomcatWebBuilder" class="org.apache.geronimo.tomcat.deployment.TomcatModuleBuilder">
         <attribute name="tomcatContainerName">?name=TomcatWebContainer</attribute>
+        <reference name="SecurityBuilders">
+            <name>SecurityBuilder</name>
+        </reference>
+        <reference name="ServiceBuilders">
+            <name>GBeanBuilder</name>
+        </reference>
         <references name="WebServiceBuilder">
             <pattern>
                 <name>WebServiceBuilder</name>

Modified: geronimo/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml (original)
+++ geronimo/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml Fri Aug 18 00:44:04 2006
@@ -100,7 +100,7 @@
     
     <module name="org.apache.geronimo.configs/j2ee-deployer/${pom.version}/car">
         <gbean name="WebBuilder">
-            <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1</attribute>
+            <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2</attribute>
         </gbean>
     </module>
     

Modified: geronimo/trunk/m2-assemblies/geronimo-jetty-minimal/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-assemblies/geronimo-jetty-minimal/src/main/var/config/config.xml?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/m2-assemblies/geronimo-jetty-minimal/src/main/var/config/config.xml (original)
+++ geronimo/trunk/m2-assemblies/geronimo-jetty-minimal/src/main/var/config/config.xml Fri Aug 18 00:44:04 2006
@@ -57,7 +57,7 @@
     
     <module name="org.apache.geronimo.configs/j2ee-deployer/${pom.version}/car">
         <gbean name="WebBuilder">
-            <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1</attribute>
+            <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2</attribute>
         </gbean>
     </module>
 

Modified: geronimo/trunk/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml (original)
+++ geronimo/trunk/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml Fri Aug 18 00:44:04 2006
@@ -109,7 +109,7 @@
     
     <module name="org.apache.geronimo.configs/j2ee-deployer/${pom.version}/car">
         <gbean name="WebBuilder">
-            <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1</attribute>
+            <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2</attribute>
         </gbean>
     </module>
     

Modified: geronimo/trunk/m2-assemblies/geronimo-tomcat-minimal/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-assemblies/geronimo-tomcat-minimal/src/main/var/config/config.xml?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/m2-assemblies/geronimo-tomcat-minimal/src/main/var/config/config.xml (original)
+++ geronimo/trunk/m2-assemblies/geronimo-tomcat-minimal/src/main/var/config/config.xml Fri Aug 18 00:44:04 2006
@@ -59,7 +59,7 @@
     
     <module name="org.apache.geronimo.configs/j2ee-deployer/${pom.version}/car">
         <gbean name="WebBuilder">
-            <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1</attribute>
+            <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2</attribute>
         </gbean>
     </module>
 

Modified: geronimo/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PlanProcessorMojo.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PlanProcessorMojo.java?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PlanProcessorMojo.java (original)
+++ geronimo/trunk/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PlanProcessorMojo.java Fri Aug 18 00:44:04 2006
@@ -61,7 +61,7 @@
 {
     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");
 
     /**
      * @parameter expression="${basedir}/src/plan"

Modified: geronimo/trunk/modules/activemq-gbean-management/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/activemq-gbean-management/pom.xml?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/modules/activemq-gbean-management/pom.xml (original)
+++ geronimo/trunk/modules/activemq-gbean-management/pom.xml Fri Aug 18 00:44:04 2006
@@ -58,7 +58,7 @@
         </dependency>
 
     </dependencies>
-    
+
     <build>
         <!-- FIXME: Remove when the default is to use the m2 standard layout -->
         <sourceDirectory>${pom.basedir}/src/main/java</sourceDirectory>

Modified: geronimo/trunk/modules/activemq-gbean/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/activemq-gbean/pom.xml?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/modules/activemq-gbean/pom.xml (original)
+++ geronimo/trunk/modules/activemq-gbean/pom.xml Fri Aug 18 00:44:04 2006
@@ -94,7 +94,7 @@
         </dependency>
         
     </dependencies>
-    
+
     <build>
         <!-- FIXME: Remove when the default is to use the m2 standard layout -->
         <sourceDirectory>${pom.basedir}/src/main/java</sourceDirectory>

Modified: geronimo/trunk/modules/activemq-gbean/src/test/java/org/apache/activemq/gbean/ConnectorTest.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/activemq-gbean/src/test/java/org/apache/activemq/gbean/ConnectorTest.java?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/modules/activemq-gbean/src/test/java/org/apache/activemq/gbean/ConnectorTest.java (original)
+++ geronimo/trunk/modules/activemq-gbean/src/test/java/org/apache/activemq/gbean/ConnectorTest.java Fri Aug 18 00:44:04 2006
@@ -16,8 +16,6 @@
  */
 package org.apache.activemq.gbean;
 
-import org.apache.activemq.gbean.TransportConnectorGBeanImpl;
-
 import junit.framework.TestCase;
 
 /**

Modified: geronimo/trunk/modules/axis-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/axis-builder/pom.xml?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/modules/axis-builder/pom.xml (original)
+++ geronimo/trunk/modules/axis-builder/pom.xml Fri Aug 18 00:44:04 2006
@@ -30,7 +30,7 @@
 
     <artifactId>geronimo-axis-builder</artifactId>
     <name>Geronimo :: Axis :: Builder</name>
-    
+
     <!--
     
     HACK: Need to explicitly configure SCM for this module since its artifactId

Modified: geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/WSDescriptorParser.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/WSDescriptorParser.java?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/WSDescriptorParser.java (original)
+++ geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/WSDescriptorParser.java Fri Aug 18 00:44:04 2006
@@ -61,7 +61,6 @@
 
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.kernel.ClassLoading;
-import org.apache.geronimo.schema.SchemaConversionUtils;
 import org.apache.geronimo.xbeans.j2ee.ExceptionMappingType;
 import org.apache.geronimo.xbeans.j2ee.JavaWsdlMappingDocument;
 import org.apache.geronimo.xbeans.j2ee.JavaWsdlMappingType;
@@ -76,6 +75,7 @@
 import org.apache.geronimo.xbeans.j2ee.WebservicesDocument;
 import org.apache.geronimo.xbeans.j2ee.WebservicesType;
 import org.apache.geronimo.xbeans.j2ee.XsdQNameType;
+import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
 import org.apache.xmlbeans.XmlException;
 
 /**
@@ -379,7 +379,7 @@
     public static Map parseWebServiceDescriptor(URL wsDDUrl, JarFile moduleFile, boolean isEJB, Map servletLocations) throws DeploymentException {
         try {
             WebservicesDocument webservicesDocument = WebservicesDocument.Factory.parse(wsDDUrl);
-            SchemaConversionUtils.validateDD(webservicesDocument);
+            XmlBeansUtil.validateDD(webservicesDocument);
             WebservicesType webservicesType = webservicesDocument.getWebservices();
             return parseWebServiceDescriptor(webservicesType, moduleFile, isEJB, servletLocations);
         } catch (XmlException e) {

Modified: geronimo/trunk/modules/axis-builder/src/test/org/apache/geronimo/axis/builder/ParsingTest.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/axis-builder/src/test/org/apache/geronimo/axis/builder/ParsingTest.java?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/modules/axis-builder/src/test/org/apache/geronimo/axis/builder/ParsingTest.java (original)
+++ geronimo/trunk/modules/axis-builder/src/test/org/apache/geronimo/axis/builder/ParsingTest.java Fri Aug 18 00:44:04 2006
@@ -32,7 +32,6 @@
 import org.apache.xmlbeans.XmlBeans;
 import org.apache.xmlbeans.XmlException;
 import org.apache.xmlbeans.SchemaTypeLoader;
-import org.apache.geronimo.schema.SchemaConversionUtils;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
 
@@ -65,7 +64,7 @@
     }
 
     private Map parse(File schema1) throws IOException, XmlException, DeploymentException, URISyntaxException {
-        XmlObject xmlObject = XmlBeansUtil.parse(schema1.toURL());
+        XmlObject xmlObject = XmlBeansUtil.parse(schema1.toURL(), getClass().getClassLoader());
         Collection errors = new ArrayList();
         XmlOptions xmlOptions = new XmlOptions();
         xmlOptions.setErrorListener(errors);

Modified: geronimo/trunk/modules/axis-builder/src/test/org/apache/geronimo/axis/builder/ServiceReferenceTest.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/axis-builder/src/test/org/apache/geronimo/axis/builder/ServiceReferenceTest.java?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/modules/axis-builder/src/test/org/apache/geronimo/axis/builder/ServiceReferenceTest.java (original)
+++ geronimo/trunk/modules/axis-builder/src/test/org/apache/geronimo/axis/builder/ServiceReferenceTest.java Fri Aug 18 00:44:04 2006
@@ -112,11 +112,11 @@
         ArtifactManager artifactManager = new DefaultArtifactManager();
         ArtifactResolver artifactResolver = new DefaultArtifactResolver(artifactManager, Collections.EMPTY_SET, null);
         ConfigurationManager configurationManager = new SimpleConfigurationManager(Collections.EMPTY_SET, artifactResolver, Collections.EMPTY_SET);        
-        context = new DeploymentContext(tmpbasedir, null, environment, ConfigurationModuleType.CAR, naming, configurationManager, Collections.EMPTY_SET);
+        AbstractName moduleName = naming.createRootName(configID, "testejb", NameFactory.EJB_MODULE);
+        context = new DeploymentContext(tmpbasedir, null, environment, moduleName, ConfigurationModuleType.CAR, naming, configurationManager, Collections.EMPTY_SET);
 
         File moduleLocation = new File(tmpbasedir, "ejb");
         moduleLocation.mkdirs();
-        AbstractName moduleName = naming.createRootName(configID, "testejb", NameFactory.EJB_MODULE);
         module = new EJBModule(true, moduleName, environment, new UnpackedJarFile(moduleLocation), "ejb", null, null, null);
 
         runExternalWSTest = System.getProperty("geronimo.run.external.webservicetest", "false").equals("true");

Modified: geronimo/trunk/modules/axis/src/resources2/META-INF/geronimo-dependency.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/axis/src/resources2/META-INF/geronimo-dependency.xml?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/modules/axis/src/resources2/META-INF/geronimo-dependency.xml (original)
+++ geronimo/trunk/modules/axis/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>axis</dep:groupId>
     <dep:artifactId>axis</dep:artifactId>

Modified: geronimo/trunk/modules/client-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/client-builder/pom.xml?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/modules/client-builder/pom.xml (original)
+++ geronimo/trunk/modules/client-builder/pom.xml Fri Aug 18 00:44:04 2006
@@ -60,7 +60,13 @@
             <artifactId>geronimo-connector-builder</artifactId>
             <version>${pom.version}</version>
         </dependency>
-        
+
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>geronimo-security-builder</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
     </dependencies>
     
     <build>
@@ -84,7 +90,7 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
                 <configuration>
-                    <sourceSchemas>geronimo-application-client-1.1.xsd</sourceSchemas>
+                    <sourceSchemas>geronimo-application-client-1.2.xsd</sourceSchemas>
                 </configuration>
             </plugin>
             

Modified: geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java (original)
+++ geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java Fri Aug 18 00:44:04 2006
@@ -16,6 +16,23 @@
  */
 package org.apache.geronimo.client.builder;
 
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.StringTokenizer;
+import java.util.jar.Attributes;
+import java.util.jar.JarFile;
+import java.util.jar.Manifest;
+import java.util.zip.ZipEntry;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.client.AppClientContainer;
@@ -23,6 +40,8 @@
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.deployment.DeploymentContext;
 import org.apache.geronimo.deployment.ModuleIDBuilder;
+import org.apache.geronimo.deployment.NamespaceDrivenBuilder;
+import org.apache.geronimo.deployment.NamespaceDrivenBuilderCollection;
 import org.apache.geronimo.deployment.service.EnvironmentBuilder;
 import org.apache.geronimo.deployment.service.ServiceConfigBuilder;
 import org.apache.geronimo.deployment.util.DeploymentUtil;
@@ -44,6 +63,7 @@
 import org.apache.geronimo.j2ee.deployment.RefContext;
 import org.apache.geronimo.j2ee.deployment.ResourceReferenceBuilder;
 import org.apache.geronimo.j2ee.deployment.ServiceReferenceBuilder;
+import org.apache.geronimo.j2ee.deployment.SecurityBuilder;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.j2ee.management.impl.J2EEAppClientModuleImpl;
 import org.apache.geronimo.kernel.GBeanAlreadyExistsException;
@@ -57,7 +77,6 @@
 import org.apache.geronimo.naming.deployment.ENCConfigBuilder;
 import org.apache.geronimo.schema.SchemaConversionUtils;
 import org.apache.geronimo.security.deploy.DefaultPrincipal;
-import org.apache.geronimo.security.deployment.SecurityBuilder;
 import org.apache.geronimo.xbeans.geronimo.client.GerApplicationClientDocument;
 import org.apache.geronimo.xbeans.geronimo.client.GerApplicationClientType;
 import org.apache.geronimo.xbeans.geronimo.client.GerResourceType;
@@ -69,23 +88,6 @@
 import org.apache.xmlbeans.XmlException;
 import org.apache.xmlbeans.XmlObject;
 
-import java.io.File;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Map;
-import java.util.StringTokenizer;
-import java.util.jar.Attributes;
-import java.util.jar.JarFile;
-import java.util.jar.Manifest;
-import java.util.zip.ZipEntry;
-
 
 /**
  * @version $Rev:385232 $ $Date$
@@ -104,6 +106,9 @@
     private final SingleElementCollection connectorModuleBuilder;
     private final SingleElementCollection resourceReferenceBuilder;
     private final SingleElementCollection serviceReferenceBuilder;
+    private final SingleElementCollection securityBuilder;
+    private final NamespaceDrivenBuilderCollection serviceBuilder;
+
     private static final String GERAPPCLIENT_NAMESPACE = GerApplicationClientDocument.type.getDocumentElementName().getNamespaceURI();
 
     public AppClientModuleBuilder(Environment defaultClientEnvironment,
@@ -114,7 +119,9 @@
             EJBReferenceBuilder ejbReferenceBuilder,
             ModuleBuilder connectorModuleBuilder,
             ResourceReferenceBuilder resourceReferenceBuilder,
-            ServiceReferenceBuilder serviceReferenceBuilder) {
+            ServiceReferenceBuilder serviceReferenceBuilder,
+            NamespaceDrivenBuilder securityBuilder,
+            NamespaceDrivenBuilder serviceBuilder) {
         this(defaultClientEnvironment,
                 defaultServerEnvironment,
                 transactionManagerObjectName,
@@ -123,7 +130,9 @@
                 new SingleElementCollection(ejbReferenceBuilder),
                 new SingleElementCollection(connectorModuleBuilder),
                 new SingleElementCollection(resourceReferenceBuilder),
-                new SingleElementCollection(serviceReferenceBuilder));
+                new SingleElementCollection(serviceReferenceBuilder),
+                new SingleElementCollection(securityBuilder),
+                serviceBuilder == null? Collections.EMPTY_SET: Collections.singleton(serviceBuilder));
     }
 
     public AppClientModuleBuilder(AbstractNameQuery transactionManagerObjectName,
@@ -133,9 +142,10 @@
             Collection connectorModuleBuilder,
             Collection resourceReferenceBuilder,
             Collection serviceReferenceBuilder,
+            Collection securityBuilder,
+            Collection serviceBuilder,
             Environment defaultClientEnvironment,
-            Environment defaultServerEnvironment
-    ) {
+            Environment defaultServerEnvironment) {
         this(defaultClientEnvironment,
                 defaultServerEnvironment,
                 transactionManagerObjectName,
@@ -144,7 +154,9 @@
                 new SingleElementCollection(ejbReferenceBuilder),
                 new SingleElementCollection(connectorModuleBuilder),
                 new SingleElementCollection(resourceReferenceBuilder),
-                new SingleElementCollection(serviceReferenceBuilder));
+                new SingleElementCollection(serviceReferenceBuilder),
+                new SingleElementCollection(securityBuilder),
+                serviceBuilder);
     }
 
     private AppClientModuleBuilder(Environment defaultClientEnvironment,
@@ -155,7 +167,9 @@
             SingleElementCollection ejbReferenceBuilder,
             SingleElementCollection connectorModuleBuilder,
             SingleElementCollection resourceReferenceBuilder,
-            SingleElementCollection serviceReferenceBuilder) {
+            SingleElementCollection serviceReferenceBuilder,
+            SingleElementCollection securityBuilder,
+            Collection serviceBuilder) {
         this.defaultClientEnvironment = defaultClientEnvironment;
         this.defaultServerEnvironment = defaultServerEnvironment;
         this.corbaGBeanObjectName = corbaGBeanObjectName;
@@ -165,6 +179,8 @@
         this.connectorModuleBuilder = connectorModuleBuilder;
         this.resourceReferenceBuilder = resourceReferenceBuilder;
         this.serviceReferenceBuilder = serviceReferenceBuilder;
+        this.securityBuilder = securityBuilder;
+        this.serviceBuilder = new NamespaceDrivenBuilderCollection(serviceBuilder);
     }
 
     private EJBReferenceBuilder getEjbReferenceBuilder() {
@@ -183,6 +199,10 @@
         return (ServiceReferenceBuilder) serviceReferenceBuilder.getElement();
     }
 
+    private org.apache.geronimo.j2ee.deployment.SecurityBuilder getSecurityBuilder() {
+        return (SecurityBuilder) securityBuilder.getElement();
+    }
+
     public Module createModule(File plan, JarFile moduleFile, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
         return createModule(plan, moduleFile, "app-client", null, null, null, naming, idBuilder);
     }
@@ -271,7 +291,7 @@
                         rawPlan = XmlBeansUtil.parse((File) plan);
                     } else {
                         URL path = DeploymentUtil.createJarURL(moduleFile, "META-INF/geronimo-application-client.xml");
-                        rawPlan = XmlBeansUtil.parse(path);
+                        rawPlan = XmlBeansUtil.parse(path, getClass().getClassLoader());
                     }
                 }
             } catch (IOException e) {
@@ -461,8 +481,7 @@
 
                 // pop in all the gbeans declared in the geronimo app client file
                 if (geronimoAppClient != null) {
-                    GbeanType[] gbeans = geronimoAppClient.getGbeanArray();
-                    ServiceConfigBuilder.addGBeans(gbeans, appClientClassLoader, appClientDeploymentContext.getModuleName(), appClientDeploymentContext);
+                    serviceBuilder.build(geronimoAppClient, appClientDeploymentContext, appClientDeploymentContext);
                     //deploy the resource adapters specified in the geronimo-application.xml
                     Collection resourceModules = new ArrayList();
                     try {
@@ -561,7 +580,7 @@
                         appClientContainerGBeanData.setAttribute("realmName", realmName);
                         appClientContainerGBeanData.setAttribute("callbackHandlerClassName", callbackHandlerClassName);
                     } else if (geronimoAppClient.isSetDefaultPrincipal()) {
-                        DefaultPrincipal defaultPrincipal = SecurityBuilder.buildDefaultPrincipal(geronimoAppClient.getDefaultPrincipal());
+                        DefaultPrincipal defaultPrincipal = getSecurityBuilder().buildDefaultPrincipal(geronimoAppClient.getDefaultPrincipal());
                         appClientContainerGBeanData.setAttribute("defaultPrincipal", defaultPrincipal);
                     }
                     appClientContainerGBeanData.setReferencePattern("JNDIContext", jndiContextName);
@@ -713,6 +732,8 @@
         infoBuilder.addReference("ConnectorModuleBuilder", ModuleBuilder.class, NameFactory.MODULE_BUILDER);
         infoBuilder.addReference("ResourceReferenceBuilder", ResourceReferenceBuilder.class, NameFactory.MODULE_BUILDER);
         infoBuilder.addReference("ServiceReferenceBuilder", ServiceReferenceBuilder.class, NameFactory.MODULE_BUILDER);
+        infoBuilder.addReference("SecurityBuilder", SecurityBuilder.class, NameFactory.MODULE_BUILDER);
+        infoBuilder.addReference("ServiceBuilders", NamespaceDrivenBuilder.class, NameFactory.MODULE_BUILDER);
 
         infoBuilder.addInterface(ModuleBuilder.class);
 
@@ -723,6 +744,8 @@
                 "ConnectorModuleBuilder",
                 "ResourceReferenceBuilder",
                 "ServiceReferenceBuilder",
+                "SecurityBuilder",
+                "ServiceBuilders",
                 "defaultClientEnvironment",
                 "defaultServerEnvironment",
         });

Modified: geronimo/trunk/modules/client-builder/src/resources2/META-INF/geronimo-dependency.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/client-builder/src/resources2/META-INF/geronimo-dependency.xml?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/modules/client-builder/src/resources2/META-INF/geronimo-dependency.xml (original)
+++ geronimo/trunk/modules/client-builder/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.modules</dep:groupId>
     <dep:artifactId>geronimo-client</dep:artifactId>

Copied: geronimo/trunk/modules/client-builder/src/schema/geronimo-application-client-1.2.xsd (from r432067, geronimo/trunk/modules/client-builder/src/schema/geronimo-application-client-1.1.xsd)
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/client-builder/src/schema/geronimo-application-client-1.2.xsd?p2=geronimo/trunk/modules/client-builder/src/schema/geronimo-application-client-1.2.xsd&p1=geronimo/trunk/modules/client-builder/src/schema/geronimo-application-client-1.1.xsd&r1=432067&r2=432510&rev=432510&view=diff
==============================================================================
--- geronimo/trunk/modules/client-builder/src/schema/geronimo-application-client-1.1.xsd (original)
+++ geronimo/trunk/modules/client-builder/src/schema/geronimo-application-client-1.2.xsd Fri Aug 18 00:44:04 2006
@@ -17,21 +17,21 @@
 -->
 <!-- @version $Rev$ $Date$ -->
 <xs:schema
-    xmlns:geronimo="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.1"
-    targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.1"
-    xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1"
-    xmlns:connector="http://geronimo.apache.org/xml/ns/j2ee/connector-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:geronimo="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.2"
+    targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.2"
+    xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
+    xmlns:connector="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2"
+    xmlns:security="http://geronimo.apache.org/xml/ns/security-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/j2ee/connector-1.1" schemaLocation="geronimo-connector-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/connector-1.2" schemaLocation="geronimo-connector-1.2.xsd"/>
+    <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.2" schemaLocation="geronimo-module-1.2.xsd"/>
 
     <xs:element name="application-client" type="geronimo:application-clientType"/>
 
@@ -57,7 +57,7 @@
 
             <xs:element name="resource" type="geronimo:resourceType" minOccurs="0" maxOccurs="unbounded"/>
 
-            <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/client-builder/src/schema/xmlconfig.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/client-builder/src/schema/xmlconfig.xml?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/modules/client-builder/src/schema/xmlconfig.xml (original)
+++ geronimo/trunk/modules/client-builder/src/schema/xmlconfig.xml Fri Aug 18 00:44:04 2006
@@ -18,7 +18,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/application-client-1.1">
+    <xb:namespace uri="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.2">
         <xb:package>org.apache.geronimo.xbeans.geronimo.client</xb:package>
         <xb:prefix>Ger</xb:prefix>
     </xb:namespace>

Modified: geronimo/trunk/modules/client-builder/src/test/org/apache/geronimo/client/builder/PlanParsingTest.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/client-builder/src/test/org/apache/geronimo/client/builder/PlanParsingTest.java?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/modules/client-builder/src/test/org/apache/geronimo/client/builder/PlanParsingTest.java (original)
+++ geronimo/trunk/modules/client-builder/src/test/org/apache/geronimo/client/builder/PlanParsingTest.java Fri Aug 18 00:44:04 2006
@@ -3,13 +3,13 @@
 import java.io.File;
 
 import junit.framework.TestCase;
-import org.apache.geronimo.schema.SchemaConversionUtils;
 import org.apache.geronimo.xbeans.geronimo.client.GerApplicationClientDocument;
 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.deployment.xbeans.EnvironmentType;
 import org.apache.geronimo.deployment.xbeans.ArtifactType;
+import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
 
 /**
  */
@@ -19,7 +19,7 @@
     File basedir = new File(System.getProperty("basedir", "."));
 
     protected void setUp() throws Exception {
-        builder = new AppClientModuleBuilder(new Environment(), null, null, null, null, null, null, null, null);
+        builder = new AppClientModuleBuilder(new Environment(), null, null, null, null, null, null, null, null, null, null);
     }
 
     public void testResourceRef() throws Exception {
@@ -43,7 +43,7 @@
         ref.setRefName("ref");
         ref.setResourceLink("target");
 
-        SchemaConversionUtils.validateDD(appClient);
+        XmlBeansUtil.validateDD(appClient);
 //        System.out.println(appClient.toString());
     }
 

Modified: geronimo/trunk/modules/connector-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/connector-builder/pom.xml?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/pom.xml (original)
+++ geronimo/trunk/modules/connector-builder/pom.xml Fri Aug 18 00:44:04 2006
@@ -92,14 +92,15 @@
                     <include>NOTICE.txt</include>
                 </includes>
             </resource>
-            
-            <resource>
-                <directory>${pom.basedir}/src/schema</directory>
-                <targetPath>META-INF</targetPath>
-                <includes>
-                    <include>geronimo-connector-1.1.xsd</include>
-                </includes>
-            </resource>
+
+            <!-- TODO this should not be needed -->
+            <!--<resource>-->
+                <!--<directory>${pom.basedir}/src/schema</directory>-->
+                <!--<targetPath>META-INF</targetPath>-->
+                <!--<includes>-->
+                    <!--<include>geronimo-connector-1.2.xsd</include>-->
+                <!--</includes>-->
+            <!--</resource>-->
         </resources>
 
         <plugins>
@@ -107,7 +108,7 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
                 <configuration>
-                    <sourceSchemas>geronimo-connector-1.1.xsd</sourceSchemas>
+                    <sourceSchemas>geronimo-connector-1.2.xsd</sourceSchemas>
                 </configuration>
             </plugin>
             

Modified: geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java (original)
+++ geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java Fri Aug 18 00:44:04 2006
@@ -35,8 +35,10 @@
 import java.util.Set;
 import java.util.jar.JarFile;
 import java.util.zip.ZipEntry;
+
 import javax.naming.Reference;
 import javax.xml.namespace.QName;
+
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.common.UnresolvedReferenceException;
 import org.apache.geronimo.common.propertyeditor.PropertyEditors;
@@ -60,11 +62,11 @@
 import org.apache.geronimo.connector.outbound.connectionmanagerconfig.TransactionSupport;
 import org.apache.geronimo.connector.outbound.connectionmanagerconfig.XATransactions;
 import org.apache.geronimo.deployment.ModuleIDBuilder;
+import org.apache.geronimo.deployment.NamespaceDrivenBuilderCollection;
+import org.apache.geronimo.deployment.NamespaceDrivenBuilder;
 import org.apache.geronimo.deployment.service.EnvironmentBuilder;
-import org.apache.geronimo.deployment.service.ServiceConfigBuilder;
 import org.apache.geronimo.deployment.util.DeploymentUtil;
 import org.apache.geronimo.deployment.xbeans.EnvironmentType;
-import org.apache.geronimo.deployment.xbeans.GbeanType;
 import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.AbstractNameQuery;
@@ -120,6 +122,8 @@
  * @version $Rev:385659 $ $Date$
  */
 public class ConnectorModuleBuilder implements ModuleBuilder, ResourceReferenceBuilder {
+    private static QName CONNECTOR_QNAME = GerConnectorDocument.type.getDocumentElementName();
+    static final String GERCONNECTOR_NAMESPACE = CONNECTOR_QNAME.getNamespaceURI();
 
     private final int defaultMaxSize;
     private final int defaultMinSize;
@@ -128,8 +132,7 @@
     private final boolean defaultXATransactionCaching;
     private final boolean defaultXAThreadCaching;
     private final Environment defaultEnvironment;
-    private static QName CONNECTOR_QNAME = GerConnectorDocument.type.getDocumentElementName();
-    static final String GERCONNECTOR_NAMESPACE = CONNECTOR_QNAME.getNamespaceURI();
+    private final NamespaceDrivenBuilderCollection serviceBuilders;
 
     public ConnectorModuleBuilder(Environment defaultEnvironment,
             int defaultMaxSize,
@@ -137,7 +140,8 @@
             int defaultBlockingTimeoutMilliseconds,
             int defaultIdleTimeoutMinutes,
             boolean defaultXATransactionCaching,
-            boolean defaultXAThreadCaching) {
+            boolean defaultXAThreadCaching,
+            Collection serviceBuilders) {
         this.defaultEnvironment = defaultEnvironment;
 
         this.defaultMaxSize = defaultMaxSize;
@@ -146,6 +150,7 @@
         this.defaultIdleTimeoutMinutes = defaultIdleTimeoutMinutes;
         this.defaultXATransactionCaching = defaultXATransactionCaching;
         this.defaultXAThreadCaching = defaultXAThreadCaching;
+        this.serviceBuilders = new NamespaceDrivenBuilderCollection(serviceBuilders);
     }
 
     public Module createModule(File plan, JarFile moduleFile, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
@@ -225,7 +230,7 @@
                 cursor.dispose();
             }
 
-            SchemaConversionUtils.validateDD(gerConnector);
+            XmlBeansUtil.validateDD(gerConnector);
         } catch (XmlException e) {
             throw new DeploymentException(e);
         }
@@ -235,8 +240,8 @@
         if (earEnvironment != null) {
             EnvironmentBuilder.mergeEnvironments(earEnvironment, environment);
             environment = earEnvironment;
-            if(!environment.getConfigId().isResolved()) {
-                throw new IllegalStateException("Connector module ID should be fully resolved (not "+environment.getConfigId()+")");
+            if (!environment.getConfigId().isResolved()) {
+                throw new IllegalStateException("Connector module ID should be fully resolved (not " + environment.getConfigId() + ")");
             }
         } else {
             idBuilder.resolve(environment, new File(moduleFile.getName()).getName(), "rar");
@@ -377,8 +382,7 @@
 
         GerConnectorType geronimoConnector = (GerConnectorType) module.getVendorDD();
 
-        GbeanType[] gbeans = geronimoConnector.getGbeanArray();
-        ServiceConfigBuilder.addGBeans(gbeans, cl, resourceAdapterModuleName, earContext);
+        serviceBuilders.build(geronimoConnector, earContext, earContext);
 
         addConnectorGBeans(earContext, jcaResourcejsr77Name, resourceAdapterModuleData, connector, geronimoConnector, cl);
 
@@ -868,6 +872,8 @@
         infoBuilder.addAttribute("defaultXATransactionCaching", boolean.class, true, true);
         infoBuilder.addAttribute("defaultXAThreadCaching", boolean.class, true, true);
 
+        infoBuilder.addReference("ServiceBuilders", NamespaceDrivenBuilder.class, NameFactory.MODULE_BUILDER);
+
         infoBuilder.addInterface(ModuleBuilder.class);
         infoBuilder.addInterface(ResourceReferenceBuilder.class);
 
@@ -877,7 +883,8 @@
                 "defaultBlockingTimeoutMilliseconds",
                 "defaultIdleTimeoutMinutes",
                 "defaultXATransactionCaching",
-                "defaultXAThreadCaching"});
+                "defaultXAThreadCaching",
+                "ServiceBuilders"});
         GBEAN_INFO = infoBuilder.getBeanInfo();
     }
 

Copied: geronimo/trunk/modules/connector-builder/src/schema/geronimo-connector-1.2.xsd (from r432067, geronimo/trunk/modules/connector-builder/src/schema/geronimo-connector-1.1.xsd)
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/connector-builder/src/schema/geronimo-connector-1.2.xsd?p2=geronimo/trunk/modules/connector-builder/src/schema/geronimo-connector-1.2.xsd&p1=geronimo/trunk/modules/connector-builder/src/schema/geronimo-connector-1.1.xsd&r1=432067&r2=432510&rev=432510&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/schema/geronimo-connector-1.1.xsd (original)
+++ geronimo/trunk/modules/connector-builder/src/schema/geronimo-connector-1.2.xsd Fri Aug 18 00:44:04 2006
@@ -17,23 +17,23 @@
 -->
 
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema"
-    xmlns:ger="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1"
-    xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1"
-    xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.1"
-    targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1"
+    xmlns:ger="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2"
+    xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
+    xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2"
+    targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     elementFormDefault="qualified"
     attributeFormDefault="unqualified">
 
-    <xs:import namespace="http://geronimo.apache.org/xml/ns/naming-1.1" schemaLocation="geronimo-naming-1.1.xsd"/>
-    <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.1" schemaLocation="geronimo-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/deployment-1.2" schemaLocation="geronimo-module-1.2.xsd"/>
     <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
 
     <xs:annotation>
         <xs:documentation>
             <![CDATA[
             documents using this schema should start like:
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1"
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2"
     version="1.5">
 
           @(#)geronimo-connector_1_5.xsds
@@ -297,7 +297,7 @@
 
             <xs:element name="adminobject" type="ger:adminobjectType" minOccurs="0" maxOccurs="unbounded"/>
 
-            <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/connector-builder/src/schema/xmlconfig.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/connector-builder/src/schema/xmlconfig.xml?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/schema/xmlconfig.xml (original)
+++ geronimo/trunk/modules/connector-builder/src/schema/xmlconfig.xml Fri Aug 18 00:44:04 2006
@@ -1,7 +1,7 @@
 <xb:config xmlns:xb="http://www.bea.com/2002/09/xbean/config"
     >
 
-    <xb:namespace uri="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
+    <xb:namespace uri="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
         <xb:package>org.apache.geronimo.xbeans.geronimo</xb:package>
         <xb:prefix>Ger</xb:prefix>
     </xb:namespace>

Modified: geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java (original)
+++ geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java Fri Aug 18 00:44:04 2006
@@ -33,6 +33,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.jar.JarFile;
+
 import javax.naming.Reference;
 import javax.sql.DataSource;
 import javax.xml.namespace.QName;
@@ -41,6 +42,7 @@
 import org.apache.geronimo.common.DeploymentException;
 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.DeploymentUtil;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.AbstractNameQuery;
@@ -163,7 +165,8 @@
         JarFile rarFile = null;
         try {
             rarFile = DeploymentUtil.createJarFile(new File(basedir, "target/test-ear-noger.ear"));
-
+            GBeanBuilder serviceBuilder = new GBeanBuilder(null, null);
+//            EARConfigBuilder configBuilder = new EARConfigBuilder(defaultEnvironment, transactionContextManagerName, connectionTrackerName, null, null, null, new AbstractNameQuery(serverName, J2EEServerImpl.GBEAN_INFO.getInterfaces()), null, null, ejbReferenceBuilder, null,
             EARConfigBuilder configBuilder = new EARConfigBuilder(defaultEnvironment,
                     transactionManagerName,
                     connectionTrackerName,
@@ -175,10 +178,12 @@
                     null,
                     ejbReferenceBuilder,
                     null,
-                    new ConnectorModuleBuilder(defaultEnvironment, defaultMaxSize, defaultMinSize, defaultBlockingTimeoutMilliseconds, defaultidleTimeoutMinutes, defaultXATransactionCaching, defaultXAThreadCaching),
+                    new ConnectorModuleBuilder(defaultEnvironment, defaultMaxSize, defaultMinSize, defaultBlockingTimeoutMilliseconds, defaultidleTimeoutMinutes, defaultXATransactionCaching, defaultXAThreadCaching, Collections.singleton(serviceBuilder)),
                     resourceReferenceBuilder,
                     null,
                     serviceReferenceBuilder,
+                    null,
+                    serviceBuilder,
                     kernel.getNaming());
             ConfigurationData configData = null;
             DeploymentContext context = null;
@@ -352,7 +357,7 @@
         String resourceAdapterName = "testRA";
 
         try {
-            ConnectorModuleBuilder moduleBuilder = new ConnectorModuleBuilder(defaultEnvironment, defaultMaxSize, defaultMinSize, defaultBlockingTimeoutMilliseconds, defaultidleTimeoutMinutes, defaultXATransactionCaching, defaultXAThreadCaching);
+            ConnectorModuleBuilder moduleBuilder = new ConnectorModuleBuilder(defaultEnvironment, defaultMaxSize, defaultMinSize, defaultBlockingTimeoutMilliseconds, defaultidleTimeoutMinutes, defaultXATransactionCaching, defaultXAThreadCaching, Collections.singleton(new GBeanBuilder(null, null)));
             File rarFile = action.getRARFile();
 
             ClassLoader oldCl = Thread.currentThread().getContextClassLoader();

Modified: geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/PlanParsingTest.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/PlanParsingTest.java?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/PlanParsingTest.java (original)
+++ geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/PlanParsingTest.java Fri Aug 18 00:44:04 2006
@@ -11,7 +11,6 @@
 import org.apache.geronimo.xbeans.geronimo.GerConnectorType;
 import org.apache.geronimo.xbeans.j2ee.ConnectorDocument;
 import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
-import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
 import org.apache.xmlbeans.XmlException;
 import org.apache.xmlbeans.XmlObject;
 
@@ -26,10 +25,10 @@
     public void testLoadGeronimoDeploymentDescriptor10() throws Exception {
         URL srcXml = classLoader.getResource("connector_1_0/geronimo-ra.xml");
 //        File geronimoDD = new File(basedir, "src/test-data/connector_1_0/geronimo-ra.xml");
-        XmlObject plan = XmlBeansUtil.parse(srcXml);
+        XmlObject plan = XmlBeansUtil.parse(srcXml, getClass().getClassLoader());
         GerConnectorDocument connectorDocument = (GerConnectorDocument) plan.changeType(GerConnectorDocument.type);
         GerConnectorType connector = (GerConnectorType) SchemaConversionUtils.fixGeronimoSchema(connectorDocument, CONNECTOR_QNAME, GerConnectorType.type);
-        SchemaConversionUtils.validateDD(connector);
+        XmlBeansUtil.validateDD(connector);
         assertEquals(1, connectorDocument.getConnector().getResourceadapterArray().length);
     }
 
@@ -37,17 +36,17 @@
         URL srcXml = classLoader.getResource("connector_1_5/ra.xml");
 //        File j2eeDD = new File(basedir, "src/test-data/connector_1_5/ra.xml");
 //        assertTrue(j2eeDD.exists());
-        XmlObject plan = XmlBeansUtil.parse(srcXml);
+        XmlObject plan = XmlBeansUtil.parse(srcXml, getClass().getClassLoader());
         ConnectorDocument connectorDocument = (ConnectorDocument) plan.changeType(ConnectorDocument.type);
         assertNotNull(connectorDocument.getConnector().getResourceadapter());
-        SchemaConversionUtils.validateDD(connectorDocument);
+        XmlBeansUtil.validateDD(connectorDocument);
     }
 
     public void testLoadGeronimoDeploymentDescriptor15() throws Exception {
         URL srcXml = classLoader.getResource("connector_1_5/geronimo-ra.xml");
 //        File geronimoDD = new File(basedir, "src/test-data/connector_1_5/geronimo-ra.xml");
 //        assertTrue(geronimoDD.exists());
-        XmlObject plan = XmlBeansUtil.parse(srcXml);
+        XmlObject plan = XmlBeansUtil.parse(srcXml, getClass().getClassLoader());
         GerConnectorDocument connectorDocument = (GerConnectorDocument) plan.changeType(GerConnectorDocument.type);
         GerConnectorType connector = (GerConnectorType) SchemaConversionUtils.fixGeronimoSchema(connectorDocument, CONNECTOR_QNAME, GerConnectorType.type);
         assertEquals(1, connector.getResourceadapterArray().length);
@@ -58,13 +57,13 @@
 //        File resourcePlan = new File(basedir, "src/test-data/data/dup-resourceadapter-name.xml");
 //        assertTrue(resourcePlan.exists());
 
-        XmlObject plan = XmlBeansUtil.parse(srcXml);
+        XmlObject plan = XmlBeansUtil.parse(srcXml, getClass().getClassLoader());
         GerConnectorDocument doc = (GerConnectorDocument) plan.changeType(GerConnectorDocument.type);
         if (doc == null) {
             doc = (GerConnectorDocument) plan;
         }
         try {
-            SchemaConversionUtils.validateDD(doc);
+            XmlBeansUtil.validateDD(doc);
             fail("dup resource adapter name is invalid");
         } catch (XmlException e) {
             //expected
@@ -76,13 +75,13 @@
 //        File resourcePlan = new File(basedir, "src/test-data/data/dup-connectionfactoryinstance-name.xml");
 //        assertTrue(resourcePlan.exists());
 
-        XmlObject plan = XmlBeansUtil.parse(srcXml);
+        XmlObject plan = XmlBeansUtil.parse(srcXml, getClass().getClassLoader());
         GerConnectorDocument doc = (GerConnectorDocument) plan.changeType(GerConnectorDocument.type);
         if (doc == null) {
             doc = (GerConnectorDocument) plan;
         }
         try {
-            SchemaConversionUtils.validateDD(doc);
+            XmlBeansUtil.validateDD(doc);
             fail("dup connection factory name is invalid");
         } catch (XmlException e) {
             //expected
@@ -94,13 +93,13 @@
 //        File resourcePlan = new File(basedir, "src/test-data/data/dup-admin-object-name.xml");
 //        assertTrue(resourcePlan.exists());
 
-        XmlObject plan = XmlBeansUtil.parse(srcXml);
+        XmlObject plan = XmlBeansUtil.parse(srcXml, getClass().getClassLoader());
         GerConnectorDocument doc = (GerConnectorDocument) plan.changeType(GerConnectorDocument.type);
         if (doc == null) {
             doc = (GerConnectorDocument) plan;
         }
         try {
-            SchemaConversionUtils.validateDD(doc);
+            XmlBeansUtil.validateDD(doc);
             fail("dup admin object name is invalid");
         } catch (XmlException e) {
             //expected
@@ -112,7 +111,7 @@
 //        File resourcePlan = new File(basedir, "src/test-data/data/old-schema-plan.xml");
 //        assertTrue(resourcePlan.exists());
 
-        XmlObject plan = XmlBeansUtil.parse(srcXml);
+        XmlObject plan = XmlBeansUtil.parse(srcXml, getClass().getClassLoader());
         GerConnectorDocument doc = (GerConnectorDocument) plan.changeType(GerConnectorDocument.type);
         if (doc == null) {
             doc = (GerConnectorDocument) plan;

Modified: geronimo/trunk/modules/deploy-tool/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/deploy-tool/pom.xml?rev=432510&r1=432509&r2=432510&view=diff
==============================================================================
--- geronimo/trunk/modules/deploy-tool/pom.xml (original)
+++ geronimo/trunk/modules/deploy-tool/pom.xml Fri Aug 18 00:44:04 2006
@@ -75,7 +75,13 @@
             <artifactId>geronimo-deploy-jsr88</artifactId>
             <version>${pom.version}</version>
         </dependency>
-        
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-service-builder</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
         <!-- Thirdparty Dependencies -->
         
         <dependency>



Mime
View raw message