geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r418888 [4/7] - in /geronimo/branches/pluggable-jacc: ./ applications/console/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/ configs/ configs/activemq/ configs/client-deployer/src/plan/ configs/client/ configs/...
Date Tue, 04 Jul 2006 00:50:47 GMT
Modified: geronimo/branches/pluggable-jacc/modules/deploy-tool/src/java/org/apache/geronimo/deployment/PluginBootstrap.java
URL: http://svn.apache.org/viewvc/geronimo/branches/pluggable-jacc/modules/deploy-tool/src/java/org/apache/geronimo/deployment/PluginBootstrap.java?rev=418888&r1=418657&r2=418888&view=diff
==============================================================================
--- geronimo/branches/pluggable-jacc/modules/deploy-tool/src/java/org/apache/geronimo/deployment/PluginBootstrap.java (original)
+++ geronimo/branches/pluggable-jacc/modules/deploy-tool/src/java/org/apache/geronimo/deployment/PluginBootstrap.java Mon Jul  3 17:50:41 2006
@@ -23,6 +23,7 @@
 import java.util.jar.JarOutputStream;
 
 import org.apache.geronimo.deployment.service.ServiceConfigBuilder;
+import org.apache.geronimo.deployment.service.GBeanBuilder;
 import org.apache.geronimo.deployment.xbeans.ModuleDocument;
 import org.apache.geronimo.deployment.xbeans.ModuleType;
 import org.apache.geronimo.kernel.Jsr77Naming;
@@ -71,7 +72,8 @@
         ModuleType config = ModuleDocument.Factory.parse(plan).getModule();
 
         Maven1Repository repository = new Maven1Repository(localRepo);
-        ServiceConfigBuilder builder = new ServiceConfigBuilder(null, Collections.singleton(repository), new Jsr77Naming());
+        GBeanBuilder gBeanBuilder = new GBeanBuilder(null, null);
+        ServiceConfigBuilder builder = new ServiceConfigBuilder(null, Collections.singleton(repository), Collections.singleton(gBeanBuilder), new Jsr77Naming());
         ConfigurationStore targetConfigurationStore = new NullConfigurationStore() {
             public File createNewConfigurationDir(Artifact configId) throws ConfigurationAlreadyExistsException {
                 return buildDir;

Modified: geronimo/branches/pluggable-jacc/modules/deploy-tool/src/java/org/apache/geronimo/deployment/PluginBootstrap2.java
URL: http://svn.apache.org/viewvc/geronimo/branches/pluggable-jacc/modules/deploy-tool/src/java/org/apache/geronimo/deployment/PluginBootstrap2.java?rev=418888&r1=418657&r2=418888&view=diff
==============================================================================
--- geronimo/branches/pluggable-jacc/modules/deploy-tool/src/java/org/apache/geronimo/deployment/PluginBootstrap2.java (original)
+++ geronimo/branches/pluggable-jacc/modules/deploy-tool/src/java/org/apache/geronimo/deployment/PluginBootstrap2.java Mon Jul  3 17:50:41 2006
@@ -23,6 +23,7 @@
 import java.util.jar.JarOutputStream;
 
 import org.apache.geronimo.deployment.service.ServiceConfigBuilder;
+import org.apache.geronimo.deployment.service.GBeanBuilder;
 import org.apache.geronimo.deployment.xbeans.ModuleDocument;
 import org.apache.geronimo.deployment.xbeans.ModuleType;
 import org.apache.geronimo.kernel.Jsr77Naming;
@@ -71,7 +72,8 @@
         ModuleType config = ModuleDocument.Factory.parse(plan).getModule();
 
         Maven2Repository repository = new Maven2Repository(localRepo);
-        ServiceConfigBuilder builder = new ServiceConfigBuilder(null, Collections.singleton(repository), new Jsr77Naming());
+        GBeanBuilder gBeanBuilder = new GBeanBuilder(null, null);
+        ServiceConfigBuilder builder = new ServiceConfigBuilder(null, Collections.singleton(repository), Collections.singleton(gBeanBuilder), new Jsr77Naming());
         ConfigurationStore targetConfigurationStore = new NullConfigurationStore() {
             public File createNewConfigurationDir(Artifact configId) throws ConfigurationAlreadyExistsException {
                 return buildDir;

Modified: geronimo/branches/pluggable-jacc/modules/deployment/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/pluggable-jacc/modules/deployment/pom.xml?rev=418888&r1=418657&r2=418888&view=diff
==============================================================================
--- geronimo/branches/pluggable-jacc/modules/deployment/pom.xml (original)
+++ geronimo/branches/pluggable-jacc/modules/deployment/pom.xml Mon Jul  3 17:50:41 2006
@@ -58,6 +58,16 @@
         </dependency>
 
         <dependency>
+            <groupId>xmlbeans</groupId>
+            <artifactId>xbean</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+        </dependency>
+
+        <dependency>
             <groupId>xml-resolver</groupId>
             <artifactId>xml-resolver</artifactId>
         </dependency>

Modified: geronimo/branches/pluggable-jacc/modules/deployment/src/java/org/apache/geronimo/deployment/ConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/branches/pluggable-jacc/modules/deployment/src/java/org/apache/geronimo/deployment/ConfigurationBuilder.java?rev=418888&r1=418657&r2=418888&view=diff
==============================================================================
--- geronimo/branches/pluggable-jacc/modules/deployment/src/java/org/apache/geronimo/deployment/ConfigurationBuilder.java (original)
+++ geronimo/branches/pluggable-jacc/modules/deployment/src/java/org/apache/geronimo/deployment/ConfigurationBuilder.java Mon Jul  3 17:50:41 2006
@@ -33,6 +33,8 @@
  * @version $Rev$ $Date$
  */
 public interface ConfigurationBuilder {
+    static final String CONFIG_BUILDER = "ConfigBuilder";
+
     /**
      * Builds a deployment plan specific to this builder from a planFile and/or
      * module if this builder can process it.

Modified: geronimo/branches/pluggable-jacc/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java
URL: http://svn.apache.org/viewvc/geronimo/branches/pluggable-jacc/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java?rev=418888&r1=418657&r2=418888&view=diff
==============================================================================
--- geronimo/branches/pluggable-jacc/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java (original)
+++ geronimo/branches/pluggable-jacc/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java Mon Jul  3 17:50:41 2006
@@ -74,12 +74,13 @@
     private final Configuration configuration;
     private final Naming naming;
     private final List additionalDeployment = new ArrayList();
+    protected final AbstractName moduleName;
 
-    public DeploymentContext(File baseDir, File inPlaceConfigurationDir, Environment environment, ConfigurationModuleType moduleType, Naming naming, ConfigurationManager configurationManager, Collection repositories) throws DeploymentException {
-        this(baseDir, inPlaceConfigurationDir, environment,  moduleType, naming, createConfigurationManager(configurationManager, repositories));
+    public DeploymentContext(File baseDir, File inPlaceConfigurationDir, Environment environment, AbstractName moduleName, ConfigurationModuleType moduleType, Naming naming, ConfigurationManager configurationManager, Collection repositories) throws DeploymentException {
+        this(baseDir, inPlaceConfigurationDir, environment, moduleName, moduleType, naming, createConfigurationManager(configurationManager, repositories));
     }
 
-    public DeploymentContext(File baseDir, File inPlaceConfigurationDir, Environment environment, ConfigurationModuleType moduleType, Naming naming, ConfigurationManager configurationManager) throws DeploymentException {
+    public DeploymentContext(File baseDir, File inPlaceConfigurationDir, Environment environment, AbstractName moduleName, ConfigurationModuleType moduleType, Naming naming, ConfigurationManager configurationManager) throws DeploymentException {
         if (baseDir == null) throw new NullPointerException("baseDir is null");
         if (environment == null) throw new NullPointerException("environment is null");
         if (moduleType == null) throw new NullPointerException("type is null");
@@ -92,6 +93,8 @@
 
         this.inPlaceConfigurationDir = inPlaceConfigurationDir;
 
+        this.moduleName = moduleName;
+
         this.naming = naming;
 
         this.configuration = createTempConfiguration(environment, moduleType, baseDir, inPlaceConfigurationDir, configurationManager, naming);
@@ -404,6 +407,10 @@
 
     public List getAdditionalDeployment() {
         return additionalDeployment;
+    }
+
+    public AbstractName getModuleName() {
+        return moduleName;
     }
 
     public List verify() throws DeploymentException {

Added: geronimo/branches/pluggable-jacc/modules/deployment/src/java/org/apache/geronimo/deployment/NamespaceDrivenBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/branches/pluggable-jacc/modules/deployment/src/java/org/apache/geronimo/deployment/NamespaceDrivenBuilder.java?rev=418888&view=auto
==============================================================================
--- geronimo/branches/pluggable-jacc/modules/deployment/src/java/org/apache/geronimo/deployment/NamespaceDrivenBuilder.java (added)
+++ geronimo/branches/pluggable-jacc/modules/deployment/src/java/org/apache/geronimo/deployment/NamespaceDrivenBuilder.java Mon Jul  3 17:50:41 2006
@@ -0,0 +1,34 @@
+/**
+ *
+ * Copyright 2006 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.apache.geronimo.deployment;
+
+import java.util.List;
+
+import org.apache.xmlbeans.XmlObject;
+import org.apache.geronimo.common.DeploymentException;
+import org.apache.geronimo.gbean.AbstractName;
+
+/**
+ * @version $Rev:$ $Date:$
+ */
+public interface NamespaceDrivenBuilder {
+    void build(XmlObject container, DeploymentContext applicationContext, DeploymentContext moduleContext) throws DeploymentException;
+
+    String getNamespace();
+
+}

Propchange: geronimo/branches/pluggable-jacc/modules/deployment/src/java/org/apache/geronimo/deployment/NamespaceDrivenBuilder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/pluggable-jacc/modules/deployment/src/java/org/apache/geronimo/deployment/NamespaceDrivenBuilder.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/branches/pluggable-jacc/modules/deployment/src/java/org/apache/geronimo/deployment/NamespaceDrivenBuilder.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/branches/pluggable-jacc/modules/deployment/src/java/org/apache/geronimo/deployment/NamespaceDrivenBuilderCollection.java
URL: http://svn.apache.org/viewvc/geronimo/branches/pluggable-jacc/modules/deployment/src/java/org/apache/geronimo/deployment/NamespaceDrivenBuilderCollection.java?rev=418888&view=auto
==============================================================================
--- geronimo/branches/pluggable-jacc/modules/deployment/src/java/org/apache/geronimo/deployment/NamespaceDrivenBuilderCollection.java (added)
+++ geronimo/branches/pluggable-jacc/modules/deployment/src/java/org/apache/geronimo/deployment/NamespaceDrivenBuilderCollection.java Mon Jul  3 17:50:41 2006
@@ -0,0 +1,79 @@
+/**
+ *
+ * Copyright 2006 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.apache.geronimo.deployment;
+
+import java.util.Set;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Collection;
+import java.util.List;
+
+import org.apache.geronimo.gbean.ReferenceCollection;
+import org.apache.geronimo.gbean.ReferenceCollectionListener;
+import org.apache.geronimo.gbean.ReferenceCollectionEvent;
+import org.apache.geronimo.common.DeploymentException;
+import org.apache.xmlbeans.XmlObject;
+
+/**
+ * @version $Rev:$ $Date:$
+ */
+public class NamespaceDrivenBuilderCollection {
+
+    private final Collection builders;
+    private final Set namespaces = new HashSet();
+
+    public NamespaceDrivenBuilderCollection(Collection builders) {
+        this.builders = builders;
+        if (builders instanceof ReferenceCollection) {
+            ((ReferenceCollection)builders).addReferenceCollectionListener(new ReferenceCollectionListener() {
+
+                public void memberAdded(ReferenceCollectionEvent event) {
+                    addBuilder(event.getMember());
+                }
+
+                public void memberRemoved(ReferenceCollectionEvent event) {
+                    Object builder = event.getMember();
+                    String namespace = ((NamespaceDrivenBuilder)builder).getNamespace();
+                    namespaces.remove(namespace);
+                }
+            });
+        }
+        for (Iterator iterator = builders.iterator(); iterator.hasNext();) {
+            Object builder = iterator.next();
+            addBuilder(builder);
+        }
+    }
+
+    private void addBuilder(Object builder) {
+        String namespace = ((NamespaceDrivenBuilder)builder).getNamespace();
+        if (namespaces.contains(namespace)) {
+            throw new IllegalArgumentException("Duplicate namespace in builder set: " + namespace);
+        }
+        namespaces.add(namespace);
+    }
+
+    public void build(XmlObject container, DeploymentContext applicationContext, DeploymentContext moduleContext) throws DeploymentException {
+        for (Iterator iterator = builders.iterator(); iterator.hasNext();) {
+            NamespaceDrivenBuilder builder = (NamespaceDrivenBuilder) iterator.next();
+            builder.build(container, applicationContext, moduleContext);
+        }
+    }
+
+    public void addLoaders(List loaderList) {
+    }
+}

Propchange: geronimo/branches/pluggable-jacc/modules/deployment/src/java/org/apache/geronimo/deployment/NamespaceDrivenBuilderCollection.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/pluggable-jacc/modules/deployment/src/java/org/apache/geronimo/deployment/NamespaceDrivenBuilderCollection.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/branches/pluggable-jacc/modules/deployment/src/java/org/apache/geronimo/deployment/NamespaceDrivenBuilderCollection.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/branches/pluggable-jacc/modules/deployment/src/test/org/apache/geronimo/deployment/DeploymentContextTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/pluggable-jacc/modules/deployment/src/test/org/apache/geronimo/deployment/DeploymentContextTest.java?rev=418888&r1=418657&r2=418888&view=diff
==============================================================================
--- geronimo/branches/pluggable-jacc/modules/deployment/src/test/org/apache/geronimo/deployment/DeploymentContextTest.java (original)
+++ geronimo/branches/pluggable-jacc/modules/deployment/src/test/org/apache/geronimo/deployment/DeploymentContextTest.java Mon Jul  3 17:50:41 2006
@@ -56,7 +56,7 @@
             ArtifactManager artifactManager = new DefaultArtifactManager();
             ArtifactResolver artifactResolver = new DefaultArtifactResolver(artifactManager, Collections.EMPTY_SET, null);
             SimpleConfigurationManager configurationManager = new SimpleConfigurationManager(Collections.EMPTY_SET, artifactResolver, Collections.EMPTY_SET);
-            DeploymentContext context = new DeploymentContext(basedir, null, environment, ConfigurationModuleType.CAR, new Jsr77Naming(), configurationManager, Collections.EMPTY_SET);
+            DeploymentContext context = new DeploymentContext(basedir, null, environment, null, ConfigurationModuleType.CAR, new Jsr77Naming(), configurationManager, Collections.EMPTY_SET);
             Enhancer enhancer = new Enhancer();
             enhancer.setInterfaces(new Class[]{DataSource.class});
             enhancer.setCallbackType(MethodInterceptor.class);

Modified: geronimo/branches/pluggable-jacc/modules/deployment/src/test/org/apache/geronimo/deployment/SingleFileHotDeployerTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/pluggable-jacc/modules/deployment/src/test/org/apache/geronimo/deployment/SingleFileHotDeployerTest.java?rev=418888&r1=418657&r2=418888&view=diff
==============================================================================
--- geronimo/branches/pluggable-jacc/modules/deployment/src/test/org/apache/geronimo/deployment/SingleFileHotDeployerTest.java (original)
+++ geronimo/branches/pluggable-jacc/modules/deployment/src/test/org/apache/geronimo/deployment/SingleFileHotDeployerTest.java Mon Jul  3 17:50:41 2006
@@ -267,6 +267,7 @@
             return new DeploymentContext(dir,
                     dir,
                     new Environment(configId),
+                    null,
                     ConfigurationModuleType.CAR,
                     new Jsr77Naming(),
                     new SimpleConfigurationManager(Collections.singletonList(store), artifactResolver, Collections.EMPTY_SET));

Modified: geronimo/branches/pluggable-jacc/modules/directory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/pluggable-jacc/modules/directory/pom.xml?rev=418888&r1=418657&r2=418888&view=diff
==============================================================================
--- geronimo/branches/pluggable-jacc/modules/directory/pom.xml (original)
+++ geronimo/branches/pluggable-jacc/modules/directory/pom.xml Mon Jul  3 17:50:41 2006
@@ -40,7 +40,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
-                <version>${xmlbeansMavenPluginVersion}</version>
                 <executions>
                     <execution>
                         <phase>process-resources</phase>

Modified: geronimo/branches/pluggable-jacc/modules/j2ee-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/pluggable-jacc/modules/j2ee-builder/pom.xml?rev=418888&r1=418657&r2=418888&view=diff
==============================================================================
--- geronimo/branches/pluggable-jacc/modules/j2ee-builder/pom.xml (original)
+++ geronimo/branches/pluggable-jacc/modules/j2ee-builder/pom.xml Mon Jul  3 17:50:41 2006
@@ -58,7 +58,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
-                <version>${xmlbeansMavenPluginVersion}</version>
                 <executions>
                     <execution>
                         <goals>
@@ -89,9 +88,38 @@
             <artifactId>stax-api</artifactId>
         </dependency>
 
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.modules</groupId>-->
+            <!--<artifactId>geronimo-security-builder</artifactId>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-security-builder</artifactId>
+            <artifactId>geronimo-security</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-service-builder</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-j2ee-schema</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-common</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-j2ee</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-kernel</artifactId>
         </dependency>
     </dependencies>
 </project>

Modified: geronimo/branches/pluggable-jacc/modules/j2ee-builder/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/pluggable-jacc/modules/j2ee-builder/project.xml?rev=418888&r1=418657&r2=418888&view=diff
==============================================================================
--- geronimo/branches/pluggable-jacc/modules/j2ee-builder/project.xml (original)
+++ geronimo/branches/pluggable-jacc/modules/j2ee-builder/project.xml Mon Jul  3 17:50:41 2006
@@ -76,14 +76,14 @@
             <artifactId>geronimo-security</artifactId>
             <version>${pom.currentVersion}</version>
         </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-security-builder</artifactId>
-            <version>${pom.currentVersion}</version>
-            <properties>
-                <xmlbeans>true</xmlbeans>
-            </properties>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>geronimo</groupId>-->
+            <!--<artifactId>geronimo-security-builder</artifactId>-->
+            <!--<version>${pom.currentVersion}</version>-->
+            <!--<properties>-->
+                <!--<xmlbeans>true</xmlbeans>-->
+            <!--</properties>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-service-builder</artifactId>

Modified: geronimo/branches/pluggable-jacc/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java
URL: http://svn.apache.org/viewvc/geronimo/branches/pluggable-jacc/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java?rev=418888&r1=418657&r2=418888&view=diff
==============================================================================
--- geronimo/branches/pluggable-jacc/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java (original)
+++ geronimo/branches/pluggable-jacc/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java Mon Jul  3 17:50:41 2006
@@ -29,7 +29,7 @@
 import org.apache.xmlbeans.XmlObject;
 
 /**
- * @version $Rev: 385487 $ $Date$
+ * @version $Rev$ $Date$
  */
 public class AppClientModule extends Module {
     private final Environment clientEnvironment;

Modified: geronimo/branches/pluggable-jacc/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ConnectorModule.java
URL: http://svn.apache.org/viewvc/geronimo/branches/pluggable-jacc/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ConnectorModule.java?rev=418888&r1=418657&r2=418888&view=diff
==============================================================================
--- geronimo/branches/pluggable-jacc/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ConnectorModule.java (original)
+++ geronimo/branches/pluggable-jacc/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ConnectorModule.java Mon Jul  3 17:50:41 2006
@@ -28,7 +28,7 @@
 import org.apache.xmlbeans.XmlObject;
 
 /**
- * @version $Rev: 385487 $ $Date$
+ * @version $Rev$ $Date$
  */
 public class ConnectorModule extends Module {
     public ConnectorModule(boolean standAlone, AbstractName moduleName, Environment environment, JarFile moduleFile, String targetPath, XmlObject specDD, XmlObject vendorDD, String originalSpecDD) {

Modified: geronimo/branches/pluggable-jacc/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/branches/pluggable-jacc/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java?rev=418888&r1=418657&r2=418888&view=diff
==============================================================================
--- geronimo/branches/pluggable-jacc/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java (original)
+++ geronimo/branches/pluggable-jacc/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java Mon Jul  3 17:50:41 2006
@@ -44,13 +44,14 @@
 import org.apache.geronimo.deployment.ConfigurationBuilder;
 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;
 import org.apache.geronimo.deployment.util.NestedJarFile;
 import org.apache.geronimo.deployment.xbeans.ArtifactType;
 import org.apache.geronimo.deployment.xbeans.EnvironmentType;
-import org.apache.geronimo.deployment.xbeans.GbeanType;
+import org.apache.geronimo.deployment.xbeans.ServiceDocument;
 import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.AbstractNameQuery;
@@ -79,12 +80,11 @@
 import org.apache.geronimo.management.J2EEResource;
 import org.apache.geronimo.management.J2EEServer;
 import org.apache.geronimo.schema.SchemaConversionUtils;
-import org.apache.geronimo.security.deployment.SecurityBuilder;
-import org.apache.geronimo.security.deployment.SecurityConfiguration;
 import org.apache.geronimo.xbeans.geronimo.j2ee.GerApplicationDocument;
 import org.apache.geronimo.xbeans.geronimo.j2ee.GerApplicationType;
 import org.apache.geronimo.xbeans.geronimo.j2ee.GerExtModuleType;
 import org.apache.geronimo.xbeans.geronimo.j2ee.GerModuleType;
+import org.apache.geronimo.xbeans.geronimo.j2ee.GerSecurityDocument;
 import org.apache.geronimo.xbeans.j2ee.ApplicationType;
 import org.apache.geronimo.xbeans.j2ee.ModuleType;
 import org.apache.xmlbeans.XmlException;
@@ -99,6 +99,8 @@
     private static final String LINE_SEP = System.getProperty("line.separator");
 
     private final static QName APPLICATION_QNAME = GerApplicationDocument.type.getDocumentElementName();
+    private static final QName SECURITY_QNAME = GerSecurityDocument.type.getDocumentElementName();
+    private static final QName SERVICE_QNAME = ServiceDocument.type.getDocumentElementName();
 
     private final ConfigurationManager configurationManager;
     private final Collection repositories;
@@ -109,6 +111,8 @@
     private final SingleElementCollection ejbReferenceBuilder;
     private final SingleElementCollection resourceReferenceBuilder;
     private final SingleElementCollection serviceReferenceBuilder;
+    private final NamespaceDrivenBuilderCollection securityBuilders;
+    private final NamespaceDrivenBuilderCollection serviceBuilders;
 
     private final Environment defaultEnvironment;
     private final AbstractNameQuery serverName;
@@ -136,6 +140,8 @@
             Collection resourceReferenceBuilder,
             Collection appClientConfigBuilder,
             Collection serviceReferenceBuilder,
+            Collection securityBuilders,
+            Collection serviceBuilders,
             Kernel kernel) {
         this(defaultEnvironment,
                 transactionManagerAbstractName,
@@ -154,6 +160,8 @@
                 new SingleElementCollection(resourceReferenceBuilder),
                 new SingleElementCollection(appClientConfigBuilder),
                 new SingleElementCollection(serviceReferenceBuilder),
+                securityBuilders,
+                serviceBuilders,
                 kernel.getNaming());
     }
     public EARConfigBuilder(Environment defaultEnvironment,
@@ -172,6 +180,8 @@
             ResourceReferenceBuilder resourceReferenceBuilder,
             ModuleBuilder appClientConfigBuilder,
             ServiceReferenceBuilder serviceReferenceBuilder,
+            NamespaceDrivenBuilder securityBuilder,
+            NamespaceDrivenBuilder serviceBuilder,
             Naming naming) {
         this(defaultEnvironment,
                 transactionManagerAbstractName,
@@ -190,6 +200,8 @@
                 new SingleElementCollection(resourceReferenceBuilder),
                 new SingleElementCollection(appClientConfigBuilder),
                 new SingleElementCollection(serviceReferenceBuilder),
+                securityBuilder == null? Collections.EMPTY_SET: Collections.singleton(securityBuilder),
+                serviceBuilder == null? Collections.EMPTY_SET: Collections.singleton(serviceBuilder),
                 naming);
     }
 
@@ -210,7 +222,8 @@
             SingleElementCollection resourceReferenceBuilder,
             SingleElementCollection appClientConfigBuilder,
             SingleElementCollection serviceReferenceBuilder,
-            Naming naming) {
+            Collection securityBuilders,
+            Collection serviceBuilders, Naming naming) {
         this.configurationManager = configurationManager;
         this.repositories = repositories;
         this.defaultEnvironment = defaultEnvironment;
@@ -222,6 +235,9 @@
         this.connectorConfigBuilder = connectorConfigBuilder;
         this.appClientConfigBuilder = appClientConfigBuilder;
         this.serviceReferenceBuilder = serviceReferenceBuilder;
+        this.securityBuilders = new NamespaceDrivenBuilderCollection(securityBuilders);
+        this.serviceBuilders = new NamespaceDrivenBuilderCollection(serviceBuilders);
+
         this.transactionManagerObjectName = transactionManagerAbstractName;
         this.transactionContextManagerObjectName = transactionContextManagerAbstractName;
         this.connectionTrackerObjectName = connectionTrackerAbstractName;
@@ -327,14 +343,14 @@
             XmlObject rawPlan;
             try {
                 if (planFile != null) {
-                    rawPlan = XmlBeansUtil.parse(planFile.toURL());
+                    rawPlan = XmlBeansUtil.parse(planFile.toURL(), getClass().getClassLoader());
                     gerApplication = (GerApplicationType) SchemaConversionUtils.fixGeronimoSchema(rawPlan, APPLICATION_QNAME, GerApplicationType.type);
                     if (gerApplication == null) {
                         return null;
                     }
                 } else {
                     URL path = DeploymentUtil.createJarURL(earFile, "META-INF/geronimo-application.xml");
-                    rawPlan = XmlBeansUtil.parse(path);
+                    rawPlan = XmlBeansUtil.parse(path, getClass().getClassLoader());
                     gerApplication = (GerApplicationType) SchemaConversionUtils.fixGeronimoSchema(rawPlan, APPLICATION_QNAME, GerApplicationType.type);
                 }
             } catch (IOException e) {
@@ -507,8 +523,8 @@
 
             // add gbeans declared in the geronimo-application.xml
             if (geronimoApplication != null) {
-                GbeanType[] gbeans = geronimoApplication.getGbeanArray();
-                ServiceConfigBuilder.addGBeans(gbeans, cl, earContext.getModuleName(), earContext);
+                securityBuilders.build(geronimoApplication, earContext, earContext);
+                serviceBuilders.build(geronimoApplication, earContext, earContext);
             }
 
             // Create the J2EEApplication managed object
@@ -545,22 +561,6 @@
                 earContext.addGBean(gbeanData);
             }
 
-            //look for application plan security config
-            if (geronimoApplication != null && geronimoApplication.isSetSecurity()) {
-                SecurityConfiguration securityConfiguration = SecurityBuilder.buildSecurityConfiguration(geronimoApplication.getSecurity(), cl);
-                earContext.setSecurityConfiguration(securityConfiguration);
-            }
-
-            //add the JACC gbean if there is a principal-role mapping
-            if (earContext.getSecurityConfiguration() != null) {
-                GBeanData roleMapperData = SecurityBuilder.configureRoleMapper(naming, earContext.getModuleName(), earContext.getSecurityConfiguration());
-                earContext.addGBean(roleMapperData);
-                GBeanData jaccBeanData = SecurityBuilder.configureApplicationPolicyManager(naming, earContext.getModuleName(), earContext.getContextIDToPermissionsMap(), earContext.getSecurityConfiguration());
-                jaccBeanData.setReferencePattern("PrincipalRoleMapper", roleMapperData.getAbstractName());
-                earContext.addGBean(jaccBeanData);
-                earContext.setJaccManagerName(jaccBeanData.getAbstractName());
-            }
-
             // each module can now add it's GBeans
             for (Iterator iterator = modules.iterator(); iterator.hasNext();) {
                 Module module = (Module) iterator.next();
@@ -619,11 +619,11 @@
     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() : "") );
@@ -631,7 +631,7 @@
         }
         return true;
     }
-    
+
     private static Map filter(Map original, String key, String value) {
         LinkedHashMap filter = new LinkedHashMap(original);
         filter.put(key, value);
@@ -918,30 +918,32 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(EARConfigBuilder.class, NameFactory.CONFIG_BUILDER);
-        infoFactory.addAttribute("defaultEnvironment", Environment.class, true, true);
-        infoFactory.addAttribute("transactionManagerAbstractName", AbstractNameQuery.class, true);
-        infoFactory.addAttribute("transactionContextManagerAbstractName", AbstractNameQuery.class, true);
-        infoFactory.addAttribute("connectionTrackerAbstractName", AbstractNameQuery.class, true);
-        infoFactory.addAttribute("transactionalTimerAbstractName", AbstractNameQuery.class, true);
-        infoFactory.addAttribute("nonTransactionalTimerAbstractName", AbstractNameQuery.class, true);
-        infoFactory.addAttribute("corbaGBeanAbstractName", AbstractNameQuery.class, true);
-        infoFactory.addAttribute("serverName", AbstractNameQuery.class, true);
-
-        infoFactory.addReference("Repositories", Repository.class, "Repository");
-        infoFactory.addReference("EJBConfigBuilder", ModuleBuilder.class, NameFactory.MODULE_BUILDER);
-        infoFactory.addReference("EJBReferenceBuilder", EJBReferenceBuilder.class, NameFactory.MODULE_BUILDER);
-        infoFactory.addReference("WebConfigBuilder", ModuleBuilder.class, NameFactory.MODULE_BUILDER);
-        infoFactory.addReference("ConnectorConfigBuilder", ModuleBuilder.class, NameFactory.MODULE_BUILDER);
-        infoFactory.addReference("ResourceReferenceBuilder", ResourceReferenceBuilder.class, NameFactory.MODULE_BUILDER);
-        infoFactory.addReference("AppClientConfigBuilder", ModuleBuilder.class, NameFactory.MODULE_BUILDER);
-        infoFactory.addReference("ServiceReferenceBuilder", ServiceReferenceBuilder.class, NameFactory.MODULE_BUILDER);
+        GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(EARConfigBuilder.class, NameFactory.CONFIG_BUILDER);
+        infoBuilder.addAttribute("defaultEnvironment", Environment.class, true, true);
+        infoBuilder.addAttribute("transactionManagerAbstractName", AbstractNameQuery.class, true);
+        infoBuilder.addAttribute("transactionContextManagerAbstractName", AbstractNameQuery.class, true);
+        infoBuilder.addAttribute("connectionTrackerAbstractName", AbstractNameQuery.class, true);
+        infoBuilder.addAttribute("transactionalTimerAbstractName", AbstractNameQuery.class, true);
+        infoBuilder.addAttribute("nonTransactionalTimerAbstractName", AbstractNameQuery.class, true);
+        infoBuilder.addAttribute("corbaGBeanAbstractName", AbstractNameQuery.class, true);
+        infoBuilder.addAttribute("serverName", AbstractNameQuery.class, true);
+
+        infoBuilder.addReference("Repositories", Repository.class, "Repository");
+        infoBuilder.addReference("EJBConfigBuilder", ModuleBuilder.class, NameFactory.MODULE_BUILDER);
+        infoBuilder.addReference("EJBReferenceBuilder", EJBReferenceBuilder.class, NameFactory.MODULE_BUILDER);
+        infoBuilder.addReference("WebConfigBuilder", ModuleBuilder.class, NameFactory.MODULE_BUILDER);
+        infoBuilder.addReference("ConnectorConfigBuilder", ModuleBuilder.class, NameFactory.MODULE_BUILDER);
+        infoBuilder.addReference("ResourceReferenceBuilder", ResourceReferenceBuilder.class, NameFactory.MODULE_BUILDER);
+        infoBuilder.addReference("AppClientConfigBuilder", ModuleBuilder.class, NameFactory.MODULE_BUILDER);
+        infoBuilder.addReference("ServiceReferenceBuilder", ServiceReferenceBuilder.class, NameFactory.MODULE_BUILDER);
+        infoBuilder.addReference("SecurityBuilders", NamespaceDrivenBuilder.class, NameFactory.MODULE_BUILDER);
+        infoBuilder.addReference("ServiceBuilders", NamespaceDrivenBuilder.class, NameFactory.MODULE_BUILDER);
 
-        infoFactory.addAttribute("kernel", Kernel.class, false);
+        infoBuilder.addAttribute("kernel", Kernel.class, false);
 
-        infoFactory.addInterface(ConfigurationBuilder.class);
+        infoBuilder.addInterface(ConfigurationBuilder.class);
 
-        infoFactory.setConstructor(new String[]{
+        infoBuilder.setConstructor(new String[]{
                 "defaultEnvironment",
                 "transactionManagerAbstractName",
                 "transactionContextManagerAbstractName",
@@ -958,10 +960,12 @@
                 "ResourceReferenceBuilder",
                 "AppClientConfigBuilder",
                 "ServiceReferenceBuilder",
+                "SecurityBuilders",
+                "ServiceBuilders",
                 "kernel"
         });
 
-        GBEAN_INFO = infoFactory.getBeanInfo();
+        GBEAN_INFO = infoBuilder.getBeanInfo();
     }
 
     public static GBeanInfo getGBeanInfo() {

Modified: geronimo/branches/pluggable-jacc/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java
URL: http://svn.apache.org/viewvc/geronimo/branches/pluggable-jacc/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java?rev=418888&r1=418657&r2=418888&view=diff
==============================================================================
--- geronimo/branches/pluggable-jacc/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java (original)
+++ geronimo/branches/pluggable-jacc/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java Mon Jul  3 17:50:41 2006
@@ -26,10 +26,9 @@
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.kernel.Naming;
-import org.apache.geronimo.kernel.config.ConfigurationModuleType;
 import org.apache.geronimo.kernel.config.ConfigurationManager;
+import org.apache.geronimo.kernel.config.ConfigurationModuleType;
 import org.apache.geronimo.kernel.repository.Environment;
-import org.apache.geronimo.security.deployment.SecurityConfiguration;
 
 /**
  * @version $Rev:386276 $ $Date$
@@ -45,12 +44,11 @@
     private final AbstractNameQuery corbaGBeanObjectName;
 
     private final RefContext refContext;
-    private final AbstractName moduleName;
     private final AbstractNameQuery serverName;
 
     private final Map contextIDToPermissionsMap = new HashMap();
     private AbstractName jaccManagerName;
-    private SecurityConfiguration securityConfiguration;
+    private Object securityConfiguration;
 
     public EARContext(File baseDir,
             File inPlaceConfigurationDir,
@@ -67,9 +65,8 @@
             AbstractNameQuery nonTransactedTimerName,
             AbstractNameQuery corbaGBeanObjectName,
             RefContext refContext) throws DeploymentException {
-        super(baseDir, inPlaceConfigurationDir, environment, moduleType, naming, configurationManager, repositories);
+        super(baseDir, inPlaceConfigurationDir, environment, baseName, moduleType, naming, configurationManager, repositories);
 
-        moduleName = baseName;
         this.serverName = serverName;
         this.transactionManagerObjectName = transactionManagerObjectName;
         this.transactionContextManagerObjectName = transactionContextManagerObjectName;
@@ -95,9 +92,8 @@
             AbstractNameQuery nonTransactedTimerName,
             AbstractNameQuery corbaGBeanObjectName,
             RefContext refContext) throws DeploymentException {
-        super(baseDir, inPlaceConfigurationDir, environment, moduleType, naming, configurationManager);
+        super(baseDir, inPlaceConfigurationDir, environment, baseName, moduleType, naming, configurationManager);
 
-        moduleName = baseName;
         this.serverName = serverName;
 
         this.transactionManagerObjectName = transactionManagerObjectName;
@@ -110,8 +106,7 @@
     }
 
     public EARContext(File baseDir, File inPlaceConfigurationDir, Environment environment, ConfigurationModuleType moduleType, AbstractName baseName, EARContext parent) throws DeploymentException {
-        super(baseDir, inPlaceConfigurationDir, environment, moduleType, parent.getNaming(), parent.getConfigurationManager());
-        moduleName = baseName;
+        super(baseDir, inPlaceConfigurationDir, environment, baseName, moduleType, parent.getNaming(), parent.getConfigurationManager());
         this.serverName = parent.getServerName();
 
         this.transactionManagerObjectName = parent.getTransactionManagerObjectName();
@@ -155,10 +150,6 @@
         return refContext;
     }
 
-    public AbstractName getModuleName() {
-        return moduleName;
-    }
-
     public Map getContextIDToPermissionsMap() {
         return contextIDToPermissionsMap;
     }
@@ -178,14 +169,14 @@
         return jaccManagerName;
     }
 
-    public void setSecurityConfiguration(SecurityConfiguration securityConfiguration) throws DeploymentException {
+    public void setSecurityConfiguration(Object securityConfiguration) throws DeploymentException {
         if (this.securityConfiguration != null) {
             throw new DeploymentException("Only one security configuration allowed per application");
         }
         this.securityConfiguration = securityConfiguration;
     }
 
-    public SecurityConfiguration getSecurityConfiguration() {
+    public Object getSecurityConfiguration() {
         return securityConfiguration;
     }
 }

Added: geronimo/branches/pluggable-jacc/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/SecurityBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/branches/pluggable-jacc/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/SecurityBuilder.java?rev=418888&view=auto
==============================================================================
--- geronimo/branches/pluggable-jacc/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/SecurityBuilder.java (added)
+++ geronimo/branches/pluggable-jacc/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/SecurityBuilder.java Mon Jul  3 17:50:41 2006
@@ -0,0 +1,36 @@
+/**
+ *
+ * Copyright 2006 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.apache.geronimo.j2ee.deployment;
+
+import org.apache.geronimo.deployment.NamespaceDrivenBuilder;
+import org.apache.geronimo.security.deploy.DefaultPrincipal;
+import org.apache.geronimo.security.deploy.PrincipalInfo;
+import org.apache.xmlbeans.XmlObject;
+
+/**
+ * @version $Rev:$ $Date:$
+ */
+public interface SecurityBuilder extends NamespaceDrivenBuilder {
+
+    //used from app client builder
+    DefaultPrincipal buildDefaultPrincipal(XmlObject defaultPrincipalType);
+
+    //used from TSSConfigEditor
+    PrincipalInfo buildPrincipal(XmlObject principalType);
+
+}

Propchange: geronimo/branches/pluggable-jacc/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/SecurityBuilder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/pluggable-jacc/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/SecurityBuilder.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/branches/pluggable-jacc/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/SecurityBuilder.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/branches/pluggable-jacc/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/branches/pluggable-jacc/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java?rev=418888&r1=418657&r2=418888&view=diff
==============================================================================
--- geronimo/branches/pluggable-jacc/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java (original)
+++ geronimo/branches/pluggable-jacc/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java Mon Jul  3 17:50:41 2006
@@ -101,7 +101,7 @@
         XmlObject xmlObject;
         if (plan instanceof File) {
             try {
-                xmlObject = XmlBeansUtil.parse(((File) plan).toURL());
+                xmlObject = XmlBeansUtil.parse(((File) plan).toURL(), getClass().getClassLoader());
             } catch (IOException e) {
                 throw new DeploymentException("Could not read plan file", e);
             } catch (XmlException e) {

Modified: geronimo/branches/pluggable-jacc/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/WebModule.java
URL: http://svn.apache.org/viewvc/geronimo/branches/pluggable-jacc/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/WebModule.java?rev=418888&r1=418657&r2=418888&view=diff
==============================================================================
--- geronimo/branches/pluggable-jacc/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/WebModule.java (original)
+++ geronimo/branches/pluggable-jacc/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/WebModule.java Mon Jul  3 17:50:41 2006
@@ -29,7 +29,7 @@
 import org.apache.xmlbeans.XmlObject;
 
 /**
- * @version $Rev: 385487 $ $Date$
+ * @version $Rev$ $Date$
  */
 public class WebModule extends Module {
     private final String contextRoot;

Modified: geronimo/branches/pluggable-jacc/modules/j2ee-builder/src/schema/geronimo-application-1.0.xsd
URL: http://svn.apache.org/viewvc/geronimo/branches/pluggable-jacc/modules/j2ee-builder/src/schema/geronimo-application-1.0.xsd?rev=418888&r1=418657&r2=418888&view=diff
==============================================================================
--- geronimo/branches/pluggable-jacc/modules/j2ee-builder/src/schema/geronimo-application-1.0.xsd (original)
+++ geronimo/branches/pluggable-jacc/modules/j2ee-builder/src/schema/geronimo-application-1.0.xsd Mon Jul  3 17:50:41 2006
@@ -19,14 +19,14 @@
 <xs:schema
     xmlns:geronimo="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
     targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
-    xmlns:security="http://geronimo.apache.org/xml/ns/security-1.1"
     xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.0"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     elementFormDefault="qualified"
     attributeFormDefault="unqualified"
     version="1.0">
+    <!--xmlns:security="http://geronimo.apache.org/xml/ns/security-1.1"-->
 
-    <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/security-1.1" schemaLocation="geronimo-security-1.1.xsd"/>-->
     <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.0" schemaLocation="geronimo-config-1.0.xsd"/>
 
     <xs:element name="application" type="geronimo:applicationType"/>
@@ -41,7 +41,8 @@
 
             <xs:element name="module" type="geronimo:moduleType" minOccurs="0" maxOccurs="unbounded"/>
             <xs:element name="ext-module" type="geronimo:ext-moduleType" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element ref="security:security" minOccurs="0"/>
+            <!--<xs:element ref="security:security" minOccurs="0"/>-->
+            <xs:any namespace="http://geronimo.apache.org/xml/ns/security-1.1" processContents="lax" minOccurs="0"/>
             <xs:element ref="sys:gbean" minOccurs="0" maxOccurs="unbounded"/>
         </xs:sequence>
 

Modified: geronimo/branches/pluggable-jacc/modules/j2ee-builder/src/schema/geronimo-application-1.1.xsd
URL: http://svn.apache.org/viewvc/geronimo/branches/pluggable-jacc/modules/j2ee-builder/src/schema/geronimo-application-1.1.xsd?rev=418888&r1=418657&r2=418888&view=diff
==============================================================================
--- geronimo/branches/pluggable-jacc/modules/j2ee-builder/src/schema/geronimo-application-1.1.xsd (original)
+++ geronimo/branches/pluggable-jacc/modules/j2ee-builder/src/schema/geronimo-application-1.1.xsd Mon Jul  3 17:50:41 2006
@@ -19,14 +19,14 @@
 <xs:schema
     xmlns:geronimo="http://geronimo.apache.org/xml/ns/j2ee/application-1.1"
     targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/application-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:xs="http://www.w3.org/2001/XMLSchema"
     elementFormDefault="qualified"
     attributeFormDefault="unqualified"
     version="1.0">
+    <!--xmlns:security="http://geronimo.apache.org/xml/ns/security-1.1"-->
 
-    <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/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:element name="application" type="geronimo:applicationType"/>
@@ -37,8 +37,11 @@
 
             <xs:element name="module" type="geronimo:moduleType" minOccurs="0" maxOccurs="unbounded"/>
             <xs:element name="ext-module" type="geronimo:ext-moduleType" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element ref="security:security" minOccurs="0"/>
-            <xs:element ref="sys:gbean" minOccurs="0" maxOccurs="unbounded"/>
+            <!--<xs:element ref="security:security" minOccurs="0"/>-->
+            <!--<xs:any namespace="http://geronimo.apache.org/xml/ns/security-1.1" processContents="lax" minOccurs="0"/>-->
+            <!--<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>-->
+            <xs:element ref="geronimo:security" minOccurs="0"/>
+            <xs:element ref="sys:service" minOccurs="0" maxOccurs="unbounded"/>
         </xs:sequence>
 
         <!--TODO application name should be settable using name-key in the environment.  Does this work? -->
@@ -70,6 +73,14 @@
                 </xs:element>
                 <xs:any namespace="##other" processContents="lax"/>
             </xs:choice>
+        </xs:sequence>
+    </xs:complexType>
+
+
+    <xs:element name="security" type="geronimo:abstract-securityType"/>
+
+    <xs:complexType name="abstract-securityType" abstract="true">
+        <xs:sequence>
         </xs:sequence>
     </xs:complexType>
 

Modified: geronimo/branches/pluggable-jacc/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/pluggable-jacc/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java?rev=418888&r1=418657&r2=418888&view=diff
==============================================================================
--- geronimo/branches/pluggable-jacc/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java (original)
+++ geronimo/branches/pluggable-jacc/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java Mon Jul  3 17:50:41 2006
@@ -38,6 +38,7 @@
 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.util.DeploymentUtil;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.AbstractNameQuery;
@@ -83,6 +84,10 @@
         }
     };
 
+    private static final NamespaceDrivenBuilder securityBuilder = null;
+    private static final NamespaceDrivenBuilder serviceBuilder = null;
+
+
     private static final Naming naming = new Jsr77Naming();
 
     private static final AbstractName rootConfig = naming.createRootName(new Artifact("test", "stuff", "", "car"), "test", "test") ;
@@ -276,6 +281,8 @@
                     resourceReferenceBuilder,
                     appClientConfigBuilder,
                     serviceReferenceBuilder,
+                    securityBuilder,
+                    serviceBuilder,
                     naming);
 
             Object plan = configBuilder.getDeploymentPlan(null, earFile, idBuilder);
@@ -308,6 +315,8 @@
                 resourceReferenceBuilder,
                 appClientConfigBuilder,
                 serviceReferenceBuilder,
+                securityBuilder,
+                serviceBuilder,
                 naming);
 
         ConfigurationData configurationData = null;
@@ -348,6 +357,8 @@
                 resourceReferenceBuilder,
                 appClientConfigBuilder,
                 serviceReferenceBuilder,
+                securityBuilder,
+                serviceBuilder,
                 naming);
 
         ConfigurationData configurationData = null;
@@ -388,6 +399,8 @@
                 resourceReferenceBuilder,
                 appClientConfigBuilder,
                 serviceReferenceBuilder,
+                securityBuilder,
+                serviceBuilder,
                 naming);
 
         ConfigurationData configurationData = null;
@@ -428,6 +441,8 @@
                 resourceReferenceBuilder,
                 appClientConfigBuilder,
                 serviceReferenceBuilder,
+                securityBuilder,
+                serviceBuilder,
                 naming);
 
         ConfigurationData configurationData = null;
@@ -468,6 +483,8 @@
                 resourceReferenceBuilder,
                 appClientConfigBuilder,
                 serviceReferenceBuilder,
+                securityBuilder,
+                serviceBuilder,
                 naming);
 
 
@@ -507,6 +524,8 @@
                 resourceReferenceBuilder,
                 appClientConfigBuilder,
                 serviceReferenceBuilder,
+                securityBuilder,
+                serviceBuilder,
                 naming);
 
         ConfigurationData configurationData = null;
@@ -545,6 +564,8 @@
                 resourceReferenceBuilder,
                 appClientConfigBuilder,
                 serviceReferenceBuilder,
+                securityBuilder,
+                serviceBuilder,
                 naming);
 
         ConfigurationData configurationData = null;

Modified: geronimo/branches/pluggable-jacc/modules/j2ee-schema/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/pluggable-jacc/modules/j2ee-schema/pom.xml?rev=418888&r1=418657&r2=418888&view=diff
==============================================================================
--- geronimo/branches/pluggable-jacc/modules/j2ee-schema/pom.xml (original)
+++ geronimo/branches/pluggable-jacc/modules/j2ee-schema/pom.xml Mon Jul  3 17:50:41 2006
@@ -36,7 +36,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
-                <version>${xmlbeansMavenPluginVersion}</version>
                 <executions>
                     <execution>
                         <goals>
@@ -46,8 +45,10 @@
                 </executions>
 
                 <configuration>
-                    <download>true</download>
-                    <sourceSchemas>j2ee_1_4schema/application_1_4.xsd,j2ee_1_4schema/j2ee_jaxrpc_mapping_1_1.xsd,j2ee_1_3schema/connector_1_0.xsd,j2ee_1_4schema/j2ee_1_4.xsd,j2ee_1_4schema/connector_1_5.xsd,j2ee_1_4schema/ejb-jar_2_1.xsd,j2ee_1_4schema/web-app_2_4.xsd,j2ee_1_4schema/application-client_1_4.xsd,j2ee_1_4schema/j2ee_web_services_1_1.xsd</sourceSchemas>
+                    <!--<download>true</download>-->
+                    <debug>true</debug>
+                    <catalogLocation>${basedir}/src/catalog/resolver-catalog.xml</catalogLocation>
+                    <sourceSchemas>j2ee_1_4schema/application_1_4.xsd,j2ee_1_4schema/j2ee_jaxrpc_mapping_1_1.xsd,j2ee_1_3schema/connector_1_0.xsd,j2ee_1_4schema/j2ee_1_4.xsd,j2ee_1_4schema/connector_1_5.xsd,j2ee_1_4schema/ejb-jar_2_1.xsd,j2ee_1_4schema/web-app_2_4.xsd,j2ee_1_4schema/application-client_1_4.xsd,j2ee_1_4schema/j2ee_web_services_1_1.xsd,j2ee_1_4schema/j2ee_web_services_client_1_1.xsd</sourceSchemas>
                     <schemaDirectory>src</schemaDirectory>
                     <!-- <catalogLocation>src/catalog</catalogLocation> -->
                     <xmlConfigs>
@@ -59,6 +60,11 @@
     </build>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-service-builder</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>xmlbeans</groupId>
             <artifactId>xbean</artifactId>

Modified: geronimo/branches/pluggable-jacc/modules/j2ee-schema/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/pluggable-jacc/modules/j2ee-schema/project.xml?rev=418888&r1=418657&r2=418888&view=diff
==============================================================================
--- geronimo/branches/pluggable-jacc/modules/j2ee-schema/project.xml (original)
+++ geronimo/branches/pluggable-jacc/modules/j2ee-schema/project.xml Mon Jul  3 17:50:41 2006
@@ -48,6 +48,12 @@
             <type>plugin</type>
         </dependency>
 
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-service-builder</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+
         <!-- needed for xmlbeans runtime-->
         <dependency>
             <groupId>xmlbeans</groupId>

Modified: geronimo/branches/pluggable-jacc/modules/j2ee-schema/src/java/org/apache/geronimo/schema/SchemaConversionUtils.java
URL: http://svn.apache.org/viewvc/geronimo/branches/pluggable-jacc/modules/j2ee-schema/src/java/org/apache/geronimo/schema/SchemaConversionUtils.java?rev=418888&r1=418657&r2=418888&view=diff
==============================================================================
--- geronimo/branches/pluggable-jacc/modules/j2ee-schema/src/java/org/apache/geronimo/schema/SchemaConversionUtils.java (original)
+++ geronimo/branches/pluggable-jacc/modules/j2ee-schema/src/java/org/apache/geronimo/schema/SchemaConversionUtils.java Mon Jul  3 17:50:41 2006
@@ -17,10 +17,9 @@
 
 package org.apache.geronimo.schema;
 
-import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
+
 import javax.xml.namespace.QName;
 
 import org.apache.geronimo.xbeans.j2ee.ApplicationClientDocument;
@@ -28,12 +27,12 @@
 import org.apache.geronimo.xbeans.j2ee.ConnectorDocument;
 import org.apache.geronimo.xbeans.j2ee.EjbJarDocument;
 import org.apache.geronimo.xbeans.j2ee.WebAppDocument;
+import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
 import org.apache.xmlbeans.SchemaType;
 import org.apache.xmlbeans.XmlCursor;
 import org.apache.xmlbeans.XmlDocumentProperties;
 import org.apache.xmlbeans.XmlException;
 import org.apache.xmlbeans.XmlObject;
-import org.apache.xmlbeans.XmlOptions;
 
 /**
  * @version $Rev$ $Date$
@@ -83,7 +82,7 @@
 
     public static ApplicationDocument convertToApplicationSchema(XmlObject xmlObject) throws XmlException {
         if (ApplicationDocument.type.equals(xmlObject.schemaType())) {
-            validateDD(xmlObject);
+            XmlBeansUtil.validateDD(xmlObject);
             return (ApplicationDocument) xmlObject;
         }
         XmlCursor cursor = xmlObject.newCursor();
@@ -102,17 +101,17 @@
         }
         XmlObject result = xmlObject.changeType(ApplicationDocument.type);
         if (result != null) {
-            validateDD(result);
+            XmlBeansUtil.validateDD(result);
             return (ApplicationDocument) result;
         }
-        validateDD(xmlObject);
+        XmlBeansUtil.validateDD(xmlObject);
         return (ApplicationDocument) xmlObject;
 
     }
 
     public static ApplicationClientDocument convertToApplicationClientSchema(XmlObject xmlObject) throws XmlException {
         if (ApplicationClientDocument.type.equals(xmlObject.schemaType())) {
-            validateDD(xmlObject);
+            XmlBeansUtil.validateDD(xmlObject);
             return (ApplicationClientDocument) xmlObject;
         }
         XmlCursor cursor = xmlObject.newCursor();
@@ -131,17 +130,17 @@
         }
         XmlObject result = xmlObject.changeType(ApplicationClientDocument.type);
         if (result != null) {
-            validateDD(result);
+            XmlBeansUtil.validateDD(result);
             return (ApplicationClientDocument) result;
         }
-        validateDD(xmlObject);
+        XmlBeansUtil.validateDD(xmlObject);
         return (ApplicationClientDocument) xmlObject;
 
     }
 
     public static ConnectorDocument convertToConnectorSchema(XmlObject xmlObject) throws XmlException {
         if (ConnectorDocument.type.equals(xmlObject.schemaType())) {
-            validateDD(xmlObject);
+            XmlBeansUtil.validateDD(xmlObject);
             return (ConnectorDocument) xmlObject;
         }
         XmlCursor cursor = xmlObject.newCursor();
@@ -202,17 +201,17 @@
         }
         XmlObject result = xmlObject.changeType(ConnectorDocument.type);
         if (result != null) {
-            validateDD(result);
+            XmlBeansUtil.validateDD(result);
             return (ConnectorDocument) result;
         }
-        validateDD(xmlObject);
+        XmlBeansUtil.validateDD(xmlObject);
         return (ConnectorDocument) xmlObject;
 
     }
 
     public static EjbJarDocument convertToEJBSchema(XmlObject xmlObject) throws XmlException {
         if (EjbJarDocument.type.equals(xmlObject.schemaType())) {
-            validateDD(xmlObject);
+            XmlBeansUtil.validateDD(xmlObject);
             return (EjbJarDocument) xmlObject;
         }
         XmlCursor cursor = xmlObject.newCursor();
@@ -222,7 +221,7 @@
             cursor.toFirstChild();
             if ("http://java.sun.com/xml/ns/j2ee".equals(cursor.getName().getNamespaceURI())) {
                 XmlObject result = xmlObject.changeType(EjbJarDocument.type);
-                validateDD(result);
+                XmlBeansUtil.validateDD(result);
                 return (EjbJarDocument) result;
             }
             // deployment descriptor is probably in EJB 1.1 or 2.0 format
@@ -248,16 +247,16 @@
         }
         XmlObject result = xmlObject.changeType(EjbJarDocument.type);
         if (result != null) {
-            validateDD(result);
+            XmlBeansUtil.validateDD(result);
             return (EjbJarDocument) result;
         }
-        validateDD(xmlObject);
+        XmlBeansUtil.validateDD(xmlObject);
         return (EjbJarDocument) xmlObject;
     }
 
     public static WebAppDocument convertToServletSchema(XmlObject xmlObject) throws XmlException {
         if (WebAppDocument.type.equals(xmlObject.schemaType())) {
-            validateDD(xmlObject);
+            XmlBeansUtil.validateDD(xmlObject);
             return (WebAppDocument) xmlObject;
         }
         XmlCursor cursor = xmlObject.newCursor();
@@ -266,7 +265,7 @@
             cursor.toFirstChild();
             if ("http://java.sun.com/xml/ns/j2ee".equals(cursor.getName().getNamespaceURI())) {
                 XmlObject result = xmlObject.changeType(WebAppDocument.type);
-                validateDD(result);
+                XmlBeansUtil.validateDD(result);
                 return (WebAppDocument) result;
             }
 
@@ -320,10 +319,10 @@
         }
         XmlObject result = xmlObject.changeType(WebAppDocument.type);
         if (result != null) {
-            validateDD(result);
+            XmlBeansUtil.validateDD(result);
             return (WebAppDocument) result;
         }
-        validateDD(xmlObject);
+        XmlBeansUtil.validateDD(xmlObject);
         return (WebAppDocument) xmlObject;
     }
 
@@ -367,7 +366,7 @@
                 if (result == null || result.schemaType() != desiredType) {
                     result = temp.copy().changeType(desiredType);
                 }
-                validateDD(result);
+                XmlBeansUtil.validateDD(result);
                 return result;
             } else {
                 return null;
@@ -489,7 +488,6 @@
 
                     cursor.toNextSibling(J2EE_NAMESPACE, "abstract-schema-name");
                     while (cursor.toNextSibling(J2EE_NAMESPACE, "cmp-field")) {
-                        ;
                     }
                     cursor.toNextSibling(J2EE_NAMESPACE, "primkey-field");
                     cursor.toNextSibling();
@@ -505,14 +503,13 @@
                         //cursor still on transaction-type
                     }
                     if (!cursor.toNextSibling(J2EE_NAMESPACE, "activation-config")) {
-                        boolean hasProperties = false;
                         //skip transaction-type
                         cursor.toNextSibling();
                         //convert EJB 2.0 elements to activation-config-properties.
                         moveable.toCursor(cursor);
                         cursor.push();
                         cursor.beginElement("activation-config", J2EE_NAMESPACE);
-                        hasProperties |= addActivationConfigProperty(moveable, cursor, "message-selector", "messageSelector");
+                        boolean hasProperties = addActivationConfigProperty(moveable, cursor, "message-selector", "messageSelector");
                         hasProperties |= addActivationConfigProperty(moveable, cursor, "acknowledge-mode", "acknowledgeMode");
                         if (new QName(J2EE_NAMESPACE, "message-driven-destination").equals(moveable.getName()) ||
                                 moveable.toNextSibling(J2EE_NAMESPACE, "message-driven-destination")) {
@@ -594,17 +591,6 @@
         moveElements("env-entry-name", moveable, cursor);
         moveElements("env-entry-type", moveable, cursor);
         moveElements("env-entry-value", moveable, cursor);
-    }
-
-    public static void validateDD(XmlObject dd) throws XmlException {
-        XmlOptions xmlOptions = new XmlOptions();
-        xmlOptions.setLoadLineNumbers();
-        Collection errors = new ArrayList();
-        xmlOptions.setErrorListener(errors);
-        if (!dd.validate(xmlOptions)) {
-            throw new XmlException("Invalid deployment descriptor: " + errors + "\nDescriptor: " + dd.toString(), null, errors);
-        }
-//        System.out.println("descriptor: " + dd.toString());
     }
 
     private static void moveElements(String localName, XmlCursor moveable, XmlCursor toHere) {

Modified: geronimo/branches/pluggable-jacc/modules/j2ee-schema/src/test/org/apache/geronimo/schema/SchemaConversionUtilsTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/pluggable-jacc/modules/j2ee-schema/src/test/org/apache/geronimo/schema/SchemaConversionUtilsTest.java?rev=418888&r1=418657&r2=418888&view=diff
==============================================================================
--- geronimo/branches/pluggable-jacc/modules/j2ee-schema/src/test/org/apache/geronimo/schema/SchemaConversionUtilsTest.java (original)
+++ geronimo/branches/pluggable-jacc/modules/j2ee-schema/src/test/org/apache/geronimo/schema/SchemaConversionUtilsTest.java Mon Jul  3 17:50:41 2006
@@ -28,6 +28,7 @@
 import org.apache.xmlbeans.XmlObject;
 import org.apache.xmlbeans.XmlException;
 import org.apache.geronimo.xbeans.j2ee.EjbJarType;
+import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
 
 /**
  * ejb 1.1 dtd appears to be a subset of ejb 2.0 dtd so the same xsl should
@@ -64,7 +65,7 @@
         URL expectedOutputXml = classLoader.getResource("j2ee_1_3dtd/application-client-14.xml");
         XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
         XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
-        SchemaConversionUtils.validateDD(expected);
+        XmlBeansUtil.validateDD(expected);
         xmlObject = SchemaConversionUtils.convertToApplicationClientSchema(xmlObject);
 //        System.out.println(xmlObject.toString());
 //        System.out.println(expected.toString());
@@ -93,7 +94,7 @@
         URL expectedOutputXml = classLoader.getResource("j2ee_1_3dtd/application-14.xml");
         XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
         XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
-        SchemaConversionUtils.validateDD(expected);
+        XmlBeansUtil.validateDD(expected);
         xmlObject = SchemaConversionUtils.convertToApplicationSchema(xmlObject);
 //        System.out.println(xmlObject.toString());
 //        System.out.println(expected.toString());
@@ -122,7 +123,7 @@
         URL expectedOutputXml = classLoader.getResource("j2ee_1_3dtd/ra-15.xml");
         XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
         XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
-        SchemaConversionUtils.validateDD(expected);
+        XmlBeansUtil.validateDD(expected);
         xmlObject = SchemaConversionUtils.convertToConnectorSchema(xmlObject);
 //        System.out.println(xmlObject.toString());
 //        System.out.println(expected.toString());
@@ -151,7 +152,7 @@
         URL expectedOutputXml = classLoader.getResource("j2ee_1_2dtd/ejb-1-21.xml");
         XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
         XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
-        SchemaConversionUtils.validateDD(expected);
+        XmlBeansUtil.validateDD(expected);
         xmlObject = SchemaConversionUtils.convertToEJBSchema(xmlObject);
 //        System.out.println(xmlObject.toString());
 //        System.out.println(expected.toString());
@@ -180,7 +181,7 @@
         URL expectedOutputXml = classLoader.getResource("j2ee_1_3dtd/ejb-jar-21.xml");
         XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
         XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
-        SchemaConversionUtils.validateDD(expected);
+        XmlBeansUtil.validateDD(expected);
         xmlObject = SchemaConversionUtils.convertToEJBSchema(xmlObject);
 //        System.out.println(xmlObject.toString());
 //        System.out.println(expected.toString());
@@ -209,7 +210,7 @@
         URL expectedOutputXml = classLoader.getResource("j2ee_1_3dtd/mdb-ejb-jar-21-GERONIMO-1649.xml");
         XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
         XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
-        SchemaConversionUtils.validateDD(expected);
+        XmlBeansUtil.validateDD(expected);
         xmlObject = SchemaConversionUtils.convertToEJBSchema(xmlObject);
 //        System.out.println(xmlObject.toString());
 //        System.out.println(expected.toString());
@@ -238,7 +239,7 @@
         URL expectedOutputXml = classLoader.getResource("j2ee_1_3dtd/mdb-ejb-jar-21.xml");
         XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
         XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
-        SchemaConversionUtils.validateDD(expected);
+        XmlBeansUtil.validateDD(expected);
         xmlObject = SchemaConversionUtils.convertToEJBSchema(xmlObject);
 //        System.out.println(xmlObject.toString());
 //        System.out.println(expected.toString());

Modified: geronimo/branches/pluggable-jacc/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/JVMTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/pluggable-jacc/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/JVMTest.java?rev=418888&r1=418657&r2=418888&view=diff
==============================================================================
--- geronimo/branches/pluggable-jacc/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/JVMTest.java (original)
+++ geronimo/branches/pluggable-jacc/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/JVMTest.java Mon Jul  3 17:50:41 2006
@@ -22,7 +22,7 @@
 import org.apache.geronimo.management.JVM;
 
 /**
- * @version $Rev: 383682 $ $Date$
+ * @version $Rev$ $Date$
  */
 public class JVMTest extends Abstract77Test {
     private JVM jvm;

Modified: geronimo/branches/pluggable-jacc/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/ServerTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/pluggable-jacc/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/ServerTest.java?rev=418888&r1=418657&r2=418888&view=diff
==============================================================================
--- geronimo/branches/pluggable-jacc/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/ServerTest.java (original)
+++ geronimo/branches/pluggable-jacc/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/ServerTest.java Mon Jul  3 17:50:41 2006
@@ -21,7 +21,7 @@
 
 
 /**
- * @version $Rev: 383682 $ $Date$
+ * @version $Rev$ $Date$
  */
 public class ServerTest extends Abstract77Test {
     private J2EEServer server;

Modified: geronimo/branches/pluggable-jacc/modules/jetty-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/pluggable-jacc/modules/jetty-builder/pom.xml?rev=418888&r1=418657&r2=418888&view=diff
==============================================================================
--- geronimo/branches/pluggable-jacc/modules/jetty-builder/pom.xml (original)
+++ geronimo/branches/pluggable-jacc/modules/jetty-builder/pom.xml Mon Jul  3 17:50:41 2006
@@ -35,7 +35,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
-                <version>${xmlbeansMavenPluginVersion}</version>
                 <executions>
                     <execution>
                         <goals>
@@ -64,6 +63,11 @@
         <dependency>
             <groupId>stax</groupId>
             <artifactId>stax-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-security-builder</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/branches/pluggable-jacc/modules/jetty-builder/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/pluggable-jacc/modules/jetty-builder/project.xml?rev=418888&r1=418657&r2=418888&view=diff
==============================================================================
--- geronimo/branches/pluggable-jacc/modules/jetty-builder/project.xml (original)
+++ geronimo/branches/pluggable-jacc/modules/jetty-builder/project.xml Mon Jul  3 17:50:41 2006
@@ -138,6 +138,9 @@
             <groupId>geronimo</groupId>
             <artifactId>geronimo-j2ee-builder</artifactId>
             <version>${pom.currentVersion}</version>
+            <properties>
+                <xmlbeans>true</xmlbeans>
+            </properties>
         </dependency>
 
         <dependency>



Mime
View raw message