dain 2005/07/13 16:49:28
Modified: modules/core/src/java/org/openejb/corba Adapter.java
AdapterEntity.java AdapterStateful.java
AdapterStateless.java AdapterWrapper.java
StandardServant.java TSSBean.java
Removed: modules/core/src/java/org/openejb/corba OpenORBNameBean.java
Log:
Removed openorb/tmporb
Removed tools jar hack
Removed all stub/tie compiler code since is used openorb
Revision Changes Path
1.12 +3 -11
openejb/modules/core/src/java/org/openejb/corba/Adapter.java
Index: Adapter.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/Adapter.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Adapter.java 24 Jun 2005 07:54:14 -0000 1.11
+++ Adapter.java 13 Jul 2005 20:49:28 -0000 1.12
@@ -62,10 +62,8 @@
import org.openejb.EJBContainer;
import org.openejb.EJBInterfaceType;
import org.openejb.corba.transaction.ServerTransactionPolicyFactory;
-import org.openejb.corba.util.TieLoader;
import org.openejb.proxy.ProxyInfo;
-
/**
* @version $Revision$ $Date$
*/
@@ -73,13 +71,11 @@
private final EJBContainer container;
protected final POA homePOA;
private final NamingContextExt initialContext;
- private final TieLoader tieLoader;
private final byte[] home_id;
private final org.omg.CORBA.Object homeReference;
- protected Adapter(EJBContainer container, ORB orb, POA parentPOA,
TieLoader tieLoader, Policy securityPolicy) throws CORBAException {
+ protected Adapter(EJBContainer container, ORB orb, POA parentPOA, Policy
securityPolicy) throws CORBAException {
this.container = container;
- this.tieLoader = tieLoader;
this.home_id = container.getContainerID().toString().getBytes();
Any any = orb.create_any();
@@ -135,10 +131,6 @@
public NamingContextExt getInitialContext() {
return initialContext;
- }
-
- public TieLoader getTieLoader() {
- return tieLoader;
}
public org.omg.CORBA.Object getHomeReference() {
1.12 +4 -6
openejb/modules/core/src/java/org/openejb/corba/AdapterEntity.java
Index: AdapterEntity.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/AdapterEntity.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AdapterEntity.java 24 Jun 2005 07:54:14 -0000 1.11
+++ AdapterEntity.java 13 Jul 2005 20:49:28 -0000 1.12
@@ -68,7 +68,6 @@
import org.openejb.EJBContainer;
import org.openejb.EJBInterfaceType;
import org.openejb.corba.transaction.ServerTransactionPolicyFactory;
-import org.openejb.corba.util.TieLoader;
import org.openejb.proxy.ProxyInfo;
@@ -81,8 +80,8 @@
private final POA poa;
private final String referenceInterface;
- public AdapterEntity(EJBContainer container, ORB orb, POA parentPOA,
TieLoader tieLoader, Policy securityPolicy) throws CORBAException {
- super(container, orb, parentPOA, tieLoader, securityPolicy);
+ public AdapterEntity(EJBContainer container, ORB orb, POA parentPOA,
Policy securityPolicy) throws CORBAException {
+ super(container, orb, parentPOA, securityPolicy);
Any any = orb.create_any();
any.insert_Value(container.getRemoteTxPolicyConfig());
@@ -162,5 +161,4 @@
public void postinvoke(byte[] oid, POA poa, String operation, Object
cookie, Servant servant) {
}
}
-
}
1.12 +4 -7
openejb/modules/core/src/java/org/openejb/corba/AdapterStateful.java
Index: AdapterStateful.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/AdapterStateful.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AdapterStateful.java 24 Jun 2005 07:54:14 -0000 1.11
+++ AdapterStateful.java 13 Jul 2005 20:49:28 -0000 1.12
@@ -69,10 +69,8 @@
import org.openejb.EJBContainer;
import org.openejb.EJBInterfaceType;
import org.openejb.corba.transaction.ServerTransactionPolicyFactory;
-import org.openejb.corba.util.TieLoader;
import org.openejb.proxy.ProxyInfo;
-
/**
* @version $Revision$ $Date$
*/
@@ -82,8 +80,8 @@
private final POA poa;
private final String referenceInterface;
- public AdapterStateful(EJBContainer container, ORB orb, POA parentPOA,
TieLoader tieLoader, Policy securityPolicy) throws CORBAException {
- super(container, orb, parentPOA, tieLoader, securityPolicy);
+ public AdapterStateful(EJBContainer container, ORB orb, POA parentPOA,
Policy securityPolicy) throws CORBAException {
+ super(container, orb, parentPOA, securityPolicy);
Any any = orb.create_any();
any.insert_Value(container.getRemoteTxPolicyConfig());
@@ -163,5 +161,4 @@
public void postinvoke(byte[] oid, POA poa, String operation, Object
cookie, Servant servant) {
}
}
-
}
1.12 +4 -6
openejb/modules/core/src/java/org/openejb/corba/AdapterStateless.java
Index: AdapterStateless.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/AdapterStateless.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AdapterStateless.java 24 Jun 2005 07:54:14 -0000 1.11
+++ AdapterStateless.java 13 Jul 2005 20:49:28 -0000 1.12
@@ -57,10 +57,8 @@
import org.openejb.EJBContainer;
import org.openejb.EJBInterfaceType;
import org.openejb.corba.transaction.ServerTransactionPolicyFactory;
-import org.openejb.corba.util.TieLoader;
import org.openejb.proxy.ProxyInfo;
-
/**
* @version $Revision$ $Date$
*/
@@ -69,8 +67,8 @@
private final byte[] object_id;
private final org.omg.CORBA.Object objectReference;
- public AdapterStateless(EJBContainer container, ORB orb, POA parentPOA,
TieLoader tieLoader, Policy securityPolicy) throws CORBAException {
- super(container, orb, parentPOA, tieLoader, securityPolicy);
+ public AdapterStateless(EJBContainer container, ORB orb, POA parentPOA,
Policy securityPolicy) throws CORBAException {
+ super(container, orb, parentPOA, securityPolicy);
Any any = orb.create_any();
any.insert_Value(container.getRemoteTxPolicyConfig());
1.4 +6 -8
openejb/modules/core/src/java/org/openejb/corba/AdapterWrapper.java
Index: AdapterWrapper.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/AdapterWrapper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AdapterWrapper.java 12 Mar 2005 17:04:53 -0000 1.3
+++ AdapterWrapper.java 13 Jul 2005 20:49:28 -0000 1.4
@@ -54,8 +54,6 @@
import org.openejb.EJBComponentType;
import org.openejb.EJBContainer;
-import org.openejb.corba.util.TieLoader;
-
/**
* @version $Revision$ $Date$
@@ -74,17 +72,17 @@
return container;
}
- public void start(ORB orb, POA poa, NamingContextExt initialContext,
TieLoader tieLoader, Policy securityPolicy) throws CORBAException {
+ public void start(ORB orb, POA poa, NamingContextExt initialContext,
Policy securityPolicy) throws CORBAException {
switch (container.getProxyInfo().getComponentType()) {
case EJBComponentType.STATELESS:
- generator = new AdapterStateless(container, orb, poa,
tieLoader, securityPolicy);
+ generator = new AdapterStateless(container, orb, poa,
securityPolicy);
break;
case EJBComponentType.STATEFUL:
- generator = new AdapterStateful(container, orb, poa,
tieLoader, securityPolicy);
+ generator = new AdapterStateful(container, orb, poa,
securityPolicy);
break;
case EJBComponentType.BMP_ENTITY:
case EJBComponentType.CMP_ENTITY:
- generator = new AdapterEntity(container, orb, poa,
tieLoader, securityPolicy);
+ generator = new AdapterEntity(container, orb, poa,
securityPolicy);
break;
default:
throw new CORBAException("CORBA Adapter does not handle MDB
containers");
1.10 +7 -27
openejb/modules/core/src/java/org/openejb/corba/StandardServant.java
Index: StandardServant.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/StandardServant.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- StandardServant.java 28 Jun 2005 08:34:25 -0000 1.9
+++ StandardServant.java 13 Jul 2005 20:49:28 -0000 1.10
@@ -48,29 +48,24 @@
import java.rmi.AccessException;
import java.rmi.MarshalException;
import java.rmi.NoSuchObjectException;
-import java.rmi.Remote;
import java.rmi.RemoteException;
-import java.util.Collections;
import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
import java.util.Map;
import javax.ejb.EJBHome;
import javax.ejb.EJBObject;
import javax.ejb.Handle;
import javax.ejb.RemoveException;
+import javax.naming.Context;
+import javax.naming.NamingException;
import javax.transaction.InvalidTransactionException;
import javax.transaction.TransactionRequiredException;
import javax.transaction.TransactionRolledbackException;
-import javax.naming.Context;
-import javax.naming.NamingException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.core.service.InvocationResult;
-import org.apache.geronimo.naming.java.SimpleReadOnlyContext;
import org.apache.geronimo.naming.java.RootContext;
+import org.apache.geronimo.naming.java.SimpleReadOnlyContext;
import org.omg.CORBA.BAD_OPERATION;
import org.omg.CORBA.INVALID_TRANSACTION;
import org.omg.CORBA.MARSHAL;
@@ -90,8 +85,6 @@
import org.openejb.EJBInterfaceType;
import org.openejb.EJBInvocation;
import org.openejb.EJBInvocationImpl;
-import org.openejb.corba.compiler.IiopOperation;
-import org.openejb.corba.compiler.PortableStubCompiler;
import org.openejb.corba.util.Util;
/**
@@ -138,23 +131,10 @@
}
// build the operations index
- IiopOperation[] iiopOperations =
PortableStubCompiler.createIiopOperations(type);
- Map operations = new HashMap(iiopOperations.length);
- for (int i = 0; i < iiopOperations.length; i++) {
- IiopOperation iiopOperation = iiopOperations[i];
- operations.put(iiopOperation.getName(),
iiopOperation.getMethod());
- }
- this.operations = Collections.unmodifiableMap(operations);
+ this.operations = Util.mapOperationToMethod(type);
// creat the corba ids array
- List ids = new LinkedList();
- for (Iterator iterator =
PortableStubCompiler.getAllInterfaces(type).iterator(); iterator.hasNext();) {
- Class superInterface = (Class) iterator.next();
- if (Remote.class.isAssignableFrom(superInterface) &&
superInterface != Remote.class) {
- ids.add("RMI:" + superInterface.getName() +
":0000000000000000");
- }
- }
- typeIds = (String[]) ids.toArray(new String[ids.size()]);
+ typeIds = Util.createCorbaIds(type);
// create ReadOnlyContext
Map componentContext = new HashMap(2);
1.12 +11 -20
openejb/modules/core/src/java/org/openejb/corba/TSSBean.java
Index: TSSBean.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/TSSBean.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- TSSBean.java 2 Jun 2005 02:57:00 -0000 1.11
+++ TSSBean.java 13 Jul 2005 20:49:28 -0000 1.12
@@ -70,8 +70,6 @@
import org.openejb.corba.security.ServerPolicyFactory;
import org.openejb.corba.security.config.tss.TSSConfig;
import org.openejb.corba.security.config.tss.TSSNULLTransportConfig;
-import org.openejb.corba.util.TieLoader;
-
/**
* @version $Revision$ $Date$
@@ -83,7 +81,6 @@
private final ClassLoader classLoader;
private final String POAName;
private final CORBABean server;
- private final TieLoader tieLoader;
private POA localPOA;
private NamingContextExt initialContext;
private TSSConfig tssConfig;
@@ -97,14 +94,12 @@
classLoader = null;
POAName = null;
server = null;
- tieLoader = null;
}
- public TSSBean(ClassLoader classLoader, String POAName, CORBABean
server, TieLoader tieLoader) {
+ public TSSBean(ClassLoader classLoader, String POAName, CORBABean
server) {
this.classLoader = classLoader;
this.POAName = POAName;
this.server = server;
- this.tieLoader = tieLoader;
}
public CORBABean getServer() {
@@ -124,10 +119,6 @@
this.tssConfig = tssConfig;
}
- public TieLoader getTieLoader() {
- return tieLoader;
- }
-
/**
* TODO: Security policy really shouldn't be inserted if there is not CSI
* config to put into it.
@@ -188,10 +179,11 @@
TSSConfig config = new TSSConfig();
- if (server.getTssConfig() != null)
+ if (server.getTssConfig() != null) {
config.setTransport_mech(server.getTssConfig().getTransport_mech());
- else
+ } else {
config.setTransport_mech(new TSSNULLTransportConfig());
+ }
config.getMechListConfig().setStateful(tssConfig.getMechListConfig().isStateful());
for (int i = 0; i < tssConfig.getMechListConfig().size(); i++) {
@@ -202,12 +194,12 @@
}
public void registerContainer(EJBContainer container) throws
CORBAException {
- AdapterWrapper adapterWrapper = new AdapterWrapper(container);
+ AdapterWrapper adapterWrapper = new AdapterWrapper(container);
- adapterWrapper.start(server.getORB(), localPOA, initialContext,
tieLoader, securityPolicy);
- adapters.put(container.getContainerID(), adapterWrapper);
+ adapterWrapper.start(server.getORB(), localPOA, initialContext,
securityPolicy);
+ adapters.put(container.getContainerID(), adapterWrapper);
- log.info(POAName + " - Linked container " +
container.getContainerID());
+ log.info(POAName + " - Linked container " +
container.getContainerID());
}
public void unregisterContainer(EJBContainer container) {
@@ -231,10 +223,9 @@
infoFactory.addAttribute("POAName", String.class, true);
infoFactory.addReference("Server", CORBABean.class,
NameFactory.CORBA_SERVICE);
infoFactory.addAttribute("tssConfig", TSSConfig.class, true);
- infoFactory.addReference("TieLoader", TieLoader.class,
NameFactory.CORBA_SERVICE);
infoFactory.addOperation("registerContainer", new Class[]
{EJBContainer.class});
infoFactory.addOperation("unregisterContainer", new Class[]
{EJBContainer.class});
- infoFactory.setConstructor(new String[]{"classLoader", "POAName",
"Server", "TieLoader"});
+ infoFactory.setConstructor(new String[]{"classLoader", "POAName",
"Server"});
GBEAN_INFO = infoFactory.getBeanInfo();
}
