geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r741679 [1/3] - in /geronimo/server/trunk: buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/ framework/configs/j2ee-security/src/main/plan/ framework/configs/server-security-config/src/main/plan/ framework/confi...
Date Fri, 06 Feb 2009 19:07:20 GMT
Author: djencks
Date: Fri Feb  6 19:07:17 2009
New Revision: 741679

URL: http://svn.apache.org/viewvc?rev=741679&view=rev
Log:
GERONIMO-4531, GERONIMO-4523 Simplify builder collections. Make security principal-role mappings independent of the application

Added:
    geronimo/server/trunk/framework/configs/server-security-config/src/main/resources/security/rbac-base.xml   (with props)
    geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/xsd/geronimo-soter-1.0.xsd
      - copied, changed from r652591, geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/xsd/geronimo-security-2.0.xsd
Removed:
    geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/deploy/Security.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilderCollectionGBean.java
Modified:
    geronimo/server/trunk/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml
    geronimo/server/trunk/framework/configs/j2ee-security/src/main/plan/plan.xml
    geronimo/server/trunk/framework/configs/server-security-config/src/main/plan/plan.xml
    geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/PluginBootstrap2.java
    geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/AbstractBuilderCollection.java
    geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/AbstractNamespaceBuilder.java
    geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/NamespaceDrivenBuilderCollection.java
    geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jacc/ApplicationPolicyConfigurationManager.java
    geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jacc/PrincipalRoleMapper.java
    geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jacc/mappingprovider/ApplicationPrincipalRoleConfigurationManager.java
    geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/GBeanBuilder.java
    geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
    geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
    geronimo/server/trunk/plugins/connector/connector-deployer/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
    geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
    geronimo/server/trunk/plugins/cxf/cxf-jaxws-tools/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARContext.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilderCollection.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/xsd/geronimo-application-2.0.xsd
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTestSupport.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/NamingBuilderCollectionTest.java
    geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java
    geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/UnavailableRefBuilder.java
    geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/pom.xml
    geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/GeronimoSecurityBuilderImpl.java
    geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/SecurityConfiguration.java
    geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/xsd/geronimo-security-2.0.xsd
    geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/test/java/org/apache/geronimo/security/deployment/LoginConfigBuilderTest.java
    geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java
    geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/web25/deployment/SchemaConversionTest.java
    geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/test/java/org/apache/geronimo/jasper/deployment/BasicTest.java
    geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java
    geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-2.0.2.xsd
    geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilderTest.java
    geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/PlanParsingTest.java
    geronimo/server/trunk/plugins/jetty/geronimo-jetty6-clustering-builder-wadi/src/main/java/org/apache/geronimo/jetty6/cluster/wadi/builder/WADIJettyClusteringBuilder.java
    geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/AbstractWebModuleTest.java
    geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/SecurityTest.java
    geronimo/server/trunk/plugins/jetty/jetty6-deployer/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/src/test/java/org/apache/geronimo/myfaces/deployment/BasicTest.java
    geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbDeploymentBuilder.java
    geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
    geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/xsd/geronimo-openejb-2.0.xsd
    geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-builder-wadi/src/main/java/org/apache/geronimo/openejb/deployment/cluster/WADIOpenEJBClusteringBuilder.java
    geronimo/server/trunk/plugins/openejb/openejb-deployer/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-2.0.1.xsd
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/test/java/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/test/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/test/resources/deployables/war4/WEB-INF/geronimo-web.xml
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/src/main/java/org/apache/geronimo/tomcat/cluster/wadi/builder/WADITomcatClusteringBuilder.java
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/src/test/java/org/apache/geronimo/tomcat/cluster/wadi/builder/WADITomcatClusteringBuilderTest.java
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/ContainerTest.java
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/JAASSecurityTest.java
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/JACCSecurityTest.java
    geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/src/main/plan/plan.xml

Modified: geronimo/server/trunk/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml?rev=741679&r1=741678&r2=741679&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ geronimo/server/trunk/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml Fri Feb  6 19:07:17 2009
@@ -21,7 +21,7 @@
         <cxfDeployer>org.apache.geronimo.configs/cxf-deployer/${geronimoVersion}/car</cxfDeployer>
         <axis2Deployer>org.apache.geronimo.configs/axis2-deployer/${geronimoVersion}/car</axis2Deployer>
         <tomcatDeployer>org.apache.geronimo.configs/tomcat6-deployer/${geronimoVersion}/car</tomcatDeployer>
-        <jetty6Deployer>org.apache.geronimo.configs/jetty6-deployer/${geronimoVersion}/car</jetty6Deployer>
+        <jetty6Deployer>org.apache.geronimo.configs/jetty7-deployer/${geronimoVersion}/car</jetty7Deployer>
         <jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${geronimoVersion}/car</jasperDeployer>
         <jpaDeployer>org.apache.geronimo.configs/persistence-jpa10-deployer/${geronimoVersion}/car</jpaDeployer>
     </properties>
@@ -61,7 +61,7 @@
                         <!-- gbean deployer is default.  For jee apps include all deployers your app needs, see properties -->
                         <!--<deploymentConfig>${gbeanDeployer}</deploymentConfig>-->
                         <!--<deploymentConfig>${j2eeDeployer}</deploymentConfig>-->
-                        <!--<deploymentConfig>${jetty6Deployer}</deploymentConfig>-->
+                        <!--<deploymentConfig>${jetty7Deployer}</deploymentConfig>-->
                         <!--<deploymentConfig>${jasperDeployer}</deploymentConfig>-->
                         <!--<deploymentConfig>${jpaDeployer}</deploymentConfig>-->
                     </deploymentConfigs>

Modified: geronimo/server/trunk/framework/configs/j2ee-security/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-security/src/main/plan/plan.xml?rev=741679&r1=741678&r2=741679&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-security/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/configs/j2ee-security/src/main/plan/plan.xml Fri Feb  6 19:07:17 2009
@@ -25,8 +25,16 @@
         <reference name="ServerInfo"><name>ServerInfo</name></reference>
         <attribute name="policyConfigurationFactory">org.apache.geronimo.security.jacc.mappingprovider.GeronimoPolicyConfigurationFactory</attribute>
         <attribute name="policyProvider">org.apache.geronimo.security.jacc.mappingprovider.GeronimoPolicy</attribute>
+        <!--<attribute name="policyConfigurationFactory">org.soter.rbac.jacc.RbacPolicyConfigurationFactory</attribute>-->
+        <!--<attribute name="policyProvider">org.soter.rbac.jacc.RbacPolicy</attribute>-->
     </gbean>
 
+    <!--<gbean name="Rbac" class="org.apache.geronimo.security.jacc.rbac.RbacConfiguration">-->
+        <!--<attribute name="principalClass">org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal</attribute>-->
+        <!--<attribute name="configuration">var/security/rbac-base.xml</attribute>-->
+        <!--<reference name="ServerInfo"><name>ServerInfo</name></reference>-->
+    <!--</gbean>-->
+
     <!-- Register GeronimoLoginConfiguration as the LoginConfiguration handler -->
     <gbean name="LoginConfiguration" class="org.apache.geronimo.security.jaas.GeronimoLoginConfiguration">
         <references name="Configurations">

Modified: geronimo/server/trunk/framework/configs/server-security-config/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/server-security-config/src/main/plan/plan.xml?rev=741679&r1=741678&r2=741679&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/server-security-config/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/configs/server-security-config/src/main/plan/plan.xml Fri Feb  6 19:07:17 2009
@@ -50,6 +50,14 @@
          </reference>
      </gbean>
 
+    <!--<gbean name="SystemRbac" class="org.apache.geronimo.security.jacc.rbac.RbacConfiguration">-->
+        <!--<attribute name="principalClass">org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal</attribute>-->
+        <!--<attribute name="configuration">var/security/rbac-base.xml</attribute>-->
+        <!--<reference name="ServerInfo">-->
+            <!--<name>ServerInfo</name>-->
+        <!--</reference>-->
+    <!--</gbean>-->
+
     <gbean name="geronimo-default" class="org.apache.geronimo.security.keystore.FileKeystoreInstance">
         <attribute name="keystoreName">geronimo-default</attribute>
         <attribute name="keystorePath">var/security/keystores/geronimo-default</attribute>

Added: geronimo/server/trunk/framework/configs/server-security-config/src/main/resources/security/rbac-base.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/server-security-config/src/main/resources/security/rbac-base.xml?rev=741679&view=auto
==============================================================================
--- geronimo/server/trunk/framework/configs/server-security-config/src/main/resources/security/rbac-base.xml (added)
+++ geronimo/server/trunk/framework/configs/server-security-config/src/main/resources/security/rbac-base.xml Fri Feb  6 19:07:17 2009
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<rbac xmlns="http://geronimo.apache.org/xml/ns/rbac-xml">
+    <scope>
+        <scope-name>global</scope-name>
+        <role>
+            <role-name>manager</role-name>
+        </role>
+        <role>
+            <role-name>user</role-name>
+        </role>
+        <role>
+            <role-name>admin</role-name>
+        </role>
+    </scope>
+</rbac>
\ No newline at end of file

Propchange: geronimo/server/trunk/framework/configs/server-security-config/src/main/resources/security/rbac-base.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/configs/server-security-config/src/main/resources/security/rbac-base.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/configs/server-security-config/src/main/resources/security/rbac-base.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/PluginBootstrap2.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/PluginBootstrap2.java?rev=741679&r1=741678&r2=741679&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/PluginBootstrap2.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/PluginBootstrap2.java Fri Feb  6 19:07:17 2009
@@ -77,7 +77,7 @@
 
         Maven2Repository repository = new Maven2Repository(localRepo);
         GBeanBuilder gBeanBuilder = new GBeanBuilder(null, null);
-        ServiceConfigBuilder builder = new ServiceConfigBuilder(null, Collections.singleton(repository), Collections.singleton(gBeanBuilder), new Jsr77Naming());
+        ServiceConfigBuilder builder = new ServiceConfigBuilder(null, Collections.singleton(repository), Collections.<NamespaceDrivenBuilder>singleton(gBeanBuilder), new Jsr77Naming());
         ConfigurationStore targetConfigurationStore = new NullConfigurationStore() {
             public File createNewConfigurationDir(Artifact configId) throws ConfigurationAlreadyExistsException {
                 return buildDir;

Modified: geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/AbstractBuilderCollection.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/AbstractBuilderCollection.java?rev=741679&r1=741678&r2=741679&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/AbstractBuilderCollection.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/AbstractBuilderCollection.java Fri Feb  6 19:07:17 2009
@@ -19,8 +19,6 @@
 import java.util.Collection;
 import java.util.Collections;
 
-import javax.xml.namespace.QName;
-
 import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
 import org.apache.geronimo.gbean.ReferenceCollection;
 import org.apache.geronimo.gbean.ReferenceCollectionEvent;
@@ -30,15 +28,13 @@
 /**
  * @version $Rev$ $Date$
  */
-public abstract class AbstractBuilderCollection<T> {
+public abstract class AbstractBuilderCollection<T extends AbstractNamespaceBuilder> {
     protected final Collection<T> builders;
-    protected final QName basePlanElementName;
     protected QNameSet specQNames = QNameSet.EMPTY;
     protected QNameSet planQNames = QNameSet.EMPTY;
 
-    protected AbstractBuilderCollection(Collection<T> builders, final QName basePlanElementName) {
-        this.builders = builders == null ? Collections.EMPTY_SET : builders;
-        this.basePlanElementName = basePlanElementName;
+    protected AbstractBuilderCollection(Collection<T> builders) {
+        this.builders = builders == null ? Collections.<T>emptySet() : builders;
         if (builders instanceof ReferenceCollection) {
             ((ReferenceCollection) builders).addReferenceCollectionListener(new ReferenceCollectionListener() {
 
@@ -48,11 +44,11 @@
 
                 public void memberRemoved(ReferenceCollectionEvent event) {
                     T builder = (T) event.getMember();
-                    QNameSet builderSpecQNames = ((AbstractNamespaceBuilder) builder).getSpecQNameSet();
+                    QNameSet builderSpecQNames = builder.getSpecQNameSet();
                     specQNames = specQNames.intersect(builderSpecQNames.inverse());
-                    QNameSet builderPlanQNames = ((AbstractNamespaceBuilder) builder).getPlanQNameSet();
+                    QNameSet builderPlanQNames = builder.getPlanQNameSet();
                     planQNames = planQNames.intersect(builderPlanQNames.inverse());
-                    XmlBeansUtil.unregisterSubstitutionGroupElements(basePlanElementName, builderPlanQNames);
+                    XmlBeansUtil.unregisterSubstitutionGroupElements(builder.getBaseQName(), builderPlanQNames);
                 }
             });
         }
@@ -63,8 +59,8 @@
 
 
     protected void addBuilder(T builder) {
-        QNameSet builderSpecQNames = ((AbstractNamespaceBuilder) builder).getSpecQNameSet();
-        QNameSet builderPlanQNames = ((AbstractNamespaceBuilder) builder).getPlanQNameSet();
+        QNameSet builderSpecQNames = builder.getSpecQNameSet();
+        QNameSet builderPlanQNames = builder.getPlanQNameSet();
         if (builderSpecQNames == null) {
             throw new IllegalStateException("Builder " + builder + " is missing spec qnames");
         }
@@ -82,7 +78,7 @@
 
         }
         //really?
-        XmlBeansUtil.registerSubstitutionGroupElements(basePlanElementName, builderPlanQNames);
+        XmlBeansUtil.registerSubstitutionGroupElements(builder.getBaseQName(), builderPlanQNames);
     }
 
     public QNameSet getSpecQNameSet() {

Modified: geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/AbstractNamespaceBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/AbstractNamespaceBuilder.java?rev=741679&r1=741678&r2=741679&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/AbstractNamespaceBuilder.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/AbstractNamespaceBuilder.java Fri Feb  6 19:07:17 2009
@@ -16,6 +16,8 @@
  */
 package org.apache.geronimo.deployment;
 
+import javax.xml.namespace.QName;
+
 import org.apache.xmlbeans.QNameSet;
 
 /**
@@ -25,4 +27,6 @@
     QNameSet getSpecQNameSet();
 
     QNameSet getPlanQNameSet();
+
+    QName getBaseQName();
 }

Modified: geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/NamespaceDrivenBuilderCollection.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/NamespaceDrivenBuilderCollection.java?rev=741679&r1=741678&r2=741679&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/NamespaceDrivenBuilderCollection.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/NamespaceDrivenBuilderCollection.java Fri Feb  6 19:07:17 2009
@@ -29,22 +29,20 @@
 /**
  * @version $Rev$ $Date$
  */
-public class NamespaceDrivenBuilderCollection extends AbstractBuilderCollection {
+public class NamespaceDrivenBuilderCollection extends AbstractBuilderCollection<NamespaceDrivenBuilder> {
 
-    public NamespaceDrivenBuilderCollection(Collection builders, final QName basePlanElementName) {
-        super(builders, basePlanElementName);
+    public NamespaceDrivenBuilderCollection(Collection<NamespaceDrivenBuilder> builders) {
+        super(builders);
     }
 
     public void buildEnvironment(XmlObject container, Environment environment) throws DeploymentException {
-        for (Iterator iterator = builders.iterator(); iterator.hasNext();) {
-            NamespaceDrivenBuilder builder = (NamespaceDrivenBuilder) iterator.next();
+        for (NamespaceDrivenBuilder builder : builders) {
             builder.buildEnvironment(container, environment);
         }
     }
 
     public void build(XmlObject container, DeploymentContext applicationContext, DeploymentContext moduleContext) throws DeploymentException {
-        for (Iterator iterator = builders.iterator(); iterator.hasNext();) {
-            NamespaceDrivenBuilder builder = (NamespaceDrivenBuilder) iterator.next();
+        for (NamespaceDrivenBuilder builder : builders) {
             builder.build(container, applicationContext, moduleContext);
         }
     }

Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jacc/ApplicationPolicyConfigurationManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jacc/ApplicationPolicyConfigurationManager.java?rev=741679&r1=741678&r2=741679&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jacc/ApplicationPolicyConfigurationManager.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jacc/ApplicationPolicyConfigurationManager.java Fri Feb  6 19:07:17 2009
@@ -32,9 +32,6 @@
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
-import org.apache.geronimo.security.ContextManager;
-import org.apache.geronimo.security.IdentificationPrincipal;
-import org.apache.geronimo.security.SubjectId;
 import org.apache.geronimo.security.SecurityNames;
 import org.apache.geronimo.security.credentialstore.CredentialStore;
 import org.apache.geronimo.security.deploy.SubjectInfo;
@@ -45,14 +42,9 @@
 public class ApplicationPolicyConfigurationManager implements GBeanLifecycle, RunAsSource {
 
     private final Map<String, PolicyConfiguration> contextIdToPolicyConfigurationMap = new HashMap<String, PolicyConfiguration>();
-    private final Map<String, Subject> roleDesignates = new HashMap<String, Subject>();
-    private final Subject defaultSubject;
     private final PrincipalRoleMapper principalRoleMapper;
 
-    public ApplicationPolicyConfigurationManager(Map<String, ComponentPermissions> contextIdToPermissionsMap, SubjectInfo defaultSubjectInfo, Map<String, SubjectInfo> roleDesignates, ClassLoader cl, CredentialStore credentialStore, PrincipalRoleMapper principalRoleMapper) throws PolicyContextException, ClassNotFoundException, LoginException {
-        if (credentialStore == null && (!roleDesignates.isEmpty() || defaultSubjectInfo != null)) {
-            throw new NullPointerException("No CredentialStore supplied to resolve default and run-as subjects");
-        }
+    public ApplicationPolicyConfigurationManager(Map<String, ComponentPermissions> contextIdToPermissionsMap, PrincipalRoleMapper principalRoleMapper, ClassLoader cl) throws PolicyContextException, ClassNotFoundException, LoginException {
         this.principalRoleMapper = principalRoleMapper;
         Thread currentThread = Thread.currentThread();
         ClassLoader oldClassLoader = currentThread.getContextClassLoader();
@@ -105,37 +97,14 @@
         Policy policy = Policy.getPolicy();
         policy.refresh();
 
-        if (defaultSubjectInfo == null) {
-            defaultSubject = ContextManager.EMPTY;
-        } else {
-            defaultSubject = credentialStore.getSubject(defaultSubjectInfo.getRealm(), defaultSubjectInfo.getId());
-            registerSubject(defaultSubject);
-        }
-
-        for (Map.Entry<String, SubjectInfo> entry : roleDesignates.entrySet()) {
-            String role = entry.getKey();
-            SubjectInfo subjectInfo = entry.getValue();
-            if (subjectInfo == null || credentialStore == null) {
-                throw new NullPointerException("No subjectInfo for role " + role);
-            }
-            Subject roleDesignate = credentialStore.getSubject(subjectInfo.getRealm(), subjectInfo.getId());
-            registerSubject(roleDesignate);
-            this.roleDesignates.put(role, roleDesignate);
-        }
-    }
-
-    private void registerSubject(Subject subject) {
-        ContextManager.registerSubject(subject);
-        SubjectId id = ContextManager.getSubjectId(subject);
-        subject.getPrincipals().add(new IdentificationPrincipal(id));
     }
 
     public Subject getDefaultSubject() {
-        return defaultSubject;
+        return principalRoleMapper.getDefaultSubject();
     }
 
     public Subject getSubjectForRole(String role) {
-        return roleDesignates.get(role);
+        return principalRoleMapper.getSubjectForRole(role);
     }
 
     public void doStart() throws Exception {
@@ -143,14 +112,6 @@
     }
 
     public void doStop() throws Exception {
-        for (Map.Entry<String, Subject> entry : roleDesignates.entrySet()) {
-            Subject roleDesignate = entry.getValue();
-            ContextManager.unregisterSubject(roleDesignate);
-        }
-        if (defaultSubject != ContextManager.EMPTY) {
-            ContextManager.unregisterSubject(defaultSubject);
-        }
-
         if (principalRoleMapper != null) {
             principalRoleMapper.uninstall(contextIdToPolicyConfigurationMap.keySet());
         }
@@ -169,16 +130,14 @@
     static {
         GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(ApplicationPolicyConfigurationManager.class, SecurityNames.JACC_MANAGER);
         infoBuilder.addAttribute("contextIdToPermissionsMap", Map.class, true);
-        infoBuilder.addAttribute("defaultSubjectInfo", SubjectInfo.class, true);
-        infoBuilder.addAttribute("roleDesignates", Map.class, true);
         infoBuilder.addAttribute("classLoader", ClassLoader.class, false);
-        infoBuilder.addReference("CredentialStore", CredentialStore.class, GBeanInfoBuilder.DEFAULT_J2EE_TYPE);
         infoBuilder.addReference("PrincipalRoleMapper", PrincipalRoleMapper.class, SecurityNames.JACC_MANAGER);
-        infoBuilder.setConstructor(new String[] {"contextIdToPermissionsMap", "defaultSubjectInfo", "roleDesignates", "classLoader", "CredentialStore", "PrincipalRoleMapper"});
+        infoBuilder.setConstructor(new String[] {"contextIdToPermissionsMap", "PrincipalRoleMapper", "classLoader"});
         GBEAN_INFO = infoBuilder.getBeanInfo();
     }
 
     public static GBeanInfo getGBeanInfo() {
         return GBEAN_INFO;
     }
+
 }

Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jacc/PrincipalRoleMapper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jacc/PrincipalRoleMapper.java?rev=741679&r1=741678&r2=741679&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jacc/PrincipalRoleMapper.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jacc/PrincipalRoleMapper.java Fri Feb  6 19:07:17 2009
@@ -21,7 +21,7 @@
 
 /**
  */
-public interface PrincipalRoleMapper {
+public interface PrincipalRoleMapper extends RunAsSource {
     void install(Set<String> contextIds) throws PolicyContextException;
 
     void uninstall(Set<String> contextIds) throws PolicyContextException;

Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jacc/mappingprovider/ApplicationPrincipalRoleConfigurationManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jacc/mappingprovider/ApplicationPrincipalRoleConfigurationManager.java?rev=741679&r1=741678&r2=741679&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jacc/mappingprovider/ApplicationPrincipalRoleConfigurationManager.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jacc/mappingprovider/ApplicationPrincipalRoleConfigurationManager.java Fri Feb  6 19:07:17 2009
@@ -18,14 +18,22 @@
 
 import java.util.Map;
 import java.util.Set;
+import java.util.HashMap;
 import java.security.Principal;
 
 import javax.security.jacc.PolicyContextException;
+import javax.security.auth.Subject;
+import javax.security.auth.login.LoginException;
 
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.security.jacc.PrincipalRoleMapper;
 import org.apache.geronimo.security.SecurityNames;
+import org.apache.geronimo.security.ContextManager;
+import org.apache.geronimo.security.SubjectId;
+import org.apache.geronimo.security.IdentificationPrincipal;
+import org.apache.geronimo.security.credentialstore.CredentialStore;
+import org.apache.geronimo.security.deploy.SubjectInfo;
 
 /**
  * @version $Rev$ $Date$
@@ -34,11 +42,34 @@
 
     private static PrincipalRoleConfigurationFactory principalRoleConfigurationFactory;
     private final Map<Principal, Set<String>> principalRoleMap;
+    private final Map<String, Subject> roleDesignates = new HashMap<String, Subject>();
+    private final Subject defaultSubject;
 
-    public ApplicationPrincipalRoleConfigurationManager(Map<Principal, Set<String>> principalRoleMap) throws PolicyContextException, ClassNotFoundException {
+    public ApplicationPrincipalRoleConfigurationManager(Map<Principal, Set<String>> principalRoleMap, SubjectInfo defaultSubjectInfo, Map<String, SubjectInfo> roleDesignates, CredentialStore credentialStore) throws PolicyContextException, ClassNotFoundException, LoginException {
+        if (credentialStore == null && (!roleDesignates.isEmpty() || defaultSubjectInfo != null)) {
+            throw new NullPointerException("No CredentialStore supplied to resolve default and run-as subjects");
+        }
         this.principalRoleMap = principalRoleMap;
+        if (defaultSubjectInfo == null) {
+            defaultSubject = ContextManager.EMPTY;
+        } else {
+            defaultSubject = credentialStore.getSubject(defaultSubjectInfo.getRealm(), defaultSubjectInfo.getId());
+            registerSubject(defaultSubject);
+        }
+
+        for (Map.Entry<String, SubjectInfo> entry : roleDesignates.entrySet()) {
+            String role = entry.getKey();
+            SubjectInfo subjectInfo = entry.getValue();
+            if (subjectInfo == null || credentialStore == null) {
+                throw new NullPointerException("No subjectInfo for role " + role);
+            }
+            Subject roleDesignate = credentialStore.getSubject(subjectInfo.getRealm(), subjectInfo.getId());
+            registerSubject(roleDesignate);
+            this.roleDesignates.put(role, roleDesignate);
+        }
     }
 
+
     public static void setPrincipalRoleConfigurationFactory(PrincipalRoleConfigurationFactory principalRoleConfigurationFactory) {
         if (ApplicationPrincipalRoleConfigurationManager.principalRoleConfigurationFactory != null) {
             throw new IllegalStateException("ApplicationPrincipalRoleConfigurationManager.principalRoleConfigurationFactory already set");
@@ -62,18 +93,52 @@
     public void uninstall(Set<String> contextIds) throws PolicyContextException {
     }
 
+    private void registerSubject(Subject subject) {
+        ContextManager.registerSubject(subject);
+        SubjectId id = ContextManager.getSubjectId(subject);
+        subject.getPrincipals().add(new IdentificationPrincipal(id));
+    }
+
+    public Subject getDefaultSubject() {
+        return defaultSubject;
+    }
+
+    public Subject getSubjectForRole(String role) {
+        return roleDesignates.get(role);
+    }
+
+    public void doStart() throws Exception {
+
+    }
+
+    public void doStop() throws Exception {
+        for (Map.Entry<String, Subject> entry : roleDesignates.entrySet()) {
+            Subject roleDesignate = entry.getValue();
+            ContextManager.unregisterSubject(roleDesignate);
+        }
+        if (defaultSubject != ContextManager.EMPTY) {
+            ContextManager.unregisterSubject(defaultSubject);
+        }
+    }
+
+    public void doFail() {
+
+    }
 
     public static final GBeanInfo GBEAN_INFO;
 
     static {
         GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(ApplicationPrincipalRoleConfigurationManager.class, SecurityNames.JACC_MANAGER);
         infoBuilder.addAttribute("principalRoleMap", Map.class, true);
-        infoBuilder.addInterface(PrincipalRoleMapper.class);
-        infoBuilder.setConstructor(new String[] {"principalRoleMap"});
+        infoBuilder.addAttribute("defaultSubjectInfo", SubjectInfo.class, true);
+        infoBuilder.addAttribute("roleDesignates", Map.class, true);
+        infoBuilder.addReference("CredentialStore", CredentialStore.class, GBeanInfoBuilder.DEFAULT_J2EE_TYPE);
+        infoBuilder.setConstructor(new String[] {"principalRoleMap", "defaultSubjectInfo", "roleDesignates", "CredentialStore"});
         GBEAN_INFO = infoBuilder.getBeanInfo();
     }
 
     public GBeanInfo getGBeanInfo() {
         return GBEAN_INFO;
     }
+
 }

Modified: geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/GBeanBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/GBeanBuilder.java?rev=741679&r1=741678&r2=741679&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/GBeanBuilder.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/GBeanBuilder.java Fri Feb  6 19:07:17 2009
@@ -190,6 +190,10 @@
         return GBEAN_QNAME_SET;
     }
 
+    public QName getBaseQName() {
+        return SERVICE_QNAME;
+    }
+
     public static final GBeanInfo GBEAN_INFO;
 
     static {

Modified: geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java?rev=741679&r1=741678&r2=741679&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java Fri Feb  6 19:07:17 2009
@@ -87,11 +87,11 @@
         this(defaultEnvironment, repositories, Collections.EMPTY_LIST, naming, null);
     }
 
-    public ServiceConfigBuilder(Environment defaultEnvironment, Collection repositories, Collection serviceBuilders, Kernel kernel) {
+    public ServiceConfigBuilder(Environment defaultEnvironment, Collection repositories, Collection<NamespaceDrivenBuilder> serviceBuilders, Kernel kernel) {
         this(defaultEnvironment, repositories, serviceBuilders, kernel.getNaming(), ConfigurationUtil.getConfigurationManager(kernel));
     }
 
-    public ServiceConfigBuilder(Environment defaultEnvironment, Collection repositories, Collection serviceBuilders, Naming naming) {
+    public ServiceConfigBuilder(Environment defaultEnvironment, Collection repositories, Collection<NamespaceDrivenBuilder> serviceBuilders, Naming naming) {
         this(defaultEnvironment, repositories, serviceBuilders, naming, null);
     }
 
@@ -107,7 +107,7 @@
         doStop();
     }
 
-    private ServiceConfigBuilder(Environment defaultEnvironment, Collection repositories, Collection serviceBuilders, Naming naming, ConfigurationManager configurationManager) {
+    private ServiceConfigBuilder(Environment defaultEnvironment, Collection repositories, Collection<NamespaceDrivenBuilder> serviceBuilders, Naming naming, ConfigurationManager configurationManager) {
         this.naming = naming;
         this.configurationManager = configurationManager;
 
@@ -115,7 +115,7 @@
         this.defaultEnvironment = defaultEnvironment;
 
         this.repositories = repositories;
-        this.serviceBuilders = new NamespaceDrivenBuilderCollection(serviceBuilders, GBeanBuilder.SERVICE_QNAME);
+        this.serviceBuilders = new NamespaceDrivenBuilderCollection(serviceBuilders);
     }
 
     public Object getDeploymentPlan(File planFile, JarFile jarFile, ModuleIDBuilder idBuilder) throws DeploymentException {

Modified: geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java?rev=741679&r1=741678&r2=741679&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java (original)
+++ geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java Fri Feb  6 19:07:17 2009
@@ -25,29 +25,26 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.StringTokenizer;
-import java.util.LinkedHashSet;
 import java.util.jar.Attributes;
 import java.util.jar.JarFile;
 import java.util.jar.Manifest;
 import java.util.zip.ZipEntry;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.geronimo.client.AppClientContainer;
 import org.apache.geronimo.client.StaticJndiContextPlugin;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.deployment.ClassPathList;
 import org.apache.geronimo.deployment.DeploymentContext;
 import org.apache.geronimo.deployment.ModuleIDBuilder;
+import org.apache.geronimo.deployment.ModuleList;
 import org.apache.geronimo.deployment.NamespaceDrivenBuilder;
 import org.apache.geronimo.deployment.NamespaceDrivenBuilderCollection;
-import org.apache.geronimo.deployment.ModuleList;
 import org.apache.geronimo.deployment.service.EnvironmentBuilder;
-import org.apache.geronimo.deployment.service.GBeanBuilder;
 import org.apache.geronimo.deployment.util.DeploymentUtil;
 import org.apache.geronimo.deployment.util.NestedJarFile;
 import org.apache.geronimo.deployment.xbeans.EnvironmentType;
@@ -58,8 +55,9 @@
 import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
-import org.apache.geronimo.gbean.SingleElementCollection;
 import org.apache.geronimo.gbean.GBeanLifecycle;
+import org.apache.geronimo.gbean.SingleElementCollection;
+import org.apache.geronimo.j2ee.ApplicationInfo;
 import org.apache.geronimo.j2ee.deployment.AppClientModule;
 import org.apache.geronimo.j2ee.deployment.ConnectorModule;
 import org.apache.geronimo.j2ee.deployment.CorbaGBeanNameSource;
@@ -72,7 +70,6 @@
 import org.apache.geronimo.j2ee.deployment.annotation.AnnotatedApplicationClient;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.j2ee.management.impl.J2EEAppClientModuleImpl;
-import org.apache.geronimo.j2ee.ApplicationInfo;
 import org.apache.geronimo.kernel.GBeanAlreadyExistsException;
 import org.apache.geronimo.kernel.Naming;
 import org.apache.geronimo.kernel.config.Configuration;
@@ -80,17 +77,15 @@
 import org.apache.geronimo.kernel.config.ConfigurationModuleType;
 import org.apache.geronimo.kernel.config.ConfigurationStore;
 import org.apache.geronimo.kernel.repository.Artifact;
-import org.apache.geronimo.kernel.repository.Environment;
-import org.apache.geronimo.kernel.repository.Repository;
 import org.apache.geronimo.kernel.repository.ArtifactResolver;
+import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.kernel.repository.MissingDependencyException;
+import org.apache.geronimo.kernel.repository.Repository;
 import org.apache.geronimo.schema.SchemaConversionUtils;
 import org.apache.geronimo.security.deploy.SubjectInfo;
-import org.apache.geronimo.security.deployment.SecurityConfiguration;
 import org.apache.geronimo.xbeans.geronimo.client.GerApplicationClientDocument;
 import org.apache.geronimo.xbeans.geronimo.client.GerApplicationClientType;
 import org.apache.geronimo.xbeans.geronimo.client.GerResourceType;
-import org.apache.geronimo.xbeans.geronimo.naming.GerAbstractNamingEntryDocument;
 import org.apache.geronimo.xbeans.geronimo.security.GerSubjectInfoType;
 import org.apache.geronimo.xbeans.javaee.ApplicationClientDocument;
 import org.apache.geronimo.xbeans.javaee.ApplicationClientType;
@@ -99,6 +94,8 @@
 import org.apache.xmlbeans.XmlCursor;
 import org.apache.xmlbeans.XmlException;
 import org.apache.xmlbeans.XmlObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -201,8 +198,8 @@
         this.credentialStoreName = credentialStoreName;
         this.repositories = repositories;
         this.connectorModuleBuilder = connectorModuleBuilder;
-        this.serviceBuilder = new NamespaceDrivenBuilderCollection(serviceBuilder, GBeanBuilder.SERVICE_QNAME);
-        this.namingBuilders = new NamingBuilderCollection(namingBuilders, GerAbstractNamingEntryDocument.type.getDocumentElementName());
+        this.serviceBuilder = new NamespaceDrivenBuilderCollection(serviceBuilder);
+        this.namingBuilders = new NamingBuilderCollection(namingBuilders);
         this.moduleBuilderExtensions = moduleBuilderExtensions;
         this.clientArtifactResolver = clientArtifactResolver;
     }
@@ -739,14 +736,15 @@
                         appClientContainerGBeanData.setAttribute("defaultSubject", subjectInfo);
                         appClientContainerGBeanData.setReferencePattern("CredentialStore", credentialStoreName);
                     } else if (earContext.getSecurityConfiguration() != null) {
+                        log.warn("Configuration of app client default subject from ear security configuration no longer supported.");
                         //beware a linkage error if we cast this to SubjectInfo
-                        String realm = ((SecurityConfiguration) earContext.getSecurityConfiguration()).getDefaultSubjectRealm();
-                        String id = ((SecurityConfiguration) earContext.getSecurityConfiguration()).getDefaultSubjectId();
-                        if (realm != null) {
-                            SubjectInfo subjectInfo = new SubjectInfo(realm, id);
-                            appClientContainerGBeanData.setAttribute("defaultSubject", subjectInfo);
-                            appClientContainerGBeanData.setReferencePattern("CredentialStore", credentialStoreName);
-                        }
+//                        String realm = ((SecurityConfiguration) earContext.getSecurityConfiguration()).getDefaultSubjectRealm();
+//                        String id = ((SecurityConfiguration) earContext.getSecurityConfiguration()).getDefaultSubjectId();
+//                        if (realm != null) {
+//                            SubjectInfo subjectInfo = new SubjectInfo(realm, id);
+//                            appClientContainerGBeanData.setAttribute("defaultSubject", subjectInfo);
+//                            appClientContainerGBeanData.setReferencePattern("CredentialStore", credentialStoreName);
+//                        }
                     }
                     appClientContainerGBeanData.setReferencePattern("JNDIContext", jndiContextName);
                     appClientContainerGBeanData.setAttribute("holder", holder);

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java?rev=741679&r1=741678&r2=741679&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java Fri Feb  6 19:07:17 2009
@@ -25,6 +25,7 @@
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Date;
 import java.util.Enumeration;
 import java.util.HashMap;
@@ -34,14 +35,11 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
-import java.util.Collections;
 import java.util.jar.JarFile;
 import java.util.zip.ZipEntry;
 
 import javax.xml.namespace.QName;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.common.propertyeditor.PropertyEditors;
 import org.apache.geronimo.connector.ActivationSpecWrapperGBean;
@@ -67,7 +65,6 @@
 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.GBeanBuilder;
 import org.apache.geronimo.deployment.util.DeploymentUtil;
 import org.apache.geronimo.deployment.xbeans.EnvironmentType;
 import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
@@ -78,8 +75,8 @@
 import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
-import org.apache.geronimo.gbean.InvalidConfigurationException;
 import org.apache.geronimo.gbean.GBeanLifecycle;
+import org.apache.geronimo.gbean.InvalidConfigurationException;
 import org.apache.geronimo.gbean.MultiGBeanInfoFactory;
 import org.apache.geronimo.j2ee.deployment.ActivationSpecInfoLocator;
 import org.apache.geronimo.j2ee.deployment.ConnectorModule;
@@ -124,6 +121,8 @@
 import org.apache.xmlbeans.XmlDocumentProperties;
 import org.apache.xmlbeans.XmlException;
 import org.apache.xmlbeans.XmlObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Rev:385659 $ $Date$
@@ -180,7 +179,7 @@
             boolean defaultXATransactionCaching,
             boolean defaultXAThreadCaching,
             String defaultWorkManagerName,
-            Collection serviceBuilders) {
+            Collection<NamespaceDrivenBuilder> serviceBuilders) {
         this.defaultEnvironment = defaultEnvironment;
 
         this.defaultMaxSize = defaultMaxSize;
@@ -190,7 +189,7 @@
         this.defaultXATransactionCaching = defaultXATransactionCaching;
         this.defaultXAThreadCaching = defaultXAThreadCaching;
         this.defaultWorkManagerName = defaultWorkManagerName;
-        this.serviceBuilders = new NamespaceDrivenBuilderCollection(serviceBuilders, GBeanBuilder.SERVICE_QNAME);
+        this.serviceBuilders = new NamespaceDrivenBuilderCollection(serviceBuilders);
     }
 
     public void doStart() throws Exception {

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java?rev=741679&r1=741678&r2=741679&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java Fri Feb  6 19:07:17 2009
@@ -35,6 +35,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.service.GBeanBuilder;
 import org.apache.geronimo.deployment.util.DeploymentUtil;
 import org.apache.geronimo.gbean.AbstractName;
@@ -127,10 +128,9 @@
                     Collections.singleton(repository),
                     null,
                     null,
-                    new ConnectorModuleBuilder(defaultEnvironment, defaultMaxSize, defaultMinSize, defaultBlockingTimeoutMilliseconds, defaultidleTimeoutMinutes, defaultXATransactionCaching, defaultXAThreadCaching, defaultWorkManagerName, Collections.singleton(serviceBuilder)),
+                    new ConnectorModuleBuilder(defaultEnvironment, defaultMaxSize, defaultMinSize, defaultBlockingTimeoutMilliseconds, defaultidleTimeoutMinutes, defaultXATransactionCaching, defaultXAThreadCaching, defaultWorkManagerName, Collections.<NamespaceDrivenBuilder>singleton(serviceBuilder)),
                     activationSpecInfoLocator,
                     null,
-                    null,
                     serviceBuilder,
                     null,
                     kernel.getNaming(),
@@ -310,7 +310,7 @@
         String resourceAdapterName = "testRA";
 
         try {
-            ConnectorModuleBuilder moduleBuilder = new ConnectorModuleBuilder(defaultEnvironment, defaultMaxSize, defaultMinSize, defaultBlockingTimeoutMilliseconds, defaultidleTimeoutMinutes, defaultXATransactionCaching, defaultXAThreadCaching, defaultWorkManagerName, Collections.singleton(new GBeanBuilder(null, null)));
+            ConnectorModuleBuilder moduleBuilder = new ConnectorModuleBuilder(defaultEnvironment, defaultMaxSize, defaultMinSize, defaultBlockingTimeoutMilliseconds, defaultidleTimeoutMinutes, defaultXATransactionCaching, defaultXAThreadCaching, defaultWorkManagerName, Collections.<NamespaceDrivenBuilder>singleton(new GBeanBuilder(null, null)));
             File rarFile = action.getRARFile();
 
             ClassLoader oldCl = Thread.currentThread().getContextClassLoader();

Modified: geronimo/server/trunk/plugins/connector/connector-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/connector-deployer/src/main/history/dependencies.xml?rev=741679&r1=741678&r2=741679&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/connector-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/connector/connector-deployer/src/main/history/dependencies.xml Fri Feb  6 19:07:17 2009
@@ -6,17 +6,17 @@
         <version>2.2-SNAPSHOT</version>
         <type>car</type>
     </module-id>
-    <dependency>
+    <dependency start="true">
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-connector-builder</artifactId>
         <type>jar</type>
     </dependency>
-    <dependency>
+    <dependency start="true">
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>transaction</artifactId>
         <type>car</type>
     </dependency>
-    <dependency>
+    <dependency start="true">
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>j2ee-deployer</artifactId>
         <type>car</type>

Modified: geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java?rev=741679&r1=741678&r2=741679&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java (original)
+++ geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java Fri Feb  6 19:07:17 2009
@@ -189,7 +189,7 @@
         this.defaultXATransactionCaching = defaultXATransactionCaching;
         this.defaultXAThreadCaching = defaultXAThreadCaching;
         this.defaultWorkManagerName = defaultWorkManagerName;
-        this.serviceBuilders = new NamespaceDrivenBuilderCollection(serviceBuilders, GBeanBuilder.SERVICE_QNAME);
+        this.serviceBuilders = new NamespaceDrivenBuilderCollection(serviceBuilders);
     }
 
     public void doStart() throws Exception {

Modified: geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java?rev=741679&r1=741678&r2=741679&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java (original)
+++ geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java Fri Feb  6 19:07:17 2009
@@ -130,7 +130,6 @@
                     new ConnectorModuleBuilder(defaultEnvironment, defaultMaxSize, defaultMinSize, defaultBlockingTimeoutMilliseconds, defaultidleTimeoutMinutes, defaultXATransactionCaching, defaultXAThreadCaching, defaultWorkManagerName, Collections.singleton(serviceBuilder)),
                     activationSpecInfoLocator,
                     null,
-                    null,
                     serviceBuilder,
                     null,
                     kernel.getNaming(),

Modified: geronimo/server/trunk/plugins/cxf/cxf-jaxws-tools/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf-jaxws-tools/src/main/history/dependencies.xml?rev=741679&r1=741678&r2=741679&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf-jaxws-tools/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf-jaxws-tools/src/main/history/dependencies.xml Fri Feb  6 19:07:17 2009
@@ -2,7 +2,7 @@
 <plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
     <module-id>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>cxf-tools</artifactId>
+        <artifactId>cxf-jaxws-tools</artifactId>
         <version>2.2-SNAPSHOT</version>
         <type>car</type>
     </module-id>
@@ -23,42 +23,32 @@
     </dependency>
     <dependency>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-core</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-bindings-soap</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-frontend-simple</artifactId>
+        <artifactId>cxf-tools-java2ws</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-tools-java2ws</artifactId>
+        <artifactId>cxf-tools-common</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-databinding-jaxb</artifactId>
+        <artifactId>cxf-api</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-api</artifactId>
+        <artifactId>cxf-common-utilities</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-tools-common</artifactId>
+        <groupId>org.apache.ws.commons.schema</groupId>
+        <artifactId>XmlSchema</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-common-utilities</artifactId>
+        <artifactId>cxf-rt-core</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -67,28 +57,28 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>com.sun.xml.bind</groupId>
-        <artifactId>jaxb-xjc</artifactId>
+        <groupId>org.apache.cxf</groupId>
+        <artifactId>cxf-rt-frontend-simple</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.ws.commons.schema</groupId>
-        <artifactId>XmlSchema</artifactId>
+        <groupId>org.apache.cxf</groupId>
+        <artifactId>cxf-rt-bindings-soap</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-bindings-xml</artifactId>
+        <artifactId>cxf-tools-wsdlto-core</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-frontend-jaxws</artifactId>
+        <artifactId>cxf-common-schemas</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-ws-addr</artifactId>
+        <artifactId>cxf-tools-validator</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -97,6 +87,11 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>com.sun.xml.bind</groupId>
+        <artifactId>jaxb-xjc</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>commons-collections</groupId>
         <artifactId>commons-collections</artifactId>
         <type>jar</type>
@@ -108,27 +103,37 @@
     </dependency>
     <dependency>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-common-schemas</artifactId>
+        <artifactId>cxf-tools-wsdlto-databinding-jaxb</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-tools-validator</artifactId>
+        <artifactId>cxf-tools-wsdlto-frontend-jaxws</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>jdom</groupId>
+        <artifactId>jdom</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-tools-wsdlto-core</artifactId>
+        <artifactId>cxf-rt-frontend-jaxws</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-tools-wsdlto-frontend-jaxws</artifactId>
+        <artifactId>cxf-rt-databinding-jaxb</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-tools-wsdlto-databinding-jaxb</artifactId>
+        <artifactId>cxf-rt-bindings-xml</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.cxf</groupId>
+        <artifactId>cxf-rt-ws-addr</artifactId>
         <type>jar</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml?rev=741679&r1=741678&r2=741679&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml Fri Feb  6 19:07:17 2009
@@ -7,18 +7,38 @@
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-tools-common</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>server-security-config</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>webservices-common</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>transaction</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>spring</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-cxf</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.ws.commons.schema</groupId>
-        <artifactId>XmlSchema</artifactId>
+        <groupId>org.apache.cxf</groupId>
+        <artifactId>cxf-rt-frontend-jaxws</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-core</artifactId>
+        <artifactId>cxf-rt-transports-http</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -28,72 +48,57 @@
     </dependency>
     <dependency>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-bindings-soap</artifactId>
+        <artifactId>cxf-common-utilities</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>transaction</artifactId>
-        <type>car</type>
+        <groupId>org.apache.ws.commons.schema</groupId>
+        <artifactId>XmlSchema</artifactId>
+        <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-frontend-simple</artifactId>
+        <groupId>org.apache.neethi</groupId>
+        <artifactId>neethi</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-databinding-jaxb</artifactId>
+        <artifactId>cxf-rt-bindings-soap</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-bindings-xml</artifactId>
+        <artifactId>cxf-tools-common</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>webservices-common</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>spring</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-transports-http</artifactId>
+        <artifactId>cxf-rt-databinding-jaxb</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-ws-addr</artifactId>
+        <artifactId>cxf-rt-bindings-xml</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.neethi</groupId>
-        <artifactId>neethi</artifactId>
+        <groupId>org.apache.cxf</groupId>
+        <artifactId>cxf-rt-core</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-cxf</artifactId>
+        <groupId>jdom</groupId>
+        <artifactId>jdom</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-frontend-jaxws</artifactId>
+        <artifactId>cxf-rt-frontend-simple</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>server-security-config</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-common-utilities</artifactId>
+        <artifactId>cxf-rt-ws-addr</artifactId>
         <type>jar</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml?rev=741679&r1=741678&r2=741679&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml Fri Feb  6 19:07:17 2009
@@ -74,6 +74,12 @@
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.testsupport</groupId>
+            <artifactId>testsupport-common</artifactId>
+            <version>${version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java?rev=741679&r1=741678&r2=741679&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java Fri Feb  6 19:07:17 2009
@@ -33,26 +33,23 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.jar.Attributes;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.jar.Manifest;
-import java.util.jar.Attributes;
 import java.util.zip.ZipEntry;
 
 import javax.xml.namespace.QName;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.geronimo.common.DeploymentException;
+import org.apache.geronimo.deployment.ClassPathList;
 import org.apache.geronimo.deployment.ConfigurationBuilder;
 import org.apache.geronimo.deployment.DeploymentContext;
 import org.apache.geronimo.deployment.ModuleIDBuilder;
+import org.apache.geronimo.deployment.ModuleList;
 import org.apache.geronimo.deployment.NamespaceDrivenBuilder;
 import org.apache.geronimo.deployment.NamespaceDrivenBuilderCollection;
-import org.apache.geronimo.deployment.ClassPathList;
-import org.apache.geronimo.deployment.ModuleList;
 import org.apache.geronimo.deployment.service.EnvironmentBuilder;
-import org.apache.geronimo.deployment.service.GBeanBuilder;
 import org.apache.geronimo.deployment.util.DeploymentUtil;
 import org.apache.geronimo.deployment.util.NestedJarFile;
 import org.apache.geronimo.deployment.xbeans.ArtifactType;
@@ -64,9 +61,9 @@
 import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.gbean.ReferencePatterns;
 import org.apache.geronimo.gbean.SingleElementCollection;
-import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.j2ee.ApplicationInfo;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.j2ee.management.impl.J2EEApplicationImpl;
@@ -83,8 +80,8 @@
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.repository.ArtifactResolver;
 import org.apache.geronimo.kernel.repository.Environment;
-import org.apache.geronimo.kernel.repository.Repository;
 import org.apache.geronimo.kernel.repository.MissingDependencyException;
+import org.apache.geronimo.kernel.repository.Repository;
 import org.apache.geronimo.management.J2EEResource;
 import org.apache.geronimo.management.J2EEServer;
 import org.apache.geronimo.schema.SchemaConversionUtils;
@@ -92,13 +89,14 @@
 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.javaee.ApplicationDocument;
 import org.apache.geronimo.xbeans.javaee.ApplicationType;
 import org.apache.geronimo.xbeans.javaee.ModuleType;
 import org.apache.xmlbeans.XmlCursor;
 import org.apache.xmlbeans.XmlException;
 import org.apache.xmlbeans.XmlObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Rev$ $Date$
@@ -123,7 +121,6 @@
     private final SingleElementCollection connectorConfigBuilder;
     private final SingleElementCollection appClientConfigBuilder;
     private final SingleElementCollection resourceReferenceBuilder;
-    private final NamespaceDrivenBuilderCollection securityBuilders;
     private final NamespaceDrivenBuilderCollection serviceBuilders;
     private final Collection<ModuleBuilderExtension> persistenceUnitBuilders;
 
@@ -145,7 +142,7 @@
     public static ThreadLocal<ApplicationInfo> appInfo = new ThreadLocal<ApplicationInfo>() {
         @Override
         protected ApplicationInfo initialValue() {
-            return (ApplicationInfo) null;
+            return null;
         }
     };
 
@@ -155,13 +152,12 @@
                             AbstractNameQuery corbaGBeanAbstractName,
                             AbstractNameQuery serverName,
                             Collection<? extends Repository> repositories,
-                            Collection ejbConfigBuilder,
-                            Collection webConfigBuilder,
-                            Collection connectorConfigBuilder,
-                            Collection resourceReferenceBuilder,
-                            Collection appClientConfigBuilder,
-                            Collection securityBuilders,
-                            Collection serviceBuilders,
+                            Collection<ModuleBuilder> ejbConfigBuilder,
+                            Collection<ModuleBuilder> webConfigBuilder,
+                            Collection<ModuleBuilder> connectorConfigBuilder,
+                            Collection<ModuleBuilder> resourceReferenceBuilder,
+                            Collection<ModuleBuilder> appClientConfigBuilder,
+                            Collection<NamespaceDrivenBuilder> serviceBuilders,
                             Collection<ModuleBuilderExtension> persistenceUnitBuilders,
                             Collection<? extends ArtifactResolver> artifactResolvers,
                             Kernel kernel) {
@@ -172,12 +168,11 @@
                 serverName,
                 ConfigurationUtil.getConfigurationManager(kernel),
                 repositories,
-                new SingleElementCollection(ejbConfigBuilder),
-                new SingleElementCollection(webConfigBuilder),
-                new SingleElementCollection(connectorConfigBuilder),
-                new SingleElementCollection(resourceReferenceBuilder),
-                new SingleElementCollection(appClientConfigBuilder),
-                securityBuilders,
+                new SingleElementCollection<ModuleBuilder>(ejbConfigBuilder),
+                new SingleElementCollection<ModuleBuilder>(webConfigBuilder),
+                new SingleElementCollection<ModuleBuilder>(connectorConfigBuilder),
+                new SingleElementCollection<ModuleBuilder>(resourceReferenceBuilder),
+                new SingleElementCollection<ModuleBuilder>(appClientConfigBuilder),
                 serviceBuilders,
                 persistenceUnitBuilders,
                 kernel.getNaming(), artifactResolvers);
@@ -194,7 +189,6 @@
                             ModuleBuilder connectorConfigBuilder,
                             ActivationSpecInfoLocator activationSpecInfoLocator,
                             ModuleBuilder appClientConfigBuilder,
-                            NamespaceDrivenBuilder securityBuilder,
                             NamespaceDrivenBuilder serviceBuilder,
                             ModuleBuilderExtension persistenceUnitBuilder,
                             Naming naming,
@@ -206,14 +200,13 @@
                 serverName,
                 null,
                 repositories,
-                new SingleElementCollection(ejbConfigBuilder),
-                new SingleElementCollection(webConfigBuilder),
-                new SingleElementCollection(connectorConfigBuilder),
-                new SingleElementCollection(activationSpecInfoLocator),
-                new SingleElementCollection(appClientConfigBuilder),
-                securityBuilder == null ? Collections.EMPTY_SET : Collections.singleton(securityBuilder),
-                serviceBuilder == null ? Collections.EMPTY_SET : Collections.singleton(serviceBuilder),
-                persistenceUnitBuilder == null ? Collections.EMPTY_SET : Collections.singleton(persistenceUnitBuilder),
+                new SingleElementCollection<ModuleBuilder>(ejbConfigBuilder),
+                new SingleElementCollection<ModuleBuilder>(webConfigBuilder),
+                new SingleElementCollection<ModuleBuilder>(connectorConfigBuilder),
+                new SingleElementCollection<ActivationSpecInfoLocator>(activationSpecInfoLocator),
+                new SingleElementCollection<ModuleBuilder>(appClientConfigBuilder),
+                serviceBuilder == null ? Collections.<NamespaceDrivenBuilder>emptySet() : Collections.singleton(serviceBuilder),
+                persistenceUnitBuilder == null ? Collections.<ModuleBuilderExtension>emptySet() : Collections.singleton(persistenceUnitBuilder),
                 naming,
                 artifactResolvers);
     }
@@ -230,8 +223,7 @@
                              SingleElementCollection connectorConfigBuilder,
                              SingleElementCollection resourceReferenceBuilder,
                              SingleElementCollection appClientConfigBuilder,
-                             Collection securityBuilders,
-                             Collection serviceBuilders,
+                             Collection<NamespaceDrivenBuilder> serviceBuilders,
                              Collection<ModuleBuilderExtension> persistenceUnitBuilders,
                              Naming naming,
                              Collection<? extends ArtifactResolver> artifactResolvers) {
@@ -244,8 +236,7 @@
         this.webConfigBuilder = webConfigBuilder;
         this.connectorConfigBuilder = connectorConfigBuilder;
         this.appClientConfigBuilder = appClientConfigBuilder;
-        this.securityBuilders = new NamespaceDrivenBuilderCollection(securityBuilders, GerSecurityDocument.type.getDocumentElementName());
-        this.serviceBuilders = new NamespaceDrivenBuilderCollection(serviceBuilders, GBeanBuilder.SERVICE_QNAME);
+        this.serviceBuilders = new NamespaceDrivenBuilderCollection(serviceBuilders);
         this.persistenceUnitBuilders = persistenceUnitBuilders;
         
         this.transactionManagerObjectName = transactionManagerAbstractName;
@@ -590,7 +581,7 @@
             ClassLoader cl = earContext.getClassLoader();
             for (Object module3 : modules) {
                 Module module = (Module) module3;
-                if (createPlanMode.get().booleanValue()) {
+                if (createPlanMode.get()) {
                     try {
                         getBuilder(module).initContext(earContext, module, cl);
                     } catch (Exception e) {
@@ -604,7 +595,6 @@
 
             // add gbeans declared in the geronimo-application.xml
             if (geronimoApplication != null) {
-                securityBuilders.build(geronimoApplication, earContext, earContext);
                 serviceBuilders.build(geronimoApplication, earContext, earContext);
             }
             
@@ -651,7 +641,7 @@
             // each module can now add it's GBeans
             for (Object module1 : modules) {
                 Module module = (Module) module1;
-                if (createPlanMode.get().booleanValue()) {
+                if (createPlanMode.get()) {
                     try {
                         getBuilder(module).addGBeans(earContext, module, cl, repositories);
                     } catch (DeploymentException e) {
@@ -663,7 +653,7 @@
                 }
             }
 
-            if (createPlanMode.get().booleanValue()) {
+            if (createPlanMode.get()) {
                 EARConfigBuilder.appInfo.set(applicationInfo);
                 throw new DeploymentException();
             }
@@ -1129,7 +1119,6 @@
         infoBuilder.addReference("ConnectorConfigBuilder", ModuleBuilder.class, NameFactory.MODULE_BUILDER);
         infoBuilder.addReference("ActivationSpecInfoLocator", ActivationSpecInfoLocator.class, NameFactory.MODULE_BUILDER);
         infoBuilder.addReference("AppClientConfigBuilder", ModuleBuilder.class, NameFactory.MODULE_BUILDER);
-        infoBuilder.addReference("SecurityBuilders", NamespaceDrivenBuilder.class, NameFactory.MODULE_BUILDER);
         infoBuilder.addReference("ServiceBuilders", NamespaceDrivenBuilder.class, NameFactory.MODULE_BUILDER);
         infoBuilder.addReference("PersistenceUnitBuilders", ModuleBuilderExtension.class, NameFactory.MODULE_BUILDER);
         infoBuilder.addReference("ArtifactResolvers", ArtifactResolver.class, "ArtifactResolver");
@@ -1148,7 +1137,6 @@
                 "ConnectorConfigBuilder",
                 "ActivationSpecInfoLocator",
                 "AppClientConfigBuilder",
-                "SecurityBuilders",
                 "ServiceBuilders",
                 "PersistenceUnitBuilders",
                 "ArtifactResolvers",

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARContext.java?rev=741679&r1=741678&r2=741679&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARContext.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARContext.java Fri Feb  6 19:07:17 2009
@@ -41,8 +41,8 @@
     private final AbstractNameQuery corbaGBeanObjectName;
 
     private final Map contextIDToPermissionsMap = new HashMap();
-    private AbstractName jaccManagerName;
     private Object securityConfiguration;
+    private boolean hasSecurity;
 
     private final Map  messageDestinations;
 
@@ -129,14 +129,6 @@
         }
     }
 
-    public void setJaccManagerName(AbstractName jaccManagerName) {
-        this.jaccManagerName = jaccManagerName;
-    }
-
-    public AbstractName getJaccManagerName() {
-        return jaccManagerName;
-    }
-
     public void setSecurityConfiguration(Object securityConfiguration) throws DeploymentException {
         if (this.securityConfiguration != null) {
             throw new DeploymentException("Only one security configuration allowed per application");
@@ -159,4 +151,12 @@
     public Map<Object,Object> getGeneralData() {
         return generalData;
     }
+
+    public boolean isHasSecurity() {
+        return hasSecurity;
+    }
+
+    public void setHasSecurity(boolean hasSecurity) {
+        this.hasSecurity = hasSecurity;
+    }
 }

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilderCollection.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilderCollection.java?rev=741679&r1=741678&r2=741679&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilderCollection.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilderCollection.java Fri Feb  6 19:07:17 2009
@@ -29,15 +29,20 @@
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.deployment.AbstractBuilderCollection;
 import org.apache.geronimo.kernel.repository.Environment;
+import org.apache.geronimo.gbean.annotation.GBean;
+import org.apache.geronimo.gbean.annotation.ParamAttribute;
+import org.apache.geronimo.gbean.annotation.ParamReference;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.xmlbeans.XmlObject;
 
 /**
  * @version $Rev$ $Date$
  */
+@GBean(j2eeType = NameFactory.MODULE_BUILDER)
 public class NamingBuilderCollection extends AbstractBuilderCollection<NamingBuilder> implements NamingBuilder {
 
-    public NamingBuilderCollection(Collection<NamingBuilder> builders, final QName basePlanElementName) {
-        super(builders, basePlanElementName);
+    public NamingBuilderCollection(@ParamReference(name = "NamingBuilders", namingType = NameFactory.MODULE_BUILDER)Collection<NamingBuilder> builders) {
+        super(builders);
     }
 
     public void buildEnvironment(XmlObject specDD, XmlObject plan, Environment environment) throws DeploymentException {
@@ -82,4 +87,8 @@
         return NORMAL_PRIORITY;
     }
 
+    public QName getBaseQName() {
+        throw new IllegalStateException("Don't call this");
+    }
+
 }

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/xsd/geronimo-application-2.0.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/xsd/geronimo-application-2.0.xsd?rev=741679&r1=741678&r2=741679&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/xsd/geronimo-application-2.0.xsd (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/xsd/geronimo-application-2.0.xsd Fri Feb  6 19:07:17 2009
@@ -105,7 +105,7 @@
                 </xs:annotation>
             </xs:element>
 
-            <xs:element ref="geronimo:security" minOccurs="0">
+            <xs:element ref="geronimo:security" minOccurs="0" maxOccurs="unbounded">
                 <xs:annotation>
                     <xs:documentation>
                         Reference to security element defined in this schema. If



Mime
View raw message