geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From delaf...@apache.org
Subject svn commit: r159298 - in geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter: Adapter.java AdapterManager.java AdapterManagerGBean.java CorbaAdapter.java HomeAdapter.txt RemoteAdapter.txt
Date Mon, 28 Mar 2005 20:35:10 GMT
Author: delafran
Date: Mon Mar 28 12:35:09 2005
New Revision: 159298

URL: http://svn.apache.org/viewcvs?view=rev&rev=159298
Log:
Removed openejb dependencies.

Added:
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/HomeAdapter.txt
      - copied, changed from r159183, geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/HomeAdapter.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/RemoteAdapter.txt
      - copied, changed from r159183, geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/RemoteAdapter.java
Modified:
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/Adapter.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/AdapterManager.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/AdapterManagerGBean.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/CorbaAdapter.java

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/Adapter.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/Adapter.java?view=diff&r1=159297&r2=159298
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/Adapter.java
(original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/Adapter.java
Mon Mar 28 12:35:09 2005
@@ -19,7 +19,7 @@
 
 import org.apache.geronimo.interop.rmi.iiop.ObjectRef;
 import org.apache.geronimo.interop.rmi.iiop.RemoteInterface;
-import org.openejb.EJBContainer;
+//import org.openejb.EJBContainer;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -35,8 +35,8 @@
     public abstract ObjectRef getObjectRef();
 
     public abstract Object getServant();
-    public abstract EJBContainer getEJBContainer();
-    public abstract Object getEJBHome();
+//    public abstract EJBContainer getEJBContainer();
+//    public abstract Object getEJBHome();
 
     public abstract void invoke(java.lang.String methodName, byte[] objectKey, org.apache.geronimo.interop.rmi.iiop.ObjectInputStream
input, org.apache.geronimo.interop.rmi.iiop.ObjectOutputStream output);
 

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/AdapterManager.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/AdapterManager.java?view=diff&r1=159297&r2=159298
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/AdapterManager.java
(original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/AdapterManager.java
Mon Mar 28 12:35:09 2005
@@ -17,8 +17,8 @@
  */
 package org.apache.geronimo.interop.adapter;
 
-import org.openejb.EJBContainer;
-import org.openejb.EJBComponentType;
+//import org.openejb.EJBContainer;
+//import org.openejb.EJBComponentType;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.gbean.*;
@@ -50,11 +50,13 @@
         this.classLoader = null;
     }
 
-    public AdapterManager( ClassLoader classLoader, Collection containers ) {
-        log.debug( "AdapterManager(): containers = " + containers );
+    //public AdapterManager( ClassLoader classLoader, Collection containers ) {
+    public AdapterManager( ClassLoader classLoader) {
+        //log.debug( "AdapterManager(): containers = " + containers );
 
         this.classLoader = classLoader;
 
+        /*
         ReferenceCollection ref = (ReferenceCollection) containers;
         ref.addReferenceCollectionListener(this);
 
@@ -63,6 +65,7 @@
         int len = ( containers != null ? containers.size() : 20 );
         homeAdapters = new HashMap( len );
         remoteAdapters = new HashMap( len );
+        */
 
         // Todo: Add the containers .. invoke memberAdded for each element in containers.
 
@@ -129,6 +132,7 @@
     }
 
     public void memberAdded(ReferenceCollectionEvent event) {
+        /*
         EJBContainer container = (EJBContainer) event.getMember();
 
         log.debug( "AdapterManager.memberAdded(): container = " + container );
@@ -156,9 +160,11 @@
         adapter = new RemoteAdapter( container );
         adapter.start();
         registerRemoteAdapter( adapter );
+        */
     }
 
     public void memberRemoved(ReferenceCollectionEvent event) {
+        /*
         EJBContainer container = (EJBContainer) event.getMember();
 
         log.debug( "AdapterManager.memberRemoved(): container = " + container );
@@ -171,6 +177,7 @@
         adapter = getRemoteAdapter( container.getContainerID() );
         adapter.stop();
         unregisterRemoteAdapter( adapter );
+        */
     }
 
     public static final GBeanInfo GBEAN_INFO;
@@ -179,9 +186,10 @@
         GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(AdapterManager.class);
 
         infoFactory.addAttribute("classLoader", ClassLoader.class, false);
-        infoFactory.addReference("containers", EJBContainer.class);
+        //infoFactory.addReference("containers", EJBContainer.class);
 
-        infoFactory.setConstructor(new String[]{"classLoader", "containers"});
+        //infoFactory.setConstructor(new String[]{"classLoader", "containers"});
+        infoFactory.setConstructor(new String[]{"classLoader"});
 
         GBEAN_INFO = infoFactory.getBeanInfo();
     }

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/AdapterManagerGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/AdapterManagerGBean.java?view=diff&r1=159297&r2=159298
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/AdapterManagerGBean.java
(original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/AdapterManagerGBean.java
Mon Mar 28 12:35:09 2005
@@ -20,7 +20,6 @@
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 
-
 public class AdapterManagerGBean
 {
     public static final GBeanInfo GBEAN_INFO;

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/CorbaAdapter.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/CorbaAdapter.java?view=diff&r1=159297&r2=159298
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/CorbaAdapter.java
(original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/CorbaAdapter.java
Mon Mar 28 12:35:09 2005
@@ -17,16 +17,11 @@
  */
 package org.apache.geronimo.interop.adapter;
 
-import java.util.HashMap;
-
 import org.apache.geronimo.interop.rmi.iiop.RemoteInterface;
-import org.apache.geronimo.interop.rmi.iiop.ObjectInputStream;
-import org.apache.geronimo.interop.rmi.iiop.ObjectOutputStream;
 import org.apache.geronimo.interop.rmi.iiop.ObjectRef;
 import org.apache.geronimo.interop.naming.NameService;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.openejb.EJBContainer;
 
 public class CorbaAdapter extends Adapter {
 
@@ -164,7 +159,7 @@
         return remoteClassObject;
     }
 
-    public EJBContainer getEJBContainer()
+    public Object getEJBContainer()
     {
         return null;  //To change body of implemented methods use File | Settings | File
Templates.
     }

Copied: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/HomeAdapter.txt
(from r159183, geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/HomeAdapter.java)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/HomeAdapter.txt?view=diff&rev=159298&p1=geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/HomeAdapter.java&r1=159183&p2=geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/HomeAdapter.txt&r2=159298
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/HomeAdapter.java
(original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/HomeAdapter.txt
Mon Mar 28 12:35:09 2005
@@ -28,8 +28,8 @@
 import org.apache.geronimo.interop.naming.NameService;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.openejb.EJBContainer;
-import org.openejb.proxy.ProxyInfo;
+//import org.openejb.EJBContainer;
+//import org.openejb.proxy.ProxyInfo;
 
 public class HomeAdapter extends Adapter {
 

Copied: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/RemoteAdapter.txt
(from r159183, geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/RemoteAdapter.java)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/RemoteAdapter.txt?view=diff&rev=159298&p1=geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/RemoteAdapter.java&r1=159183&p2=geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/RemoteAdapter.txt&r2=159298
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/RemoteAdapter.java
(original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/RemoteAdapter.txt
Mon Mar 28 12:35:09 2005
@@ -20,10 +20,10 @@
 import org.apache.geronimo.interop.rmi.iiop.ObjectInputStream;
 import org.apache.geronimo.interop.rmi.iiop.ObjectOutputStream;
 import org.apache.geronimo.interop.rmi.iiop.ObjectRef;
-import org.openejb.EJBContainer;
-import org.openejb.client.ProxyFactory;
-import org.openejb.proxy.ProxyInfo;
-import org.openejb.proxy.EJBProxyFactory;
+//import org.openejb.EJBContainer;
+//import org.openejb.client.ProxyFactory;
+//import org.openejb.proxy.ProxyInfo;
+//import org.openejb.proxy.EJBProxyFactory;
 
 import java.util.HashMap;
 import java.util.Vector;



Mime
View raw message