Diff
Modified: branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/CMPEntityBuilder.java (2558 => 2559)
--- branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/CMPEntityBuilder.java 2006-03-15 08:21:07 UTC (rev 2558)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/CMPEntityBuilder.java 2006-03-16 06:52:48 UTC (rev 2559)
@@ -106,7 +106,7 @@
}
OpenejbEntityBeanType openejbEntityBean = (OpenejbEntityBeanType) openejbBeans.get(getString(entityBean.getEjbName()));
- AbstractName entityObjectName = super.createEJBObjectName(moduleBaseName, entityBean);
+ AbstractName entityObjectName = super.createEJBObjectName(earContext, moduleBaseName, entityBean);
GBeanData entityGBean = createBean(earContext, ejbModule, entityObjectName, entityBean, openejbEntityBean, ejbSchema, sqlSchema, globalSchema, transactionPolicyHelper, cl, tmDelegate, cacheDelegate, componentPermissions, policyContextID);
@@ -126,7 +126,7 @@
public Schemata buildSchemata(final EARContext earContext, final AbstractName moduleJ2eeContext, String moduleName, EjbJarType ejbJar, OpenejbOpenejbJarType openejbEjbJar, ClassLoader cl, final PKGenBuilder pkGen, final DataSource dataSource, final TransactionManager tm) throws DeploymentException {
SchemataBuilder builder = new SchemataBuilder() {
protected EJBProxyFactory buildEJBProxyFactory(EntityBeanType entityBean, String remoteInterfaceName, String homeInterfaceName, String localInterfaceName, String localHomeInterfaceName, ClassLoader cl) throws DeploymentException {
- AbstractName entityObjectName = createEJBObjectName(moduleJ2eeContext, entityBean);
+ AbstractName entityObjectName = createEJBObjectName(earContext, moduleJ2eeContext, entityBean);
//TODO configid need canonical form
return (EJBProxyFactory) getModuleBuilder().createEJBProxyFactory(entityObjectName.toString(),
false,
Modified: branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/EntityBuilder.java (2558 => 2559)
--- branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/EntityBuilder.java 2006-03-15 08:21:07 UTC (rev 2558)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/EntityBuilder.java 2006-03-16 06:52:48 UTC (rev 2559)
@@ -57,7 +57,6 @@
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;
@@ -104,7 +103,7 @@
}
OpenejbEntityBeanType openejbEntityBean = (OpenejbEntityBeanType) openejbBeans.get(entityBean.getEjbName().getStringValue().trim());
- AbstractName entityObjectName = createEJBObjectName(moduleBaseName, entityBean);
+ AbstractName entityObjectName = createEJBObjectName(earContext, moduleBaseName, entityBean);
GBeanData entityGBean = createBean(earContext, ejbModule, entityObjectName, entityBean, openejbEntityBean, componentPermissions, transactionPolicyHelper, cl, policyContextID);
try {
@@ -186,9 +185,9 @@
return tssBeanObjectName;
}
- public AbstractName createEJBObjectName(AbstractName moduleBaseName, EntityBeanType entityBean) throws DeploymentException {
+ public AbstractName createEJBObjectName(EARContext earContext, AbstractName moduleBaseName, EntityBeanType entityBean) throws DeploymentException {
String ejbName = entityBean.getEjbName().getStringValue();
- return Naming.createChildName(moduleBaseName, NameFactory.ENTITY_BEAN, ejbName);
+ return earContext.getNaming().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 {
@@ -240,7 +239,7 @@
for (int i = 0; i < entityBeans.length; i++) {
EntityBeanType entityBean = entityBeans[i];
- AbstractName entityObjectName = createEJBObjectName(moduleBaseName, entityBean);
+ AbstractName entityObjectName = createEJBObjectName(earContext, moduleBaseName, entityBean);
GBeanData gbean = new GBeanData(entityObjectName, GenericEJBContainer.GBEAN_INFO);
Class homeInterface = null;
Modified: branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/MdbBuilder.java (2558 => 2559)
--- branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/MdbBuilder.java 2006-03-15 08:21:07 UTC (rev 2558)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/MdbBuilder.java 2006-03-16 06:52:48 UTC (rev 2559)
@@ -86,7 +86,6 @@
import org.apache.geronimo.xbeans.j2ee.ResourceRefType;
import org.apache.geronimo.xbeans.j2ee.ServiceRefType;
import org.apache.geronimo.kernel.GBeanAlreadyExistsException;
-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 +108,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 = Naming.createChildName(moduleBaseName, NameFactory.MESSAGE_DRIVEN_BEAN, ejbName);
- AbstractName activationSpecName = Naming.createChildName(messageDrivenObjectName, NameFactory.JCA_ACTIVATION_SPEC, ejbName);
+ AbstractName messageDrivenObjectName = earContext.getNaming().createChildName(moduleBaseName, NameFactory.MESSAGE_DRIVEN_BEAN, ejbName);
+ AbstractName activationSpecName = earContext.getNaming().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 (2558 => 2559)
--- branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java 2006-03-15 08:21:07 UTC (rev 2558)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java 2006-03-16 06:52:48 UTC (rev 2559)
@@ -178,15 +178,15 @@
return transactionImportPolicyBuilder;
}
- public Module createModule(File plan, JarFile moduleFile) throws DeploymentException {
- return createModule(plan, moduleFile, "ejb", null, true, null);
+ public Module createModule(File plan, JarFile moduleFile, Naming naming) throws DeploymentException {
+ return createModule(plan, moduleFile, "ejb", null, true, null, naming);
}
- public Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo, AbstractName earName) throws DeploymentException {
- return createModule(plan, moduleFile, targetPath, specDDUrl, false, earName);
+ public Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo, AbstractName earName, Naming naming) throws DeploymentException {
+ return createModule(plan, moduleFile, targetPath, specDDUrl, false, earName, naming);
}
- private Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, boolean standAlone, AbstractName earName) throws DeploymentException {
+ private Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, boolean standAlone, AbstractName earName, Naming naming) throws DeploymentException {
assert moduleFile != null: "moduleFile is null";
assert targetPath != null: "targetPath is null";
assert !targetPath.endsWith("/"): "targetPath must not end with a '/'";
@@ -229,7 +229,7 @@
throw new DeploymentException("Could not construct standalone ejb module name", e);
}
} else {
- moduleName = Naming.createChildName(earName, NameFactory.EJB_MODULE, targetPath);
+ moduleName = naming.createChildName(earName, targetPath, NameFactory.EJB_MODULE);
}
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 (2558 => 2559)
--- branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/SessionBuilder.java 2006-03-15 08:21:07 UTC (rev 2558)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/SessionBuilder.java 2006-03-16 06:52:48 UTC (rev 2559)
@@ -91,7 +91,6 @@
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;
@@ -117,10 +116,10 @@
this.webServiceBuilder = webServiceBuilder;
}
- private AbstractName createEJBObjectName(AbstractName moduleBaseName, SessionBeanType sessionBean) {
+ private AbstractName createEJBObjectName(EARContext earContext, 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 Naming.createChildName(moduleBaseName, type, ejbName);
+ return earContext.getNaming().createChildName(moduleBaseName, type, ejbName);
}
public void processEnvironmentRefs(ContainerBuilder builder, EARContext earContext, EJBModule ejbModule, SessionBeanType sessionBean, OpenejbSessionBeanType openejbSessionBean, UserTransaction userTransaction, ClassLoader cl) throws DeploymentException {
@@ -174,7 +173,7 @@
SessionBeanType sessionBean = sessionBeans[i];
OpenejbSessionBeanType openejbSessionBean = (OpenejbSessionBeanType) openejbBeans.get(sessionBean.getEjbName().getStringValue());
- AbstractName sessionName = createEJBObjectName(moduleBaseName, sessionBean);
+ AbstractName sessionName = createEJBObjectName(earContext, moduleBaseName, sessionBean);
assert sessionName != null: "StatelesSessionBean object name is null";
addEJBContainerGBean(earContext, ejbModule, componentPermissions, cl, sessionName, sessionBean, openejbSessionBean, transactionPolicyHelper, policyContextID);
@@ -193,7 +192,7 @@
//this code belongs here
AbstractName linkName;
- linkName = Naming.createChildName(sessionName, NameFactory.WEB_SERVICE_LINK, ejbName);
+ linkName = earContext.getNaming().createChildName(sessionName, NameFactory.WEB_SERVICE_LINK, ejbName);
GBeanData linkData = new GBeanData(linkDataTemplate);
linkData.setAbstractName(linkName);
@@ -378,7 +377,7 @@
for (int i = 0; i < sessionBeans.length; i++) {
SessionBeanType sessionBean = sessionBeans[i];
- AbstractName sessionName = createEJBObjectName(moduleJ2eeContext, sessionBean);
+ AbstractName sessionName = createEJBObjectName(earContext, moduleJ2eeContext, sessionBean);
GBeanData gbean = new GBeanData(sessionName, GenericEJBContainer.GBEAN_INFO);
Class homeInterface = null;
Modified: branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/CMPEntityBuilderTest.java (2558 => 2559)
--- branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/CMPEntityBuilderTest.java 2006-03-15 08:21:07 UTC (rev 2558)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/CMPEntityBuilderTest.java 2006-03-16 06:52:48 UTC (rev 2559)
@@ -138,7 +138,7 @@
EjbJarType ejbJarType = ((EjbJarDocument) XmlObject.Factory.parse(ejbJarFile)).getEjbJar();
OpenejbOpenejbJarType openejbJarType = ((OpenejbOpenejbJarDocument) XmlObject.Factory.parse(openejbJarFile)).getOpenejbJar();
- OpenEJBModuleBuilder moduleBuilder = new OpenEJBModuleBuilder(KernelHelper.DEFAULT_ENVIRONMENT, listener, null, null);
+ OpenEJBModuleBuilder moduleBuilder = new OpenEJBModuleBuilder(KernelHelper.DEFAULT_ENVIRONMENT, listener, null, null, kernel.getNaming());
CMPEntityBuilder builder = new CMPEntityBuilder(moduleBuilder);
TranQLPKGenBuilder pkGen = new TranQLPKGenBuilder();
@@ -147,7 +147,6 @@
EARContext earContext = new EARContext(tempDir,
KernelHelper.ENVIRONMENT,
ConfigurationModuleType.EJB,
- kernel,
serverName, "null",
null,
null,
@@ -182,7 +181,7 @@
EjbJarType ejbJarType = ((EjbJarDocument) XmlObject.Factory.parse(ejbJarFile)).getEjbJar();
OpenejbOpenejbJarType openejbJarType = ((OpenejbOpenejbJarDocument) XmlObject.Factory.parse(openejbJarFile)).getOpenejbJar();
- OpenEJBModuleBuilder moduleBuilder = new OpenEJBModuleBuilder(KernelHelper.DEFAULT_ENVIRONMENT, listener, null, null);
+ OpenEJBModuleBuilder moduleBuilder = new OpenEJBModuleBuilder(KernelHelper.DEFAULT_ENVIRONMENT, listener, null, null, kernel.getNaming());
CMPEntityBuilder builder = new CMPEntityBuilder(moduleBuilder);
TranQLPKGenBuilder pkGen = new TranQLPKGenBuilder();
@@ -191,7 +190,6 @@
EARContext earContext = new EARContext(tempDir,
KernelHelper.ENVIRONMENT,
ConfigurationModuleType.EJB,
- kernel,
serverName, "null",
null,
null,
@@ -227,7 +225,7 @@
EjbJarType ejbJarType = ((EjbJarDocument) XmlObject.Factory.parse(ejbJarFile)).getEjbJar();
OpenejbOpenejbJarType openejbJarType = ((OpenejbOpenejbJarDocument) XmlObject.Factory.parse(openejbJarFile)).getOpenejbJar();
- OpenEJBModuleBuilder moduleBuilder = new OpenEJBModuleBuilder(KernelHelper.DEFAULT_ENVIRONMENT, listener, null, null);
+ OpenEJBModuleBuilder moduleBuilder = new OpenEJBModuleBuilder(KernelHelper.DEFAULT_ENVIRONMENT, listener, null, null, kernel.getNaming());
CMPEntityBuilder builder = new CMPEntityBuilder(moduleBuilder);
TranQLPKGenBuilder pkGen = new TranQLPKGenBuilder();
@@ -236,7 +234,6 @@
EARContext earContext = new EARContext(tempDir,
KernelHelper.ENVIRONMENT,
ConfigurationModuleType.EJB,
- kernel,
serverName, "null",
null,
null,
Modified: branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentTestSuite.java (2558 => 2559)
--- branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentTestSuite.java 2006-03-15 08:21:07 UTC (rev 2558)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentTestSuite.java 2006-03-16 06:52:48 UTC (rev 2559)
@@ -162,7 +162,7 @@
ObjectName listener = null;
WebServiceBuilder webServiceBuilder = new AxisBuilder();
GBeanData linkData = new GBeanData(WSContainerGBean.GBEAN_INFO);
- OpenEJBModuleBuilder moduleBuilder = new OpenEJBModuleBuilder(KernelHelper.DEFAULT_ENVIRONMENT, listener, linkData, webServiceBuilder);
+ OpenEJBModuleBuilder moduleBuilder = new OpenEJBModuleBuilder(KernelHelper.DEFAULT_ENVIRONMENT, listener, linkData, webServiceBuilder, kernel.getNaming());
OpenEJBReferenceBuilder ejbReferenceBuilder = new OpenEJBReferenceBuilder();
tempDir = DeploymentUtil.createTempDir();
@@ -178,8 +178,7 @@
null,// web
null, resourceReferenceBuilder, // connector
null, // app client
- serviceReferenceBuilder,
- kernel
+ serviceReferenceBuilder
);
JarFile jarFile = null;
Modified: branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/KernelHelper.java (2558 => 2559)
--- branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/KernelHelper.java 2006-03-15 08:21:07 UTC (rev 2558)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/KernelHelper.java 2006-03-16 06:52:48 UTC (rev 2559)
@@ -38,7 +38,7 @@
import org.apache.geronimo.kernel.config.Configuration;
import org.apache.geronimo.kernel.config.ConfigurationData;
import org.apache.geronimo.kernel.config.ConfigurationManager;
-import org.apache.geronimo.kernel.config.ConfigurationManagerImpl;
+import org.apache.geronimo.kernel.config.KernelConfigurationManager;
import org.apache.geronimo.kernel.config.ConfigurationStore;
import org.apache.geronimo.kernel.config.InvalidConfigException;
import org.apache.geronimo.kernel.config.NoSuchConfigException;
@@ -49,7 +49,7 @@
import org.apache.geronimo.kernel.repository.Environment;
/**
- * @version $Rev$ $Date$
+ * @version $Rev: 2527 $ $Date$
*/
public class KernelHelper {
public static final Environment DEFAULT_ENVIRONMENT = new Environment();
@@ -83,7 +83,7 @@
kernel.startGBean(artifactResolver.getName());
ObjectName configurationManagerName = new ObjectName(":j2eeType=ConfigurationManager,name=Basic");
- GBeanData configurationManagerData = new GBeanData(configurationManagerName, ConfigurationManagerImpl.GBEAN_INFO);
+ GBeanData configurationManagerData = new GBeanData(configurationManagerName, KernelConfigurationManager.GBEAN_INFO);
configurationManagerData.setReferencePattern("Stores", store.getName());
configurationManagerData.setReferencePattern("ArtifactManager", artifactManager.getName());
configurationManagerData.setReferencePattern("ArtifactResolver", artifactResolver.getName());
Modified: branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/PlanParsingTest.java (2558 => 2559)
--- branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/PlanParsingTest.java 2006-03-15 08:21:07 UTC (rev 2558)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/PlanParsingTest.java 2006-03-16 06:52:48 UTC (rev 2559)
@@ -4,15 +4,12 @@
import junit.framework.TestCase;
import org.openejb.xbeans.ejbjar.OpenejbOpenejbJarType;
-import org.apache.geronimo.kernel.repository.Repository;
/**
*/
public class PlanParsingTest extends TestCase {
- private Repository repository = null;
-
+ private static final File basedir = new File(System.getProperty("basedir", "."));
private OpenEJBModuleBuilder builder;
- File basedir = new File(System.getProperty("basedir", "."));
protected void setUp() throws Exception {
builder = new OpenEJBModuleBuilder(null, null, null, null);
Modified: branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/entity/cmp/cmr/AbstractCMRTest.java (2558 => 2559)
--- branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/entity/cmp/cmr/AbstractCMRTest.java 2006-03-15 08:21:07 UTC (rev 2558)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/entity/cmp/cmr/AbstractCMRTest.java 2006-03-16 06:52:48 UTC (rev 2559)
@@ -169,7 +169,6 @@
EARContext earContext = new EARContext(tempDir,
KernelHelper.ENVIRONMENT,
ConfigurationModuleType.EJB,
- kernel,
serverName, NameFactory.NULL,
null,
null,
Modified: branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/entity/cmp/ejbql/EJBQLTest.java (2558 => 2559)
--- branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/entity/cmp/ejbql/EJBQLTest.java 2006-03-15 08:21:07 UTC (rev 2558)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/entity/cmp/ejbql/EJBQLTest.java 2006-03-16 06:52:48 UTC (rev 2559)
@@ -193,7 +193,6 @@
EARContext earContext = new EARContext(tempDir,
KernelHelper.ENVIRONMENT,
ConfigurationModuleType.EJB,
- kernel,
serverName, NameFactory.NULL,
null,
null,
Modified: branches/v2_1/openejb2/modules/pkgen-builder/src/java/org/openejb/deployment/pkgen/TranQLPKGenBuilder.java (2558 => 2559)
--- branches/v2_1/openejb2/modules/pkgen-builder/src/java/org/openejb/deployment/pkgen/TranQLPKGenBuilder.java 2006-03-15 08:21:07 UTC (rev 2558)
+++ branches/v2_1/openejb2/modules/pkgen-builder/src/java/org/openejb/deployment/pkgen/TranQLPKGenBuilder.java 2006-03-16 06:52:48 UTC (rev 2559)
@@ -65,7 +65,6 @@
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.j2ee.deployment.EARContext;
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;
@@ -119,8 +118,8 @@
keyGeneratorDelegate = new PrimaryKeyGeneratorDelegate();
GBeanData keyGenerator;
try {
- AbstractName generatorObjectName = Naming.createChildName(baseName, "KeyGenerator", generatorName);
- AbstractName wrapperGeneratorObjectName = Naming.createChildName(generatorObjectName, "PKGenWrapper", generatorName);
+ AbstractName generatorObjectName = earContext.getNaming().createChildName(baseName, "KeyGenerator", generatorName);
+ AbstractName wrapperGeneratorObjectName = earContext.getNaming().createChildName(generatorObjectName, "PKGenWrapper", generatorName);
keyGenerator = new GBeanData(wrapperGeneratorObjectName, PrimaryKeyGeneratorWrapper.GBEAN_INFO);
keyGenerator.setReferencePattern("PrimaryKeyGenerator", generatorObjectName);
keyGenerator.setAttribute("primaryKeyGeneratorDelegate", keyGeneratorDelegate);
