geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r388688 - in /geronimo/branches/1.1: configs/daytrader-jetty/src/plan/ configs/daytrader-tomcat/src/plan/ configs/directory/src/plan/ configs/hot-deployer/src/plan/ configs/j2ee-corba/src/plan/ configs/j2ee-security/src/plan/ configs/tomcat...
Date Sat, 25 Mar 2006 02:13:50 GMT
Author: djencks
Date: Fri Mar 24 18:13:46 2006
New Revision: 388688

URL: http://svn.apache.org/viewcvs?rev=388688&view=rev
Log:
new4 completes

Modified:
    geronimo/branches/1.1/configs/daytrader-jetty/src/plan/plan.xml
    geronimo/branches/1.1/configs/daytrader-tomcat/src/plan/plan.xml
    geronimo/branches/1.1/configs/directory/src/plan/plan.xml
    geronimo/branches/1.1/configs/hot-deployer/src/plan/plan.xml
    geronimo/branches/1.1/configs/j2ee-corba/src/plan/plan.xml
    geronimo/branches/1.1/configs/j2ee-security/src/plan/plan.xml
    geronimo/branches/1.1/configs/tomcat-deployer/src/plan/plan.xml
    geronimo/branches/1.1/configs/uddi-jetty/src/plan/plan.xml
    geronimo/branches/1.1/configs/uddi-tomcat/src/plan/plan.xml
    geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java
    geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java
    geronimo/branches/1.1/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
    geronimo/branches/1.1/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java
    geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/GBeanData.java
    geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/Configuration.java
    geronimo/branches/1.1/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
    geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanBuilder.java
    geronimo/branches/1.1/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
    geronimo/branches/1.1/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java
    geronimo/branches/1.1/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
    geronimo/branches/1.1/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java

Modified: geronimo/branches/1.1/configs/daytrader-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/daytrader-jetty/src/plan/plan.xml?rev=388688&r1=388687&r2=388688&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/daytrader-jetty/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/daytrader-jetty/src/plan/plan.xml Fri Mar 24 18:13:46 2006
@@ -280,7 +280,8 @@
                 <message-driven>
                     <ejb-name>TradeStreamerMDB</ejb-name>
                     <resource-adapter>
-                        <resource-link>TradeJMSResources</resource-link>
+                        <resource-link>TradeJMS</resource-link>
+                        <!--<resource-link>TradeJMSResources</resource-link>-->
                     </resource-adapter>
                     <activation-config>
                         <activation-config-property>
@@ -305,7 +306,8 @@
                 <message-driven>
                     <ejb-name>TradeBrokerMDB</ejb-name>
                     <resource-adapter>
-                        <resource-link>TradeJMSResources</resource-link>
+                        <resource-link>TradeJMS</resource-link>
+                        <!--<resource-link>TradeJMSResources</resource-link>-->
                     </resource-adapter>
                     <activation-config>
                         <activation-config-property>
@@ -691,9 +693,6 @@
                 <attribute name="prefix">META-INF/geronimo-daytrader-derby-db</attribute>
                 <attribute name="path">var/derby</attribute>
                 <reference name="ServerInfo">
-                    <application>null</application>
-                    <moduleType>J2EEModule</moduleType>
-                    <module>geronimo/j2ee-system/${pom.currentVersion}/car</module>
                     <name>ServerInfo</name>
                 </reference>
             </gbean>

Modified: geronimo/branches/1.1/configs/daytrader-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/daytrader-tomcat/src/plan/plan.xml?rev=388688&r1=388687&r2=388688&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/daytrader-tomcat/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/daytrader-tomcat/src/plan/plan.xml Fri Mar 24 18:13:46 2006
@@ -280,7 +280,8 @@
                 <message-driven>
                     <ejb-name>TradeStreamerMDB</ejb-name>
                     <resource-adapter>
-                        <resource-link>TradeJMSResources</resource-link>
+                        <resource-link>TradeJMS</resource-link>
+                        <!--<resource-link>TradeJMSResources</resource-link>-->
                     </resource-adapter>
                     <activation-config>
                         <activation-config-property>
@@ -305,7 +306,8 @@
                 <message-driven>
                     <ejb-name>TradeBrokerMDB</ejb-name>
                     <resource-adapter>
-                        <resource-link>TradeJMSResources</resource-link>
+                        <resource-link>TradeJMS</resource-link>
+                        <!--<resource-link>TradeJMSResources</resource-link>-->
                     </resource-adapter>
                     <activation-config>
                         <activation-config-property>
@@ -690,9 +692,6 @@
                 <attribute name="prefix">META-INF/geronimo-daytrader-derby-db</attribute>
                 <attribute name="path">var/derby</attribute>
                 <reference name="ServerInfo">
-                    <application>null</application>
-                    <moduleType>J2EEModule</moduleType>
-                    <module>geronimo/j2ee-system/${pom.currentVersion}/car</module>
                     <name>ServerInfo</name>
                 </reference>
             </gbean>

Modified: geronimo/branches/1.1/configs/directory/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/directory/src/plan/plan.xml?rev=388688&r1=388687&r2=388688&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/directory/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/directory/src/plan/plan.xml Fri Mar 24 18:13:46 2006
@@ -29,7 +29,7 @@
 
     >
 
-    <gbean gbeanName="geronimo.server:name=DirectoryService" class="org.apache.geronimo.directory.DirectoryGBean">
+    <gbean name="DirectoryService" class="org.apache.geronimo.directory.DirectoryGBean">
         <attribute name="providerURL">ou=system</attribute>
         <attribute name="securityAuthentication">simple</attribute>
         <attribute name="securityPrincipal">uid=admin,ou=system</attribute>
@@ -38,7 +38,7 @@
         <attribute name="enableNetworking">true</attribute>
         <attribute name="host">0.0.0.0</attribute>
         <attribute name="port">1389</attribute>
-        <reference name="ServerInfo"><module>geronimo/j2ee-system/${pom.currentVersion}/car</module><name>ServerInfo</name></reference>
+        <reference name="ServerInfo"><name>ServerInfo</name></reference>
     </gbean>
 
 </configuration>

Modified: geronimo/branches/1.1/configs/hot-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/hot-deployer/src/plan/plan.xml?rev=388688&r1=388687&r2=388688&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/hot-deployer/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/hot-deployer/src/plan/plan.xml Fri Mar 24 18:13:46 2006
@@ -26,28 +26,13 @@
     xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
 
     >
-<!--
-    <dependency>
-        <uri>geronimo/geronimo-hot-deploy/${geronimo_version}/jar</uri>
-    </dependency>
-    <dependency>
-        <uri>geronimo/geronimo-deploy-tool/${geronimo_version}/jar</uri>
-    </dependency>
-    <dependency>
-        <uri>geronimo/geronimo-deploy-jsr88/${geronimo_version}/jar</uri>
-    </dependency>
--->
     <gbean name="HotDeployer" class="org.apache.geronimo.deployment.hot.DirectoryHotDeployer">
         <reference name="ServerInfo">
-            <module>geronimo/j2ee-system/${pom.currentVersion}/car</module>
             <name>ServerInfo</name>
         </reference>
 		<attribute name="path">deploy/</attribute>
         <attribute name="pollIntervalMillis">2000</attribute>
         <dependency>
-            <domain>geronimo.maven</domain>
-            <module>geronimo/j2ee-deployer/${pom.currentVersion}/car</module>
-            <type>ConfigBuilder</type>
             <name>EARBuilder</name>
         </dependency>
     </gbean>

Modified: geronimo/branches/1.1/configs/j2ee-corba/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/j2ee-corba/src/plan/plan.xml?rev=388688&r1=388687&r2=388688&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/j2ee-corba/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/j2ee-corba/src/plan/plan.xml Fri Mar 24 18:13:46 2006
@@ -33,7 +33,6 @@
 
     <gbean name="NameServer" class="org.openejb.corba.SunNameService">
         <reference name="ServerInfo">
-            <module>geronimo/j2ee-system/${pom.currentVersion}/car</module>
             <name>ServerInfo</name>
         </reference>
         <attribute name="dbDir">var/cosnaming.db</attribute>
@@ -43,14 +42,12 @@
     <!-- connections require SSL, no client cert, client logs in with password, no identity token -->
     <gbean name="Server" class="org.openejb.corba.CORBABean">
         <reference name="ThreadPool">
-            <module>geronimo/j2ee-server/${pom.currentVersion}/car</module>
             <name>DefaultThreadPool</name>
         </reference>
         <reference name="NameService">
             <name>NameServer</name>
         </reference>
         <reference name="SecurityService">
-            <module>*</module>
             <name>SecurityService</name>
         </reference>
         <attribute name="args">-ORBInitRef, NameService=corbaloc::${PlanCOSNamingHost}:${PlanCOSNamingPort}/NameService</attribute>
@@ -166,14 +163,12 @@
     <!-- orb with no security whatsoever -->
     <gbean name="UnprotectedServer" class="org.openejb.corba.CORBABean">
         <reference name="ThreadPool">
-            <module>geronimo/j2ee-server/${pom.currentVersion}/car</module>
             <name>DefaultThreadPool</name>
         </reference>
         <reference name="NameService">
             <name>NameServer</name>
         </reference>
         <reference name="SecurityService">
-            <module>*</module>
             <name>SecurityService</name>
         </reference>
         <attribute name="args">-ORBInitRef, NameService=corbaloc::${PlanCOSNamingHost}:${PlanCOSNamingPort}/NameService</attribute>
@@ -260,11 +255,9 @@
     <!--CSS beans for client security.  These specify what the client is willing to provide -->
     <gbean name="SSLClientCert" class="org.openejb.corba.CSSBean">
         <reference name="ThreadPool">
-            <module>geronimo/j2ee-server/${pom.currentVersion}/car</module>
             <name>DefaultThreadPool</name>
         </reference>
         <reference name="TransactionContextManager">
-            <module>geronimo/j2ee-server/${pom.currentVersion}/car</module>
             <name>TransactionContextManager</name>
         </reference>
         <attribute name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>
@@ -300,11 +293,9 @@
 
     <gbean name="SSLClientPassword" class="org.openejb.corba.CSSBean">
         <reference name="ThreadPool">
-            <module>geronimo/j2ee-server/${pom.currentVersion}/car</module>
             <name>DefaultThreadPool</name>
         </reference>
         <reference name="TransactionContextManager">
-            <module>geronimo/j2ee-server/${pom.currentVersion}/car</module>
             <name>TransactionContextManager</name>
         </reference>
         <attribute name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>
@@ -341,11 +332,9 @@
 
     <gbean name="SSLIdentityTokenPrincipal" class="org.openejb.corba.CSSBean">
         <reference name="ThreadPool">
-            <module>geronimo/j2ee-server/${pom.currentVersion}/car</module>
             <name>DefaultThreadPool</name>
         </reference>
         <reference name="TransactionContextManager">
-            <module>geronimo/j2ee-server/${pom.currentVersion}/car</module>
             <name>TransactionContextManager</name>
         </reference>
         <attribute name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>
@@ -381,11 +370,9 @@
 
     <gbean name="SSLIdentityTokenCert" class="org.openejb.corba.CSSBean">
         <reference name="ThreadPool">
-            <module>geronimo/j2ee-server/${pom.currentVersion}/car</module>
             <name>DefaultThreadPool</name>
         </reference>
         <reference name="TransactionContextManager">
-            <module>geronimo/j2ee-server/${pom.currentVersion}/car</module>
             <name>TransactionContextManager</name>
         </reference>
         <attribute name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>
@@ -421,11 +408,9 @@
 
     <gbean name="NoSecurityIdentityTokenPrincipal" class="org.openejb.corba.CSSBean">
         <reference name="ThreadPool">
-            <module>geronimo/j2ee-server/${pom.currentVersion}/car</module>
             <name>DefaultThreadPool</name>
         </reference>
         <reference name="TransactionContextManager">
-            <module>geronimo/j2ee-server/${pom.currentVersion}/car</module>
             <name>TransactionContextManager</name>
         </reference>
         <attribute name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>
@@ -457,11 +442,9 @@
 
     <gbean name="NoSecurityIdentityTokenCert" class="org.openejb.corba.CSSBean">
         <reference name="ThreadPool">
-            <module>geronimo/j2ee-server/${pom.currentVersion}/car</module>
             <name>DefaultThreadPool</name>
         </reference>
         <reference name="TransactionContextManager">
-            <module>geronimo/j2ee-server/${pom.currentVersion}/car</module>
             <name>TransactionContextManager</name>
         </reference>
         <attribute name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>
@@ -493,11 +476,9 @@
 
     <gbean name="NoSecurity" class="org.openejb.corba.CSSBean">
         <reference name="ThreadPool">
-            <module>geronimo/j2ee-server/${pom.currentVersion}/car</module>
             <name>DefaultThreadPool</name>
         </reference>
         <reference name="TransactionContextManager">
-            <module>geronimo/j2ee-server/${pom.currentVersion}/car</module>
             <name>TransactionContextManager</name>
         </reference>
         <attribute name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>

Modified: geronimo/branches/1.1/configs/j2ee-security/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/j2ee-security/src/plan/plan.xml?rev=388688&r1=388687&r2=388688&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/j2ee-security/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/j2ee-security/src/plan/plan.xml Fri Mar 24 18:13:46 2006
@@ -31,7 +31,7 @@
     <!--runtime dependencies-->
 
     <gbean name="SecurityService" class="org.apache.geronimo.security.SecurityServiceImpl">
-        <reference name="ServerInfo"><module>geronimo/j2ee-system/${pom.currentVersion}/car</module><name>ServerInfo</name></reference>
+        <reference name="ServerInfo"><name>ServerInfo</name></reference>
         <attribute name="policyConfigurationFactory">org.apache.geronimo.security.jacc.GeronimoPolicyConfigurationFactory</attribute>
         <attribute name="policyProvider">org.apache.geronimo.security.jacc.GeronimoPolicy</attribute>
     </gbean>
@@ -46,13 +46,13 @@
     </gbean>
 
     <gbean name="JaasLoginService" class="org.apache.geronimo.security.jaas.server.JaasLoginService">
-        <reference name="Realms"><application>*</application><module>*</module><name>*</name></reference>
+        <reference name="Realms"></reference>
         <!--        <attribute name="reclaimPeriod">100000</attribute>-->
         <attribute name="algorithm">HmacSHA1</attribute>
         <attribute name="password">secret</attribute>
     </gbean>
 
-    <gbean gbeanName="geronimo.remoting:target=JaasLoginServiceRemotingServer" class="org.apache.geronimo.security.remoting.jmx.JaasLoginServiceRemotingServer">
+    <gbean name="JaasLoginServiceRemotingServer" class="org.apache.geronimo.security.remoting.jmx.JaasLoginServiceRemotingServer">
         <attribute name="protocol">tcp</attribute>
         <attribute name="host">${PlanServerHostname}</attribute>
         <attribute name="port">${PlanRemoteLoginPort}</attribute>
@@ -84,7 +84,7 @@
         <reference name="LoginModuleConfiguration">
             <name>properties-login</name>
         </reference>
-        <reference name="ServerInfo"><module>geronimo/j2ee-system/${pom.currentVersion}/car</module><name>ServerInfo</name></reference>
+        <reference name="ServerInfo"><name>ServerInfo</name></reference>
         <reference name="LoginService"><name>JaasLoginService</name></reference>
     </gbean>
     <gbean name="properties-login" class="org.apache.geronimo.security.jaas.JaasLoginModuleUse">

Modified: geronimo/branches/1.1/configs/tomcat-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/tomcat-deployer/src/plan/plan.xml?rev=388688&r1=388687&r2=388688&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/tomcat-deployer/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/tomcat-deployer/src/plan/plan.xml Fri Mar 24 18:13:46 2006
@@ -22,7 +22,7 @@
 
     <gbean name="TomcatWebBuilder" class="org.apache.geronimo.tomcat.deployment.TomcatModuleBuilder">
         <attribute name="defaultContextPriorityClassloader">false</attribute>
-        <attribute name="tomcatContainerObjectName">geronimo.server:name=TomcatWebContainer,*</attribute>
+        <attribute name="tomcatContainerName">?name=TomcatWebContainer</attribute>
         <reference name="WebServiceBuilder">
             <!--<module>${pom.groupId}/j2ee-deployer/${pom.currentVersion}/car</module>-->
             <name>WebServiceBuilder</name>

Modified: geronimo/branches/1.1/configs/uddi-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/uddi-jetty/src/plan/plan.xml?rev=388688&r1=388687&r2=388688&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/uddi-jetty/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/uddi-jetty/src/plan/plan.xml Fri Mar 24 18:13:46 2006
@@ -26,20 +26,12 @@
 
             <context-root>/juddi</context-root>
             <context-priority-classloader>false</context-priority-classloader>
-<!--
-            <resource-ref>
-                <ref-name>jdbc/juddiDB</ref-name>
-                <resource-link>SystemDatasource</resource-link>
-            </resource-ref>
--->
+
             <gbean name="UDDIResources" class="org.apache.geronimo.system.util.DirectoryInitializationGBean">
                 <!-- copies uddi derby db files into specified location -->
                 <attribute name="prefix">META-INF/geronimo-uddi-db</attribute>
                 <attribute name="path">var/derby</attribute>
                 <reference name="ServerInfo">
-                    <application>null</application>
-                    <moduleType>J2EEModule</moduleType>
-                    <module>geronimo/j2ee-system/${pom.currentVersion}/car</module>
                     <name>ServerInfo</name>
                 </reference>
             </gbean>

Modified: geronimo/branches/1.1/configs/uddi-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/uddi-tomcat/src/plan/plan.xml?rev=388688&r1=388687&r2=388688&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/uddi-tomcat/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/uddi-tomcat/src/plan/plan.xml Fri Mar 24 18:13:46 2006
@@ -32,9 +32,6 @@
                 <attribute name="prefix">META-INF/geronimo-uddi-db</attribute>
                 <attribute name="path">var/derby</attribute>
                 <reference name="ServerInfo">
-                    <application>null</application>
-                    <moduleType>J2EEModule</moduleType>
-                    <module>geronimo/j2ee-system/${pom.currentVersion}/car</module>
                     <name>ServerInfo</name>
                 </reference>
             </gbean>

Modified: geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java?rev=388688&r1=388687&r2=388688&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java (original)
+++ geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java Fri Mar 24 18:13:46 2006
@@ -121,6 +121,11 @@
     }
 
     public DeploymentContext(File baseDir, Environment environment, ConfigurationModuleType moduleType, Naming naming, Collection repositories, Collection stores) throws DeploymentException {
+        this(baseDir, environment,  moduleType, naming, createConfigurationManager(repositories, stores, naming));
+    }
+
+    public DeploymentContext(File baseDir, Environment environment, ConfigurationModuleType moduleType, Naming naming, ConfigurationManager configurationManager) throws DeploymentException {
+        this.configurationManager = configurationManager;
         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");
@@ -137,10 +142,14 @@
         this.environment = environment;
         this.naming = naming;
 
+        this.configuration = createTempConfiguration(environment, moduleType, baseDir, configurationManager, naming);
+    }
+
+    private static ConfigurationManager createConfigurationManager(Collection repositories, Collection stores, Naming naming) {
         ArtifactManager artifactManager = new DefaultArtifactManager();
         ArtifactResolver artifactResolver = new DefaultArtifactResolver(artifactManager, repositories);
-        this.configurationManager = new SimpleConfigurationManager(stores, artifactResolver, naming, repositories);
-        this.configuration = createTempConfiguration(environment, moduleType, baseDir, configurationManager, naming);
+        ConfigurationManager configurationManager = new SimpleConfigurationManager(stores, artifactResolver, naming, repositories);
+        return configurationManager;
     }
 
     private static Configuration createTempConfiguration(Environment environment, ConfigurationModuleType moduleType, File baseDir, ConfigurationManager configurationManager, Naming naming) throws DeploymentException {
@@ -152,6 +161,10 @@
         } catch (Exception e) {
             throw new DeploymentException("Unable to create configuration for deployment", e);
         }
+    }
+
+    protected ConfigurationManager getConfigurationManager() {
+        return configurationManager;
     }
 
     public Artifact getConfigID() {

Modified: geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java?rev=388688&r1=388687&r2=388688&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java Fri Mar 24 18:13:46 2006
@@ -20,21 +20,18 @@
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Collections;
 
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.deployment.DeploymentContext;
 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.ConfigurationStore;
 import org.apache.geronimo.kernel.repository.Environment;
-import org.apache.geronimo.kernel.repository.Repository;
-import org.apache.geronimo.kernel.Naming;
 import org.apache.geronimo.security.deployment.SecurityConfiguration;
 
 /**
- * @version $Rev: 386000 $ $Date$
+ * @version $Rev:386276 $ $Date$
  */
 public class EARContext extends DeploymentContext {
 
@@ -54,23 +51,6 @@
     private AbstractName jaccManagerName;
     private SecurityConfiguration securityConfiguration;
 
-    public EARContext(File baseDir, Environment environment, ConfigurationModuleType moduleType, Naming naming, Repository repository, ConfigurationStore configurationStore, AbstractNameQuery serverName, AbstractName baseName, AbstractNameQuery transactionContextManagerObjectName, AbstractNameQuery connectionTrackerObjectName, AbstractNameQuery transactedTimerName, AbstractNameQuery nonTransactedTimerName, AbstractNameQuery corbaGBeanObjectName, RefContext refContext) throws DeploymentException {
-        this(baseDir,
-                environment,
-                moduleType,
-                naming,
-                repository == null ? Collections.EMPTY_SET : Collections.singleton(repository),
-                configurationStore == null ? Collections.EMPTY_SET : Collections.singleton(configurationStore), 
-                serverName,
-                baseName,
-                transactionContextManagerObjectName,
-                connectionTrackerObjectName,
-                transactedTimerName,
-                nonTransactedTimerName,
-                corbaGBeanObjectName,
-                refContext);
-    }
-
     public EARContext(File baseDir, Environment environment, ConfigurationModuleType moduleType, Naming naming, Collection repositories, Collection configurationStores, AbstractNameQuery serverName, AbstractName baseName, AbstractNameQuery transactionContextManagerObjectName, AbstractNameQuery connectionTrackerObjectName, AbstractNameQuery transactedTimerName, AbstractNameQuery nonTransactedTimerName, AbstractNameQuery corbaGBeanObjectName, RefContext refContext) throws DeploymentException {
         super(baseDir, environment, moduleType, naming, repositories, configurationStores);
         moduleName = baseName;
@@ -82,6 +62,19 @@
         this.nonTransactedTimerName = nonTransactedTimerName;
         this.corbaGBeanObjectName = corbaGBeanObjectName;
         this.refContext = refContext;
+    }
+
+    public EARContext(File baseDir, Environment environment, ConfigurationModuleType moduleType, AbstractName baseName, EARContext parent) throws DeploymentException {
+        super(baseDir, environment, moduleType, parent.getNaming(), parent.getConfigurationManager());
+        moduleName = baseName;
+        this.serverName = parent.getServerName();
+
+        this.transactionContextManagerObjectName = parent.getTransactionContextManagerObjectName();
+        this.connectionTrackerObjectName = parent.getConnectionTrackerObjectName();
+        this.transactedTimerName = parent.getTransactedTimerName();
+        this.nonTransactedTimerName = parent.getNonTransactedTimerName();
+        this.corbaGBeanObjectName = parent.getCORBAGBeanObjectName();
+        this.refContext = parent.getRefContext();
     }
 
     public AbstractNameQuery getServerName() {

Modified: geronimo/branches/1.1/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java?rev=388688&r1=388687&r2=388688&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java (original)
+++ geronimo/branches/1.1/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java Fri Mar 24 18:13:46 2006
@@ -90,6 +90,7 @@
 
 import javax.servlet.Servlet;
 import javax.transaction.UserTransaction;
+import javax.management.ObjectName;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -297,13 +298,12 @@
     }
 
     public void initContext(EARContext earContext, Module module, ClassLoader cl) throws DeploymentException {
-        EARContext moduleContext = module.getEarContext();
         WebAppType webApp = (WebAppType) module.getSpecDD();
         MessageDestinationType[] messageDestinations = webApp.getMessageDestinationArray();
         JettyWebAppType gerWebApp = (JettyWebAppType) module.getVendorDD();
         GerMessageDestinationType[] gerMessageDestinations = gerWebApp.getMessageDestinationArray();
 
-        ENCConfigBuilder.registerMessageDestinations(moduleContext.getRefContext(), module.getName(), messageDestinations, gerMessageDestinations);
+        ENCConfigBuilder.registerMessageDestinations(earContext.getRefContext(), module.getName(), messageDestinations, gerMessageDestinations);
         if ((webApp.getSecurityConstraintArray().length > 0 || webApp.getSecurityRoleArray().length > 0) &&
                 !gerWebApp.isSetSecurityRealmName()) {
             throw new DeploymentException("web.xml includes security elements but Geronimo deployment plan is not provided or does not contain <security-realm-name> element necessary to configure security accordingly.");
@@ -606,7 +606,7 @@
                 if (filterMappingType.isSetUrlPattern()) {
                     String urlPattern = filterMappingType.getUrlPattern().getStringValue().trim();
                     filterMappingData.setAttribute("urlPattern", urlPattern);
-                    filterMappingName = earContext.getNaming().createChildName(filterAbstractName, urlPattern, NameFactory.URL_WEB_FILTER_MAPPING);
+                    filterMappingName = earContext.getNaming().createChildName(filterAbstractName, ObjectName.quote(urlPattern), NameFactory.URL_WEB_FILTER_MAPPING);
                 }
                 if (filterMappingType.isSetServletName()) {
                     String servletName = filterMappingType.getServletName().getStringValue().trim();

Modified: geronimo/branches/1.1/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java?rev=388688&r1=388687&r2=388688&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java (original)
+++ geronimo/branches/1.1/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java Fri Mar 24 18:13:46 2006
@@ -146,8 +146,8 @@
                 environment,
                 ConfigurationModuleType.WAR,
                 naming,
-                repository,
-                configStore,
+                repository == null? Collections.EMPTY_SET: Collections.singleton(repository),
+                Collections.singleton(configStore),
                 new AbstractNameQuery(serverName),
                 moduleName,
                 new AbstractNameQuery(tcmName),

Modified: geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/GBeanData.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/GBeanData.java?rev=388688&r1=388687&r2=388688&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/GBeanData.java (original)
+++ geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/GBeanData.java Fri Mar 24 18:13:46 2006
@@ -29,7 +29,7 @@
 import java.util.Set;
 
 /**
- * @version $Rev: 384686 $ $Date$
+ * @version $Rev$ $Date$
  */
 public class GBeanData implements Externalizable {
     private GBeanInfo gbeanInfo;
@@ -203,8 +203,8 @@
         //write the dependencies
         out.writeInt(dependencies.size());
         for (Iterator iterator = dependencies.iterator(); iterator.hasNext();) {
-            ObjectName objectName = (ObjectName) iterator.next();
-            out.writeObject(objectName);
+            ReferencePatterns referencePatterns = (ReferencePatterns) iterator.next();
+            out.writeObject(referencePatterns);
         }
 
     }
@@ -239,8 +239,8 @@
             //read the dependencies
             int dependencyCount = in.readInt();
             for (int i = 0; i < dependencyCount; i++) {
-                ObjectName objectName = (ObjectName) in.readObject();
-                dependencies.add(objectName);
+                ReferencePatterns referencePatterns = (ReferencePatterns) in.readObject();
+                dependencies.add(referencePatterns);
             }
         } catch (IOException e) {
             throw (IOException) new IOException("Unable to deserialize GBeanData " + abstractName).initCause(e);

Modified: geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/Configuration.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/Configuration.java?rev=388688&r1=388687&r2=388688&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/Configuration.java (original)
+++ geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/Configuration.java Fri Mar 24 18:13:46 2006
@@ -240,7 +240,6 @@
         //
         // Process transtive dependencies splitting it into classParents, serviceParents and artifactDependencies
         //
-        if (parents == null) parents = Collections.EMPTY_SET;
         Map parentsById = new HashMap();
         for (Iterator iterator = parents.iterator(); iterator.hasNext();) {
             Configuration configuration = (Configuration) iterator.next();

Modified: geronimo/branches/1.1/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java?rev=388688&r1=388687&r2=388688&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java (original)
+++ geronimo/branches/1.1/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java Fri Mar 24 18:13:46 2006
@@ -131,6 +131,7 @@
     }
 
     static void addResourceRefs(Configuration earContext, RefContext refContext, URI moduleURI, ResourceRefType[] resourceRefs, Map refMap, ClassLoader cl, ComponentContextBuilder builder) throws DeploymentException {
+        //TODO configid remove URI parameter?
         if (refMap == null) {
             refMap = Collections.EMPTY_MAP;
         }
@@ -170,7 +171,7 @@
                     j2eeType = NameFactory.JCA_MANAGED_CONNECTION_FACTORY;
                 }
                 try {
-                    AbstractNameQuery containerId = getResourceContainerId(name, j2eeType, moduleURI, gerResourceRef);
+                    AbstractNameQuery containerId = getResourceContainerId(name, j2eeType, null, gerResourceRef);
 
                     ref = refContext.getConnectionFactoryRef(containerId, iface, earContext);
                     builder.bind(name, ref);
@@ -601,6 +602,7 @@
 
 
     public static void setResourceEnvironment(URI uri, ResourceEnvironmentBuilder builder, ResourceRefType[] resourceRefs, GerResourceRefType[] gerResourceRefs) {
+        //TODO configid remove URI parameter?
         Map refMap = mapResourceRefs(gerResourceRefs);
         Set unshareableResources = new HashSet();
         Set applicationManagedSecurityResources = new HashSet();
@@ -614,7 +616,7 @@
                     && !JAXR_CONNECTION_FACTORY_CLASS.equals(type)) {
 
                 GerResourceRefType gerResourceRef = (GerResourceRefType) refMap.get(resourceRefType.getResRefName().getStringValue());
-                AbstractNameQuery containerId = getResourceContainerId(getStringValue(resourceRefType.getResRefName()), NameFactory.JCA_MANAGED_CONNECTION_FACTORY, uri, gerResourceRef);
+                AbstractNameQuery containerId = getResourceContainerId(getStringValue(resourceRefType.getResRefName()), NameFactory.JCA_MANAGED_CONNECTION_FACTORY, null, gerResourceRef);
 
                 if ("Unshareable".equals(getStringValue(resourceRefType.getResSharingScope()))) {
                     unshareableResources.add(containerId);

Modified: geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanBuilder.java?rev=388688&r1=388687&r2=388688&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanBuilder.java (original)
+++ geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanBuilder.java Fri Mar 24 18:13:46 2006
@@ -17,6 +17,14 @@
 
 package org.apache.geronimo.deployment.service;
 
+import java.beans.PropertyEditor;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.common.propertyeditor.PropertyEditors;
 import org.apache.geronimo.deployment.DeploymentContext;
@@ -30,17 +38,8 @@
 import org.apache.geronimo.gbean.GReferenceInfo;
 import org.apache.geronimo.gbean.ReferencePatterns;
 import org.apache.geronimo.kernel.repository.Artifact;
-import org.apache.geronimo.kernel.Naming;
 import org.apache.xmlbeans.XmlObject;
 
-import java.beans.PropertyEditor;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
 /**
  * @version $Rev$ $Date$
  */
@@ -132,7 +131,7 @@
     }
 
     public void addDependency(PatternType patternType) throws DeploymentException {
-        AbstractNameQuery refInfo = buildAbstractNameQuery(null, patternType);
+        AbstractNameQuery refInfo = buildAbstractNameQuery(patternType, null);
         gbean.addDependency(refInfo);
     }
 
@@ -167,7 +166,7 @@
 
         Artifact artifact = artifactid != null? new Artifact(groupId, artifactid, version, "car"): null;
         //get the type from the gbean info if not supplied explicitly
-        if (type == null) {
+        if (type == null && referenceInfo != null) {
             type = referenceInfo.getNameTypeName();
         }
         Map nameMap = new HashMap();
@@ -180,7 +179,7 @@
         if (module != null) {
             nameMap.put("J2EEModule", module);
         }
-        String interfaceType = referenceInfo.getReferenceType();
+        String interfaceType = referenceInfo == null? null: referenceInfo.getReferenceType();
         return new AbstractNameQuery(artifact, nameMap, Collections.singleton(interfaceType));
     }
 

Modified: geronimo/branches/1.1/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java?rev=388688&r1=388687&r2=388688&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java (original)
+++ geronimo/branches/1.1/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java Fri Mar 24 18:13:46 2006
@@ -50,6 +50,7 @@
 import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.j2ee.deployment.EARContext;
 import org.apache.geronimo.j2ee.deployment.Module;
 import org.apache.geronimo.j2ee.deployment.ModuleBuilder;
@@ -99,7 +100,7 @@
 
     private final Environment defaultEnvironment;
     private final boolean defaultContextPriorityClassloader;
-    private final AbstractName tomcatContainerObjectName;
+    private final AbstractNameQuery tomcatContainerName;
 
     private final WebServiceBuilder webServiceBuilder;
 
@@ -107,14 +108,14 @@
 
     public TomcatModuleBuilder(Environment defaultEnvironment,
                                boolean defaultContextPriorityClassloader,
-                               AbstractName tomcatContainerName,
+                               AbstractNameQuery tomcatContainerName,
                                WebServiceBuilder webServiceBuilder,
                                Kernel kernel) {
         super(kernel);
         this.defaultEnvironment = defaultEnvironment;
 
         this.defaultContextPriorityClassloader = defaultContextPriorityClassloader;
-        this.tomcatContainerObjectName = tomcatContainerName;
+        this.tomcatContainerName = tomcatContainerName;
         this.webServiceBuilder = webServiceBuilder;
     }
 
@@ -248,13 +249,12 @@
 
 
     public void initContext(EARContext earContext, Module module, ClassLoader cl) throws DeploymentException {
-        EARContext moduleContext = module.getEarContext();
         WebAppType webApp = (WebAppType) module.getSpecDD();
         MessageDestinationType[] messageDestinations = webApp.getMessageDestinationArray();
         TomcatWebAppType gerWebApp = (TomcatWebAppType) module.getVendorDD();
         GerMessageDestinationType[] gerMessageDestinations = gerWebApp.getMessageDestinationArray();
 
-        ENCConfigBuilder.registerMessageDestinations(moduleContext.getRefContext(), module.getName(), messageDestinations, gerMessageDestinations);
+        ENCConfigBuilder.registerMessageDestinations(earContext.getRefContext(), module.getName(), messageDestinations, gerMessageDestinations);
         if((webApp.getSecurityConstraintArray().length > 0 || webApp.getSecurityRoleArray().length > 0) &&
                 !gerWebApp.isSetSecurityRealmName()) {
             throw new DeploymentException("web.xml includes security elements but Geronimo deployment plan is not provided or does not contain <security-realm-name> element necessary to configure security accordingly.");
@@ -318,7 +318,7 @@
 
             webModuleData.setReferencePattern("TransactionContextManager", earContext.getTransactionContextManagerObjectName());
             webModuleData.setReferencePattern("TrackedConnectionAssociator", earContext.getConnectionTrackerObjectName());
-            webModuleData.setReferencePattern("Container", tomcatContainerObjectName);
+            webModuleData.setReferencePattern("Container", tomcatContainerName);
 
             // Process the Tomcat container-config elements
             if (tomcatWebApp.isSetHost()) {
@@ -469,7 +469,7 @@
         GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(TomcatModuleBuilder.class, NameFactory.MODULE_BUILDER);
         infoBuilder.addAttribute("defaultEnvironment", Environment.class, true, true);
         infoBuilder.addAttribute("defaultContextPriorityClassloader", boolean.class, true, true);
-        infoBuilder.addAttribute("tomcatContainerObjectName", AbstractName.class, true, true);
+        infoBuilder.addAttribute("tomcatContainerName", AbstractNameQuery.class, true, true);
         infoBuilder.addReference("WebServiceBuilder", WebServiceBuilder.class, NameFactory.MODULE_BUILDER);
         infoBuilder.addAttribute("kernel", Kernel.class, false);
         infoBuilder.addInterface(ModuleBuilder.class);
@@ -477,7 +477,7 @@
         infoBuilder.setConstructor(new String[]{
             "defaultEnvironment",
             "defaultContextPriorityClassloader",
-            "tomcatContainerObjectName",
+            "tomcatContainerName",
             "WebServiceBuilder",
             "kernel"});
         GBEAN_INFO = infoBuilder.getBeanInfo();

Modified: geronimo/branches/1.1/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java?rev=388688&r1=388687&r2=388688&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java (original)
+++ geronimo/branches/1.1/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java Fri Mar 24 18:13:46 2006
@@ -7,6 +7,7 @@
 import org.apache.geronimo.deployment.xbeans.ArtifactType;
 import org.apache.geronimo.deployment.xbeans.EnvironmentType;
 import org.apache.geronimo.gbean.AbstractName;
+import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.j2ee.deployment.WebServiceBuilder;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.kernel.Jsr77Naming;
@@ -27,7 +28,7 @@
     private Naming naming = new Jsr77Naming();
     private Artifact baseId = new Artifact("test", "base", "1", "car");
     private AbstractName baseRootName = naming.createRootName(baseId, "root", NameFactory.SERVICE_MODULE);
-    private AbstractName tomcatContainerObjectName = naming.createChildName(baseRootName, "TomcatContainer", NameFactory.GERONIMO_SERVICE);
+    private AbstractNameQuery tomcatContainerObjectName = new AbstractNameQuery(naming.createChildName(baseRootName, "TomcatContainer", NameFactory.GERONIMO_SERVICE));
     private WebServiceBuilder webServiceBuilder = null;
     private Environment defaultEnvironment = new Environment();
     private TomcatModuleBuilder builder;

Modified: geronimo/branches/1.1/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java?rev=388688&r1=388687&r2=388688&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java (original)
+++ geronimo/branches/1.1/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java Fri Mar 24 18:13:46 2006
@@ -176,8 +176,8 @@
                 environment,
                 ConfigurationModuleType.WAR,
                 naming,
-                repository,
-                configStore,
+                repository == null? Collections.EMPTY_SET: Collections.singleton(repository),
+                Collections.singleton(configStore),
                 new AbstractNameQuery(serverName),
                 moduleName,
                 new AbstractNameQuery(tcmName),
@@ -362,7 +362,7 @@
 
         defaultEnvironment.addDependency(baseId, ImportType.ALL);
         defaultEnvironment.setConfigId(webModuleArtifact);
-        builder = new TomcatModuleBuilder(defaultEnvironment, true, containerName, webServiceBuilder, null);
+        builder = new TomcatModuleBuilder(defaultEnvironment, true, new AbstractNameQuery(containerName), webServiceBuilder, null);
     }
 
     protected void tearDown() throws Exception {

Modified: geronimo/branches/1.1/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java?rev=388688&r1=388687&r2=388688&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java (original)
+++ geronimo/branches/1.1/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java Fri Mar 24 18:13:46 2006
@@ -187,24 +187,15 @@
                 moduleContext = new EARContext(configurationDir,
                         environment,
                         ConfigurationModuleType.WAR,
-                        earContext.getNaming(),
-                        repositories,
-                        configurationStores,
-                        earContext.getServerName(),
                         module.getModuleName(),
-                        earContext.getTransactionContextManagerObjectName(),
-                        earContext.getConnectionTrackerObjectName(),
-                        earContext.getTransactedTimerName(),
-                        earContext.getNonTransactedTimerName(),
-                        earContext.getCORBAGBeanObjectName(),
-                        earContext.getRefContext());
+                        earContext);
             } catch (DeploymentException e) {
                 DeploymentUtil.recursiveDelete(configurationDir);
                 throw e;
             }
             //TODO this is extremely fishy
             //Add the ear parent here since it can't be loaded by any config store.
-            environment.addDependency(earConfigId, ImportType.ALL);
+//            environment.addDependency(earConfigId, ImportType.ALL);
         }
         module.setEarContext(moduleContext);
 



Mime
View raw message