djencks 2005/01/24 16:16:49
Modified: modules/openejb-builder/src/java/org/openejb/deployment
EJBConfigurer.java OpenEJBModuleBuilder.java
RemoteEJBReferenceBuilder.java
Log:
More work on GERONIMO-450. Get the j2eeType from GBeanInfo. Also remove
unneeded attribute 'type' attributes
Revision Changes Path
1.2 +3 -2
openejb/modules/openejb-builder/src/java/org/openejb/deployment/EJBConfigurer.java
Index: EJBConfigurer.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/EJBConfigurer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EJBConfigurer.java 10 Nov 2004 01:35:08 -0000 1.1
+++ EJBConfigurer.java 24 Jan 2005 21:16:49 -0000 1.2
@@ -55,6 +55,7 @@
import org.apache.geronimo.deployment.ModuleConfigurer;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
/**
*
@@ -73,7 +74,7 @@
public static final GBeanInfo GBEAN_INFO;
static {
- GBeanInfoBuilder infoFactory = new
GBeanInfoBuilder(EJBConfigurer.class);
+ GBeanInfoBuilder infoFactory = new
GBeanInfoBuilder(EJBConfigurer.class, NameFactory.DEPLOYMENT_CONFIGURER);
infoFactory.addInterface(ModuleConfigurer.class);
GBEAN_INFO = infoFactory.getBeanInfo();
}
1.23 +3 -3
openejb/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java
Index: OpenEJBModuleBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- OpenEJBModuleBuilder.java 23 Jan 2005 04:11:16 -0000 1.22
+++ OpenEJBModuleBuilder.java 24 Jan 2005 21:16:49 -0000 1.23
@@ -471,7 +471,7 @@
private static ObjectName getResourceContainerId(URI uri,
GerResourceLocatorType resourceLocator, RefContext refContext, J2eeContext
j2eeContext) throws DeploymentException {
try {
if (resourceLocator.isSetResourceLink()) {
- String containerId =
refContext.getConnectionFactoryContainerId(uri,
resourceLocator.getResourceLink(), j2eeContext);
+ String containerId =
refContext.getConnectionFactoryContainerId(uri,
resourceLocator.getResourceLink(), NameFactory.JCA_MANAGED_CONNECTION_FACTORY,
j2eeContext);
return ObjectName.getInstance(containerId);
} else if (resourceLocator.isSetTargetName()) {
String containerId = resourceLocator.getTargetName();
@@ -526,7 +526,7 @@
public static final GBeanInfo GBEAN_INFO;
static {
- GBeanInfoBuilder infoBuilder = new
GBeanInfoBuilder(OpenEJBModuleBuilder.class);
+ GBeanInfoBuilder infoBuilder = new
GBeanInfoBuilder(OpenEJBModuleBuilder.class, NameFactory.MODULE_BUILDER);
infoBuilder.addAttribute("defaultParentId", URI.class, true);
infoBuilder.addReference("SkeletonGenerator",
SkeletonGenerator.class);
infoBuilder.addReference("Repository", Repository.class);
1.2 +1 -1
openejb/modules/openejb-builder/src/java/org/openejb/deployment/RemoteEJBReferenceBuilder.java
Index: RemoteEJBReferenceBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/RemoteEJBReferenceBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RemoteEJBReferenceBuilder.java 10 Nov 2004 01:35:08 -0000 1.1
+++ RemoteEJBReferenceBuilder.java 24 Jan 2005 21:16:49 -0000 1.2
@@ -25,7 +25,7 @@
public static final GBeanInfo GBEAN_INFO;
static {
- GBeanInfoBuilder infoFactory = new
GBeanInfoBuilder(RemoteEJBReferenceBuilder.class);
+ GBeanInfoBuilder infoFactory = new
GBeanInfoBuilder(RemoteEJBReferenceBuilder.class); //TODO decide what type this
should be
infoFactory.addInterface(EJBReferenceBuilder.class);
GBEAN_INFO = infoFactory.getBeanInfo();
