geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r385372 [1/3] - in /geronimo/branches/1.1/modules: client-builder/src/java/org/apache/geronimo/client/builder/ client-builder/src/schema/ connector-builder/src/java/org/apache/geronimo/connector/deployment/ connector-builder/src/schema/ con...
Date Sun, 12 Mar 2006 21:44:53 GMT
Author: djencks
Date: Sun Mar 12 13:44:50 2006
New Revision: 385372

URL: http://svn.apache.org/viewcvs?rev=385372&view=rev
Log:
Work on enc builder, connector builder, abstract web builder, app client builder. Construct names the new parent>> child way.  tests don't compile.

Added:
    geronimo/branches/1.1/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/jsr88/Pattern.java   (contents, props changed)
      - copied, changed from r385036, geronimo/branches/1.1/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/jsr88/ObjectNameGroup.java
    geronimo/branches/1.1/modules/naming-builder/src/schema/geronimo-naming-1.1.xsd
    geronimo/branches/1.1/modules/naming/src/java/org/apache/geronimo/naming/reference/ConfigurationAwareReference.java
Removed:
    geronimo/branches/1.1/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/jsr88/ObjectNameGroup.java
Modified:
    geronimo/branches/1.1/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
    geronimo/branches/1.1/modules/client-builder/src/schema/geronimo-application-client-1.1.xsd
    geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
    geronimo/branches/1.1/modules/connector-builder/src/schema/geronimo-connector-1.1.xsd
    geronimo/branches/1.1/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
    geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
    geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java
    geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBReferenceBuilder.java
    geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/RefContext.java
    geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ResourceReferenceBuilder.java
    geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnavailableEJBReferenceBuilder.java
    geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EJBRefContextTest.java
    geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java
    geronimo/branches/1.1/modules/jetty-builder/src/schema/geronimo-jetty-1.1.xsd
    geronimo/branches/1.1/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java
    geronimo/branches/1.1/modules/jetty/src/java/org/apache/geronimo/jetty/JettyManagerImpl.java
    geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/AbstractName.java
    geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/AbstractNameQuery.java
    geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/GBeanNotFoundException.java
    geronimo/branches/1.1/modules/management/project.xml
    geronimo/branches/1.1/modules/management/src/java/org/apache/geronimo/management/geronimo/NetworkManager.java
    geronimo/branches/1.1/modules/management/src/java/org/apache/geronimo/management/geronimo/WebManager.java
    geronimo/branches/1.1/modules/naming-builder/maven.xml
    geronimo/branches/1.1/modules/naming-builder/project.xml
    geronimo/branches/1.1/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
    geronimo/branches/1.1/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/jsr88/GBeanLocator.java
    geronimo/branches/1.1/modules/naming-builder/src/schema/xmlconfig.xml
    geronimo/branches/1.1/modules/naming-builder/src/test/org/apache/geronimo/naming/deployment/MessageDestinationTest.java
    geronimo/branches/1.1/modules/naming/src/java/org/apache/geronimo/naming/java/ComponentContextBuilder.java
    geronimo/branches/1.1/modules/naming/src/java/org/apache/geronimo/naming/reference/GBeanProxyReference.java
    geronimo/branches/1.1/modules/naming/src/java/org/apache/geronimo/naming/reference/ORBReference.java
    geronimo/branches/1.1/modules/naming/src/java/org/apache/geronimo/naming/reference/ResourceReference.java
    geronimo/branches/1.1/modules/naming/src/test/org/apache/geronimo/naming/java/ContextBuilderTest.java
    geronimo/branches/1.1/modules/service-builder/src/schema/geronimo-config-1.1.xsd
    geronimo/branches/1.1/modules/tomcat-builder/src/schema/geronimo-tomcat-1.1.xsd
    geronimo/branches/1.1/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
    geronimo/branches/1.1/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java
    geronimo/branches/1.1/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java
    geronimo/branches/1.1/modules/web-builder/src/schema/geronimo-web-1.1.xsd

Modified: geronimo/branches/1.1/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java?rev=385372&r1=385371&r2=385372&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java (original)
+++ geronimo/branches/1.1/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java Sun Mar 12 13:44:50 2006
@@ -27,6 +27,8 @@
 import org.apache.geronimo.deployment.xbeans.EnvironmentType;
 import org.apache.geronimo.deployment.xbeans.GbeanType;
 import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
+import org.apache.geronimo.gbean.AbstractName;
+import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
@@ -39,14 +41,14 @@
 import org.apache.geronimo.j2ee.deployment.RefContext;
 import org.apache.geronimo.j2ee.deployment.ResourceReferenceBuilder;
 import org.apache.geronimo.j2ee.deployment.ServiceReferenceBuilder;
-import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.j2ee.management.impl.J2EEAppClientModuleImpl;
 import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.GBeanAlreadyExistsException;
+import org.apache.geronimo.kernel.config.ConfigurationAlreadyExistsException;
 import org.apache.geronimo.kernel.config.ConfigurationData;
 import org.apache.geronimo.kernel.config.ConfigurationModuleType;
 import org.apache.geronimo.kernel.config.ConfigurationStore;
-import org.apache.geronimo.kernel.config.ConfigurationAlreadyExistsException;
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.kernel.repository.Repository;
@@ -65,7 +67,6 @@
 import org.apache.xmlbeans.XmlException;
 import org.apache.xmlbeans.XmlObject;
 
-import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
 import java.io.File;
 import java.io.IOException;
@@ -85,18 +86,18 @@
 
 
 /**
- * @version $Rev: 384686 $ $Date$
+ * @version $Rev:385232 $ $Date$
  */
 public class AppClientModuleBuilder implements ModuleBuilder {
 
     private final Environment defaultClientEnvironment;
     private final Environment defaultServerEnvironment;
-    private final ObjectName corbaGBeanObjectName;
+    private final AbstractNameQuery corbaGBeanObjectName;
     private final Kernel kernel;
 
     private final String clientApplicationName = "client-application";
-    private final ObjectName transactionContextManagerObjectName;
-    private final ObjectName connectionTrackerObjectName;
+    private final AbstractNameQuery transactionContextManagerObjectName;
+    private final AbstractNameQuery connectionTrackerObjectName;
     private final EJBReferenceBuilder ejbReferenceBuilder;
     private final ModuleBuilder connectorModuleBuilder;
     private final ResourceReferenceBuilder resourceReferenceBuilder;
@@ -105,9 +106,9 @@
 
     public AppClientModuleBuilder(Environment defaultClientEnvironment,
             Environment defaultServerEnvironment,
-            ObjectName transactionContextManagerObjectName,
-            ObjectName connectionTrackerObjectName,
-            ObjectName corbaGBeanObjectName,
+            AbstractNameQuery transactionContextManagerObjectName,
+            AbstractNameQuery connectionTrackerObjectName,
+            AbstractNameQuery corbaGBeanObjectName,
             EJBReferenceBuilder ejbReferenceBuilder,
             ModuleBuilder connectorModuleBuilder,
             ResourceReferenceBuilder resourceReferenceBuilder,
@@ -176,7 +177,7 @@
     }
 
     GerApplicationClientType getGeronimoAppClient(Object plan, JarFile moduleFile, boolean standAlone, String targetPath, ApplicationClientType appClient, Environment environment) throws DeploymentException {
-        GerApplicationClientType gerAppClient = null;
+        GerApplicationClientType gerAppClient;
         XmlObject rawPlan = null;
         try {
             // load the geronimo-application-client.xml from either the supplied plan or from the earFile
@@ -192,6 +193,7 @@
                     }
                 }
             } catch (IOException e) {
+                //exception means we create default
             }
 
             // if we got one extract the validate it otherwise create a default one
@@ -259,7 +261,7 @@
             Artifact configId = new Artifact(earConfigId.getGroupId(), earConfigId.getArtifactId() + "_" + module.getTargetPath(), earConfigId.getVersion(), "car");
             clientEnvironment.setConfigId(configId);
         }
-        File appClientDir = null;
+        File appClientDir;
         try {
             appClientDir = configurationStore.createNewConfigurationDir(clientEnvironment.getConfigId());
         } catch (ConfigurationAlreadyExistsException e) {
@@ -292,7 +294,7 @@
     }
 
     public void addGBeans(EARContext earContext, Module module, ClassLoader earClassLoader, Repository repository) throws DeploymentException {
-        J2eeContext earJ2eeContext = earContext.getModuleName();
+        AbstractName earName = earContext.getModuleName();
 
         AppClientModule appClientModule = (AppClientModule) module;
 
@@ -301,7 +303,7 @@
 
         // get the app client main class
         JarFile moduleFile = module.getModuleFile();
-        String mainClasss = null;
+        String mainClasss;
 //        String classPath = null;
         try {
             Manifest manifest = moduleFile.getManifest();
@@ -321,13 +323,7 @@
         }
 
         // generate the object name for the app client
-        ObjectName appClientModuleName = null;
-        try {
-            //TODO consider constructing a module context
-            appClientModuleName = NameFactory.getModuleName(null, null, null, NameFactory.APP_CLIENT_MODULE, appClientModule.getName(), earJ2eeContext);
-        } catch (MalformedObjectNameException e) {
-            throw new DeploymentException("Could not construct module name", e);
-        }
+        AbstractName appClientModuleName = NameFactory.getChildName(earName, NameFactory.APP_CLIENT_MODULE, appClientModule.getName(), null);
 
         // create a gbean for the app client module and add it to the ear
         Map componentContext;
@@ -342,7 +338,11 @@
         } catch (Exception e) {
             throw new DeploymentException("Unable to initialize AppClientModule GBean", e);
         }
-        earContext.addGBean(appClientModuleGBeanData);
+        try {
+            earContext.addGBean(appClientModuleGBeanData);
+        } catch (GBeanAlreadyExistsException e) {
+            throw new DeploymentException("Could not add application client module gbean to configuration", e);
+        }
 
         EARContext appClientDeploymentContext = appClientModule.getEarContext();
         ConfigurationData appClientConfigurationData = null;
@@ -426,7 +426,7 @@
                 }
 
                 // add the app client static jndi provider
-                ObjectName jndiContextName = ObjectName.getInstance("geronimo.client:type=StaticJndiContext");
+                AbstractName jndiContextName = NameFactory.getChildName(appClientDeploymentContext.getModuleName(), "StaticJndiContext", "StaticJndiContext", null);
                 GBeanData jndiContextGBeanData = new GBeanData(jndiContextName, StaticJndiContextPlugin.GBEAN_INFO);
                 try {
                     componentContext = buildComponentContext(appClientDeploymentContext, earContext, appClientModule, appClient, geronimoAppClient, appClientClassLoader);
@@ -439,7 +439,7 @@
                 appClientDeploymentContext.addGBean(jndiContextGBeanData);
 
                 // finally add the app client container
-                ObjectName appClientContainerName = ObjectName.getInstance("geronimo.client:type=ClientContainer");
+                AbstractName appClientContainerName = NameFactory.getChildName(appClientDeploymentContext.getModuleName(), "ClientContainer", "ClientContainer", null);
                 GBeanData appClientContainerGBeanData = new GBeanData(appClientContainerName, AppClientContainer.GBEAN_INFO);
                 try {
                     appClientContainerGBeanData.setAttribute("mainClassName", mainClasss);
@@ -479,6 +479,7 @@
                     try {
                         appClientDeploymentContext.close();
                     } catch (IOException e) {
+                        //nothing we can do
                     }
                 }
             }
@@ -503,7 +504,7 @@
     }
 
     public void addManifestClassPath(DeploymentContext deploymentContext, JarFile earFile, JarFile jarFile, URI jarFileLocation) throws DeploymentException {
-        Manifest manifest = null;
+        Manifest manifest;
         try {
             manifest = jarFile.getManifest();
         } catch (IOException e) {
@@ -555,7 +556,7 @@
                     throw new DeploymentException("Cound not copy manifest class path entry into configuration: jarFile=" + jarFileLocation + ", path=" + path, e);
                 }
 
-                JarFile classPathJarFile = null;
+                JarFile classPathJarFile;
                 try {
                     classPathJarFile = new JarFile(classPathFile);
                 } catch (IOException e) {

Modified: geronimo/branches/1.1/modules/client-builder/src/schema/geronimo-application-client-1.1.xsd
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/client-builder/src/schema/geronimo-application-client-1.1.xsd?rev=385372&r1=385371&r2=385372&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/client-builder/src/schema/geronimo-application-client-1.1.xsd (original)
+++ geronimo/branches/1.1/modules/client-builder/src/schema/geronimo-application-client-1.1.xsd Sun Mar 12 13:44:50 2006
@@ -19,7 +19,7 @@
 <xs:schema
     xmlns:geronimo="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.1"
     targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.1"
-    xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.0"
+    xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1"
     xmlns:connector="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1"
     xmlns:security="http://geronimo.apache.org/xml/ns/security-1.1"
     xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.1"
@@ -28,7 +28,7 @@
     attributeFormDefault="unqualified"
     version="1.0">
 
-    <xs:import namespace="http://geronimo.apache.org/xml/ns/naming-1.0" schemaLocation="geronimo-naming-1.0.xsd"/>
+    <xs:import namespace="http://geronimo.apache.org/xml/ns/naming-1.1" schemaLocation="geronimo-naming-1.1.xsd"/>
     <xs:import namespace="http://geronimo.apache.org/xml/ns/security-1.1" schemaLocation="geronimo-security-1.1.xsd"/>
     <xs:import namespace="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1" schemaLocation="geronimo-connector-1.1.xsd"/>
     <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.1" schemaLocation="geronimo-config-1.1.xsd"/>

Modified: geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java?rev=385372&r1=385371&r2=385372&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java (original)
+++ geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java Sun Mar 12 13:44:50 2006
@@ -49,17 +49,19 @@
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.InvalidConfigurationException;
+import org.apache.geronimo.gbean.AbstractNameQuery;
+import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.j2ee.deployment.ConnectorModule;
 import org.apache.geronimo.j2ee.deployment.EARContext;
 import org.apache.geronimo.j2ee.deployment.Module;
 import org.apache.geronimo.j2ee.deployment.ModuleBuilder;
 import org.apache.geronimo.j2ee.deployment.ResourceReferenceBuilder;
-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.GBeanNotFoundException;
 import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.GBeanAlreadyExistsException;
 import org.apache.geronimo.kernel.config.ConfigurationStore;
+import org.apache.geronimo.kernel.config.Configuration;
 import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.kernel.repository.Repository;
 import org.apache.geronimo.naming.deployment.ENCConfigBuilder;
@@ -88,8 +90,6 @@
 import org.apache.xmlbeans.XmlException;
 import org.apache.xmlbeans.XmlObject;
 
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
 import javax.naming.Reference;
 import javax.xml.namespace.QName;
 import java.beans.Introspector;
@@ -122,18 +122,16 @@
     private final boolean defaultXATransactionCaching;
     private final boolean defaultXAThreadCaching;
     private final Environment defaultEnvironment;
-    private final Kernel kernel;
     private static QName CONNECTOR_QNAME = GerConnectorDocument.type.getDocumentElementName();
     static final String GERCONNECTOR_NAMESPACE = CONNECTOR_QNAME.getNamespaceURI();
 
     public ConnectorModuleBuilder(Environment defaultEnvironment,
-            int defaultMaxSize,
-            int defaultMinSize,
-            int defaultBlockingTimeoutMilliseconds,
-            int defaultIdleTimeoutMinutes,
-            boolean defaultXATransactionCaching,
-            boolean defaultXAThreadCaching,
-            Kernel kernel) {
+                                  int defaultMaxSize,
+                                  int defaultMinSize,
+                                  int defaultBlockingTimeoutMilliseconds,
+                                  int defaultIdleTimeoutMinutes,
+                                  boolean defaultXATransactionCaching,
+                                  boolean defaultXAThreadCaching) {
         this.defaultEnvironment = defaultEnvironment;
 
         this.defaultMaxSize = defaultMaxSize;
@@ -142,7 +140,6 @@
         this.defaultIdleTimeoutMinutes = defaultIdleTimeoutMinutes;
         this.defaultXATransactionCaching = defaultXATransactionCaching;
         this.defaultXAThreadCaching = defaultXAThreadCaching;
-        this.kernel = kernel;
     }
 
     public Module createModule(File plan, JarFile moduleFile) throws DeploymentException {
@@ -190,7 +187,7 @@
                             CONNECTOR_QNAME,
                             GerConnectorType.type);
                 } else {
-                    GerConnectorDocument gerConnectorDoc = null;
+                    GerConnectorDocument gerConnectorDoc;
                     ArrayList errors = new ArrayList();
                     if (plan != null) {
                         gerConnectorDoc = GerConnectorDocument.Factory.parse((File) plan, XmlBeansUtil.createXmlOptions(errors));
@@ -206,6 +203,7 @@
                     }
                 }
             } catch (IOException e) {
+                //do nothing
             }
 
             // if we got one extract the validate it otherwise create a default one
@@ -232,7 +230,6 @@
     }
 
     public void installModule(JarFile earFile, EARContext earContext, Module module, ConfigurationStore configurationStore, Repository repository) throws DeploymentException {
-        GerConnectorType vendorConnector = (GerConnectorType) module.getVendorDD();
         try {
             JarFile moduleFile = module.getModuleFile();
 
@@ -259,18 +256,19 @@
     }
 
     public void initContext(EARContext earContext, Module module, ClassLoader cl) throws DeploymentException {
-        J2eeContext earJ2eeContext = earContext.getModuleName();
-        J2eeContext moduleJ2eeContext = J2eeContextImpl.newModuleContextFromApplication(earJ2eeContext, NameFactory.RESOURCE_ADAPTER_MODULE, module.getName());
-        J2eeContext resourceJ2eeContext = J2eeContextImpl.newModuleContextFromApplication(earJ2eeContext, NameFactory.JCA_RESOURCE, module.getName());
+        ConnectorModule resourceModule = (ConnectorModule) module;
+        AbstractName resourceAdapterModuleName;
+        if (resourceModule.isStandAlone()) {
+            resourceAdapterModuleName = earContext.getModuleName();
+        } else {
+            AbstractName applicationName = earContext.getApplicationName();
+            resourceAdapterModuleName = NameFactory.getChildName(applicationName, NameFactory.RESOURCE_ADAPTER_MODULE, module.getName(), null);
+        }
+        AbstractName resourceName = NameFactory.getChildName(resourceAdapterModuleName, NameFactory.JCA_RESOURCE, module.getName(), null);
+
         final ConnectorType connector = (ConnectorType) module.getSpecDD();
 
         //set up the metadata for the ResourceAdapterModule
-        ObjectName resourceAdapterModuleName = null;
-        try {
-            resourceAdapterModuleName = NameFactory.getModuleName(null, null, null, null, null, moduleJ2eeContext);
-        } catch (MalformedObjectNameException e) {
-            throw new DeploymentException("Could not construct module name", e);
-        }
         GBeanData resourceAdapterModuleData = new GBeanData(resourceAdapterModuleName, ResourceAdapterModuleImplGBean.GBEAN_INFO);
 
         // initalize the GBean
@@ -296,7 +294,8 @@
             resourceAdapterModuleData.setAttribute("resourceAdapterGBeanData", resourceAdapterGBeanData);
         }
 
-        if (resourceadapter.isSetInboundResourceadapter() && resourceadapter.getInboundResourceadapter().isSetMessageadapter()) {
+        if (resourceadapter.isSetInboundResourceadapter() && resourceadapter.getInboundResourceadapter().isSetMessageadapter())
+        {
             Map activationSpecInfoMap = getActivationSpecInfoMap(resourceadapter.getInboundResourceadapter().getMessageadapter().getMessagelistenerArray(), cl);
             resourceAdapterModuleData.setAttribute("activationSpecInfoMap", activationSpecInfoMap);
         }
@@ -307,7 +306,11 @@
             resourceAdapterModuleData.setAttribute("managedConnectionFactoryInfoMap", managedConnectionFactoryInfoMap);
         }
 
-        earContext.addGBean(resourceAdapterModuleData);
+        try {
+            earContext.addGBean(resourceAdapterModuleData);
+        } catch (GBeanAlreadyExistsException e) {
+            throw new DeploymentException("Could not add resource adapter module gbean to context", e);
+        }
 
         //register the instances we will create later
         GerConnectorType geronimoConnector = (GerConnectorType) module.getVendorDD();
@@ -317,15 +320,16 @@
 
             if (resourceadapter.isSetResourceadapterClass()) {
                 // set the resource adapter class and activationSpec info map
-                try {
-                    if (resourceadapter.isSetInboundResourceadapter() && resourceadapter.getInboundResourceadapter().isSetMessageadapter()) {
-                        String resourceAdapterName = geronimoResourceAdapter.getResourceadapterInstance().getResourceadapterName();
-                        ObjectName resourceAdapterObjectName = NameFactory.getComponentName(null, null, null, null, null, resourceAdapterName, NameFactory.JCA_RESOURCE_ADAPTER, resourceJ2eeContext);
-                        GBeanData resourceAdapterData = new GBeanData(resourceAdapterObjectName, null);
+                if (resourceadapter.isSetInboundResourceadapter() && resourceadapter.getInboundResourceadapter().isSetMessageadapter())
+                {
+                    String resourceAdapterNameString = geronimoResourceAdapter.getResourceadapterInstance().getResourceadapterName();
+                    AbstractName resourceAdapterName = NameFactory.getChildName(resourceName, NameFactory.JCA_RESOURCE_ADAPTER, resourceAdapterNameString, null);
+                    GBeanData resourceAdapterData = new GBeanData(resourceAdapterName, null);
+                    try {
                         earContext.addGBean(resourceAdapterData);
+                    } catch (GBeanAlreadyExistsException e) {
+                        throw new DeploymentException("Could not add resource adapter gbean to context", e);
                     }
-                } catch (MalformedObjectNameException e) {
-                    throw new DeploymentException("Could not construct resource adapter instance", e);
                 }
             }
             if (geronimoResourceAdapter.isSetOutboundResourceadapter()) {
@@ -335,14 +339,13 @@
                     GerConnectiondefinitionInstanceType[] connectionDefinitionInstances = connectionDefinition.getConnectiondefinitionInstanceArray();
                     for (int j = 0; j < connectionDefinitionInstances.length; j++) {
                         GerConnectiondefinitionInstanceType connectionDefinitionInstance = connectionDefinitionInstances[j];
-                        ObjectName connectionFactoryObjectName = null;
+                        AbstractName connectionFactoryObjectName = NameFactory.getChildName(resourceName, NameFactory.JCA_MANAGED_CONNECTION_FACTORY, connectionDefinitionInstance.getName(), null);
+                        GBeanData connectionFactoryData = new GBeanData(connectionFactoryObjectName, null);
                         try {
-                            connectionFactoryObjectName = NameFactory.getComponentName(null, null, null, null, null, connectionDefinitionInstance.getName(), NameFactory.JCA_MANAGED_CONNECTION_FACTORY, resourceJ2eeContext);
-                        } catch (MalformedObjectNameException e) {
-                            throw new DeploymentException("Could not construct resource object name", e);
+                            earContext.addGBean(connectionFactoryData);
+                        } catch (GBeanAlreadyExistsException e) {
+                            throw new DeploymentException("Could not add connection factory gbean to context", e);
                         }
-                        GBeanData connectionFactoryData = new GBeanData(connectionFactoryObjectName, null);
-                        earContext.addGBean(connectionFactoryData);
                     }
                 }
             }
@@ -352,34 +355,32 @@
             for (int j = 0; j < gerAdminObject.getAdminobjectInstanceArray().length; j++) {
                 GerAdminobjectInstanceType gerAdminObjectInstance = gerAdminObject.getAdminobjectInstanceArray()[j];
 
-                ObjectName adminObjectObjectName = null;
+                AbstractName adminObjectObjectName = NameFactory.getChildName(resourceName, NameFactory.JCA_ADMIN_OBJECT, gerAdminObjectInstance.getMessageDestinationName(), null);
+                GBeanData adminObjectData = new GBeanData(adminObjectObjectName, null);
                 try {
-                    adminObjectObjectName = NameFactory.getComponentName(null, null, null, null, null, gerAdminObjectInstance.getMessageDestinationName(), NameFactory.JCA_ADMIN_OBJECT, resourceJ2eeContext);
-                } catch (MalformedObjectNameException e) {
-                    throw new DeploymentException("Could not construct resource object name", e);
+                    earContext.addGBean(adminObjectData);
+                } catch (GBeanAlreadyExistsException e) {
+                    throw new DeploymentException("Could not add admin object gbean to context", e);
                 }
-                GBeanData adminObjectData = new GBeanData(adminObjectObjectName, null);
-                earContext.addGBean(adminObjectData);
             }
         }
 
     }
 
     public void addGBeans(EARContext earContext, Module module, ClassLoader cl, Repository repository) throws DeploymentException {
-        J2eeContext earJ2eeContext = earContext.getModuleName();
-        J2eeContext moduleJ2eeContext = J2eeContextImpl.newModuleContextFromApplication(earJ2eeContext, NameFactory.RESOURCE_ADAPTER_MODULE, module.getName());
-        J2eeContext resourceJ2eeContext = J2eeContextImpl.newModuleContextFromApplication(earJ2eeContext, NameFactory.JCA_RESOURCE, module.getName());
+        ConnectorModule resourceModule = (ConnectorModule) module;
+        AbstractName resourceAdapterModuleName;
+        if (resourceModule.isStandAlone()) {
+            resourceAdapterModuleName = earContext.getModuleName();
+        } else {
+            AbstractName applicationName = earContext.getApplicationName();
+            resourceAdapterModuleName = NameFactory.getChildName(applicationName, NameFactory.RESOURCE_ADAPTER_MODULE, module.getName(), null);
+        }
+        AbstractName resourceAdapterjsr77Name = NameFactory.getChildName(resourceAdapterModuleName, NameFactory.RESOURCE_ADAPTER, module.getName(), null);
 
         XmlObject specDD = module.getSpecDD();
 
-        // build the objectName
-        ObjectName resourceAdapterModuleName = null;
-        try {
-            resourceAdapterModuleName = NameFactory.getModuleName(null, null, null, null, null, moduleJ2eeContext);
-        } catch (MalformedObjectNameException e) {
-            throw new DeploymentException("Could not construct module name", e);
-        }
-        GBeanData resourceAdapterModuleData = null;
+        GBeanData resourceAdapterModuleData;
         try {
             resourceAdapterModuleData = earContext.getGBeanInstance(resourceAdapterModuleName);
         } catch (GBeanNotFoundException e) {
@@ -388,45 +389,45 @@
         if (resourceAdapterModuleData == null) {
             throw new DeploymentException("Internal consistency bug: gbean data for module is missing: " + resourceAdapterModuleName);
         }
-        ObjectName resourceAdapterjsr77Name = null;
-        try {
-            resourceAdapterjsr77Name = NameFactory.getComponentName(null, null, null, null, null, resourceJ2eeContext.getJ2eeModuleName(), NameFactory.RESOURCE_ADAPTER, moduleJ2eeContext);
-        } catch (MalformedObjectNameException e) {
-            throw new DeploymentException("Could not construct resource adapter placeholder name", e);
-        }
-        resourceAdapterModuleData.setAttribute("resourceAdapter", resourceAdapterjsr77Name.getCanonicalName());
+        resourceAdapterModuleData.setAttribute("resourceAdapter", resourceAdapterjsr77Name.getObjectName().getCanonicalName());
 
         // add it
-        earContext.addGBean(resourceAdapterModuleData);
+        try {
+            earContext.addGBean(resourceAdapterModuleData);
+        } catch (GBeanAlreadyExistsException e) {
+            throw new DeploymentException("Could not add resource adapter module gbean to context", e);
+        }
 
         //construct the bogus resource adapter and jca resource placeholders
         GBeanData resourceAdapterData = new GBeanData(resourceAdapterjsr77Name, ResourceAdapterImplGBean.GBEAN_INFO);
-        ObjectName jcaResourcejsr77Name = null;
+        AbstractName jcaResourcejsr77Name = NameFactory.getChildName(resourceAdapterjsr77Name, NameFactory.JCA_RESOURCE, module.getName(),  null);
+        resourceAdapterData.setAttribute("JCAResource", jcaResourcejsr77Name.getObjectName().getCanonicalName());
         try {
-            //TODO double check the module type is correct.
-            jcaResourcejsr77Name = NameFactory.getComponentName(null, null, null, NameFactory.RESOURCE_ADAPTER, null, resourceJ2eeContext.getJ2eeModuleName(), NameFactory.JCA_RESOURCE, moduleJ2eeContext);
-        } catch (MalformedObjectNameException e) {
-            throw new DeploymentException("Could not construct jca resource placeholder name", e);
+            earContext.addGBean(resourceAdapterData);
+        } catch (GBeanAlreadyExistsException e) {
+            throw new DeploymentException("Could not add resource adapter gbean to context", e);
         }
-        resourceAdapterData.setAttribute("JCAResource", jcaResourcejsr77Name.getCanonicalName());
-        earContext.addGBean(resourceAdapterData);
 
         GBeanData jcaResourceData = new GBeanData(jcaResourcejsr77Name, JCAResourceImplGBean.GBEAN_INFO);
-        earContext.addGBean(jcaResourceData);
+        try {
+            earContext.addGBean(jcaResourceData);
+        } catch (GBeanAlreadyExistsException e) {
+            throw new DeploymentException("Could not add jca resource gbean to context", e);
+        }
 
         GerConnectorType geronimoConnector = (GerConnectorType) module.getVendorDD();
 
         GbeanType[] gbeans = geronimoConnector.getGbeanArray();
-        ServiceConfigBuilder.addGBeans(gbeans, cl, moduleJ2eeContext, earContext);
+        ServiceConfigBuilder.addGBeans(gbeans, cl, resourceAdapterModuleName, earContext);
 
-        addConnectorGBeans(earContext, resourceJ2eeContext, resourceAdapterModuleData, (ConnectorType) specDD, geronimoConnector, cl);
+        addConnectorGBeans(earContext, jcaResourcejsr77Name, resourceAdapterModuleData, (ConnectorType) specDD, geronimoConnector, cl);
     }
 
     public String getSchemaNamespace() {
         return GERCONNECTOR_NAMESPACE;
     }
 
-    private void addConnectorGBeans(EARContext earContext, J2eeContext moduleJ2eeContext, GBeanData resourceAdapterModuleData, ConnectorType connector, GerConnectorType geronimoConnector, ClassLoader cl) throws DeploymentException {
+    private void addConnectorGBeans(EARContext earContext, AbstractName jcaResourceName, GBeanData resourceAdapterModuleData, ConnectorType connector, GerConnectorType geronimoConnector, ClassLoader cl) throws DeploymentException {
         ResourceadapterType resourceadapter = connector.getResourceadapter();
 
         GerResourceadapterType[] geronimoResourceAdapters = geronimoConnector.getResourceadapterArray();
@@ -434,7 +435,7 @@
             GerResourceadapterType geronimoResourceAdapter = geronimoResourceAdapters[k];
 
             // Resource Adapter
-            ObjectName resourceAdapterObjectName = null;
+            AbstractName resourceAdapterAbstractName = null;
             if (resourceadapter.isSetResourceadapterClass()) {
                 GBeanData resourceAdapterGBeanData = locateResourceAdapterGBeanData(resourceAdapterModuleData);
                 GBeanData resourceAdapterInstanceGBeanData = new GBeanData(resourceAdapterGBeanData);
@@ -442,17 +443,17 @@
                 setDynamicGBeanDataAttributes(resourceAdapterInstanceGBeanData, geronimoResourceAdapter.getResourceadapterInstance().getConfigPropertySettingArray(), cl);
 
                 // set the work manager name
-                ObjectName workManagerName = ENCConfigBuilder.getGBeanId(NameFactory.JCA_WORK_MANAGER, geronimoResourceAdapter.getResourceadapterInstance().getWorkmanager(), moduleJ2eeContext, earContext, kernel);
+                AbstractNameQuery workManagerName = ENCConfigBuilder.getGBeanId(NameFactory.JCA_WORK_MANAGER, geronimoResourceAdapter.getResourceadapterInstance().getWorkmanager(), earContext);
                 resourceAdapterInstanceGBeanData.setReferencePattern("WorkManager", workManagerName);
 
                 String resourceAdapterName = geronimoResourceAdapter.getResourceadapterInstance().getResourceadapterName();
+                    resourceAdapterAbstractName = NameFactory.getChildName(jcaResourceName, NameFactory.JCA_RESOURCE_ADAPTER, resourceAdapterName, null);
+                resourceAdapterInstanceGBeanData.setAbstractName(resourceAdapterAbstractName);
                 try {
-                    resourceAdapterObjectName = NameFactory.getComponentName(null, null, null, null, null, resourceAdapterName, NameFactory.JCA_RESOURCE_ADAPTER, moduleJ2eeContext);
-                } catch (MalformedObjectNameException e) {
-                    throw new DeploymentException("Could not construct resource adapter object name", e);
+                    earContext.addGBean(resourceAdapterInstanceGBeanData);
+                } catch (GBeanAlreadyExistsException e) {
+                    throw new DeploymentException("Could not add resource adapter instance gbean to context", e);
                 }
-                resourceAdapterInstanceGBeanData.setName(resourceAdapterObjectName);
-                earContext.addGBean(resourceAdapterInstanceGBeanData);
             }
 
             // Outbound Managed Connection Factories (think JDBC data source or JMS connection factory)
@@ -463,7 +464,8 @@
                     throw new DeploymentException("Geronimo plan configures an outbound resource adapter but ra.xml does not describe any");
                 }
                 String transactionSupport = resourceadapter.getOutboundResourceadapter().getTransactionSupport().getStringValue().trim();
-                for (int i = 0; i < geronimoResourceAdapter.getOutboundResourceadapter().getConnectionDefinitionArray().length; i++) {
+                for (int i = 0; i < geronimoResourceAdapter.getOutboundResourceadapter().getConnectionDefinitionArray().length; i++)
+                {
                     GerConnectionDefinitionType geronimoConnectionDefinition = geronimoResourceAdapter.getOutboundResourceadapter().getConnectionDefinitionArray(i);
                     assert geronimoConnectionDefinition != null: "Null GeronimoConnectionDefinition";
 
@@ -474,10 +476,11 @@
                         throw new DeploymentException("No connection definition for ConnectionFactory class: " + connectionFactoryInterfaceName);
                     }
 
-                    for (int j = 0; j < geronimoConnectionDefinition.getConnectiondefinitionInstanceArray().length; j++) {
+                    for (int j = 0; j < geronimoConnectionDefinition.getConnectiondefinitionInstanceArray().length; j++)
+                    {
                         GerConnectiondefinitionInstanceType connectionfactoryInstance = geronimoConnectionDefinition.getConnectiondefinitionInstanceArray()[j];
 
-                        addOutboundGBeans(earContext, moduleJ2eeContext, resourceAdapterObjectName, connectionFactoryGBeanData, connectionfactoryInstance, transactionSupport, cl);
+                        addOutboundGBeans(earContext, jcaResourceName, resourceAdapterAbstractName, connectionFactoryGBeanData, connectionfactoryInstance, transactionSupport, cl);
                     }
                 }
             }
@@ -500,14 +503,13 @@
                 GerAdminobjectInstanceType gerAdminObjectInstance = gerAdminObject.getAdminobjectInstanceArray()[j];
                 setDynamicGBeanDataAttributes(adminObjectInstanceGBeanData, gerAdminObjectInstance.getConfigPropertySettingArray(), cl);
                 // add it
-                ObjectName adminObjectObjectName = null;
+                AbstractName adminObjectAbstractName = NameFactory.getChildName(jcaResourceName, NameFactory.JCA_ADMIN_OBJECT, gerAdminObjectInstance.getMessageDestinationName().trim(), null);
+                adminObjectInstanceGBeanData.setAbstractName(adminObjectAbstractName);
                 try {
-                    adminObjectObjectName = NameFactory.getComponentName(null, null, null, null, null, gerAdminObjectInstance.getMessageDestinationName(), NameFactory.JCA_ADMIN_OBJECT, moduleJ2eeContext);
-                } catch (MalformedObjectNameException e) {
-                    throw new DeploymentException("Could not construct admin object object name", e);
+                    earContext.addGBean(adminObjectInstanceGBeanData);
+                } catch (GBeanAlreadyExistsException e) {
+                    throw new DeploymentException("Could not add admin object gbean to context", e);
                 }
-                adminObjectInstanceGBeanData.setName(adminObjectObjectName);
-                earContext.addGBean(adminObjectInstanceGBeanData);
             }
         }
     }
@@ -524,7 +526,7 @@
             //add all javabean properties that have both getter and setter.  Ignore the "required" flag from the dd.
             Map getters = new HashMap();
             Set setters = new HashSet();
-            Method[] methods = null;
+            Method[] methods;
             try {
                 Class activationSpecClass = cl.loadClass(activationSpecClassName);
                 methods = activationSpecClass.getMethods();
@@ -534,7 +536,8 @@
             for (int j = 0; j < methods.length; j++) {
                 Method method = methods[j];
                 String methodName = method.getName();
-                if ((methodName.startsWith("get") || methodName.startsWith("is")) && method.getParameterTypes().length == 0) {
+                if ((methodName.startsWith("get") || methodName.startsWith("is")) && method.getParameterTypes().length == 0)
+                {
                     String attributeName = (methodName.startsWith("get")) ? methodName.substring(3) : methodName.substring(2);
                     getters.put(Introspector.decapitalize(attributeName), method.getReturnType().getName());
                 } else if (methodName.startsWith("set") && method.getParameterTypes().length == 1) {
@@ -652,8 +655,8 @@
         }
 
         // Handle numeric fields with no value set
-        if(value.equals("")) {
-            if(Number.class.isAssignableFrom(clazz) || Date.class.isAssignableFrom(clazz)) {
+        if (value.equals("")) {
+            if (Number.class.isAssignableFrom(clazz) || Date.class.isAssignableFrom(clazz)) {
                 return null;
             }
         }
@@ -663,23 +666,18 @@
         return editor.getValue();
     }
 
-    private ObjectName configureConnectionManager(EARContext earContext, J2eeContext j2eeContext, String ddTransactionSupport, GerConnectiondefinitionInstanceType connectionfactoryInstance, ClassLoader cl) throws DeploymentException {
+    private AbstractName configureConnectionManager(EARContext earContext, AbstractName jcaResourceName, String ddTransactionSupport, GerConnectiondefinitionInstanceType connectionfactoryInstance, ClassLoader cl) throws DeploymentException {
 //        if (connectionfactoryInstance.getConnectionmanagerRef() != null) {
-            //we don't configure anything, just use the supplied gbean
+        //we don't configure anything, just use the supplied gbean
 //            try {
-//                return ObjectName.getInstance(connectionfactoryInstance.getConnectionmanagerRef());
-//            } catch (MalformedObjectNameException e) {
-//                throw new DeploymentException("Invalid ObjectName string supplied for ConnectionManager reference", e);
+//                return AbstractName.getInstance(connectionfactoryInstance.getConnectionmanagerRef());
+//            } catch (MalformedAbstractNameException e) {
+//                throw new DeploymentException("Invalid AbstractName string supplied for ConnectionManager reference", e);
 //            }
 //        }
 
         // create the object name for our connection manager
-        ObjectName connectionManagerObjectName = null;
-        try {
-            connectionManagerObjectName = NameFactory.getComponentName(null, null, null, null, null, connectionfactoryInstance.getName(), NameFactory.JCA_CONNECTION_MANAGER, j2eeContext);
-        } catch (MalformedObjectNameException e) {
-            throw new DeploymentException("Could not construct connection manager object name", e);
-        }
+        AbstractName connectionManagerAbstractName = NameFactory.getChildName(jcaResourceName, NameFactory.JCA_CONNECTION_MANAGER, connectionfactoryInstance.getName().trim(), null);
 
         // create the data holder for our connection manager
         GBeanInfo gbeanInfo;
@@ -688,11 +686,11 @@
         } catch (InvalidConfigurationException e) {
             throw new DeploymentException("Unable to create GMBean", e);
         }
-        GBeanData connectionManagerGBean = new GBeanData(connectionManagerObjectName, gbeanInfo);
+        GBeanData connectionManagerGBean = new GBeanData(connectionManagerAbstractName, gbeanInfo);
 
         //we configure our connection manager
         GerConnectionmanagerType connectionManager = connectionfactoryInstance.getConnectionmanager();
-        TransactionSupport transactionSupport = null;
+        TransactionSupport transactionSupport;
         if (connectionManager.isSetNoTransaction()) {
             transactionSupport = NoTransactions.INSTANCE;
         } else if (connectionManager.isSetLocalTransaction()) {
@@ -712,7 +710,7 @@
             //this should not happen
             throw new DeploymentException("Unexpected transaction support element");
         }
-        PoolingSupport pooling = null;
+        PoolingSupport pooling;
         if (connectionManager.getSinglePool() != null) {
             GerSinglepoolType pool = connectionManager.getSinglePool();
 
@@ -743,34 +741,32 @@
             connectionManagerGBean.setAttribute("transactionSupport", transactionSupport);
             connectionManagerGBean.setAttribute("pooling", pooling);
             connectionManagerGBean.setReferencePattern("ConnectionTracker", earContext.getConnectionTrackerObjectName());
-            connectionManagerGBean.setAttribute("containerManagedSecurity", new Boolean(connectionManager.isSetContainerManagedSecurity()));
+            connectionManagerGBean.setAttribute("containerManagedSecurity", Boolean.valueOf(connectionManager.isSetContainerManagedSecurity()));
             connectionManagerGBean.setReferencePattern("TransactionContextManager", earContext.getTransactionContextManagerObjectName());
         } catch (Exception e) {
             throw new DeploymentException("Problem setting up ConnectionManager", e);
         }
 
-        earContext.addGBean(connectionManagerGBean);
-        return connectionManagerObjectName;
+        try {
+            earContext.addGBean(connectionManagerGBean);
+        } catch (GBeanAlreadyExistsException e) {
+            throw new DeploymentException("Could not add connection manager gbean to context", e);
+        }
+        return connectionManagerAbstractName;
     }
 
-    private void addOutboundGBeans(EARContext earContext,
-                                   J2eeContext j2eeContext,
-                                   ObjectName resourceAdapterObjectName,
-                                   GBeanData managedConnectionFactoryPrototypeGBeanData,
-                                   GerConnectiondefinitionInstanceType connectiondefinitionInstance,
-                                   String transactionSupport,
-                                   ClassLoader cl) throws DeploymentException {
+    private void addOutboundGBeans(EARContext earContext, AbstractName jcaResourceName, AbstractName resourceAdapterAbstractName, GBeanData managedConnectionFactoryPrototypeGBeanData, GerConnectiondefinitionInstanceType connectiondefinitionInstance, String transactionSupport, ClassLoader cl) throws DeploymentException {
         GBeanData managedConnectionFactoryInstanceGBeanData = new GBeanData(managedConnectionFactoryPrototypeGBeanData);
         // ConnectionManager
-        ObjectName connectionManagerObjectName = configureConnectionManager(earContext, j2eeContext, transactionSupport, connectiondefinitionInstance, cl);
+        AbstractName connectionManagerAbstractName = configureConnectionManager(earContext, jcaResourceName, transactionSupport, connectiondefinitionInstance, cl);
 
         // ManagedConnectionFactory
         setDynamicGBeanDataAttributes(managedConnectionFactoryInstanceGBeanData, connectiondefinitionInstance.getConfigPropertySettingArray(), cl);
         try {
-            if (resourceAdapterObjectName != null) {
-                managedConnectionFactoryInstanceGBeanData.setReferencePattern("ResourceAdapterWrapper", resourceAdapterObjectName);
+            if (resourceAdapterAbstractName != null) {
+                managedConnectionFactoryInstanceGBeanData.setReferencePattern("ResourceAdapterWrapper", resourceAdapterAbstractName);
             }
-            managedConnectionFactoryInstanceGBeanData.setReferencePattern("ConnectionManagerContainer", connectionManagerObjectName);
+            managedConnectionFactoryInstanceGBeanData.setReferencePattern("ConnectionManagerContainer", connectionManagerAbstractName);
             //additional interfaces implemented by connection factory
             String[] implementedInterfaces = connectiondefinitionInstance.getImplementedInterfaceArray();
             if (implementedInterfaces != null) {
@@ -786,36 +782,34 @@
             throw new DeploymentException(e);
         }
 
-        ObjectName managedConnectionFactoryObjectName = null;
+        AbstractName managedConnectionFactoryAbstractName = NameFactory.getChildName(jcaResourceName, NameFactory.JCA_MANAGED_CONNECTION_FACTORY, connectiondefinitionInstance.getName().trim(), null);
+        managedConnectionFactoryInstanceGBeanData.setAbstractName(managedConnectionFactoryAbstractName);
         try {
-            managedConnectionFactoryObjectName = NameFactory.getComponentName(null, null, null, null, null, connectiondefinitionInstance.getName(), NameFactory.JCA_MANAGED_CONNECTION_FACTORY, j2eeContext);
-        } catch (MalformedObjectNameException e) {
-            throw new DeploymentException("Could not construct managed connection factory object name", e);
+            earContext.addGBean(managedConnectionFactoryInstanceGBeanData);
+        } catch (GBeanAlreadyExistsException e) {
+            throw new DeploymentException("Could not add managed connection factory gbean to context", e);
         }
-        managedConnectionFactoryInstanceGBeanData.setName(managedConnectionFactoryObjectName);
-        earContext.addGBean(managedConnectionFactoryInstanceGBeanData);
 
         // ConnectionFactory
-        ObjectName connectionFactoryObjectName = null;
-        try {
-            connectionFactoryObjectName = NameFactory.getComponentName(null, null, null, null, null, connectiondefinitionInstance.getName(), NameFactory.JCA_CONNECTION_FACTORY, j2eeContext);
-        } catch (MalformedObjectNameException e) {
-            throw new DeploymentException("Could not construct connection factory object name", e);
-        }
-        GBeanData connectionFactoryGBeanData = new GBeanData(connectionFactoryObjectName, JCAConnectionFactoryImplGBean.GBEAN_INFO);
+        AbstractName connectionFactoryAbstractName = NameFactory.getChildName(jcaResourceName, NameFactory.JCA_CONNECTION_FACTORY, connectiondefinitionInstance.getName().trim(), null);
+        GBeanData connectionFactoryGBeanData = new GBeanData(connectionFactoryAbstractName, JCAConnectionFactoryImplGBean.GBEAN_INFO);
         connectionFactoryGBeanData.setReferencePattern("J2EEServer", earContext.getServerObjectName());
-        connectionFactoryGBeanData.setAttribute("managedConnectionFactory", managedConnectionFactoryObjectName.getCanonicalName());
+        connectionFactoryGBeanData.setAttribute("managedConnectionFactory", managedConnectionFactoryAbstractName.getObjectName().getCanonicalName());
 
-        earContext.addGBean(connectionFactoryGBeanData);
+        try {
+            earContext.addGBean(connectionFactoryGBeanData);
+        } catch (GBeanAlreadyExistsException e) {
+            throw new DeploymentException("Could not add connection factory gbean to context", e);
+        }
     }
 
     //ResourceReferenceBuilder implementation
-    public Reference createResourceRef(String containerId, Class iface) throws DeploymentException {
-        return new ResourceReference(containerId, iface);
+    public Reference createResourceRef(AbstractNameQuery containerId, Class iface, Configuration configuration) throws DeploymentException {
+        return new ResourceReference(configuration.getId(), containerId, iface);
     }
 
-    public Reference createAdminObjectRef(String containerId, Class iface) throws DeploymentException {
-        return new ResourceReference(containerId, iface);
+    public Reference createAdminObjectRef(AbstractNameQuery containerId, Class iface, Configuration configuration) throws DeploymentException {
+        return new ResourceReference(configuration.getId(), containerId, iface);
     }
 
     public GBeanData locateActivationSpecInfo(GBeanData resourceAdapterModuleData, String messageListenerInterface) throws DeploymentException {
@@ -863,19 +857,16 @@
         infoBuilder.addAttribute("defaultXATransactionCaching", boolean.class, true, true);
         infoBuilder.addAttribute("defaultXAThreadCaching", boolean.class, true, true);
 
-        infoBuilder.addAttribute("kernel", Kernel.class, false);
-
         infoBuilder.addInterface(ModuleBuilder.class);
         infoBuilder.addInterface(ResourceReferenceBuilder.class);
 
         infoBuilder.setConstructor(new String[]{"defaultEnvironment",
-                                                "defaultMaxSize",
-                                                "defaultMinSize",
-                                                "defaultBlockingTimeoutMilliseconds",
-                                                "defaultIdleTimeoutMinutes",
-                                                "defaultXATransactionCaching",
-                                                "defaultXAThreadCaching",
-                                                "kernel"});
+                "defaultMaxSize",
+                "defaultMinSize",
+                "defaultBlockingTimeoutMilliseconds",
+                "defaultIdleTimeoutMinutes",
+                "defaultXATransactionCaching",
+                "defaultXAThreadCaching"});
         GBEAN_INFO = infoBuilder.getBeanInfo();
     }
 

Modified: geronimo/branches/1.1/modules/connector-builder/src/schema/geronimo-connector-1.1.xsd
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/connector-builder/src/schema/geronimo-connector-1.1.xsd?rev=385372&r1=385371&r2=385372&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/connector-builder/src/schema/geronimo-connector-1.1.xsd (original)
+++ geronimo/branches/1.1/modules/connector-builder/src/schema/geronimo-connector-1.1.xsd Sun Mar 12 13:44:50 2006
@@ -18,14 +18,14 @@
 
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema"
     xmlns:ger="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1"
-    xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.0"
+    xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1"
     xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.1"
     targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     elementFormDefault="qualified"
     attributeFormDefault="unqualified">
 
-    <xs:import namespace="http://geronimo.apache.org/xml/ns/naming-1.0" schemaLocation="geronimo-naming-1.0.xsd"/>
+    <xs:import namespace="http://geronimo.apache.org/xml/ns/naming-1.1" schemaLocation="geronimo-naming-1.1.xsd"/>
     <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.1" schemaLocation="geronimo-config-1.1.xsd"/>
     <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
 

Modified: geronimo/branches/1.1/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java?rev=385372&r1=385371&r2=385372&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java (original)
+++ geronimo/branches/1.1/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java Sun Mar 12 13:44:50 2006
@@ -26,6 +26,7 @@
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.AbstractName;
+import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.j2ee.deployment.EARConfigBuilder;
 import org.apache.geronimo.j2ee.deployment.EARContext;
 import org.apache.geronimo.j2ee.deployment.EJBReferenceBuilder;
@@ -83,7 +84,7 @@
 import java.util.jar.JarFile;
 
 /**
- * @version $Rev: 384933 $ $Date$
+ * @version $Rev:385232 $ $Date$
  */
 public class ConnectorModuleBuilderTest extends TestCase {
     private static final File basedir = new File(System.getProperty("basedir", System.getProperty("user.dir")));
@@ -138,11 +139,11 @@
 
     private ResourceReferenceBuilder resourceReferenceBuilder = new ResourceReferenceBuilder() {
 
-        public Reference createResourceRef(String containerId, Class iface) {
+        public Reference createResourceRef(AbstractNameQuery containerId, Class iface, Configuration configuration) {
             return null;
         }
 
-        public Reference createAdminObjectRef(String containerId, Class iface) {
+        public Reference createAdminObjectRef(AbstractNameQuery containerId, Class iface, Configuration configuration) {
             return null;
         }
 

Modified: geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java?rev=385372&r1=385371&r2=385372&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java Sun Mar 12 13:44:50 2006
@@ -30,6 +30,7 @@
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.AbstractName;
+import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.j2ee.ApplicationInfo;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.j2ee.management.impl.J2EEApplicationImpl;
@@ -74,7 +75,7 @@
 import java.util.zip.ZipEntry;
 
 /**
- * @version $Rev: 384686 $ $Date$
+ * @version $Rev:385232 $ $Date$
  */
 public class EARConfigBuilder implements ConfigurationBuilder {
 
@@ -91,15 +92,15 @@
     private final ServiceReferenceBuilder serviceReferenceBuilder;
 
     private final Environment defaultEnvironment;
-    private final AbstractName transactionContextManagerObjectName;
-    private final AbstractName connectionTrackerObjectName;
-    private final AbstractName transactionalTimerObjectName;
-    private final AbstractName nonTransactionalTimerObjectName;
-    private final AbstractName corbaGBeanObjectName;
+    private final AbstractNameQuery transactionContextManagerObjectName;
+    private final AbstractNameQuery connectionTrackerObjectName;
+    private final AbstractNameQuery transactionalTimerObjectName;
+    private final AbstractNameQuery nonTransactionalTimerObjectName;
+    private final AbstractNameQuery corbaGBeanObjectName;
     private static final String DEFAULT_GROUPID = "defaultGroupId";
 
 
-    public EARConfigBuilder(Environment defaultEnvironment, AbstractName transactionContextManagerAbstractName, AbstractName connectionTrackerAbstractName, AbstractName transactionalTimerAbstractName, AbstractName nonTransactionalTimerAbstractName, AbstractName corbaGBeanAbstractName, Repository repository, ModuleBuilder ejbConfigBuilder, EJBReferenceBuilder ejbReferenceBuilder, ModuleBuilder webConfigBuilder, ModuleBuilder connectorConfigBuilder, ResourceReferenceBuilder resourceReferenceBuilder, ModuleBuilder appClientConfigBuilder, ServiceReferenceBuilder serviceReferenceBuilder, Kernel kernel) {
+    public EARConfigBuilder(Environment defaultEnvironment, AbstractNameQuery transactionContextManagerAbstractName, AbstractNameQuery connectionTrackerAbstractName, AbstractNameQuery transactionalTimerAbstractName, AbstractNameQuery nonTransactionalTimerAbstractName, AbstractNameQuery corbaGBeanAbstractName, Repository repository, ModuleBuilder ejbConfigBuilder, EJBReferenceBuilder ejbReferenceBuilder, ModuleBuilder webConfigBuilder, ModuleBuilder connectorConfigBuilder, ResourceReferenceBuilder resourceReferenceBuilder, ModuleBuilder appClientConfigBuilder, ServiceReferenceBuilder serviceReferenceBuilder, Kernel kernel) {
         this.kernel = kernel;
         this.repository = repository;
         this.defaultEnvironment = defaultEnvironment;

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=385372&r1=385371&r2=385372&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 Sun Mar 12 13:44:50 2006
@@ -25,6 +25,7 @@
 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.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.config.ConfigurationModuleType;
@@ -32,20 +33,20 @@
 import org.apache.geronimo.security.deployment.SecurityConfiguration;
 
 /**
- * @version $Rev: 384686 $ $Date$
+ * @version $Rev$ $Date$
  */
 public class EARContext extends DeploymentContext implements NamingContext {
     private final AbstractName domainObjectName;
     private final AbstractName serverObjectName;
     private final AbstractName applicationName;
 
-    private final AbstractName transactionContextManagerObjectName;
-    private final AbstractName connectionTrackerObjectName;
+    private final AbstractNameQuery transactionContextManagerObjectName;
+    private final AbstractNameQuery connectionTrackerObjectName;
 
-    private final AbstractName transactedTimerName;
-    private final AbstractName nonTransactedTimerName;
+    private final AbstractNameQuery transactedTimerName;
+    private final AbstractNameQuery nonTransactedTimerName;
 
-    private final AbstractName corbaGBeanObjectName;
+    private final AbstractNameQuery corbaGBeanObjectName;
 
     private final RefContext refContext;
     private final AbstractName moduleName;
@@ -54,7 +55,7 @@
     private AbstractName jaccManagerName;
     private SecurityConfiguration securityConfiguration;
 
-    public EARContext(File baseDir, Environment environment, ConfigurationModuleType moduleType, Kernel kernel, String j2eeApplicationName, AbstractName transactionContextManagerObjectName, AbstractName connectionTrackerObjectName, AbstractName transactedTimerName, AbstractName nonTransactedTimerName, AbstractName corbaGBeanObjectName, RefContext refContext) throws MalformedObjectNameException, DeploymentException {
+    public EARContext(File baseDir, Environment environment, ConfigurationModuleType moduleType, Kernel kernel, String j2eeApplicationName, AbstractNameQuery transactionContextManagerObjectName, AbstractNameQuery connectionTrackerObjectName, AbstractNameQuery transactedTimerName, AbstractNameQuery nonTransactedTimerName, AbstractNameQuery corbaGBeanObjectName, RefContext refContext) throws MalformedObjectNameException, DeploymentException {
         super(baseDir, environment, moduleType, kernel);
         if (moduleType.equals(ConfigurationModuleType.EAR)) {
             moduleName = NameFactory.buildApplicationName(environment.getProperties(), environment.getConfigId());
@@ -99,23 +100,23 @@
         return applicationName;
     }
 
-    public AbstractName getTransactionContextManagerObjectName() {
+    public AbstractNameQuery getTransactionContextManagerObjectName() {
         return transactionContextManagerObjectName;
     }
 
-    public AbstractName getConnectionTrackerObjectName() {
+    public AbstractNameQuery getConnectionTrackerObjectName() {
         return connectionTrackerObjectName;
     }
 
-    public AbstractName getTransactedTimerName() {
+    public AbstractNameQuery getTransactedTimerName() {
         return transactedTimerName;
     }
 
-    public AbstractName getNonTransactedTimerName() {
+    public AbstractNameQuery getNonTransactedTimerName() {
         return nonTransactedTimerName;
     }
 
-    public AbstractName getCORBAGBeanObjectName() {
+    public AbstractNameQuery getCORBAGBeanObjectName() {
         return corbaGBeanObjectName;
     }
 

Modified: geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBReferenceBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBReferenceBuilder.java?rev=385372&r1=385371&r2=385372&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBReferenceBuilder.java (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBReferenceBuilder.java Sun Mar 12 13:44:50 2006
@@ -22,6 +22,8 @@
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.gbean.AbstractName;
+import org.apache.geronimo.gbean.AbstractNameQuery;
+import org.apache.geronimo.kernel.repository.Artifact;
 
 
 /**
@@ -33,7 +35,7 @@
 
     Reference createEJBRemoteReference(String objectName, GBeanData gbeanData, boolean isSession, String home, String remote) throws DeploymentException;
 
-    Reference createCORBAReference(URI corbaURL, String objectName, AbstractName containerName, String home) throws DeploymentException;
+    Reference createCORBAReference(Artifact configId, AbstractNameQuery containerNameQuery, URI nsCorbaloc, String objectName, String home) throws DeploymentException;
 
     Object createHandleDelegateReference() throws DeploymentException;
 

Modified: geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/RefContext.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/RefContext.java?rev=385372&r1=385371&r2=385372&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/RefContext.java (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/RefContext.java Sun Mar 12 13:44:50 2006
@@ -35,6 +35,8 @@
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.kernel.GBeanNotFoundException;
 import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.repository.Artifact;
+import org.apache.geronimo.kernel.config.Configuration;
 
 
 /**
@@ -88,8 +90,8 @@
         return ejbReferenceBuilder.createEJBRemoteReference(objectName, null, isSession, home, remote);
     }
 
-    public Reference getCORBARemoteRef(URI corbaURL, String objectName, AbstractName containerName, String home) throws DeploymentException {
-        return ejbReferenceBuilder.createCORBAReference(corbaURL, objectName, containerName, home);
+    public Reference getCORBARemoteRef(Artifact configId, AbstractNameQuery containerNameQuery, URI nsCorbaloc, String objectName, String home) throws DeploymentException {
+        return ejbReferenceBuilder.createCORBAReference(configId, containerNameQuery, nsCorbaloc, objectName, home);
     }
 
     public Reference getEJBLocalRef(String objectName, boolean isSession, String localHome, String local) throws DeploymentException {
@@ -110,12 +112,12 @@
         return ejbReferenceBuilder.createEJBLocalReference(containerData.getName().getCanonicalName(), containerData, isSession, localHome, local);
     }
 
-    public Reference getConnectionFactoryRef(String containerId, Class iface) throws DeploymentException {
-        return resourceReferenceBuilder.createResourceRef(containerId, iface);
+    public Reference getConnectionFactoryRef(AbstractNameQuery containerId, Class iface, Configuration configuration) throws DeploymentException {
+        return resourceReferenceBuilder.createResourceRef(containerId, iface, configuration);
     }
 
-    public Reference getAdminObjectRef(String containerId, Class iface) throws DeploymentException {
-        return resourceReferenceBuilder.createAdminObjectRef(containerId, iface);
+    public Reference getAdminObjectRef(AbstractNameQuery containerId, Class iface, Configuration configuration) throws DeploymentException {
+        return resourceReferenceBuilder.createAdminObjectRef(containerId, iface, configuration);
     }
 
     public Object getServiceReference(Class serviceInterface, URI wsdlURI, URI jaxrpcMappingURI, QName serviceQName, Map portComponentRefMap, List handlerInfos, Object serviceRefType, DeploymentContext deploymentContext, Module module, ClassLoader classLoader) throws DeploymentException {

Modified: geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ResourceReferenceBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ResourceReferenceBuilder.java?rev=385372&r1=385371&r2=385372&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ResourceReferenceBuilder.java (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ResourceReferenceBuilder.java Sun Mar 12 13:44:50 2006
@@ -20,15 +20,17 @@
 
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.gbean.GBeanData;
+import org.apache.geronimo.gbean.AbstractNameQuery;
+import org.apache.geronimo.kernel.config.Configuration;
 
 /**
  * @version $Rev$ $Date$
  */
 public interface ResourceReferenceBuilder {
 
-    Reference createResourceRef(String containerId, Class iface) throws DeploymentException;
+    Reference createResourceRef(AbstractNameQuery containerId, Class iface, Configuration configuration) throws DeploymentException;
 
-    Reference createAdminObjectRef(String containerId, Class iface) throws DeploymentException;
+    Reference createAdminObjectRef(AbstractNameQuery containerId, Class iface, Configuration configuration) throws DeploymentException;
 
     GBeanData locateActivationSpecInfo(GBeanData resourceAdapterModuleData, String messageListenerInterface) throws DeploymentException;
 

Modified: geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnavailableEJBReferenceBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnavailableEJBReferenceBuilder.java?rev=385372&r1=385371&r2=385372&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnavailableEJBReferenceBuilder.java (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnavailableEJBReferenceBuilder.java Sun Mar 12 13:44:50 2006
@@ -24,7 +24,9 @@
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.gbean.AbstractName;
+import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.apache.geronimo.kernel.repository.Artifact;
 
 /**
  * @version $Rev$ $Date$
@@ -39,7 +41,7 @@
         throw new DeploymentException("EJB references are unavailable in this configuration");
     }
 
-    public Reference createCORBAReference(URI corbaURL, String objectName, AbstractName containerName, String home) throws DeploymentException {
+    public Reference createCORBAReference(Artifact configId, AbstractNameQuery containerNameQuery, URI nsCorbaloc, String objectName, String home) throws DeploymentException {
         throw new DeploymentException("EJB references are unavailable in this configuration");
     }
 

Modified: geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EJBRefContextTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EJBRefContextTest.java?rev=385372&r1=385371&r2=385372&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EJBRefContextTest.java (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EJBRefContextTest.java Sun Mar 12 13:44:50 2006
@@ -29,8 +29,10 @@
 import org.apache.geronimo.deployment.DeploymentContext;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.GBeanData;
+import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.kernel.repository.Artifact;
+import org.apache.geronimo.kernel.config.Configuration;
 
 /**
  * @version $Rev$ $Date$
@@ -250,11 +252,11 @@
     }
 
     private static class MockResourceReferenceBuilder implements ResourceReferenceBuilder {
-        public Reference createResourceRef(String containerId, Class iface) {
+        public Reference createResourceRef(AbstractNameQuery containerId, Class iface, Configuration configuration) {
             return null;
         }
 
-        public Reference createAdminObjectRef(String containerId, Class iface) {
+        public Reference createAdminObjectRef(AbstractNameQuery containerId, Class iface, Configuration configuration) {
             return null;
         }
 

Modified: geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java?rev=385372&r1=385371&r2=385372&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java Sun Mar 12 13:44:50 2006
@@ -19,7 +19,9 @@
 import junit.framework.Assert;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.gbean.GBeanData;
+import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.kernel.config.ConfigurationStore;
+import org.apache.geronimo.kernel.config.Configuration;
 import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.kernel.repository.Repository;
 
@@ -75,11 +77,11 @@
         return null;
     }
 
-    public Reference createResourceRef(String containerId, Class iface) throws DeploymentException {
+    public Reference createResourceRef(AbstractNameQuery containerId, Class iface, Configuration configuration) throws DeploymentException {
         return null;
     }
 
-    public Reference createAdminObjectRef(String containerId, Class iface) throws DeploymentException {
+    public Reference createAdminObjectRef(AbstractNameQuery containerId, Class iface, Configuration configuration) throws DeploymentException {
         return null;
     }
 

Modified: geronimo/branches/1.1/modules/jetty-builder/src/schema/geronimo-jetty-1.1.xsd
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/jetty-builder/src/schema/geronimo-jetty-1.1.xsd?rev=385372&r1=385371&r2=385372&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty-builder/src/schema/geronimo-jetty-1.1.xsd (original)
+++ geronimo/branches/1.1/modules/jetty-builder/src/schema/geronimo-jetty-1.1.xsd Sun Mar 12 13:44:50 2006
@@ -19,7 +19,7 @@
 <xs:schema
     xmlns:web="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1"
     targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1"
-    xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.0"
+    xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1"
     xmlns:security="http://geronimo.apache.org/xml/ns/security-1.1"
     xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.1"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
@@ -27,7 +27,7 @@
     attributeFormDefault="unqualified"
     version="1.0">
 
-    <xs:import namespace="http://geronimo.apache.org/xml/ns/naming-1.0" schemaLocation="geronimo-naming-1.0.xsd"/>
+    <xs:import namespace="http://geronimo.apache.org/xml/ns/naming-1.1" schemaLocation="geronimo-naming-1.1.xsd"/>
     <xs:import namespace="http://geronimo.apache.org/xml/ns/security-1.1" schemaLocation="geronimo-security-1.1.xsd"/>
     <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.1" schemaLocation="geronimo-config-1.1.xsd"/>
 

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=385372&r1=385371&r2=385372&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 Sun Mar 12 13:44:50 2006
@@ -44,6 +44,7 @@
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.AbstractName;
+import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.j2ee.deployment.EARContext;
 import org.apache.geronimo.j2ee.deployment.EJBReferenceBuilder;
 import org.apache.geronimo.j2ee.deployment.Module;
@@ -82,7 +83,7 @@
 import org.apache.geronimo.transaction.manager.TransactionManagerImplGBean;
 
 /**
- * @version $Rev: 384933 $ $Date$
+ * @version $Rev:385232 $ $Date$
  */
 public class JettyModuleBuilderTest extends TestCase {
     private String DOMAIN_NAME = "geronimo.test";
@@ -195,11 +196,11 @@
                 },
                 new ResourceReferenceBuilder() {
 
-                    public Reference createResourceRef(String containerId, Class iface) throws DeploymentException {
+                    public Reference createResourceRef(AbstractNameQuery containerId, Class iface, Configuration configuration) throws DeploymentException {
                         return null;
                     }
 
-                    public Reference createAdminObjectRef(String containerId, Class iface) throws DeploymentException {
+                    public Reference createAdminObjectRef(AbstractNameQuery containerId, Class iface, Configuration configuration) throws DeploymentException {
                         return null;
                     }
 



Mime
View raw message