2005-10-25 Audrius Meskauskas <AudriusA@Bioinformatics.org>

* gnu/CORBA/interfaces/SocketFactory.java: New file.
* gnu/CORBA/interfaces/gnuSocketFactory.java: Deleted.
* gnu/CORBA/DefaultSocketFactory.java,
gnu/CORBA/Functional_ORB.java,
org/omg/CORBA/ORB.java: Replacing gnuSocketFactory into SocketFactory.

5 files changed, 19 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 9de179663..1af808e91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
-	2005-10-25  Audrius Meskauskas  <AudriusA@Bioinformatics.org>
+2005-10-25  Audrius Meskauskas  <AudriusA@Bioinformatics.org>
+
+	* gnu/CORBA/interfaces/SocketFactory.java: New file.
+	* gnu/CORBA/interfaces/gnuSocketFactory.java: Deleted.
+	* gnu/CORBA/DefaultSocketFactory.java,
+	gnu/CORBA/Functional_ORB.java,
+	org/omg/CORBA/ORB.java: Replacing gnuSocketFactory into SocketFactory.
+
+2005-10-25  Audrius Meskauskas  <AudriusA@Bioinformatics.org>
 
 	* org/omg/CosNaming/BindingIteratorHelper.java,
 	org/omg/CosNaming/NamingContextExtHelper.java,
@@ -18,7 +26,6 @@
 	org/omg/PortableServer/ServantLocatorHelper.java: Added
 	unchecked_narrow method.
 
-
 2005-10-24  Roman Kennke  <kennke@aicas.com>
 
 	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
diff --git a/gnu/CORBA/DefaultSocketFactory.java b/gnu/CORBA/DefaultSocketFactory.java
index 4f6a27db7..51df04719 100644
--- a/gnu/CORBA/DefaultSocketFactory.java
+++ b/gnu/CORBA/DefaultSocketFactory.java
@@ -38,7 +38,7 @@
 
 package gnu.CORBA;
 
-import gnu.CORBA.interfaces.gnuSocketFactory;
+import gnu.CORBA.interfaces.SocketFactory;
 
 import java.io.IOException;
 import java.net.ServerSocket;
@@ -51,7 +51,7 @@ import java.net.Socket;
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
 public class DefaultSocketFactory
-  implements gnuSocketFactory
+  implements SocketFactory
 {
   /**
    * It is enough to have one instance of this class for all ORBs.
diff --git a/gnu/CORBA/Functional_ORB.java b/gnu/CORBA/Functional_ORB.java
index 42c87ea38..e474c3055 100644
--- a/gnu/CORBA/Functional_ORB.java
+++ b/gnu/CORBA/Functional_ORB.java
@@ -49,7 +49,7 @@ import gnu.CORBA.GIOP.RequestHeader;
 import gnu.CORBA.NamingService.NameParser;
 import gnu.CORBA.NamingService.NamingServiceTransient;
 import gnu.CORBA.Poa.gnuForwardRequest;
-import gnu.CORBA.interfaces.gnuSocketFactory;
+import gnu.CORBA.interfaces.SocketFactory;
 
 import org.omg.CORBA.BAD_OPERATION;
 import org.omg.CORBA.BAD_PARAM;
@@ -450,7 +450,7 @@ public class Functional_ORB extends Restricted_ORB
   /**
    * The producer of the client and server sockets for this ORB.
    */
-  public gnuSocketFactory socketFactory = DefaultSocketFactory.Singleton;
+  public SocketFactory socketFactory = DefaultSocketFactory.Singleton;
 
   /**
    * Create the instance of the Functional ORB.
@@ -1623,14 +1623,14 @@ public class Functional_ORB extends Restricted_ORB
             );
           }
         
-        if (props.containsKey(gnuSocketFactory.PROPERTY))
+        if (props.containsKey(SocketFactory.PROPERTY))
           {
             String factory = null;
             try
               {
-                factory = props.getProperty(gnuSocketFactory.PROPERTY);
+                factory = props.getProperty(SocketFactory.PROPERTY);
                 if (factory!=null)
-                  socketFactory = (gnuSocketFactory) 
+                  socketFactory = (SocketFactory) 
                     ObjectCreator.forName(factory).newInstance();
               }
             catch (Exception ex)
diff --git a/gnu/CORBA/interfaces/gnuSocketFactory.java b/gnu/CORBA/interfaces/SocketFactory.java
index 08057f5fa..7797dcbf9 100644
--- a/gnu/CORBA/interfaces/gnuSocketFactory.java
+++ b/gnu/CORBA/interfaces/SocketFactory.java
@@ -1,4 +1,4 @@
-/* gnuSocketFactory.java --
+/* SocketFactory.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -56,7 +56,7 @@ import java.net.Socket;
  * 
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
-public interface gnuSocketFactory
+public interface SocketFactory
 {
   /**
    * The name of the ORB property that forces the ORB to use the socket
diff --git a/org/omg/CORBA/ORB.java b/org/omg/CORBA/ORB.java
index 0d14c9d18..57d7cce2c 100644
--- a/org/omg/CORBA/ORB.java
+++ b/org/omg/CORBA/ORB.java
@@ -113,7 +113,7 @@ import java.util.Properties;
  * property com.sun.CORBA.connection.ORBSocketFactoryClass. To have multiple
  * types of sockets, instantiate several ORB's with this property each time
  * set to the different value. 
- * The factory must implement gnu.CORBA.interfaces.gnuSocketFactory.
+ * The factory must implement gnu.CORBA.interfaces.SocketFactory.
  * </td>
  * </tr>
  * </table>