[openejb-scm] [2550] branches/v2_1/openejb2/modules/core/src/java/org/openejb/server/httpd: Added Naming class to kernel to abstract name construction rules.

Mon, 13 Mar 2006 13:11:45 -0800

Title: [2550] branches/v2_1/openejb2/modules/core/src/java/org/openejb/server/httpd: Added Naming class to kernel to abstract name construction rules.

Diff

Modified: branches/v2_1/openejb2/modules/core/src/java/org/openejb/server/httpd/HttpServerGBean.java (2549 => 2550)

--- branches/v2_1/openejb2/modules/core/src/java/org/openejb/server/httpd/HttpServerGBean.java	2006-03-13 19:24:03 UTC (rev 2549)
+++ branches/v2_1/openejb2/modules/core/src/java/org/openejb/server/httpd/HttpServerGBean.java	2006-03-13 21:13:03 UTC (rev 2550)
@@ -46,17 +46,15 @@
 package org.openejb.server.httpd;
 
 import java.net.Socket;
-import javax.management.ObjectName;
 
+import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
-import org.apache.geronimo.gbean.AbstractName;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.kernel.GBeanAlreadyExistsException;
 import org.apache.geronimo.kernel.GBeanNotFoundException;
 import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.kernel.jmx.JMXUtil;
-import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 
 public class HttpServerGBean {

Modified: branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/EntityBuilder.java (2549 => 2550)

--- branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/EntityBuilder.java	2006-03-13 19:24:03 UTC (rev 2549)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/EntityBuilder.java	2006-03-13 21:13:03 UTC (rev 2550)
@@ -57,6 +57,7 @@
 import org.apache.geronimo.kernel.ClassLoading;
 import org.apache.geronimo.kernel.GBeanAlreadyExistsException;
 import org.apache.geronimo.kernel.GBeanNotFoundException;
+import org.apache.geronimo.kernel.Naming;
 import org.apache.geronimo.naming.deployment.ENCConfigBuilder;
 import org.apache.geronimo.security.deployment.SecurityConfiguration;
 import org.apache.geronimo.security.jacc.ComponentPermissions;
@@ -187,7 +188,7 @@
 
     public AbstractName createEJBObjectName(AbstractName moduleBaseName, EntityBeanType entityBean) throws DeploymentException {
         String ejbName = entityBean.getEjbName().getStringValue();
-        return NameFactory.getChildName(moduleBaseName, NameFactory.ENTITY_BEAN, ejbName, null);
+        return Naming.createChildName(moduleBaseName, NameFactory.ENTITY_BEAN, ejbName);
     }
 
     public void processEnvironmentRefs(ContainerBuilder builder, EARContext earContext, EJBModule ejbModule, EntityBeanType entityBean, OpenejbEntityBeanType openejbEntityBean, UserTransaction userTransaction, ClassLoader cl) throws DeploymentException {

Modified: branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/MdbBuilder.java (2549 => 2550)

--- branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/MdbBuilder.java	2006-03-13 19:24:03 UTC (rev 2549)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/MdbBuilder.java	2006-03-13 21:13:03 UTC (rev 2550)
@@ -87,6 +87,7 @@
 import org.apache.geronimo.xbeans.j2ee.ServiceRefType;
 import org.apache.geronimo.kernel.GBeanAlreadyExistsException;
 import org.apache.geronimo.kernel.GBeanNotFoundException;
+import org.apache.geronimo.kernel.Naming;
 import org.openejb.transaction.TransactionPolicySource;
 import org.openejb.xbeans.ejbjar.OpenejbActivationConfigPropertyType;
 import org.openejb.xbeans.ejbjar.OpenejbMessageDrivenBeanType;
@@ -109,8 +110,8 @@
                 throw new DeploymentException("No openejb deployment descriptor for mdb: " + messageDrivenBean.getEjbName().getStringValue() + ". Known beans: " + openejbBeans.keySet().toArray());
             }
             String ejbName = messageDrivenBean.getEjbName().getStringValue().trim();
-            AbstractName messageDrivenObjectName = NameFactory.getChildName(moduleBaseName, NameFactory.MESSAGE_DRIVEN_BEAN, ejbName, null);
-            AbstractName activationSpecName = NameFactory.getChildName(messageDrivenObjectName, NameFactory.JCA_ACTIVATION_SPEC, ejbName, null);
+            AbstractName messageDrivenObjectName = Naming.createChildName(moduleBaseName, NameFactory.MESSAGE_DRIVEN_BEAN, ejbName);
+            AbstractName activationSpecName = Naming.createChildName(messageDrivenObjectName, NameFactory.JCA_ACTIVATION_SPEC, ejbName);
 
             //TODO configid need canonical form
             String containerId = messageDrivenObjectName.toString();

Modified: branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java (2549 => 2550)

--- branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java	2006-03-13 19:24:03 UTC (rev 2549)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java	2006-03-13 21:13:03 UTC (rev 2550)
@@ -69,6 +69,7 @@
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.kernel.GBeanNotFoundException;
 import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.Naming;
 import org.apache.geronimo.kernel.config.Configuration;
 import org.apache.geronimo.kernel.config.ConfigurationModuleType;
 import org.apache.geronimo.kernel.config.ConfigurationStore;
@@ -228,7 +229,7 @@
                 throw new DeploymentException("Could not construct standalone ejb module name", e);
             }
         } else {
-            moduleName = NameFactory.getChildName(earName, NameFactory.EJB_MODULE, targetPath, null);
+            moduleName = Naming.createChildName(earName, NameFactory.EJB_MODULE, targetPath);
         }
 
         return new EJBModule(standAlone, moduleName, environment, moduleFile, targetPath, ejbJar, openejbJar, specDD);

Modified: branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/SessionBuilder.java (2549 => 2550)

--- branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/SessionBuilder.java	2006-03-13 19:24:03 UTC (rev 2549)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/SessionBuilder.java	2006-03-13 21:13:03 UTC (rev 2550)
@@ -91,6 +91,7 @@
 import org.apache.geronimo.xbeans.j2ee.WebservicesDocument;
 import org.apache.geronimo.kernel.GBeanAlreadyExistsException;
 import org.apache.geronimo.kernel.GBeanNotFoundException;
+import org.apache.geronimo.kernel.Naming;
 import org.apache.xmlbeans.XmlException;
 import org.openejb.EJBComponentType;
 import org.openejb.GenericEJBContainer;
@@ -119,7 +120,7 @@
     private AbstractName createEJBObjectName(AbstractName moduleBaseName, SessionBeanType sessionBean) {
         String ejbName = sessionBean.getEjbName().getStringValue().trim();
         String type = "Stateless".equals(sessionBean.getSessionType().getStringValue().trim()) ? NameFactory.STATELESS_SESSION_BEAN : NameFactory.STATEFUL_SESSION_BEAN;
-        return NameFactory.getChildName(moduleBaseName, type, ejbName, null);
+        return Naming.createChildName(moduleBaseName, type, ejbName);
     }
 
     public void processEnvironmentRefs(ContainerBuilder builder, EARContext earContext, EJBModule ejbModule, SessionBeanType sessionBean, OpenejbSessionBeanType openejbSessionBean, UserTransaction userTransaction, ClassLoader cl) throws DeploymentException {
@@ -192,7 +193,7 @@
 
         //this code belongs here
         AbstractName linkName;
-            linkName = NameFactory.getChildName(sessionName, NameFactory.WEB_SERVICE_LINK, ejbName, null);
+            linkName = Naming.createChildName(sessionName, NameFactory.WEB_SERVICE_LINK, ejbName);
 
         GBeanData linkData = new GBeanData(linkDataTemplate);
         linkData.setAbstractName(linkName);

Modified: branches/v2_1/openejb2/modules/pkgen-builder/src/java/org/openejb/deployment/pkgen/TranQLPKGenBuilder.java (2549 => 2550)

--- branches/v2_1/openejb2/modules/pkgen-builder/src/java/org/openejb/deployment/pkgen/TranQLPKGenBuilder.java	2006-03-13 19:24:03 UTC (rev 2549)
+++ branches/v2_1/openejb2/modules/pkgen-builder/src/java/org/openejb/deployment/pkgen/TranQLPKGenBuilder.java	2006-03-13 21:13:03 UTC (rev 2550)
@@ -49,7 +49,6 @@
 
 import java.util.Map;
 import java.util.HashMap;
-import javax.management.ObjectName;
 import javax.sql.DataSource;
 import javax.transaction.TransactionManager;
 
@@ -65,8 +64,8 @@
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.j2ee.deployment.EARContext;
-import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.kernel.GBeanAlreadyExistsException;
+import org.apache.geronimo.kernel.Naming;
 import org.openejb.xbeans.pkgen.EjbKeyGeneratorType;
 import org.openejb.xbeans.pkgen.EjbCustomGeneratorType;
 import org.openejb.xbeans.pkgen.EjbSequenceTableType;
@@ -120,8 +119,8 @@
                 keyGeneratorDelegate = new PrimaryKeyGeneratorDelegate();
                 GBeanData keyGenerator;
                 try {
-                    AbstractName generatorObjectName = NameFactory.getChildName(baseName, "KeyGenerator", generatorName, null);
-                    AbstractName wrapperGeneratorObjectName = NameFactory.getChildName(generatorObjectName, "PKGenWrapper", generatorName, null);
+                    AbstractName generatorObjectName = Naming.createChildName(baseName, "KeyGenerator", generatorName);
+                    AbstractName wrapperGeneratorObjectName = Naming.createChildName(generatorObjectName, "PKGenWrapper", generatorName);
                     keyGenerator = new GBeanData(wrapperGeneratorObjectName, PrimaryKeyGeneratorWrapper.GBEAN_INFO);
                     keyGenerator.setReferencePattern("PrimaryKeyGenerator", generatorObjectName);
                     keyGenerator.setAttribute("primaryKeyGeneratorDelegate", keyGeneratorDelegate);

Reply via email to