djencks 2005/03/05 21:49:38
Modified: modules/core/src/java/org/openejb/entity/cmp/pkgenerator
AutoIncrementTablePrimaryKeyGeneratorWrapper.java
SQLPrimaryKeyGeneratorWrapper.java
SequenceTablePrimaryKeyGeneratorWrapper.java
Log:
GERONIMO-450. Change name to gbeanName, namePart to name, and break up
reference patterns into pieces
Revision Changes Path
1.5 +3 -2
openejb/modules/core/src/java/org/openejb/entity/cmp/pkgenerator/AutoIncrementTablePrimaryKeyGeneratorWrapper.java
Index: AutoIncrementTablePrimaryKeyGeneratorWrapper.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/entity/cmp/pkgenerator/AutoIncrementTablePrimaryKeyGeneratorWrapper.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AutoIncrementTablePrimaryKeyGeneratorWrapper.java 20 Feb 2005 15:44:48
-0000 1.4
+++ AutoIncrementTablePrimaryKeyGeneratorWrapper.java 6 Mar 2005 02:49:25
-0000 1.5
@@ -55,6 +55,7 @@
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.gbean.GBeanLifecycle;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.tranql.cache.CacheRow;
import org.tranql.cache.DuplicateIdentityException;
import org.tranql.cache.InTxCache;
@@ -111,7 +112,7 @@
GBeanInfoBuilder infoFactory = new
GBeanInfoBuilder(AutoIncrementTablePrimaryKeyGeneratorWrapper.class);
infoFactory.addInterface(PrimaryKeyGenerator.class);
- infoFactory.addReference("ManagedConnectionFactoryWrapper",
ManagedConnectionFactoryWrapper.class);
+ infoFactory.addReference("ManagedConnectionFactoryWrapper",
ManagedConnectionFactoryWrapper.class,
NameFactory.JCA_MANAGED_CONNECTION_FACTORY);
infoFactory.addAttribute("sql", String.class, true);
infoFactory.addAttribute("returnType", Class.class, true);
1.8 +3 -2
openejb/modules/core/src/java/org/openejb/entity/cmp/pkgenerator/SQLPrimaryKeyGeneratorWrapper.java
Index: SQLPrimaryKeyGeneratorWrapper.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/entity/cmp/pkgenerator/SQLPrimaryKeyGeneratorWrapper.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SQLPrimaryKeyGeneratorWrapper.java 20 Feb 2005 15:44:48 -0000
1.7
+++ SQLPrimaryKeyGeneratorWrapper.java 6 Mar 2005 02:49:28 -0000
1.8
@@ -59,6 +59,7 @@
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.gbean.GBeanLifecycle;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.tranql.cache.CacheRow;
import org.tranql.cache.DuplicateIdentityException;
import org.tranql.cache.InTxCache;
@@ -133,7 +134,7 @@
GBeanInfoBuilder infoFactory = new
GBeanInfoBuilder(SQLPrimaryKeyGeneratorWrapper.class);
infoFactory.addInterface(PrimaryKeyGenerator.class);
- infoFactory.addReference("ManagedConnectionFactoryWrapper",
ManagedConnectionFactoryWrapper.class);
+ infoFactory.addReference("ManagedConnectionFactoryWrapper",
ManagedConnectionFactoryWrapper.class,
NameFactory.JCA_MANAGED_CONNECTION_FACTORY);
infoFactory.addAttribute("initSQL", String.class, true);
infoFactory.addAttribute("sql", String.class, true);
infoFactory.addAttribute("returnType", Class.class, true);
1.7 +3 -2
openejb/modules/core/src/java/org/openejb/entity/cmp/pkgenerator/SequenceTablePrimaryKeyGeneratorWrapper.java
Index: SequenceTablePrimaryKeyGeneratorWrapper.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/entity/cmp/pkgenerator/SequenceTablePrimaryKeyGeneratorWrapper.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SequenceTablePrimaryKeyGeneratorWrapper.java 20 Feb 2005 15:44:48
-0000 1.6
+++ SequenceTablePrimaryKeyGeneratorWrapper.java 6 Mar 2005 02:49:38
-0000 1.7
@@ -55,6 +55,7 @@
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.gbean.GBeanLifecycle;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.tranql.cache.CacheRow;
import org.tranql.cache.DuplicateIdentityException;
import org.tranql.cache.InTxCache;
@@ -112,7 +113,7 @@
GBeanInfoBuilder infoFactory = new
GBeanInfoBuilder(SequenceTablePrimaryKeyGeneratorWrapper.class);
infoFactory.addInterface(PrimaryKeyGenerator.class);
- infoFactory.addReference("ManagedConnectionFactoryWrapper",
ManagedConnectionFactoryWrapper.class);
+ infoFactory.addReference("ManagedConnectionFactoryWrapper",
ManagedConnectionFactoryWrapper.class,
NameFactory.JCA_MANAGED_CONNECTION_FACTORY);
infoFactory.addAttribute("tableName", String.class, true);
infoFactory.addAttribute("sequenceName", String.class, true);
infoFactory.addAttribute("batchSize", int.class, true);
