maguro 2005/03/07 23:08:30
Modified: modules/openejb-builder/src/java/org/openejb/deployment
OpenEJBModuleBuilder.java
RemoteEJBReferenceBuilder.java
Log:
Intermediate CORBA checkin.
Revision Changes Path
1.33 +34 -28
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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- OpenEJBModuleBuilder.java 6 Mar 2005 02:49:43 -0000 1.32
+++ OpenEJBModuleBuilder.java 8 Mar 2005 04:08:30 -0000 1.33
@@ -59,11 +59,26 @@
import java.util.Map;
import java.util.Set;
import java.util.jar.JarFile;
-
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
import javax.naming.Reference;
+import org.apache.xmlbeans.XmlException;
+import org.apache.xmlbeans.XmlObject;
+import org.tranql.cache.CacheFlushStrategyFactory;
+import org.tranql.cache.EnforceRelationshipsFlushStrategyFactory;
+import org.tranql.cache.GlobalSchema;
+import org.tranql.cache.SimpleFlushStrategyFactory;
+import org.tranql.ejb.EJBSchema;
+import org.tranql.ejb.TransactionManagerDelegate;
+import org.tranql.ejbqlcompiler.DerbyDBSyntaxtFactory;
+import org.tranql.ejbqlcompiler.DerbyEJBQLCompilerFactory;
+import org.tranql.sql.BaseSQLSchema;
+import org.tranql.sql.DBSyntaxFactory;
+import org.tranql.sql.DataSourceDelegate;
+import org.tranql.sql.EJBQLCompilerFactory;
+import org.tranql.sql.SQLSchema;
+
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.service.ServiceConfigBuilder;
import org.apache.geronimo.deployment.util.DeploymentUtil;
@@ -90,12 +105,12 @@
import org.apache.geronimo.xbeans.j2ee.EjbJarType;
import org.apache.geronimo.xbeans.j2ee.EnterpriseBeansType;
import org.apache.geronimo.xbeans.j2ee.SecurityRoleType;
-import org.apache.xmlbeans.XmlException;
-import org.apache.xmlbeans.XmlObject;
+
import org.openejb.EJBModuleImpl;
+import org.openejb.corba.CORBAHandleDelegate;
import org.openejb.corba.compiler.CompilerException;
import org.openejb.corba.compiler.SkeletonGenerator;
-import org.openejb.corba.CORBAHandleDelegate;
+import org.openejb.corba.proxy.CORBAProxyReference;
import org.openejb.proxy.EJBProxyFactory;
import org.openejb.proxy.EJBProxyReference;
import org.openejb.xbeans.ejbjar.OpenejbEntityBeanType;
@@ -103,19 +118,6 @@
import org.openejb.xbeans.ejbjar.OpenejbOpenejbJarDocument;
import org.openejb.xbeans.ejbjar.OpenejbOpenejbJarType;
import org.openejb.xbeans.ejbjar.OpenejbSessionBeanType;
-import org.tranql.cache.CacheFlushStrategyFactory;
-import org.tranql.cache.EnforceRelationshipsFlushStrategyFactory;
-import org.tranql.cache.GlobalSchema;
-import org.tranql.cache.SimpleFlushStrategyFactory;
-import org.tranql.ejb.EJBSchema;
-import org.tranql.ejb.TransactionManagerDelegate;
-import org.tranql.ejbqlcompiler.DerbyDBSyntaxtFactory;
-import org.tranql.ejbqlcompiler.DerbyEJBQLCompilerFactory;
-import org.tranql.sql.BaseSQLSchema;
-import org.tranql.sql.DBSyntaxFactory;
-import org.tranql.sql.DataSourceDelegate;
-import org.tranql.sql.EJBQLCompilerFactory;
-import org.tranql.sql.SQLSchema;
/**
@@ -219,8 +221,8 @@
try {
if (plan instanceof XmlObject) {
openejbJar = (OpenejbOpenejbJarType)
SchemaConversionUtils.getNestedObjectAsType((XmlObject) plan,
- "openejb-jar",
- OpenejbOpenejbJarType.type);
+
"openejb-jar",
+
OpenejbOpenejbJarType.type);
} else {
OpenejbOpenejbJarDocument openejbJarDoc = null;
if (plan != null) {
@@ -342,6 +344,10 @@
return EJBProxyReference.createRemote(objectName, session, remote,
home);
}
+ public Reference createCORBAReference(URI corbaURL, String objectName,
ObjectName containerName, String home) throws DeploymentException {
+ return new CORBAProxyReference(corbaURL, objectName, containerName,
home);
+ }
+
public Object createHandleDelegateReference() {
return new CORBAHandleDelegate.HandleDelegateReference();
}
@@ -532,15 +538,15 @@
//construct name from components
try {
return NameFactory.getComponentName(resourceLocator.getDomain(),
- resourceLocator.getServer(),
- resourceLocator.getApplication(),
- NameFactory.JCA_RESOURCE,
- resourceLocator.getModule(),
- resourceLocator.getName(),
- //todo determine type from iface class
+ resourceLocator.getServer(),
+
resourceLocator.getApplication(),
+ NameFactory.JCA_RESOURCE,
+ resourceLocator.getModule(),
+ resourceLocator.getName(),
+ //todo determine type from
iface class
// resourceLocator.getType(),
- NameFactory.JCA_MANAGED_CONNECTION_FACTORY,
- j2eeContext);
+
NameFactory.JCA_MANAGED_CONNECTION_FACTORY,
+ j2eeContext);
} catch (MalformedObjectNameException e) {
throw new DeploymentException("Could not construct cmp
datasource object name", e);
}
1.5 +57 -0
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RemoteEJBReferenceBuilder.java 6 Mar 2005 02:49:43 -0000 1.4
+++ RemoteEJBReferenceBuilder.java 8 Mar 2005 04:08:30 -0000 1.5
@@ -1,14 +1,67 @@
+/* ====================================================================
+ * Redistribution and use of this software and associated documentation
+ * ("Software"), with or without modification, are permitted provided
+ * that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain copyright
+ * statements and notices. Redistributions must also contain a
+ * copy of this document.
+ *
+ * 2. Redistributions in binary form must reproduce this list of
+ * conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * 3. The name "OpenEJB" must not be used to endorse or promote
+ * products derived from this Software without prior written
+ * permission of The OpenEJB Group. For written permission,
+ * please contact [EMAIL PROTECTED]
+ *
+ * 4. Products derived from this Software may not be called "OpenEJB"
+ * nor may "OpenEJB" appear in their names without prior written
+ * permission of The OpenEJB Group. OpenEJB is a registered
+ * trademark of The OpenEJB Group.
+ *
+ * 5. Due credit should be given to the OpenEJB Project
+ * (http://openejb.org/).
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OPENEJB GROUP AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
+ * NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE OPENEJB GROUP OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the OpenEJB Project. For more information
+ * please see <http://openejb.org/>.
+ *
+ * ====================================================================
+ */
package org.openejb.deployment;
+import java.net.URI;
+import javax.management.ObjectName;
import javax.naming.Reference;
+import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.j2ee.deployment.EJBReferenceBuilder;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+
import org.openejb.client.naming.RemoteEJBObjectFactory;
import org.openejb.client.naming.RemoteEJBRefAddr;
import org.openejb.corba.CORBAHandleDelegate;
+import org.openejb.corba.proxy.CORBAProxyReference;
+
/**
*/
@@ -22,6 +75,10 @@
RemoteEJBRefAddr addr = new RemoteEJBRefAddr(objectName);
Reference reference = new Reference(null, addr,
RemoteEJBObjectFactory.class.getName(), null);
return reference;
+ }
+
+ public Reference createCORBAReference(URI corbaURL, String objectName,
ObjectName containerName, String home) throws DeploymentException {
+ return new CORBAProxyReference(corbaURL, objectName, containerName,
home);
}
public Object createHandleDelegateReference() {
