geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r164105 - in /geronimo/trunk/modules/interop: ./ src/java/org/apache/geronimo/interop/ src/java/org/apache/geronimo/interop/naming/ src/java/org/apache/geronimo/interop/rmi/iiop/ src/java/org/apache/geronimo/interop/rmi/iiop/client/ src/java/org/apache/geronimo/interop/rmi/iiop/server/
Date Thu, 21 Apr 2005 19:13:43 GMT
Author: djencks
Date: Thu Apr 21 12:13:40 2005
New Revision: 164105

URL: http://svn.apache.org/viewcvs?rev=164105&view=rev
Log:
Use the corba classes from the spec module

Modified:
    geronimo/trunk/modules/interop/maven.xml
    geronimo/trunk/modules/interop/project.properties
    geronimo/trunk/modules/interop/project.xml
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/InteropGBean.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/naming/NameService.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/CdrInputStream.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/CdrOutputStream.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/CorbaObject.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/GiopMessage.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/ObjectRef.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/ObjectRefHelper.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/PrimitiveType.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/PutField.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/RemoteObject.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/SimpleObjectInputStream.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/SimpleObjectOutputStream.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/ValueType.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/ValueTypeField.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/client/ClientNamingContext.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/client/Connection.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/client/ConnectionPool.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/server/MessageHandler.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/server/RmiIiopServerGBean.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/server/ServerNamingContext.java

Modified: geronimo/trunk/modules/interop/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/maven.xml?rev=164105&r1=164104&r2=164105&view=diff
==============================================================================
--- geronimo/trunk/modules/interop/maven.xml (original)
+++ geronimo/trunk/modules/interop/maven.xml Thu Apr 21 12:13:40 2005
@@ -6,16 +6,16 @@
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-  
+
 
 <!-- $Rev: 46019 $ $Date: 2004-09-14 05:56:06 -0400 (Tue, 14 Sep 2004) $ -->
 
@@ -25,7 +25,7 @@
     >
 
     <!-- <property name="idlj.verbose" value="-verbose"/> -->
-    <property name="idlj.verbose" value="-verbose"/> 
+    <property name="idlj.verbose" value="-verbose"/>
     <property name="pkg.prefix" value="org.apache.geronimo.interop"/>
 
     <!--
@@ -124,7 +124,7 @@
         <ant:property name="idl.file" value="GSSUP"/>
       </ant:ant>
     </goal>
-        
+
     <goal name="interop:idlj:csiv2:csiiop">
       <ant:echo message="Interop :: idlj :: CSIv2 :: CSIIIOP"/>
       <ant:ant antfile="build.xml">
@@ -264,10 +264,10 @@
       </ant:exec>
     </goal>
 
-    <preGoal name="java:compile">
-        <attainGoal name="interop:idlj"/>
-        <attainGoal name="interop:java:compile"/>
-    </preGoal>
+<!--    <preGoal name="java:compile">-->
+<!--        <attainGoal name="interop:idlj"/>-->
+<!--        <attainGoal name="interop:java:compile"/>-->
+<!--    </preGoal>-->
 
     <postGoal name="java:compile">
       <!--

Modified: geronimo/trunk/modules/interop/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/project.properties?rev=164105&r1=164104&r2=164105&view=diff
==============================================================================
--- geronimo/trunk/modules/interop/project.properties (original)
+++ geronimo/trunk/modules/interop/project.properties Thu Apr 21 12:13:40 2005
@@ -3,5 +3,5 @@
 ##
 
 # Include classes generated by the IDL-to-Java compiler in the eclipse classpath
-maven.eclipse.classpath.include=target/src
-maven.idea.generated.source=src 
+#maven.eclipse.classpath.include=target/src
+#maven.idea.generated.source=src 

Modified: geronimo/trunk/modules/interop/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/project.xml?rev=164105&r1=164104&r2=164105&view=diff
==============================================================================
--- geronimo/trunk/modules/interop/project.xml (original)
+++ geronimo/trunk/modules/interop/project.xml Thu Apr 21 12:13:40 2005
@@ -56,6 +56,12 @@
 
         <dependency>
             <groupId>geronimo-spec</groupId>
+            <artifactId>geronimo-spec-corba</artifactId>
+            <version>${geronimo_spec_corba_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo-spec</groupId>
             <artifactId>geronimo-spec-ejb</artifactId>
             <version>${geronimo_spec_ejb_version}</version>
         </dependency>

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/InteropGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/InteropGBean.java?rev=164105&r1=164104&r2=164105&view=diff
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/InteropGBean.java
(original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/InteropGBean.java
Thu Apr 21 12:13:40 2005
@@ -21,11 +21,10 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
-import org.apache.geronimo.interop.IOP.IOR;
+import org.omg.IOP.IOR;
 
 
 /**
@@ -98,9 +97,9 @@
      */
     public void echo(String msg) {
         log.info(getName() + ": Echo " + msg);
-    }    
+    }
 
-    /* 
+    /*
      * Interface :: GBeanLifecycle
      */
 
@@ -116,7 +115,7 @@
         log.info("Failed " + getName());
     }
 
-    /* 
+    /*
      * GBeanInfo
      */
 

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/naming/NameService.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/naming/NameService.java?rev=164105&r1=164104&r2=164105&view=diff
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/naming/NameService.java
(original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/naming/NameService.java
Thu Apr 21 12:13:40 2005
@@ -21,17 +21,15 @@
 import javax.naming.NamingException;
 
 import org.apache.geronimo.interop.adapter.Adapter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 public class NameService {
     private static NameService ns = null;
-    private final Log log = LogFactory.getLog(NameService.class);
 
     public static synchronized NameService getInstance() {
         if (ns == null) {
             ns = new NameService();
             ns.init();
+            
         }
         return ns;
     }

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/CdrInputStream.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/CdrInputStream.java?rev=164105&r1=164104&r2=164105&view=diff
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/CdrInputStream.java
(original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/CdrInputStream.java
Thu Apr 21 12:13:40 2005
@@ -17,16 +17,37 @@
  */
 package org.apache.geronimo.interop.rmi.iiop;
 
-import org.apache.geronimo.interop.rmi.*;
-import org.apache.geronimo.interop.rmi.iiop.client.*;
-import org.apache.geronimo.interop.rmi.iiop.compiler.StubFactory;
-import org.apache.geronimo.interop.util.*;
-import org.apache.geronimo.interop.IOP.*;
-import org.apache.geronimo.interop.GIOP.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.util.zip.GZIPInputStream;
+
 import org.apache.geronimo.interop.SystemException;
+import org.apache.geronimo.interop.rmi.RmiTrace;
+import org.apache.geronimo.interop.rmi.iiop.client.ClientNamingContext;
+import org.apache.geronimo.interop.rmi.iiop.compiler.StubFactory;
+import org.apache.geronimo.interop.util.ArrayUtil;
+import org.apache.geronimo.interop.util.BigEndian;
+import org.apache.geronimo.interop.util.ExceptionUtil;
+import org.apache.geronimo.interop.util.LittleEndian;
+import org.apache.geronimo.interop.util.ThreadContext;
+import org.apache.geronimo.interop.util.UTF8;
+import org.apache.geronimo.interop.util.UnsignedShort;
 import org.omg.CORBA.TCKind;
-import java.io.*;
-import java.util.zip.*;
+import org.omg.GIOP.LocateRequestHeader_1_0;
+import org.omg.GIOP.LocateRequestHeader_1_0Helper;
+import org.omg.GIOP.LocateRequestHeader_1_2;
+import org.omg.GIOP.LocateRequestHeader_1_2Helper;
+import org.omg.GIOP.MsgType_1_1;
+import org.omg.GIOP.ReplyHeader_1_2Helper;
+import org.omg.GIOP.RequestHeader_1_0;
+import org.omg.GIOP.RequestHeader_1_0Helper;
+import org.omg.GIOP.RequestHeader_1_1;
+import org.omg.GIOP.RequestHeader_1_1Helper;
+import org.omg.GIOP.RequestHeader_1_2;
+import org.omg.GIOP.RequestHeader_1_2Helper;
+import org.omg.GIOP.TargetAddress;
+import org.omg.IOP.IOR;
+import org.omg.IOP.IORHelper;
 
 /**
  ** CORBA 2.3 / GIOP 1.2 CDR InputStream.
@@ -36,7 +57,7 @@
 
     public static CdrInputStream getInstance()
     {
-        CdrInputStream input = new CdrInputStream(); 
+        CdrInputStream input = new CdrInputStream();
         input.init(new byte[64], 0, DEFAULT_BUFFER_LENGTH, false);
         return input;
     }
@@ -50,7 +71,7 @@
 
     public static CdrInputStream getInstance(byte[] buffer, int offset, int length, boolean
little)
     {
-        CdrInputStream input = new CdrInputStream(); 
+        CdrInputStream input = new CdrInputStream();
         input.init(buffer, offset, length, little);
         return input;
     }
@@ -62,7 +83,7 @@
 
     public static CdrInputStream getPooledInstance()
     {
-        CdrInputStream input = null; 
+        CdrInputStream input = null;
         if (input == null)
         {
             input = getInstance();
@@ -78,7 +99,7 @@
 
     private static final int MAXIMUM_POOLED_BUFFER_LENGTH = 1024;
 
-    private static boolean RMI_TRACE = true; 
+    private static boolean RMI_TRACE = true;
 
     private static final byte[] EMPTY_BYTE_ARRAY = {};
 
@@ -283,12 +304,12 @@
             {
                 _gzip = true;
             }
-            else if ((m1 == 'P' || m1 == 'p') && (m2 == 'O' || m2 == 'o') &&
(m3 == 'S' || m3 == 's') && 
+            else if ((m1 == 'P' || m1 == 'p') && (m2 == 'O' || m2 == 'o') &&
(m3 == 'S' || m3 == 's') &&
                     (m4 == 'T' || m4 == 't'))
             {
                 return receive_http_post_message(input, url);
             }
-            else if( (m1 == 'G' || m1 == 'g') && (m2 == 'E' || m2 == 'e') &&
(m3 == 'T' || m3 == 't') && 
+            else if( (m1 == 'G' || m1 == 'g') && (m2 == 'E' || m2 == 'e') &&
(m3 == 'T' || m3 == 't') &&
                 m4 == ' ')
             {
                 return receive_http_get_message(input, url);
@@ -483,7 +504,7 @@
     protected GiopMessage receive_http_get_message(java.io.InputStream input, String url)
     {
         //We have already read first 12 bytes ( = sizeof(GIOP header) )
-        
+
         int count = http_read_line(input, 12);
         String str = new String(_buffer, 0, count);
         int index = str.indexOf("/HIOP/1.0/");
@@ -508,7 +529,7 @@
     }
 
     /**
-     * Note that we consider that the client always uses HIOP/2.0. Hence, the 
+     * Note that we consider that the client always uses HIOP/2.0. Hence, the
      * iiop data is binary stream instead of base64 hex string.
      */
     public GiopMessage receive_http_response(java.io.InputStream input, String url)
@@ -520,7 +541,7 @@
         {
             throw new SystemException("HTTP response error");
         }
-        
+
         if(status.indexOf("200") == -1 || status.indexOf("ok") == -1)
         {
             throw new SystemException("HTTP response error");
@@ -572,7 +593,7 @@
     {
         //We have already read first 12 bytes ( = sizeof(GIOP header) )
         int count = http_read_line(input, 12);
-        
+
         String str = new String(_buffer, 0, count);
         int index, ver;
 
@@ -613,7 +634,7 @@
     }
 
     /**
-     * Read the line from input stream terminated by CRLF. 
+     * Read the line from input stream terminated by CRLF.
      * CRLF is not part of the data in the buffer. Return the number of bytes in the line
      */
 
@@ -1167,7 +1188,7 @@
         value.read_value(os.create_input_stream(), tc);
         return value;
     }
-    
+
     public void read_Any(org.omg.CORBA.portable.OutputStream os, org.omg.CORBA.TypeCode tc)
     {
         try

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/CdrOutputStream.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/CdrOutputStream.java?rev=164105&r1=164104&r2=164105&view=diff
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/CdrOutputStream.java
(original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/CdrOutputStream.java
Thu Apr 21 12:13:40 2005
@@ -17,13 +17,34 @@
  */
 package org.apache.geronimo.interop.rmi.iiop;
 
-import org.apache.geronimo.interop.rmi.*;
-import org.apache.geronimo.interop.util.*;
-import org.apache.geronimo.interop.IOP.*;
-import org.apache.geronimo.interop.GIOP.*;
 import org.apache.geronimo.interop.SystemException;
+import org.apache.geronimo.interop.rmi.RmiTrace;
+import org.apache.geronimo.interop.util.ArrayUtil;
+import org.apache.geronimo.interop.util.BigEndian;
+import org.apache.geronimo.interop.util.ExceptionUtil;
+import org.apache.geronimo.interop.util.JavaClass;
+import org.apache.geronimo.interop.util.UTF8;
 import org.omg.CORBA.TCKind;
-import java.io.*;
+import org.omg.GIOP.LocateReplyHeader_1_2;
+import org.omg.GIOP.LocateReplyHeader_1_2Helper;
+import org.omg.GIOP.MessageHeader_1_1;
+import org.omg.GIOP.MessageHeader_1_1Helper;
+import org.omg.GIOP.MsgType_1_1;
+import org.omg.GIOP.ReplyHeader_1_0;
+import org.omg.GIOP.ReplyHeader_1_0Helper;
+import org.omg.GIOP.ReplyHeader_1_2;
+import org.omg.GIOP.ReplyHeader_1_2Helper;
+import org.omg.GIOP.RequestHeader_1_0;
+import org.omg.GIOP.RequestHeader_1_0Helper;
+import org.omg.GIOP.RequestHeader_1_1;
+import org.omg.GIOP.RequestHeader_1_1Helper;
+import org.omg.GIOP.RequestHeader_1_2;
+import org.omg.GIOP.RequestHeader_1_2Helper;
+import org.omg.GIOP.Version;
+import org.omg.IOP.IOR;
+import org.omg.IOP.IORHelper;
+import org.omg.IOP.ServiceContext;
+import org.omg.IOP.TaggedProfile;
 
 /**
  ** CORBA 2.3 / GIOP 1.2 CDR OutputStream.
@@ -416,7 +437,7 @@
         respHeader.append("Content-Length: ");
         respHeader.append(java.lang.Integer.toString(_offset));
         respHeader.append(CRLF + CRLF);
-        
+
         byte[] header = null;
         try
         {
@@ -473,7 +494,7 @@
         byte[] data = new byte[header.length + _offset];
         System.arraycopy(header, 0, data, 0, header.length);
         System.arraycopy(_buffer, 0, data, header.length, _offset);
-        
+
         if (RMI_TRACE)
         {
             RmiTrace.send(url, data);
@@ -948,7 +969,7 @@
     }
 
 
-    // doing this specifically to handle Any. This implementation 
+    // doing this specifically to handle Any. This implementation
     // could be worng but will work for us
     public org.omg.CORBA.portable.InputStream create_input_stream()
     {

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/CorbaObject.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/CorbaObject.java?rev=164105&r1=164104&r2=164105&view=diff
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/CorbaObject.java
(original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/CorbaObject.java
Thu Apr 21 12:13:40 2005
@@ -17,7 +17,6 @@
  */
 package org.apache.geronimo.interop.rmi.iiop;
 
-import org.omg.CORBA.*;
 
 public class CorbaObject implements org.omg.CORBA.Object {
     // -----------------------------------------------------------------------

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/GiopMessage.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/GiopMessage.java?rev=164105&r1=164104&r2=164105&view=diff
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/GiopMessage.java
(original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/GiopMessage.java
Thu Apr 21 12:13:40 2005
@@ -17,7 +17,9 @@
  */
 package org.apache.geronimo.interop.rmi.iiop;
 
-import org.apache.geronimo.interop.GIOP.*;
+import org.omg.GIOP.RequestHeader_1_2;
+import org.omg.GIOP.LocateRequestHeader_1_2;
+import org.omg.GIOP.ReplyHeader_1_2;
 
 public class GiopMessage
 {

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/ObjectRef.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/ObjectRef.java?rev=164105&r1=164104&r2=164105&view=diff
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/ObjectRef.java
(original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/ObjectRef.java
Thu Apr 21 12:13:40 2005
@@ -17,13 +17,24 @@
  */
 package org.apache.geronimo.interop.rmi.iiop;
 
-import org.apache.geronimo.interop.*;
-import org.apache.geronimo.interop.rmi.iiop.client.*;
-import org.apache.geronimo.interop.IOP.*;
-import org.apache.geronimo.interop.IIOP.*;
-import org.apache.geronimo.interop.security.*;
-import org.apache.geronimo.interop.util.*;
-import java.util.*;
+import java.util.Hashtable;
+
+import org.apache.geronimo.interop.rmi.iiop.client.ClientNamingContext;
+import org.apache.geronimo.interop.rmi.iiop.client.Connection;
+import org.apache.geronimo.interop.security.SimpleSubject;
+import org.apache.geronimo.interop.util.Base16Binary;
+import org.apache.geronimo.interop.util.FutureObject;
+import org.apache.geronimo.interop.util.StringUtil;
+import org.apache.geronimo.interop.util.ThreadContext;
+import org.apache.geronimo.interop.util.UTF8;
+import org.apache.geronimo.interop.util.UnsignedShort;
+import org.omg.IIOP.ProfileBody_1_1;
+import org.omg.IIOP.ProfileBody_1_1Helper;
+import org.omg.IIOP.Version;
+import org.omg.IOP.IOR;
+import org.omg.IOP.TAG_INTERNET_IOP;
+import org.omg.IOP.TaggedComponent;
+import org.omg.IOP.TaggedProfile;
 
 public class ObjectRef extends CorbaObject
 {
@@ -65,7 +76,7 @@
 
     private int _iiopVersion = IIOP_VERSION_1_2;
 
-    private org.apache.geronimo.interop.IOP.IOR _ior;
+    private IOR _ior;
 
     private ClientNamingContext _namingContext;
 
@@ -88,10 +99,10 @@
     public long _objectVersion;
 
     // public methods
-    
+
    public ObjectRef()
    {
-   } 
+   }
 
     public Connection $connect()
     {
@@ -148,7 +159,7 @@
         _repositoryID = id;
     }
 
-    public org.apache.geronimo.interop.IOP.IOR $getIOR()
+    public IOR $getIOR()
     {
         if (_ior == null)
         {
@@ -189,7 +200,7 @@
         return _ior;
     }
 
-    public void $setIOR(org.apache.geronimo.interop.IOP.IOR ior)
+    public void $setIOR(IOR ior)
     {
         _ior = ior;
         _endpoint = null;
@@ -371,7 +382,7 @@
 
     public String $getIORString()
     {
-		org.apache.geronimo.interop.IOP.IOR ior = $getIOR();
+		IOR ior = $getIOR();
 		CdrOutputStream output = CdrOutputStream.getInstanceForEncapsulation();
 		output.setGiopVersion(GiopVersion.VERSION_1_0);
 		output.write_Object(this);
@@ -399,8 +410,8 @@
 
     public String toString()
     {
-        return getClass().getName() + ":protocol=" + Protocol.getName($getProtocol())  
-            + ":host=" + $getHost()  + ":port=" + $getPort() 
+        return getClass().getName() + ":protocol=" + Protocol.getName($getProtocol())
+            + ":host=" + $getHost()  + ":port=" + $getPort()
             +  ":key=" + Base16Binary.toString($getObjectKey());
     }
 }

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/ObjectRefHelper.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/ObjectRefHelper.java?rev=164105&r1=164104&r2=164105&view=diff
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/ObjectRefHelper.java
(original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/ObjectRefHelper.java
Thu Apr 21 12:13:40 2005
@@ -17,8 +17,7 @@
  */
 package org.apache.geronimo.interop.rmi.iiop;
 
-import org.apache.geronimo.interop.*;
-import org.apache.geronimo.interop.IOP.*;
+
 
 public class ObjectRefHelper implements ObjectHelper
 {

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/PrimitiveType.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/PrimitiveType.java?rev=164105&r1=164104&r2=164105&view=diff
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/PrimitiveType.java
(original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/PrimitiveType.java
Thu Apr 21 12:13:40 2005
@@ -17,7 +17,7 @@
  */
 package org.apache.geronimo.interop.rmi.iiop;
 
-import org.apache.geronimo.interop.util.*;
+import org.apache.geronimo.interop.util.ArrayUtil;
 
 public class PrimitiveType
 {

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/PutField.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/PutField.java?rev=164105&r1=164104&r2=164105&view=diff
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/PutField.java
(original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/PutField.java
Thu Apr 21 12:13:40 2005
@@ -17,9 +17,11 @@
  */
 package org.apache.geronimo.interop.rmi.iiop;
 
-import java.io.*;
-import java.util.*;
-import java.lang.reflect.*;
+import java.io.IOException;
+import java.io.ObjectOutput;
+import java.io.ObjectStreamClass;
+import java.io.ObjectStreamField;
+import java.lang.reflect.Method;
 
 /**
  ** An implementation of java.io.ObjectOutputStream.PutField
@@ -171,7 +173,7 @@
 
     /**
      * Write the data and fields to the specified ObjectOutput stream.
-     * 
+     *
      * @param  out the stream to write the data and fields to
      * @throws IOException if I/O errors occur while writing to the
      *        underlying stream
@@ -192,7 +194,7 @@
          * broken implementation is being retained solely for behavioral
          * compatibility, in order to support applications which use
          * OOS.PutField.write() for writing only non-primitive data.
-         * 
+         *
          * Serialization of unshared objects is not implemented here since
          * it is not necessary for backwards compatibility; also, unshared
          * semantics may not be supported by the given ObjectOutput
@@ -307,7 +309,7 @@
             java.io.ObjectStreamField f = fields[i];
             _fields[i] = new ObjectStreamField(fields[i].getName(), fields[i].getType());
             ObjectStreamField _f = _fields[i];
-            
+
             switch (f.getTypeCode())
             {
                 case 'Z':
@@ -352,7 +354,7 @@
             }
         }
         if (firstObjIndex != -1 && firstObjIndex + numObjFields != fields.length)
-        {   
+        {
             //throw new InvalidClassException(name, "illegal field order");
         }
     }

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/RemoteObject.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/RemoteObject.java?rev=164105&r1=164104&r2=164105&view=diff
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/RemoteObject.java
(original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/RemoteObject.java
Thu Apr 21 12:13:40 2005
@@ -17,8 +17,6 @@
  */
 package org.apache.geronimo.interop.rmi.iiop;
 
-import org.apache.geronimo.interop.adapter.Adapter;
-
 import java.util.HashMap;
 
 public abstract class RemoteObject {

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/SimpleObjectInputStream.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/SimpleObjectInputStream.java?rev=164105&r1=164104&r2=164105&view=diff
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/SimpleObjectInputStream.java
(original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/SimpleObjectInputStream.java
Thu Apr 21 12:13:40 2005
@@ -17,10 +17,9 @@
  */
 package org.apache.geronimo.interop.rmi.iiop;
 
-import org.apache.geronimo.interop.*;
-import org.apache.geronimo.interop.rmi.*;
-import org.apache.geronimo.interop.util.*;
-import java.io.*;
+import java.io.IOException;
+
+import org.apache.geronimo.interop.util.JavaObject;
 
 public class SimpleObjectInputStream extends ObjectInputStream
 {

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/SimpleObjectOutputStream.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/SimpleObjectOutputStream.java?rev=164105&r1=164104&r2=164105&view=diff
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/SimpleObjectOutputStream.java
(original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/SimpleObjectOutputStream.java
Thu Apr 21 12:13:40 2005
@@ -17,10 +17,10 @@
  */
 package org.apache.geronimo.interop.rmi.iiop;
 
-import org.apache.geronimo.interop.*;
-import org.apache.geronimo.interop.rmi.*;
-import org.apache.geronimo.interop.util.*;
-import java.io.*;
+import java.io.IOException;
+
+import org.apache.geronimo.interop.util.ArrayUtil;
+import org.apache.geronimo.interop.util.JavaObject;
 
 public class SimpleObjectOutputStream extends ObjectOutputStream
 {

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/ValueType.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/ValueType.java?rev=164105&r1=164104&r2=164105&view=diff
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/ValueType.java
(original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/ValueType.java
Thu Apr 21 12:13:40 2005
@@ -17,13 +17,29 @@
  */
 package org.apache.geronimo.interop.rmi.iiop;
 
-import org.apache.geronimo.interop.*;
-import org.apache.geronimo.interop.rmi.*;
-import org.apache.geronimo.interop.util.*;
-import java.io.*;
-import java.lang.reflect.*;
-import java.security.*;
-import java.util.*;
+import java.io.ByteArrayOutputStream;
+import java.io.DataOutputStream;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.ObjectStreamClass;
+import java.io.Serializable;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.security.DigestOutputStream;
+import java.security.MessageDigest;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+
+import org.apache.geronimo.interop.SystemException;
+import org.apache.geronimo.interop.util.ArrayUtil;
+import org.apache.geronimo.interop.util.ExceptionUtil;
+import org.apache.geronimo.interop.util.JavaClass;
+import org.apache.geronimo.interop.util.JavaType;
+import org.apache.geronimo.interop.util.SystemUtil;
+import org.apache.geronimo.interop.util.ThreadContext;
 import org.omg.CORBA.TCKind;
 
 /**

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/ValueTypeField.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/ValueTypeField.java?rev=164105&r1=164104&r2=164105&view=diff
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/ValueTypeField.java
(original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/ValueTypeField.java
Thu Apr 21 12:13:40 2005
@@ -17,8 +17,10 @@
  */
 package org.apache.geronimo.interop.rmi.iiop;
 
-import org.apache.geronimo.interop.*;
-import java.lang.reflect.*;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+
+import org.apache.geronimo.interop.SystemException;
 
 public class ValueTypeField
 {
@@ -208,7 +210,7 @@
         {
             if(isFinal)
             {
-                finalFieldSetter.setChar(that, value);            
+                finalFieldSetter.setChar(that, value);
             }
             else
             {

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/client/ClientNamingContext.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/client/ClientNamingContext.java?rev=164105&r1=164104&r2=164105&view=diff
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/client/ClientNamingContext.java
(original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/client/ClientNamingContext.java
Thu Apr 21 12:13:40 2005
@@ -17,7 +17,10 @@
  */
 package org.apache.geronimo.interop.rmi.iiop.client;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Map;
 import javax.naming.Context;
 import javax.naming.Name;
 import javax.naming.NameNotFoundException;
@@ -33,8 +36,11 @@
 import org.apache.geronimo.interop.rmi.iiop.ObjectRef;
 import org.apache.geronimo.interop.rmi.iiop.compiler.StubFactory;
 import org.apache.geronimo.interop.util.ExceptionUtil;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextPackage.NotFound;
 
-public class ClientNamingContext implements Context, java.io.Serializable 
+public class ClientNamingContext implements Context, java.io.Serializable
 {
 
     public static ClientNamingContext getInstance(Hashtable env)
@@ -45,7 +51,7 @@
             synchronized (contextMap)
             {
                 nc = (ClientNamingContext) contextMap.get(env);
-                if (nc == null) 
+                if (nc == null)
                 {
                     nc = new ClientNamingContext();
                     nc.init(env);
@@ -99,7 +105,7 @@
 
     private String          namePrefix;
 
-    private org.apache.geronimo.interop.CosNaming.NamingContext serverNamingContext;
+    private NamingContext serverNamingContext;
 
     public ConnectionPool getConnectionPool() {
         return connectionPool;
@@ -169,7 +175,7 @@
                     hostListCache.remove(name);
                     nb = null;
                 }
-                if (nb == null) {                    
+                if (nb == null) {
                     hostListCache.put(name, nb);
                 }
             }
@@ -289,7 +295,7 @@
         throw new OperationNotSupportedException();
     }
 
-    protected void init(Hashtable env) 
+    protected void init(Hashtable env)
     {
         this.env = env;
         Object urlObject = env.get(Context.PROVIDER_URL);
@@ -299,8 +305,8 @@
         }
         String url = urlObject.toString();
         UrlInfo urlInfo = UrlInfo.getInstance(url);
-        serverNamingContext = (org.apache.geronimo.interop.CosNaming.NamingContext)
-                StubFactory.getInstance().getStub(org.apache.geronimo.interop.CosNaming.NamingContext.class);
+        serverNamingContext = (NamingContext)
+                StubFactory.getInstance().getStub(NamingContext.class);
 
         namePrefix = urlInfo.getNamePrefix();
 
@@ -369,15 +375,15 @@
         }
         try
         {
-            org.apache.geronimo.interop.CosNaming.NameComponent[] resolveName =
-                { new org.apache.geronimo.interop.CosNaming.NameComponent(namePrefix + name,
"") };
+            NameComponent[] resolveName =
+                { new NameComponent(namePrefix + name, "") };
             org.omg.CORBA.Object object = serverNamingContext.resolve(resolveName);
             NameBinding nb = new NameBinding();
             nb.object = object;
             nb.cacheTimeout = System.currentTimeMillis() + lookupCacheTimeout;
             return nb;
         }
-        catch (org.apache.geronimo.interop.CosNaming.NamingContextPackage.NotFound notFound)
+        catch (NotFound notFound)
         {
             throw new NameNotFoundException(name);
         }

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/client/Connection.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/client/Connection.java?rev=164105&r1=164104&r2=164105&view=diff
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/client/Connection.java
(original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/client/Connection.java
Thu Apr 21 12:13:40 2005
@@ -17,30 +17,42 @@
  */
 package org.apache.geronimo.interop.rmi.iiop.client;
 
-import java.net.Socket;
 import java.io.IOException;
 import java.lang.reflect.Constructor;
+import java.net.Socket;
 
-import org.apache.geronimo.interop.GIOP.*;
-import org.apache.geronimo.interop.IOP.*;
 import org.apache.geronimo.interop.SystemException;
 import org.apache.geronimo.interop.properties.BooleanProperty;
 import org.apache.geronimo.interop.properties.IntProperty;
 import org.apache.geronimo.interop.properties.PropertyMap;
 import org.apache.geronimo.interop.properties.SystemProperties;
-import org.apache.geronimo.interop.rmi.iiop.*;
+import org.apache.geronimo.interop.rmi.iiop.BadMagicException;
+import org.apache.geronimo.interop.rmi.iiop.CdrInputStream;
+import org.apache.geronimo.interop.rmi.iiop.CdrOutputStream;
+import org.apache.geronimo.interop.rmi.iiop.GiopMessage;
+import org.apache.geronimo.interop.rmi.iiop.ObjectRef;
+import org.apache.geronimo.interop.rmi.iiop.SecurityInfo;
+import org.apache.geronimo.interop.rmi.iiop.SimpleObjectInputStream;
+import org.apache.geronimo.interop.rmi.iiop.UnsupportedProtocolVersionException;
 import org.apache.geronimo.interop.util.ExceptionUtil;
 import org.apache.geronimo.interop.util.InstancePool;
 import org.apache.geronimo.interop.util.StringUtil;
 import org.apache.geronimo.interop.util.ThreadContext;
-import org.apache.geronimo.interop.util.UTF8;
+import org.omg.GIOP.MsgType_1_1;
+import org.omg.GIOP.ReplyHeader_1_2;
+import org.omg.GIOP.ReplyStatusType_1_2;
+import org.omg.GIOP.RequestHeader_1_2;
+import org.omg.GIOP.SystemExceptionReplyBody;
+import org.omg.GIOP.SystemExceptionReplyBodyHelper;
+import org.omg.GIOP.TargetAddress;
+import org.omg.IOP.ServiceContext;
 
-public class Connection 
+public class Connection
 {
 
     private static final byte reservedBA[] = new byte[] { 0, 0, 0};
     private int requestid_ = 0;
-    
+
     // http tunnelling related
     private boolean httpTunnelled;
     private String  httpHeaders;
@@ -51,7 +63,7 @@
     {
     }
 
-    public static Connection getInstance(String endpoint, ObjectRef objectRef, PropertyMap
connProps) 
+    public static Connection getInstance(String endpoint, ObjectRef objectRef, PropertyMap
connProps)
     {
         Connection conn = new Connection();
         conn.init(endpoint, objectRef, connProps);
@@ -110,17 +122,17 @@
 
     protected java.io.OutputStream  socketOut;
 
-    public String getInstanceName() 
+    public String getInstanceName()
     {
         return url;
     }
 
-    public void close() 
+    public void close()
     {
         parameters = null;
         input = null;
         output = null;
-        if (ok) 
+        if (ok)
         {
             pool.put(this);
         }
@@ -162,7 +174,7 @@
         requestOut.write_request(request, parameters);
 
 
-        try 
+        try
         {
             if(httpTunnelled)
             {
@@ -313,7 +325,7 @@
             socketOut = socket.getOutputStream();
             socket.setSoTimeout(1000 * socketTimeout);
         }
-        catch (Exception ex) 
+        catch (Exception ex)
         {
             throw new SystemException(ex);
         }
@@ -537,7 +549,7 @@
         {
             // get http extra headers if present
             httpHeaders = connprops.getProperty("HttpExtraHeader");
-            
+
             if(httpHeaders != null && httpHeaders.toLowerCase().indexOf("user-agent")
== -1)
             {
                 httpHeaders += "User-Agent: Geronimo/1.0\r\n";
@@ -551,7 +563,7 @@
             //get webproxy host/port if present:
             webProxyHost = connprops.getProperty("WebProxyHost");
             String port = connprops.getProperty("WebProxyPort");
-            
+
             if(port != null)
             {
                 try

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/client/ConnectionPool.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/client/ConnectionPool.java?rev=164105&r1=164104&r2=164105&view=diff
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/client/ConnectionPool.java
(original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/client/ConnectionPool.java
Thu Apr 21 12:13:40 2005
@@ -17,7 +17,6 @@
  */
 package org.apache.geronimo.interop.rmi.iiop.client;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 
 import org.apache.geronimo.interop.SystemException;

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/server/MessageHandler.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/server/MessageHandler.java?rev=164105&r1=164104&r2=164105&view=diff
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/server/MessageHandler.java
(original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/server/MessageHandler.java
Thu Apr 21 12:13:40 2005
@@ -17,22 +17,35 @@
  */
 package org.apache.geronimo.interop.rmi.iiop.server;
 
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.net.InetAddress;
 import java.net.Socket;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.InputStream;
 
-import org.apache.geronimo.interop.GIOP.*;
-import org.apache.geronimo.interop.IOP.*;
 import org.apache.geronimo.interop.SystemException;
-//import org.apache.geronimo.interop.adapter.HomeAdapter;
-import org.apache.geronimo.interop.adapter.AdapterManager;
 import org.apache.geronimo.interop.adapter.Adapter;
+import org.apache.geronimo.interop.adapter.AdapterManager;
 import org.apache.geronimo.interop.naming.NameService;
-import org.apache.geronimo.interop.rmi.iiop.*;
+import org.apache.geronimo.interop.rmi.iiop.BadMagicException;
+import org.apache.geronimo.interop.rmi.iiop.CdrInputStream;
+import org.apache.geronimo.interop.rmi.iiop.CdrOutputStream;
+import org.apache.geronimo.interop.rmi.iiop.GiopMessage;
+import org.apache.geronimo.interop.rmi.iiop.ObjectInputStream;
+import org.apache.geronimo.interop.rmi.iiop.ObjectOutputStream;
+import org.apache.geronimo.interop.rmi.iiop.UnsupportedProtocolVersionException;
 import org.apache.geronimo.interop.util.UTF8;
-//import org.openejb.server.ServiceException;
+import org.omg.GIOP.KeyAddr;
+import org.omg.GIOP.LocateReplyHeader_1_2;
+import org.omg.GIOP.LocateRequestHeader_1_2;
+import org.omg.GIOP.LocateStatusType_1_2;
+import org.omg.GIOP.MsgType_1_1;
+import org.omg.GIOP.ProfileAddr;
+import org.omg.GIOP.ReferenceAddr;
+import org.omg.GIOP.ReplyHeader_1_2;
+import org.omg.GIOP.ReplyStatusType_1_2;
+import org.omg.GIOP.RequestHeader_1_2;
+import org.omg.GIOP.TargetAddress;
+import org.omg.IOP.ServiceContext;
 
 public class MessageHandler {
 

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/server/RmiIiopServerGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/server/RmiIiopServerGBean.java?rev=164105&r1=164104&r2=164105&view=diff
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/server/RmiIiopServerGBean.java
(original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/server/RmiIiopServerGBean.java
Thu Apr 21 12:13:40 2005
@@ -17,18 +17,15 @@
  */
 package org.apache.geronimo.interop.rmi.iiop.server;
 
-import org.apache.geronimo.gbean.*;
-import org.apache.geronimo.interop.adapter.AdapterManager;
+import java.net.Socket;
+import java.util.ArrayList;
+import java.util.Properties;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-//import org.openejb.server.SocketService;
-//import org.openejb.server.ServerService;
-//import org.openejb.server.ServiceException;
-
-import java.util.*;
-import java.net.Socket;
-import java.io.IOException;
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.interop.adapter.AdapterManager;
 
 //public class RmiIiopServerGBean implements ServerService {
 public class RmiIiopServerGBean {

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/server/ServerNamingContext.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/server/ServerNamingContext.java?rev=164105&r1=164104&r2=164105&view=diff
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/server/ServerNamingContext.java
(original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/rmi/iiop/server/ServerNamingContext.java
Thu Apr 21 12:13:40 2005
@@ -20,17 +20,22 @@
 import javax.naming.NameNotFoundException;
 import javax.naming.NamingException;
 
-import org.apache.geronimo.interop.CosNaming.*;
-import org.apache.geronimo.interop.CosNaming.NamingContextExtPackage.InvalidAddress;
-import org.apache.geronimo.interop.CosNaming.NamingContextPackage.AlreadyBound;
-import org.apache.geronimo.interop.CosNaming.NamingContextPackage.CannotProceed;
-import org.apache.geronimo.interop.CosNaming.NamingContextPackage.InvalidName;
-import org.apache.geronimo.interop.CosNaming.NamingContextPackage.NotFound;
-import org.apache.geronimo.interop.CosNaming.NamingContextPackage.NotFoundReason;
 import org.apache.geronimo.interop.adapter.Adapter;
 import org.apache.geronimo.interop.naming.NameService;
 import org.apache.geronimo.interop.naming.NameServiceLog;
 import org.apache.geronimo.interop.rmi.iiop.CorbaObject;
+import org.omg.CosNaming.BindingIteratorHolder;
+import org.omg.CosNaming.BindingListHolder;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextExt;
+import org.omg.CosNaming.NamingContextExtPackage.InvalidAddress;
+import org.omg.CosNaming.NamingContextPackage.AlreadyBound;
+import org.omg.CosNaming.NamingContextPackage.CannotProceed;
+import org.omg.CosNaming.NamingContextPackage.InvalidName;
+import org.omg.CosNaming.NamingContextPackage.NotFound;
+import org.omg.CosNaming.NamingContextPackage.NotFoundReason;
+import org.omg.CosNaming.NamingContextPackage.NotEmpty;
 
 public class ServerNamingContext extends CorbaObject implements NamingContextExt {
 
@@ -66,15 +71,15 @@
         throw NoImplement();
     }
 
-    public void bind_context(org.apache.geronimo.interop.CosNaming.NameComponent[] n, org.apache.geronimo.interop.CosNaming.NamingContext
nc) throws NotFound, CannotProceed, InvalidName, AlreadyBound {
+    public void bind_context(NameComponent[] n, NamingContext nc) throws NotFound, CannotProceed,
InvalidName, AlreadyBound {
         throw NoImplement();
     }
 
-    public void rebind(org.apache.geronimo.interop.CosNaming.NameComponent[] n, org.omg.CORBA.Object
obj) throws NotFound, CannotProceed, InvalidName {
+    public void rebind(NameComponent[] n, org.omg.CORBA.Object obj) throws NotFound, CannotProceed,
InvalidName {
         throw NoImplement();
     }
 
-    public void rebind_context(org.apache.geronimo.interop.CosNaming.NameComponent[] n, org.apache.geronimo.interop.CosNaming.NamingContext
nc) throws NotFound, CannotProceed, InvalidName {
+    public void rebind_context(NameComponent[] n, NamingContext nc) throws NotFound, CannotProceed,
InvalidName {
         throw NoImplement();
     }
 
@@ -92,6 +97,10 @@
 
     public NamingContext bind_new_context(NameComponent[] n) throws NotFound, AlreadyBound,
CannotProceed, InvalidName {
         throw NoImplement();
+    }
+
+    public void destroy() throws NotEmpty {
+        //TODO what should this do?
     }
 
     protected org.omg.CORBA.NO_IMPLEMENT NoImplement() {



Mime
View raw message