djencks 2005/03/05 21:49:24
Modified: modules/core/src/java/org/openejb ContainerIndex.java
EJBModuleImpl.java GenericEJBContainer.java
Log:
GERONIMO-450. Change name to gbeanName, namePart to name, and break up
reference patterns into pieces
Revision Changes Path
1.16 +2 -2
openejb/modules/core/src/java/org/openejb/ContainerIndex.java
Index: ContainerIndex.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/ContainerIndex.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ContainerIndex.java 9 Feb 2005 02:07:53 -0000 1.15
+++ ContainerIndex.java 6 Mar 2005 02:49:24 -0000 1.16
@@ -224,7 +224,7 @@
infoFactory.addOperation("getContainer", new Class[]{Integer.TYPE});
infoFactory.addOperation("getContainerByJndiName", new
Class[]{String.class});
- infoFactory.addReference("EJBContainers", EJBContainer.class);
+ infoFactory.addReference("EJBContainers", EJBContainer.class);//many
types, specify type in patterns
GBEAN_INFO = infoFactory.getBeanInfo();
}
1.15 +3 -3
openejb/modules/core/src/java/org/openejb/EJBModuleImpl.java
Index: EJBModuleImpl.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/EJBModuleImpl.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- EJBModuleImpl.java 19 Feb 2005 18:24:43 -0000 1.14
+++ EJBModuleImpl.java 6 Mar 2005 02:49:24 -0000 1.15
@@ -185,9 +185,9 @@
infoBuilder.addReference("J2EEApplication", J2EEApplication.class);
infoBuilder.addAttribute("deploymentDescriptor", String.class, true);
- infoBuilder.addReference("ConnectionFactory",
ConnectionProxyFactory.class);
+ infoBuilder.addReference("ConnectionFactory",
ConnectionProxyFactory.class, NameFactory.JCA_CONNECTION_FACTORY);
infoBuilder.addAttribute("Delegate",
ConnectionFactoryDelegate.class, true);
- infoBuilder.addReference("TransactionContextManager",
TransactionContextManager.class);
+ infoBuilder.addReference("TransactionContextManager",
TransactionContextManager.class, NameFactory.JTA_RESOURCE);
infoBuilder.addAttribute("TMDelegate",
TransactionManagerDelegate.class, true);
infoBuilder.addAttribute("kernel", Kernel.class, false);
1.43 +5 -4
openejb/modules/core/src/java/org/openejb/GenericEJBContainer.java
Index: GenericEJBContainer.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/GenericEJBContainer.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- GenericEJBContainer.java 1 Mar 2005 23:34:05 -0000 1.42
+++ GenericEJBContainer.java 6 Mar 2005 02:49:24 -0000 1.43
@@ -88,6 +88,7 @@
import org.apache.geronimo.transaction.TrackedConnectionAssociator;
import org.apache.geronimo.transaction.context.TransactionContextManager;
import org.apache.geronimo.transaction.context.UserTransactionImpl;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.openejb.cache.InstancePool;
import org.openejb.client.EJBObjectHandler;
@@ -476,9 +477,9 @@
infoFactory.addAttribute("JndiNames", String[].class, true);
infoFactory.addAttribute("LocalJndiNames", String[].class, true);
- infoFactory.addReference("TransactionContextManager",
TransactionContextManager.class);
- infoFactory.addReference("TrackedConnectionAssociator",
TrackedConnectionAssociator.class);
- infoFactory.addReference("Timer", ThreadPooledTimer.class);
+ infoFactory.addReference("TransactionContextManager",
TransactionContextManager.class, NameFactory.JTA_RESOURCE);
+ infoFactory.addReference("TrackedConnectionAssociator",
TrackedConnectionAssociator.class, NameFactory.JCA_RESOURCE);
+ infoFactory.addReference("Timer", ThreadPooledTimer.class,
NameFactory.GERONIMO_SERVICE);
infoFactory.addAttribute("objectName", String.class, false);
infoFactory.addAttribute("kernel", Kernel.class, false);
