geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r378406 [1/2] - in /geronimo/branches/configid: modules/axis-builder/src/test/org/apache/geronimo/axis/builder/ modules/client-builder/src/java/org/apache/geronimo/client/builder/ modules/client-builder/src/test-resources/plans/ modules/cli...
Date Fri, 17 Feb 2006 00:35:09 GMT
Author: djencks
Date: Thu Feb 16 16:35:03 2006
New Revision: 378406

URL: http://svn.apache.org/viewcvs?rev=378406&view=rev
Log:
Change to newer xml format. Move Environment to kernel module.

Added:
    geronimo/branches/configid/modules/kernel/src/java/org/apache/geronimo/kernel/repository/Environment.java
      - copied, changed from r377836, geronimo/branches/configid/modules/deployment/src/java/org/apache/geronimo/deployment/Environment.java
Removed:
    geronimo/branches/configid/modules/deployment/src/java/org/apache/geronimo/deployment/Environment.java
Modified:
    geronimo/branches/configid/modules/axis-builder/src/test/org/apache/geronimo/axis/builder/ServiceReferenceTest.java
    geronimo/branches/configid/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
    geronimo/branches/configid/modules/client-builder/src/test-resources/plans/plan1.xml
    geronimo/branches/configid/modules/client-builder/src/test-resources/plans/plan2.xml
    geronimo/branches/configid/modules/client-builder/src/test/org/apache/geronimo/client/builder/PlanParsingTest.java
    geronimo/branches/configid/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
    geronimo/branches/configid/modules/connector-builder/src/test-data/connector_1_0/geronimo-ra.xml
    geronimo/branches/configid/modules/connector-builder/src/test-data/connector_1_5/geronimo-ra.xml
    geronimo/branches/configid/modules/connector-builder/src/test-data/data/dup-admin-object-name.xml
    geronimo/branches/configid/modules/connector-builder/src/test-data/data/dup-connectionfactoryinstance-name.xml
    geronimo/branches/configid/modules/connector-builder/src/test-data/data/dup-resourceadapter-name.xml
    geronimo/branches/configid/modules/connector-builder/src/test-data/data/external-application-plan.xml
    geronimo/branches/configid/modules/connector-builder/src/test-data/ear/geronimo-application.xml
    geronimo/branches/configid/modules/connector-builder/src/test-resources/jms-plan.xml
    geronimo/branches/configid/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
    geronimo/branches/configid/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java
    geronimo/branches/configid/modules/deployment/src/test/org/apache/geronimo/deployment/DeploymentContextTest.java
    geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/ApplicationInfo.java
    geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java
    geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ConnectorModule.java
    geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
    geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java
    geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBModule.java
    geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/Module.java
    geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java
    geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java
    geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/WebModule.java
    geronimo/branches/configid/modules/j2ee-builder/src/test-ear/META-INF/geronimo-application.xml
    geronimo/branches/configid/modules/j2ee-builder/src/test-ear/test-ejb-jar/META-INF/openejb-jar.xml
    geronimo/branches/configid/modules/j2ee-builder/src/test-ear/test-rar/META-INF/geronimo-ra.xml
    geronimo/branches/configid/modules/j2ee-builder/src/test-ear/test-war/WEB-INF/geronimo-web.xml
    geronimo/branches/configid/modules/j2ee-builder/src/test-ear13/META-INF/geronimo-application.xml
    geronimo/branches/configid/modules/j2ee-builder/src/test-ear13/test-ejb-jar/META-INF/openejb-jar.xml
    geronimo/branches/configid/modules/j2ee-builder/src/test-ear13/test-war/WEB-INF/geronimo-web.xml
    geronimo/branches/configid/modules/j2ee-builder/src/test-plan/test-bad-car.xml
    geronimo/branches/configid/modules/j2ee-builder/src/test-plan/test-bad-ejb-jar.xml
    geronimo/branches/configid/modules/j2ee-builder/src/test-plan/test-bad-rar.xml
    geronimo/branches/configid/modules/j2ee-builder/src/test-plan/test-bad-war.xml
    geronimo/branches/configid/modules/j2ee-builder/src/test-unpacked-ear/META-INF/geronimo-application-alt-dd.xml
    geronimo/branches/configid/modules/j2ee-builder/src/test-unpacked-ear/META-INF/geronimo-application.xml
    geronimo/branches/configid/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java
    geronimo/branches/configid/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java
    geronimo/branches/configid/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java
    geronimo/branches/configid/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java
    geronimo/branches/configid/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java
    geronimo/branches/configid/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
    geronimo/branches/configid/modules/jetty-builder/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml
    geronimo/branches/configid/modules/jetty-builder/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml
    geronimo/branches/configid/modules/jetty-builder/src/test-resources/deployables/war5/WEB-INF/geronimo-jetty.xml
    geronimo/branches/configid/modules/jetty-builder/src/test-resources/plans/plan1.xml
    geronimo/branches/configid/modules/jetty-builder/src/test-resources/plans/plan1A.xml
    geronimo/branches/configid/modules/jetty-builder/src/test-resources/plans/plan1B.xml
    geronimo/branches/configid/modules/jetty-builder/src/test-resources/plans/plan1C.xml
    geronimo/branches/configid/modules/jetty-builder/src/test-resources/plans/plan2.xml
    geronimo/branches/configid/modules/jetty-builder/src/test-resources/plans/plan3.xml
    geronimo/branches/configid/modules/jetty-builder/src/test-resources/plans/plan4-converted.xml
    geronimo/branches/configid/modules/jetty-builder/src/test-resources/plans/plan4.xml
    geronimo/branches/configid/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java
    geronimo/branches/configid/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/PlanParsingTest.java
    geronimo/branches/configid/modules/service-builder/src/java/org/apache/geronimo/deployment/service/EnvironmentBuilder.java
    geronimo/branches/configid/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
    geronimo/branches/configid/modules/service-builder/src/schema/geronimo-config-1.1.xsd
    geronimo/branches/configid/modules/service-builder/src/test-resources/services/plan1.xml
    geronimo/branches/configid/modules/service-builder/src/test/org/apache/geronimo/deployment/service/ServiceConfigBuilderTest.java
    geronimo/branches/configid/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
    geronimo/branches/configid/modules/tomcat-builder/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml
    geronimo/branches/configid/modules/tomcat-builder/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml
    geronimo/branches/configid/modules/tomcat-builder/src/test-resources/deployables/war4/WEB-INF/geronimo-web.xml
    geronimo/branches/configid/modules/tomcat-builder/src/test-resources/plans/plan1.xml
    geronimo/branches/configid/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java
    geronimo/branches/configid/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
    geronimo/branches/configid/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PlanProcessor.java

Modified: geronimo/branches/configid/modules/axis-builder/src/test/org/apache/geronimo/axis/builder/ServiceReferenceTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/axis-builder/src/test/org/apache/geronimo/axis/builder/ServiceReferenceTest.java?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/axis-builder/src/test/org/apache/geronimo/axis/builder/ServiceReferenceTest.java (original)
+++ geronimo/branches/configid/modules/axis-builder/src/test/org/apache/geronimo/axis/builder/ServiceReferenceTest.java Thu Feb 16 16:35:03 2006
@@ -65,7 +65,7 @@
 import org.apache.geronimo.axis.client.ServiceImpl;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.deployment.DeploymentContext;
-import org.apache.geronimo.deployment.Environment;
+import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.deployment.util.UnpackedJarFile;
 import org.apache.geronimo.j2ee.deployment.EJBModule;
 import org.apache.geronimo.j2ee.deployment.Module;
@@ -106,7 +106,7 @@
         environment.setConfigId(configID);
         Map nameKeys = new HashMap();
         nameKeys.put("domain", "geronimo");
-        environment.setNameKeys(nameKeys);
+        environment.setProperties(nameKeys);
         context = new DeploymentContext(tmpbasedir, environment, ConfigurationModuleType.CAR, null);
 
         File moduleLocation = new File(tmpbasedir, "ejb");

Modified: geronimo/branches/configid/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java (original)
+++ geronimo/branches/configid/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java Thu Feb 16 16:35:03 2006
@@ -38,7 +38,7 @@
 import org.apache.geronimo.client.StaticJndiContextPlugin;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.deployment.DeploymentContext;
-import org.apache.geronimo.deployment.Environment;
+import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.deployment.service.EnvironmentBuilder;
 import org.apache.geronimo.deployment.service.ServiceConfigBuilder;
 import org.apache.geronimo.deployment.util.DeploymentUtil;

Modified: geronimo/branches/configid/modules/client-builder/src/test-resources/plans/plan1.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/client-builder/src/test-resources/plans/plan1.xml?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/client-builder/src/test-resources/plans/plan1.xml (original)
+++ geronimo/branches/configid/modules/client-builder/src/test-resources/plans/plan1.xml Thu Feb 16 16:35:03 2006
@@ -6,17 +6,17 @@
     <dep:client-environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
         <dep:configId>
             <dep:groupId>test</dep:groupId>
-            <dep:type>car</dep:type>
             <dep:artifactId>testclient</dep:artifactId>
             <dep:version>1</dep:version>
+            <dep:type>car</dep:type>
         </dep:configId>
     </dep:client-environment>
     <dep:server-environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
         <dep:configId>
             <dep:groupId>test</dep:groupId>
-            <dep:type>car</dep:type>
             <dep:artifactId>testserver</dep:artifactId>
             <dep:version>1</dep:version>
+            <dep:type>car</dep:type>
         </dep:configId>
     </dep:server-environment>
     <nam:resource-ref xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.1">

Modified: geronimo/branches/configid/modules/client-builder/src/test-resources/plans/plan2.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/client-builder/src/test-resources/plans/plan2.xml?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/client-builder/src/test-resources/plans/plan2.xml (original)
+++ geronimo/branches/configid/modules/client-builder/src/test-resources/plans/plan2.xml Thu Feb 16 16:35:03 2006
@@ -6,17 +6,17 @@
     <dep:client-environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
         <dep:configId>
             <dep:groupId>test</dep:groupId>
-            <dep:type>car</dep:type>
             <dep:artifactId>testclient</dep:artifactId>
             <dep:version>1</dep:version>
+            <dep:type>car</dep:type>
         </dep:configId>
     </dep:client-environment>
     <dep:server-environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
         <dep:configId>
             <dep:groupId>test</dep:groupId>
-            <dep:type>car</dep:type>
             <dep:artifactId>testserver</dep:artifactId>
             <dep:version>1</dep:version>
+            <dep:type>car</dep:type>
         </dep:configId>
     </dep:server-environment>
     <nam:resource-ref xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.1">
@@ -29,17 +29,17 @@
             <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <dep:configId>
                     <dep:groupId>test</dep:groupId>
-                    <dep:type>car</dep:type>
                     <dep:artifactId>testclient</dep:artifactId>
                     <dep:version>1</dep:version>
+                    <dep:type>car</dep:type>
                 </dep:configId>
-                <dep:classloader>
+                <dep:dependencies>
                     <dep:dependency>
                         <dep:groupId>axion</dep:groupId>
                         <dep:artifactId>axion</dep:artifactId>
                         <dep:version>1</dep:version>
                     </dep:dependency>
-                </dep:classloader>
+                </dep:dependencies>
 
             </dep:environment>
 

Modified: geronimo/branches/configid/modules/client-builder/src/test/org/apache/geronimo/client/builder/PlanParsingTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/client-builder/src/test/org/apache/geronimo/client/builder/PlanParsingTest.java?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/client-builder/src/test/org/apache/geronimo/client/builder/PlanParsingTest.java (original)
+++ geronimo/branches/configid/modules/client-builder/src/test/org/apache/geronimo/client/builder/PlanParsingTest.java Thu Feb 16 16:35:03 2006
@@ -7,7 +7,7 @@
 import org.apache.geronimo.xbeans.geronimo.client.GerApplicationClientDocument;
 import org.apache.geronimo.xbeans.geronimo.client.GerApplicationClientType;
 import org.apache.geronimo.xbeans.geronimo.naming.GerResourceRefType;
-import org.apache.geronimo.deployment.Environment;
+import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.deployment.xbeans.EnvironmentType;
 import org.apache.geronimo.deployment.xbeans.ArtifactType;
 

Modified: geronimo/branches/configid/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java (original)
+++ geronimo/branches/configid/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java Thu Feb 16 16:35:03 2006
@@ -30,8 +30,6 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.Date;
 import java.util.jar.JarFile;
 import java.util.zip.ZipEntry;
@@ -67,7 +65,7 @@
 import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
 import org.apache.geronimo.deployment.xbeans.GbeanType;
 import org.apache.geronimo.deployment.xbeans.EnvironmentType;
-import org.apache.geronimo.deployment.Environment;
+import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.gbean.DynamicGAttributeInfo;
 import org.apache.geronimo.gbean.GAttributeInfo;
 import org.apache.geronimo.gbean.GBeanData;
@@ -85,7 +83,6 @@
 import org.apache.geronimo.kernel.GBeanNotFoundException;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.repository.Repository;
-import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.naming.deployment.ENCConfigBuilder;
 import org.apache.geronimo.naming.reference.ResourceReference;
 import org.apache.geronimo.schema.SchemaConversionUtils;

Modified: geronimo/branches/configid/modules/connector-builder/src/test-data/connector_1_0/geronimo-ra.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/connector-builder/src/test-data/connector_1_0/geronimo-ra.xml?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/connector-builder/src/test-data/connector_1_0/geronimo-ra.xml (original)
+++ geronimo/branches/configid/modules/connector-builder/src/test-data/connector_1_0/geronimo-ra.xml Thu Feb 16 16:35:03 2006
@@ -20,20 +20,18 @@
     <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
         <configId>
             <groupId>geronimo</groupId>
-            <type>car</type>
             <artifactId>test-ear</artifactId>
             <version>1.0</version>
+            <type>car</type>
         </configId>
-        <name-key>
-            <key>domain</key>
-            <value>geronimo.test</value>
-        </name-key>
-        <name-key>
-            <key>J2EEServer</key>
-            <value>geronimo</value>
-        </name-key>
+        <properties>
+            <property>
+                <name>org.apache.geronimo.name.javax.management.j2ee.BaseName</name>
+                <value>geronimo.test:J2EEServer=geronimo</value>
+            </property>
+        </properties>
     </environment>
-  
+
     <resourceadapter>
         <outbound-resourceadapter>
             <connection-definition>
@@ -91,7 +89,8 @@
     </resourceadapter>
 
     <!--normally this is in the j2ee-server-plan.xml.  It is included here so the gbeans can start in unit tests-->
-    <gbean name="ConnectionTracker" class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean">
+    <gbean name="ConnectionTracker"
+           class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean">
     </gbean>
 
 </connector>

Modified: geronimo/branches/configid/modules/connector-builder/src/test-data/connector_1_5/geronimo-ra.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/connector-builder/src/test-data/connector_1_5/geronimo-ra.xml?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/connector-builder/src/test-data/connector_1_5/geronimo-ra.xml (original)
+++ geronimo/branches/configid/modules/connector-builder/src/test-data/connector_1_5/geronimo-ra.xml Thu Feb 16 16:35:03 2006
@@ -20,20 +20,18 @@
     <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
         <configId>
             <groupId>geronimo</groupId>
-            <type>car</type>
             <artifactId>test-ear</artifactId>
             <version>1.0</version>
+            <type>car</type>
         </configId>
-        <name-key>
-            <key>domain</key>
-            <value>geronimo.test</value>
-        </name-key>
-        <name-key>
-            <key>J2EEServer</key>
-            <value>geronimo</value>
-        </name-key>
+        <properties>
+            <property>
+                <name>org.apache.geronimo.name.javax.management.j2ee.BaseName</name>
+                <value>geronimo.test:J2EEServer=geronimo</value>
+            </property>
+        </properties>
     </environment>
-                                                                        
+
     <resourceadapter>
         <resourceadapter-instance>
             <resourceadapter-name>testRA</resourceadapter-name>
@@ -81,7 +79,8 @@
                 </connectiondefinition-instance>
             </connection-definition>
             <connection-definition>
-                <connectionfactory-interface>org.apache.geronimo.connector.mock.ConnectionFactoryExtension</connectionfactory-interface>
+                <connectionfactory-interface>
+                    org.apache.geronimo.connector.mock.ConnectionFactoryExtension</connectionfactory-interface>
                 <connectiondefinition-instance>
                     <name>ThirdTestOutboundConnectionFactory</name>
                     <config-property-setting name="OutboundStringProperty1">StringValue3</config-property-setting>
@@ -116,27 +115,39 @@
     </adminobject>
 
     <!--normally this is in the j2ee-server-plan.xml.  It is included here so the gbeans can start in unit tests-->
-    <gbean name="ConnectionTracker" class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean">
+    <gbean name="ConnectionTracker"
+           class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean">
     </gbean>
 
     <gbean name="DefaultWorkManager" class="org.apache.geronimo.connector.work.GeronimoWorkManagerGBean">
         <attribute name="syncMaximumPoolSize">10</attribute>
         <attribute name="startMaximumPoolSize">10</attribute>
         <attribute name="scheduledMaximumPoolSize">10</attribute>
-        <reference name="TransactionContextManager"><gbean-name>*:name=TransactionContextManager,*</gbean-name></reference>
+        <reference name="TransactionContextManager">
+            <gbean-name>*:name=TransactionContextManager,*</gbean-name>
+        </reference>
     </gbean>
 
     <gbean name="TransactionManager" class="org.apache.geronimo.transaction.manager.TransactionManagerImplGBean">
         <attribute name="defaultTransactionTimeoutSeconds">10</attribute>
         <references name="ResourceManagers">
-            <pattern><gbean-name>*:j2eeType=JCAManagedConnectionFactory,*</gbean-name></pattern>
-            <pattern><gbean-name>*:j2eeType=MessageDrivenBean,*</gbean-name></pattern>
+            <pattern>
+                <gbean-name>*:j2eeType=JCAManagedConnectionFactory,*</gbean-name>
+            </pattern>
+            <pattern>
+                <gbean-name>*:j2eeType=MessageDrivenBean,*</gbean-name>
+            </pattern>
         </references>
     </gbean>
 
-    <gbean name="TransactionContextManager" class="org.apache.geronimo.transaction.context.TransactionContextManagerGBean">
-        <reference name="TransactionManager"><gbean-name>*:name=TransactionManager,*</gbean-name></reference>
-        <reference name="XidImporter"><gbean-name>*:name=TransactionManager,*</gbean-name></reference>
+    <gbean name="TransactionContextManager"
+           class="org.apache.geronimo.transaction.context.TransactionContextManagerGBean">
+        <reference name="TransactionManager">
+            <gbean-name>*:name=TransactionManager,*</gbean-name>
+        </reference>
+        <reference name="XidImporter">
+            <gbean-name>*:name=TransactionManager,*</gbean-name>
+        </reference>
     </gbean>
 
 </connector>

Modified: geronimo/branches/configid/modules/connector-builder/src/test-data/data/dup-admin-object-name.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/connector-builder/src/test-data/data/dup-admin-object-name.xml?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/connector-builder/src/test-data/data/dup-admin-object-name.xml (original)
+++ geronimo/branches/configid/modules/connector-builder/src/test-data/data/dup-admin-object-name.xml Thu Feb 16 16:35:03 2006
@@ -16,9 +16,7 @@
     limitations under the License.
 -->
 
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.0"
-    configId="org/apache/geronimo/j2ee/deployment/test"
-    parentId="org/apache/geronimo/Server">
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
 
     <resourceadapter>
         <resourceadapter-instance>

Modified: geronimo/branches/configid/modules/connector-builder/src/test-data/data/dup-connectionfactoryinstance-name.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/connector-builder/src/test-data/data/dup-connectionfactoryinstance-name.xml?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/connector-builder/src/test-data/data/dup-connectionfactoryinstance-name.xml (original)
+++ geronimo/branches/configid/modules/connector-builder/src/test-data/data/dup-connectionfactoryinstance-name.xml Thu Feb 16 16:35:03 2006
@@ -16,9 +16,7 @@
     limitations under the License.
 -->
 
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.0"
-    configId="org/apache/geronimo/j2ee/deployment/test"
-    parentId="org/apache/geronimo/Server">
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
 
     <resourceadapter>
         <resourceadapter-instance>

Modified: geronimo/branches/configid/modules/connector-builder/src/test-data/data/dup-resourceadapter-name.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/connector-builder/src/test-data/data/dup-resourceadapter-name.xml?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/connector-builder/src/test-data/data/dup-resourceadapter-name.xml (original)
+++ geronimo/branches/configid/modules/connector-builder/src/test-data/data/dup-resourceadapter-name.xml Thu Feb 16 16:35:03 2006
@@ -16,9 +16,7 @@
     limitations under the License.
 -->
 
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.0"
-    configId="org/apache/geronimo/j2ee/deployment/test"
-    parentId="org/apache/geronimo/Server">
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
 
     <resourceadapter>
         <resourceadapter-instance>

Modified: geronimo/branches/configid/modules/connector-builder/src/test-data/data/external-application-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/connector-builder/src/test-data/data/external-application-plan.xml?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/connector-builder/src/test-data/data/external-application-plan.xml (original)
+++ geronimo/branches/configid/modules/connector-builder/src/test-data/data/external-application-plan.xml Thu Feb 16 16:35:03 2006
@@ -21,18 +21,10 @@
     <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
         <configId>
             <groupId>geronimo</groupId>
-            <type>car</type>
             <artifactId>test-ear</artifactId>
             <version>1.0</version>
+            <type>car</type>
         </configId>
-        <name-key>
-            <key>domain</key>
-            <value>geronimo.test</value>
-        </name-key>
-        <name-key>
-            <key>J2EEServer</key>
-            <value>geronimo</value>
-        </name-key>
     </environment>
 
     <module>
@@ -41,18 +33,10 @@
             <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <configId>
                     <groupId>geronimo</groupId>
-                    <type>car</type>
                     <artifactId>test-ear</artifactId>
                     <version>1.0</version>
+                    <type>car</type>
                 </configId>
-                <name-key>
-                    <key>domain</key>
-                    <value>geronimo.test</value>
-                </name-key>
-                <name-key>
-                    <key>J2EEServer</key>
-                    <value>geronimo</value>
-                </name-key>
             </environment>
 
             <resourceadapter>
@@ -115,18 +99,10 @@
             <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <configId>
                     <groupId>geronimo</groupId>
-                    <type>car</type>
                     <artifactId>test-ear</artifactId>
                     <version>1.0</version>
+                    <type>car</type>
                 </configId>
-                <name-key>
-                    <key>domain</key>
-                    <value>geronimo.test</value>
-                </name-key>
-                <name-key>
-                    <key>J2EEServer</key>
-                    <value>geronimo</value>
-                </name-key>
             </environment>
 
 

Modified: geronimo/branches/configid/modules/connector-builder/src/test-data/ear/geronimo-application.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/connector-builder/src/test-data/ear/geronimo-application.xml?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/connector-builder/src/test-data/ear/geronimo-application.xml (original)
+++ geronimo/branches/configid/modules/connector-builder/src/test-data/ear/geronimo-application.xml Thu Feb 16 16:35:03 2006
@@ -20,18 +20,16 @@
     <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
         <configId>
             <groupId>geronimo</groupId>
-            <type>car</type>
             <artifactId>test-ear</artifactId>
             <version>1.0</version>
+            <type>car</type>
         </configId>
-        <name-key>
-            <key>domain</key>
-            <value>geronimo.test</value>
-        </name-key>
-        <name-key>
-            <key>J2EEServer</key>
-            <value>geronimo</value>
-        </name-key>
+        <properties>
+            <property>
+                <name>org.apache.geronimo.name.javax.management.j2ee.BaseName</name>
+                <value>geronimo.test:J2EEServer=geronimo</value>
+            </property>
+        </properties>
     </environment>
-    
+
 </application>

Modified: geronimo/branches/configid/modules/connector-builder/src/test-resources/jms-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/connector-builder/src/test-resources/jms-plan.xml?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/connector-builder/src/test-resources/jms-plan.xml (original)
+++ geronimo/branches/configid/modules/connector-builder/src/test-resources/jms-plan.xml Thu Feb 16 16:35:03 2006
@@ -14,69 +14,69 @@
     limitations under the License.-->
 <!--$Rev: 356113 $ $Date: 2005-12-11 21:54:02 -0500 (Sun, 11 Dec 2005) $-->
 <connector configId="TestJMSConfig" xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
-  <dep:import xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
-    <dep:groupId>geronimo</dep:groupId>
-    <dep:type>car</dep:type>
-    <dep:artifactId>activemq-broker</dep:artifactId>
-    <dep:version>1.0</dep:version>
-  </dep:import>
-  <resourceadapter>
-    <resourceadapter-instance>
-      <resourceadapter-name>Test ActiveMQ RA</resourceadapter-name>
-      <config-property-setting name="ServerUrl">tcp://localhost:61616</config-property-setting>
-      <config-property-setting name="UserName">geronimo-user</config-property-setting>
-      <config-property-setting name="Password">geronimo-pw</config-property-setting>
-      <workmanager>
-        <gbean-link>DefaultWorkManager</gbean-link>
-      </workmanager>
-    </resourceadapter-instance>
-    <outbound-resourceadapter>
-      <connection-definition>
-        <connectionfactory-interface>javax.jms.ConnectionFactory</connectionfactory-interface>
-        <connectiondefinition-instance>
-          <name>DefaultActiveMQConnectionFactory</name>
-          <implemented-interface>javax.jms.QueueConnectionFactory</implemented-interface>
-          <implemented-interface>javax.jms.TopicConnectionFactory</implemented-interface>
-          <connectionmanager>
-            <xa-transaction>
-              <transaction-caching/>
-            </xa-transaction>
-            <single-pool>
-              <max-size>10</max-size>
-              <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
-              <match-one/>
-            </single-pool>
-          </connectionmanager>
-        </connectiondefinition-instance>
-      </connection-definition>
-    </outbound-resourceadapter>
-  </resourceadapter>
-  <adminobject>
-    <adminobject-interface>javax.jms.Queue</adminobject-interface>
-    <adminobject-class>org.activemq.message.ActiveMQQueue</adminobject-class>
-    <adminobject-instance>
-      <message-destination-name>TestQueue1Name</message-destination-name>
-      <config-property-setting name="PhysicalName">TestQueue1Physical</config-property-setting>
-    </adminobject-instance>
-  </adminobject>
-  <adminobject>
-    <adminobject-interface>javax.jms.Queue</adminobject-interface>
-    <adminobject-class>org.activemq.message.ActiveMQQueue</adminobject-class>
-    <adminobject-instance>
-      <message-destination-name>TestQueue2Name</message-destination-name>
-      <config-property-setting name="PhysicalName">TestQueue2Physical</config-property-setting>
-    </adminobject-instance>
-    <adminobject-instance>
-      <message-destination-name>TestQueue3Name</message-destination-name>
-      <config-property-setting name="PhysicalName">TestQueue3Physical</config-property-setting>
-    </adminobject-instance>
-  </adminobject>
-  <adminobject>
-    <adminobject-interface>javax.jms.Topic</adminobject-interface>
-    <adminobject-class>org.activemq.message.ActiveMQTopic</adminobject-class>
-    <adminobject-instance>
-      <message-destination-name>TestTopic1Name</message-destination-name>
-      <config-property-setting name="PhysicalName">TestTopic1Physical</config-property-setting>
-    </adminobject-instance>
-  </adminobject>
+    <dep:import xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+        <dep:groupId>geronimo</dep:groupId>
+        <dep:artifactId>activemq-broker</dep:artifactId>
+        <dep:version>1.0</dep:version>
+        <dep:type>car</dep:type>
+    </dep:import>
+    <resourceadapter>
+        <resourceadapter-instance>
+            <resourceadapter-name>Test ActiveMQ RA</resourceadapter-name>
+            <config-property-setting name="ServerUrl">tcp://localhost:61616</config-property-setting>
+            <config-property-setting name="UserName">geronimo-user</config-property-setting>
+            <config-property-setting name="Password">geronimo-pw</config-property-setting>
+            <workmanager>
+                <gbean-link>DefaultWorkManager</gbean-link>
+            </workmanager>
+        </resourceadapter-instance>
+        <outbound-resourceadapter>
+            <connection-definition>
+                <connectionfactory-interface>javax.jms.ConnectionFactory</connectionfactory-interface>
+                <connectiondefinition-instance>
+                    <name>DefaultActiveMQConnectionFactory</name>
+                    <implemented-interface>javax.jms.QueueConnectionFactory</implemented-interface>
+                    <implemented-interface>javax.jms.TopicConnectionFactory</implemented-interface>
+                    <connectionmanager>
+                        <xa-transaction>
+                            <transaction-caching/>
+                        </xa-transaction>
+                        <single-pool>
+                            <max-size>10</max-size>
+                            <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                            <match-one/>
+                        </single-pool>
+                    </connectionmanager>
+                </connectiondefinition-instance>
+            </connection-definition>
+        </outbound-resourceadapter>
+    </resourceadapter>
+    <adminobject>
+        <adminobject-interface>javax.jms.Queue</adminobject-interface>
+        <adminobject-class>org.activemq.message.ActiveMQQueue</adminobject-class>
+        <adminobject-instance>
+            <message-destination-name>TestQueue1Name</message-destination-name>
+            <config-property-setting name="PhysicalName">TestQueue1Physical</config-property-setting>
+        </adminobject-instance>
+    </adminobject>
+    <adminobject>
+        <adminobject-interface>javax.jms.Queue</adminobject-interface>
+        <adminobject-class>org.activemq.message.ActiveMQQueue</adminobject-class>
+        <adminobject-instance>
+            <message-destination-name>TestQueue2Name</message-destination-name>
+            <config-property-setting name="PhysicalName">TestQueue2Physical</config-property-setting>
+        </adminobject-instance>
+        <adminobject-instance>
+            <message-destination-name>TestQueue3Name</message-destination-name>
+            <config-property-setting name="PhysicalName">TestQueue3Physical</config-property-setting>
+        </adminobject-instance>
+    </adminobject>
+    <adminobject>
+        <adminobject-interface>javax.jms.Topic</adminobject-interface>
+        <adminobject-class>org.activemq.message.ActiveMQTopic</adminobject-class>
+        <adminobject-instance>
+            <message-destination-name>TestTopic1Name</message-destination-name>
+            <config-property-setting name="PhysicalName">TestTopic1Physical</config-property-setting>
+        </adminobject-instance>
+    </adminobject>
 </connector>

Modified: geronimo/branches/configid/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java (original)
+++ geronimo/branches/configid/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java Thu Feb 16 16:35:03 2006
@@ -21,7 +21,7 @@
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean;
 import org.apache.geronimo.deployment.DeploymentContext;
-import org.apache.geronimo.deployment.Environment;
+import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.deployment.util.DeploymentUtil;
 import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.gbean.GBeanInfo;
@@ -561,6 +561,7 @@
         configurationManagerName = new ObjectName(":j2eeType=ConfigurationManager,name=Basic");
         defaultEnvironment = new Environment();
         defaultEnvironment.getImports().add(Artifact.create("org/apache/geronimo/Server"));
+        defaultEnvironment.getProperties().put(NameFactory.JSR77_BASE_NAME_PROPERTY, "geronimo.test:J2EEServer=geronimo");
     }
 
     private abstract class InstallAction {

Modified: geronimo/branches/configid/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java (original)
+++ geronimo/branches/configid/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java Thu Feb 16 16:35:03 2006
@@ -32,6 +32,7 @@
 import org.apache.geronimo.kernel.config.NoSuchConfigException;
 import org.apache.geronimo.kernel.management.State;
 import org.apache.geronimo.kernel.repository.Artifact;
+import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.kernel.repository.Repository;
 
 import javax.management.ObjectName;
@@ -100,7 +101,7 @@
         configurationData.setModuleType(type);
         //TODO configid this is broken, need Artifact to URI conversion or configData to use Artifacts.
         configurationData.setParentId(new ArrayList(environment.getImports()));
-        configurationData.setNameKeys(environment.getNameKeys());
+        configurationData.setNameKeys(environment.getProperties());
 
         determineNaming();
         determineInherited();
@@ -214,14 +215,6 @@
 
     public File getBaseDir() {
         return baseDir;
-    }
-
-    public String getDomain() {
-        return (String) configurationData.getNameKeys().get("domain");
-    }
-
-    public String getServer() {
-        return (String) configurationData.getNameKeys().get("J2EEServer");
     }
 
     public void addGBean(GBeanData gbean) {

Modified: geronimo/branches/configid/modules/deployment/src/test/org/apache/geronimo/deployment/DeploymentContextTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/deployment/src/test/org/apache/geronimo/deployment/DeploymentContextTest.java?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/deployment/src/test/org/apache/geronimo/deployment/DeploymentContextTest.java (original)
+++ geronimo/branches/configid/modules/deployment/src/test/org/apache/geronimo/deployment/DeploymentContextTest.java Thu Feb 16 16:35:03 2006
@@ -20,8 +20,6 @@
 import java.net.URI;
 import java.net.URLClassLoader;
 import java.net.URL;
-import java.util.LinkedHashSet;
-import java.util.HashSet;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -29,6 +27,7 @@
 
 import org.apache.geronimo.kernel.config.ConfigurationModuleType;
 import org.apache.geronimo.kernel.repository.Artifact;
+import org.apache.geronimo.kernel.repository.Environment;
 import net.sf.cglib.proxy.Enhancer;
 import net.sf.cglib.proxy.MethodInterceptor;
 import net.sf.cglib.core.DefaultGeneratorStrategy;
@@ -50,7 +49,7 @@
             environment.setConfigId(new Artifact("foo", "artifact", "1", "car", true));
             Map nameKeys = new HashMap();
             nameKeys.put("domain", "d");
-            environment.setNameKeys(nameKeys);
+            environment.setProperties(nameKeys);
             DeploymentContext context = new DeploymentContext(basedir, environment, ConfigurationModuleType.CAR, null);
             Enhancer enhancer = new Enhancer();
             enhancer.setInterfaces(new Class[]{DataSource.class});

Modified: geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/ApplicationInfo.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/ApplicationInfo.java?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/ApplicationInfo.java (original)
+++ geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/ApplicationInfo.java Thu Feb 16 16:35:03 2006
@@ -16,12 +16,10 @@
  */
 package org.apache.geronimo.j2ee;
 
-import java.net.URI;
 import java.util.Set;
-import java.util.List;
 
 import org.apache.geronimo.kernel.config.ConfigurationModuleType;
-import org.apache.geronimo.deployment.Environment;
+import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.xmlbeans.XmlObject;
 
 /**

Modified: geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java (original)
+++ geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java Thu Feb 16 16:35:03 2006
@@ -20,11 +20,10 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Collection;
-import java.util.List;
 import java.util.jar.JarFile;
 
 import org.apache.geronimo.deployment.DeploymentContext;
-import org.apache.geronimo.deployment.Environment;
+import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.kernel.config.ConfigurationModuleType;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.xmlbeans.XmlObject;

Modified: geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ConnectorModule.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ConnectorModule.java?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ConnectorModule.java (original)
+++ geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ConnectorModule.java Thu Feb 16 16:35:03 2006
@@ -23,8 +23,8 @@
 
 import org.apache.xmlbeans.XmlObject;
 import org.apache.geronimo.kernel.config.ConfigurationModuleType;
+import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.deployment.DeploymentContext;
-import org.apache.geronimo.deployment.Environment;
 import org.apache.geronimo.common.DeploymentException;
 
 /**

Modified: geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java (original)
+++ geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java Thu Feb 16 16:35:03 2006
@@ -38,7 +38,7 @@
 
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.deployment.ConfigurationBuilder;
-import org.apache.geronimo.deployment.Environment;
+import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.deployment.service.EnvironmentBuilder;
 import org.apache.geronimo.deployment.service.ServiceConfigBuilder;
 import org.apache.geronimo.deployment.util.DeploymentUtil;
@@ -354,11 +354,7 @@
                 } catch (Exception e) {
                     throw new DeploymentException("Error initializing J2EEApplication managed object");
                 }
-                try {
-                    gbeanData.setReferencePattern("j2eeServer", NameFactory.getServerName(earContext.getDomain(), earContext.getServer(), earContext.getJ2eeContext()));
-                } catch (MalformedObjectNameException e) {
-                    throw new DeploymentException("Error constructing J2EEServer name for application", e);
-                }
+                gbeanData.setReferencePattern("j2eeServer", earContext.getServerObjectName());
                 earContext.addGBean(gbeanData);
             }
 

Modified: geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java (original)
+++ geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java Thu Feb 16 16:35:03 2006
@@ -18,9 +18,8 @@
 
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.deployment.DeploymentContext;
-import org.apache.geronimo.deployment.Environment;
+import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
-import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContextImpl;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.config.ConfigurationModuleType;
@@ -57,7 +56,7 @@
 
     public EARContext(File baseDir, Environment environment, ConfigurationModuleType moduleType, Kernel kernel, String j2eeApplicationName, ObjectName transactionContextManagerObjectName, ObjectName connectionTrackerObjectName, ObjectName transactedTimerName, ObjectName nonTransactedTimerName, ObjectName corbaGBeanObjectName, RefContext refContext) throws MalformedObjectNameException, DeploymentException {
         super(baseDir, environment, moduleType, kernel);
-        j2eeContext = new J2eeContextImpl(getDomain(), getServer(), j2eeApplicationName == null ? NameFactory.NULL : j2eeApplicationName, NameFactory.J2EE_MODULE, NameFactory.NULL, null, null);
+        j2eeContext = NameFactory.buildJ2eeContext(environment.getProperties(), j2eeApplicationName == null ? NameFactory.NULL : j2eeApplicationName, NameFactory.J2EE_MODULE, NameFactory.NULL, null, null);
         domainObjectName = NameFactory.getDomainName(null, j2eeContext);
         serverObjectName = NameFactory.getServerName(null, null, j2eeContext);
 

Modified: geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBModule.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBModule.java?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBModule.java (original)
+++ geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBModule.java Thu Feb 16 16:35:03 2006
@@ -23,8 +23,8 @@
 
 import org.apache.xmlbeans.XmlObject;
 import org.apache.geronimo.kernel.config.ConfigurationModuleType;
+import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.deployment.DeploymentContext;
-import org.apache.geronimo.deployment.Environment;
 import org.apache.geronimo.common.DeploymentException;
 
 /**

Modified: geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/Module.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/Module.java?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/Module.java (original)
+++ geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/Module.java Thu Feb 16 16:35:03 2006
@@ -17,7 +17,6 @@
 package org.apache.geronimo.j2ee.deployment;
 
 import java.util.jar.JarFile;
-import java.util.List;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.io.IOException;
@@ -25,9 +24,9 @@
 
 import org.apache.xmlbeans.XmlObject;
 import org.apache.geronimo.kernel.config.ConfigurationModuleType;
+import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.deployment.util.DeploymentUtil;
 import org.apache.geronimo.deployment.DeploymentContext;
-import org.apache.geronimo.deployment.Environment;
 import org.apache.geronimo.common.DeploymentException;
 
 /**

Modified: geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java (original)
+++ geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java Thu Feb 16 16:35:03 2006
@@ -18,11 +18,10 @@
 
 import java.io.File;
 import java.net.URL;
-import java.net.URI;
 import java.util.jar.JarFile;
 
 import org.apache.geronimo.common.DeploymentException;
-import org.apache.geronimo.deployment.Environment;
+import org.apache.geronimo.kernel.repository.Environment;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java (original)
+++ geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java Thu Feb 16 16:35:03 2006
@@ -27,7 +27,7 @@
 
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
-import org.apache.geronimo.deployment.Environment;
+import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.ReferenceCollection;

Modified: geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/WebModule.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/WebModule.java?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/WebModule.java (original)
+++ geronimo/branches/configid/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/WebModule.java Thu Feb 16 16:35:03 2006
@@ -25,8 +25,8 @@
 
 import org.apache.xmlbeans.XmlObject;
 import org.apache.geronimo.kernel.config.ConfigurationModuleType;
+import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.deployment.DeploymentContext;
-import org.apache.geronimo.deployment.Environment;
 import org.apache.geronimo.common.DeploymentException;
 
 /**

Modified: geronimo/branches/configid/modules/j2ee-builder/src/test-ear/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/j2ee-builder/src/test-ear/META-INF/geronimo-application.xml?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/j2ee-builder/src/test-ear/META-INF/geronimo-application.xml (original)
+++ geronimo/branches/configid/modules/j2ee-builder/src/test-ear/META-INF/geronimo-application.xml Thu Feb 16 16:35:03 2006
@@ -20,18 +20,16 @@
     <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
         <configId>
             <groupId>geronimo</groupId>
-            <type>car</type>
             <artifactId>test-ear</artifactId>
             <version>1.0</version>
+            <type>car</type>
         </configId>
-        <name-key>
-            <key>domain</key>
-            <value>geronimo.test</value>
-        </name-key>
-        <name-key>
-            <key>J2EEServer</key>
-            <value>geronimo</value>
-        </name-key>
+        <properties>
+            <property>
+                <name>org.apache.geronimo.name.javax.management.j2ee.BaseName</name>
+                <value>geronimo.test:J2EEServer=geronimo</value>
+            </property>
+        </properties>
     </environment>
     <!-- a random gbean just to verify that the deployer doesn't die because of it -->
     <gbean xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1" gbeanName="foo:j2eeType=J2EEDomain,name=foo"

Modified: geronimo/branches/configid/modules/j2ee-builder/src/test-ear/test-ejb-jar/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/j2ee-builder/src/test-ear/test-ejb-jar/META-INF/openejb-jar.xml?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/j2ee-builder/src/test-ear/test-ejb-jar/META-INF/openejb-jar.xml (original)
+++ geronimo/branches/configid/modules/j2ee-builder/src/test-ear/test-ejb-jar/META-INF/openejb-jar.xml Thu Feb 16 16:35:03 2006
@@ -21,9 +21,9 @@
     <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
         <configId>
             <groupId>geronimo</groupId>
-            <type>car</type>
             <artifactId>test-ejb</artifactId>
             <version>1.0</version>
+            <type>car</type>
         </configId>
     </environment>
 

Modified: geronimo/branches/configid/modules/j2ee-builder/src/test-ear/test-rar/META-INF/geronimo-ra.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/j2ee-builder/src/test-ear/test-rar/META-INF/geronimo-ra.xml?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/j2ee-builder/src/test-ear/test-rar/META-INF/geronimo-ra.xml (original)
+++ geronimo/branches/configid/modules/j2ee-builder/src/test-ear/test-rar/META-INF/geronimo-ra.xml Thu Feb 16 16:35:03 2006
@@ -20,9 +20,9 @@
     <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
         <configId>
             <groupId>geronimo</groupId>
-            <type>car</type>
             <artifactId>test-rar</artifactId>
             <version>1.0</version>
+            <type>car</type>
         </configId>
     </environment>
 

Modified: geronimo/branches/configid/modules/j2ee-builder/src/test-ear/test-war/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/j2ee-builder/src/test-ear/test-war/WEB-INF/geronimo-web.xml?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/j2ee-builder/src/test-ear/test-war/WEB-INF/geronimo-web.xml (original)
+++ geronimo/branches/configid/modules/j2ee-builder/src/test-ear/test-war/WEB-INF/geronimo-web.xml Thu Feb 16 16:35:03 2006
@@ -20,9 +20,9 @@
     <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
         <configId>
             <groupId>geronimo</groupId>
-            <type>car</type>
             <artifactId>test-ear</artifactId>
             <version>1.0</version>
+            <type>car</type>
         </configId>
     </environment>
     <jetty:context-priority-classloader>false</jetty:context-priority-classloader>

Modified: geronimo/branches/configid/modules/j2ee-builder/src/test-ear13/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/j2ee-builder/src/test-ear13/META-INF/geronimo-application.xml?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/j2ee-builder/src/test-ear13/META-INF/geronimo-application.xml (original)
+++ geronimo/branches/configid/modules/j2ee-builder/src/test-ear13/META-INF/geronimo-application.xml Thu Feb 16 16:35:03 2006
@@ -20,18 +20,18 @@
     <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
         <configId>
             <groupId>geronimo</groupId>
-            <type>car</type>
             <artifactId>test-ear</artifactId>
             <version>1.0</version>
+            <type>car</type>
         </configId>
-        <name-key>
-            <key>domain</key>
-            <value>geronimo.test</value>
-        </name-key>
-        <name-key>
-            <key>J2EEServer</key>
-            <value>geronimo</value>
-        </name-key>
+<!--
+        <properties>
+            <property>
+                <name>org.apache.geronimo.name.javax.management.j2ee.BaseName</name>
+                <value>geronimo.test:J2EEServer=geronimo</value>
+            </property>
+        </properties>
+-->
     </environment>
 
     <!-- a random gbean just to verify that the deployer doesn't die because of it -->

Modified: geronimo/branches/configid/modules/j2ee-builder/src/test-ear13/test-ejb-jar/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/j2ee-builder/src/test-ear13/test-ejb-jar/META-INF/openejb-jar.xml?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/j2ee-builder/src/test-ear13/test-ejb-jar/META-INF/openejb-jar.xml (original)
+++ geronimo/branches/configid/modules/j2ee-builder/src/test-ear13/test-ejb-jar/META-INF/openejb-jar.xml Thu Feb 16 16:35:03 2006
@@ -21,9 +21,9 @@
     <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
         <configId>
             <groupId>geronimo</groupId>
-            <type>car</type>
             <artifactId>test-ejb</artifactId>
             <version>1.0</version>
+            <type>car</type>
         </configId>
     </environment>
 

Modified: geronimo/branches/configid/modules/j2ee-builder/src/test-ear13/test-war/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/j2ee-builder/src/test-ear13/test-war/WEB-INF/geronimo-web.xml?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/j2ee-builder/src/test-ear13/test-war/WEB-INF/geronimo-web.xml (original)
+++ geronimo/branches/configid/modules/j2ee-builder/src/test-ear13/test-war/WEB-INF/geronimo-web.xml Thu Feb 16 16:35:03 2006
@@ -20,9 +20,9 @@
     <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
         <configId>
             <groupId>geronimo</groupId>
-            <type>car</type>
             <artifactId>test-ear</artifactId>
             <version>1.0</version>
+            <type>car</type>
         </configId>
     </environment>
     <jetty:context-priority-classloader>false</jetty:context-priority-classloader>

Modified: geronimo/branches/configid/modules/j2ee-builder/src/test-plan/test-bad-car.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/j2ee-builder/src/test-plan/test-bad-car.xml?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/j2ee-builder/src/test-plan/test-bad-car.xml (original)
+++ geronimo/branches/configid/modules/j2ee-builder/src/test-plan/test-bad-car.xml Thu Feb 16 16:35:03 2006
@@ -20,9 +20,9 @@
     <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
         <configId>
             <groupId>geronimo</groupId>
-            <type>car</type>
             <artifactId>test-ear</artifactId>
             <version>1.0</version>
+            <type>car</type>
         </configId>
     </environment>
 

Modified: geronimo/branches/configid/modules/j2ee-builder/src/test-plan/test-bad-ejb-jar.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/j2ee-builder/src/test-plan/test-bad-ejb-jar.xml?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/j2ee-builder/src/test-plan/test-bad-ejb-jar.xml (original)
+++ geronimo/branches/configid/modules/j2ee-builder/src/test-plan/test-bad-ejb-jar.xml Thu Feb 16 16:35:03 2006
@@ -20,9 +20,9 @@
     <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
         <configId>
             <groupId>geronimo</groupId>
-            <type>car</type>
             <artifactId>test-ear</artifactId>
             <version>1.0</version>
+            <type>car</type>
         </configId>
     </environment>
    

Modified: geronimo/branches/configid/modules/j2ee-builder/src/test-plan/test-bad-rar.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/j2ee-builder/src/test-plan/test-bad-rar.xml?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/j2ee-builder/src/test-plan/test-bad-rar.xml (original)
+++ geronimo/branches/configid/modules/j2ee-builder/src/test-plan/test-bad-rar.xml Thu Feb 16 16:35:03 2006
@@ -20,9 +20,9 @@
     <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
         <configId>
             <groupId>geronimo</groupId>
-            <type>car</type>
             <artifactId>test-ear</artifactId>
             <version>1.0</version>
+            <type>car</type>
         </configId>
     </environment>
  

Modified: geronimo/branches/configid/modules/j2ee-builder/src/test-plan/test-bad-war.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/j2ee-builder/src/test-plan/test-bad-war.xml?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/j2ee-builder/src/test-plan/test-bad-war.xml (original)
+++ geronimo/branches/configid/modules/j2ee-builder/src/test-plan/test-bad-war.xml Thu Feb 16 16:35:03 2006
@@ -20,9 +20,9 @@
     <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
         <configId>
             <groupId>geronimo</groupId>
-            <type>car</type>
             <artifactId>test-ear</artifactId>
             <version>1.0</version>
+            <type>car</type>
         </configId>
     </environment>
     

Modified: geronimo/branches/configid/modules/j2ee-builder/src/test-unpacked-ear/META-INF/geronimo-application-alt-dd.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/j2ee-builder/src/test-unpacked-ear/META-INF/geronimo-application-alt-dd.xml?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/j2ee-builder/src/test-unpacked-ear/META-INF/geronimo-application-alt-dd.xml (original)
+++ geronimo/branches/configid/modules/j2ee-builder/src/test-unpacked-ear/META-INF/geronimo-application-alt-dd.xml Thu Feb 16 16:35:03 2006
@@ -20,18 +20,18 @@
     <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
         <configId>
             <groupId>geronimo</groupId>
-            <type>car</type>
             <artifactId>test-ear</artifactId>
             <version>1.0</version>
+            <type>car</type>
         </configId>
-        <name-key>
-            <key>domain</key>
-            <value>geronimo.test</value>
-        </name-key>
-        <name-key>
-            <key>J2EEServer</key>
-            <value>geronimo</value>
-        </name-key>
+<!--
+        <properties>
+            <property>
+                <name>org.apache.geronimo.name.javax.management.j2ee.BaseName</name>
+                <value>geronimo.test:J2EEServer=geronimo</value>
+            </property>
+        </properties>
+-->
     </environment>
 
     <module>

Modified: geronimo/branches/configid/modules/j2ee-builder/src/test-unpacked-ear/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/j2ee-builder/src/test-unpacked-ear/META-INF/geronimo-application.xml?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/j2ee-builder/src/test-unpacked-ear/META-INF/geronimo-application.xml (original)
+++ geronimo/branches/configid/modules/j2ee-builder/src/test-unpacked-ear/META-INF/geronimo-application.xml Thu Feb 16 16:35:03 2006
@@ -20,18 +20,18 @@
     <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
         <configId>
             <groupId>geronimo</groupId>
-            <type>car</type>
             <artifactId>test-ear</artifactId>
             <version>1.0</version>
+            <type>car</type>
         </configId>
-        <name-key>
-            <key>domain</key>
-            <value>geronimo.test</value>
-        </name-key>
-        <name-key>
-            <key>J2EEServer</key>
-            <value>geronimo</value>
-        </name-key>
+<!--
+        <properties>
+            <property>
+                <name>org.apache.geronimo.name.javax.management.j2ee.BaseName</name>
+                <value>geronimo.test:J2EEServer=geronimo</value>
+            </property>
+        </properties>
+-->
     </environment>
 
     <!-- a random gbean just to verify that the deployer doesn't die because of it -->

Modified: geronimo/branches/configid/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java (original)
+++ geronimo/branches/configid/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java Thu Feb 16 16:35:03 2006
@@ -23,7 +23,7 @@
 import junit.framework.TestSuite;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.deployment.DeploymentContext;
-import org.apache.geronimo.deployment.Environment;
+import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.deployment.util.DeploymentUtil;
 import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.gbean.GBeanInfo;
@@ -87,6 +87,7 @@
     protected void setUp() throws Exception {
         defaultParentId = new Environment();
         defaultParentId.getImports().add(new Artifact("geronimo", "test", "1", "car", true));
+        defaultParentId.getProperties().put(NameFactory.JSR77_BASE_NAME_PROPERTY, "geronimo.test:J2EEServer=geronimo");
     }
 
     public static Test suite() throws Exception {

Modified: geronimo/branches/configid/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java (original)
+++ geronimo/branches/configid/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java Thu Feb 16 16:35:03 2006
@@ -26,7 +26,7 @@
 import junit.framework.Assert;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.gbean.GBeanData;
-import org.apache.geronimo.deployment.Environment;
+import org.apache.geronimo.kernel.repository.Environment;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/branches/configid/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java (original)
+++ geronimo/branches/configid/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java Thu Feb 16 16:35:03 2006
@@ -27,7 +27,7 @@
 
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.gbean.GBeanData;
-import org.apache.geronimo.deployment.Environment;
+import org.apache.geronimo.kernel.repository.Environment;
 
 
 /**

Modified: geronimo/branches/configid/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java (original)
+++ geronimo/branches/configid/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java Thu Feb 16 16:35:03 2006
@@ -23,7 +23,7 @@
 
 import junit.framework.Assert;
 import org.apache.geronimo.common.DeploymentException;
-import org.apache.geronimo.deployment.Environment;
+import org.apache.geronimo.kernel.repository.Environment;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/branches/configid/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java (original)
+++ geronimo/branches/configid/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java Thu Feb 16 16:35:03 2006
@@ -17,6 +17,7 @@
 package org.apache.geronimo.j2ee.j2eeobjectnames;
 
 import java.util.Properties;
+import java.util.Map;
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
 
@@ -25,6 +26,9 @@
  */
 public class NameFactory {
 
+    public static final Object JSR77_BASE_NAME_PROPERTY = "org.apache.geronimo.name.javax.management.j2ee.BaseName";
+
+
     // Manadatory key properties from JSR77.3.1.1.1.3
     public static final String J2EE_TYPE = "j2eeType";
     public static final String J2EE_NAME = "name";
@@ -107,6 +111,17 @@
     public static final String CORBA_CSS = "CORBACSS";
     public static final String CORBA_TSS = "CORBATSS";
     public static final String WEB_SERVICE_LINK = "WSLink";
+
+    public static J2eeContext buildJ2eeContext(Map properties, String applicationName, String moduleType, String moduleName, String j2eeName, String j2eeType) throws MalformedObjectNameException {
+        String baseNameString = (String) properties.get(JSR77_BASE_NAME_PROPERTY);
+        ObjectName baseName = ObjectName.getInstance(baseNameString);
+        String domain = baseName.getDomain();
+        String serverName = baseName.getKeyProperty(J2EE_SERVER);
+        if (serverName == null) {
+            throw new MalformedObjectNameException("No J2EEServer key in " + baseNameString);
+        }
+        return new J2eeContextImpl(domain, serverName, applicationName, moduleType, moduleName, j2eeName, j2eeType);
+    }
 
     public static ObjectName getDomainName(String j2eeDomainName, J2eeContext context) throws MalformedObjectNameException {
         Properties props = new Properties();

Modified: geronimo/branches/configid/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java (original)
+++ geronimo/branches/configid/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java Thu Feb 16 16:35:03 2006
@@ -53,7 +53,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.common.DeploymentException;
-import org.apache.geronimo.deployment.Environment;
+import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.deployment.service.EnvironmentBuilder;
 import org.apache.geronimo.deployment.service.ServiceConfigBuilder;
 import org.apache.geronimo.deployment.util.DeploymentUtil;

Modified: geronimo/branches/configid/modules/jetty-builder/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/jetty-builder/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/jetty-builder/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml (original)
+++ geronimo/branches/configid/modules/jetty-builder/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml Thu Feb 16 16:35:03 2006
@@ -21,11 +21,10 @@
     <environment>
         <configId>
             <groupId>foo</groupId>
-            <type>car</type>
             <artifactId>bar</artifactId>
             <version>1</version>
+            <type>car</type>
         </configId>
-        <classLoader></classLoader>
     </environment>
 
     <jetty:context-root>/test</jetty:context-root>

Modified: geronimo/branches/configid/modules/jetty-builder/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/jetty-builder/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/jetty-builder/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml (original)
+++ geronimo/branches/configid/modules/jetty-builder/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml Thu Feb 16 16:35:03 2006
@@ -22,11 +22,10 @@
     <environment>
         <configId>
             <groupId>foo</groupId>
-            <type>car</type>
             <artifactId>bar</artifactId>
             <version>1</version>
+            <type>car</type>
         </configId>
-        <classLoader></classLoader>
     </environment>
                                                               
     <context-root>/test</context-root>

Modified: geronimo/branches/configid/modules/jetty-builder/src/test-resources/deployables/war5/WEB-INF/geronimo-jetty.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/jetty-builder/src/test-resources/deployables/war5/WEB-INF/geronimo-jetty.xml?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/jetty-builder/src/test-resources/deployables/war5/WEB-INF/geronimo-jetty.xml (original)
+++ geronimo/branches/configid/modules/jetty-builder/src/test-resources/deployables/war5/WEB-INF/geronimo-jetty.xml Thu Feb 16 16:35:03 2006
@@ -22,11 +22,10 @@
     <environment>
         <configId>
             <groupId>foo</groupId>
-            <type>car</type>
             <artifactId>bar</artifactId>
             <version>1</version>
+            <type>car</type>
         </configId>
-        <classloader></classloader>
     </environment>
                                                               
     <context-root>/test</context-root>

Modified: geronimo/branches/configid/modules/jetty-builder/src/test-resources/plans/plan1.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/jetty-builder/src/test-resources/plans/plan1.xml?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/jetty-builder/src/test-resources/plans/plan1.xml (original)
+++ geronimo/branches/configid/modules/jetty-builder/src/test-resources/plans/plan1.xml Thu Feb 16 16:35:03 2006
@@ -4,11 +4,10 @@
     <environment>
         <configId>
             <groupId>foo</groupId>
-            <type>car</type>
             <artifactId>bar</artifactId>
             <version>1</version>
+            <type>car</type>
         </configId>
-        <classloader></classloader>
     </environment>
 
     <context-priority-classloader>false</context-priority-classloader>

Modified: geronimo/branches/configid/modules/jetty-builder/src/test-resources/plans/plan1A.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/jetty-builder/src/test-resources/plans/plan1A.xml?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/jetty-builder/src/test-resources/plans/plan1A.xml (original)
+++ geronimo/branches/configid/modules/jetty-builder/src/test-resources/plans/plan1A.xml Thu Feb 16 16:35:03 2006
@@ -3,11 +3,10 @@
     <environment>
         <configId>
             <groupId>foo</groupId>
-            <type>car</type>
             <artifactId>bar</artifactId>
             <version>1</version>
+            <type>car</type>
         </configId>
-        <classloader></classloader>
     </environment>
     <context-priority-classloader>false</context-priority-classloader>
     <security-realm-name>public-properties-realm</security-realm-name>

Modified: geronimo/branches/configid/modules/jetty-builder/src/test-resources/plans/plan1B.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/jetty-builder/src/test-resources/plans/plan1B.xml?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/jetty-builder/src/test-resources/plans/plan1B.xml (original)
+++ geronimo/branches/configid/modules/jetty-builder/src/test-resources/plans/plan1B.xml Thu Feb 16 16:35:03 2006
@@ -3,11 +3,10 @@
     <environment>
         <configId>
             <groupId>foo</groupId>
-            <type>car</type>
             <artifactId>bar</artifactId>
             <version>1</version>
+            <type>car</type>
         </configId>
-        <classloader></classloader>
     </environment>
     <context-priority-classloader>false</context-priority-classloader>
     <security-realm-name>public-properties-realm</security-realm-name>

Modified: geronimo/branches/configid/modules/jetty-builder/src/test-resources/plans/plan1C.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/jetty-builder/src/test-resources/plans/plan1C.xml?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/jetty-builder/src/test-resources/plans/plan1C.xml (original)
+++ geronimo/branches/configid/modules/jetty-builder/src/test-resources/plans/plan1C.xml Thu Feb 16 16:35:03 2006
@@ -3,11 +3,10 @@
     <environment>
         <configId>
             <groupId>foo</groupId>
-            <type>car</type>
             <artifactId>bar</artifactId>
             <version>1</version>
+            <type>car</type>
         </configId>
-        <classloader></classloader>
     </environment>
 
     <context-priority-classloader>false</context-priority-classloader>

Modified: geronimo/branches/configid/modules/jetty-builder/src/test-resources/plans/plan2.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/jetty-builder/src/test-resources/plans/plan2.xml?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/jetty-builder/src/test-resources/plans/plan2.xml (original)
+++ geronimo/branches/configid/modules/jetty-builder/src/test-resources/plans/plan2.xml Thu Feb 16 16:35:03 2006
@@ -3,11 +3,10 @@
     <environment>
         <configId>
             <groupId>foo</groupId>
-            <type>car</type>
             <artifactId>bar</artifactId>
             <version>1</version>
+            <type>car</type>
         </configId>
-        <classloader></classloader>
     </environment>
     <context-priority-classloader>false</context-priority-classloader>
     <resource-ref>

Modified: geronimo/branches/configid/modules/jetty-builder/src/test-resources/plans/plan3.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/jetty-builder/src/test-resources/plans/plan3.xml?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/jetty-builder/src/test-resources/plans/plan3.xml (original)
+++ geronimo/branches/configid/modules/jetty-builder/src/test-resources/plans/plan3.xml Thu Feb 16 16:35:03 2006
@@ -3,11 +3,10 @@
     <environment>
         <configId>
             <groupId>foo</groupId>
-            <type>car</type>
             <artifactId>bar</artifactId>
             <version>1</version>
+            <type>car</type>
         </configId>
-        <classloader></classloader>
     </environment>
 
 

Modified: geronimo/branches/configid/modules/jetty-builder/src/test-resources/plans/plan4-converted.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/jetty-builder/src/test-resources/plans/plan4-converted.xml?rev=378406&r1=378405&r2=378406&view=diff
==============================================================================
--- geronimo/branches/configid/modules/jetty-builder/src/test-resources/plans/plan4-converted.xml (original)
+++ geronimo/branches/configid/modules/jetty-builder/src/test-resources/plans/plan4-converted.xml Thu Feb 16 16:35:03 2006
@@ -5,11 +5,10 @@
     <dep:environment>
         <dep:configId>
             <dep:groupId>foo</dep:groupId>
-            <dep:type>car</dep:type>
             <dep:artifactId>bar</dep:artifactId>
             <dep:version>1</dep:version>
+            <dep:type>car</dep:type>
         </dep:configId>
-        <dep:classloader/>
     </dep:environment>
     <context-priority-classloader>true</context-priority-classloader>
 



Mime
View raw message