modificaitons to file names, comments,

and some changes in line with the ACE_Reactor_Notify class.

52 files changed, 975 insertions, 678 deletions

diff --git a/ace/CLASSIX/Addr.cpp b/ace/CLASSIX/CLASSIX_Addr.cpp
index f9872466453..faafc29109d 100644
--- a/ace/CLASSIX/Addr.cpp
+++ b/ace/CLASSIX/CLASSIX_Addr.cpp
@@ -4,10 +4,10 @@
 // Defines the ClassiX IPC address family address format.
 
 #define ACE_BUILD_DLL
-#include "CLASSIX/Addr.h"
+#include "ace/CLASSIX/CLASSIX_Addr.h"
 
 #if !defined (__ACE_INLINE__)
-#include "CLASSIX/Addr.i"
+#include "ace/CLASSIX/CLASSIX_Addr.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_ALLOC_HOOK_DEFINE(ACE_CLASSIX_Addr)
diff --git a/ace/CLASSIX/Addr.h b/ace/CLASSIX/CLASSIX_Addr.h
index 77664defc35..f3cbae992ff 100644
--- a/ace/CLASSIX/Addr.h
+++ b/ace/CLASSIX/CLASSIX_Addr.h
@@ -4,17 +4,14 @@
 // ============================================================================
 //
 // = LIBRARY
-//    ipp_ace
+//    ACE
 // 
 // = FILENAME
 //    CLASSIX_Addr.h
 //
 // = AUTHOR
-//    Wei Chiang
+//    Nokia Telecommunications
 //
-// = COPYRIGHT
-//     Copyright 1998 Nokia Telecommunications
-// 
 // ============================================================================
 
 #if !defined (ACE_CLASSIX_ADDR_H)
@@ -24,7 +21,7 @@
 #include "ace/Addr.h"
 
 #include <ipc/chIpc.h>
-#include <CLASSIX/OS.h>
+#include <ace/CLASSIX/CLASSIX_OS.h>
 
 class ACE_Export ACE_CLASSIX_Addr : public ACE_Addr
 {
@@ -47,7 +44,7 @@ public:
     PORT,			// use Peer_Port
     GROUP,			// use Peer_Group
     STAMP,			// use peer_Stamp
-    DYNAMIC,		// use Peer_Group
+    DYNAMIC,		        // use Peer_Group
     UNDEFINED
   };
 
@@ -89,7 +86,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "CLASSIX/Addr.i"
+#include "ace/CLASSIX/CLASSIX_Addr.i"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_CLASSIX_ADDR_H */
diff --git a/ace/CLASSIX/Addr.i b/ace/CLASSIX/CLASSIX_Addr.i
index 13cc5fd48e3..13cc5fd48e3 100644
--- a/ace/CLASSIX/Addr.i
+++ b/ace/CLASSIX/CLASSIX_Addr.i
diff --git a/ace/CLASSIX/CLASSIX_CLD_Connector.cpp b/ace/CLASSIX/CLASSIX_CLD_Connector.cpp
new file mode 100644
index 00000000000..a054213561a
--- /dev/null
+++ b/ace/CLASSIX/CLASSIX_CLD_Connector.cpp
@@ -0,0 +1,116 @@
+// $Id$
+/*
+// ============================================================================
+//
+// = LIBRARY
+//     ace
+// 
+// = FILENAME
+//     CLASSIX_CLD_Connector.cpp
+//
+// = AUTHOR(S)
+//     Nokia Telecommunications
+// 
+//
+// ============================================================================
+*/
+#define ACE_BUILD_DLL
+#include "ace/CLASSIX/CLASSIX_CLD_Connector.h"
+#include "ace/CLASSIX/CLASSIX_Addr.h"
+
+ACE_ALLOC_HOOK_DEFINE(ACE_CLASSIX_CLD_Connector)
+
+#if !defined (__ACE_INLINE__)
+#include "CLASSIX_CLD_Connector.i"
+#endif /* __ACE_INLINE__ */
+/* ------------------------------------------------------------------------- */
+
+ACE_CLASSIX_CLD_Connector::ACE_CLASSIX_CLD_Connector (
+    ACE_CLASSIX_Stream &new_stream, 
+    const ACE_Addr &remote_sap, 
+    ACE_Time_Value *timeout,
+    const ACE_Addr &local_sap,
+    int reuse_addr,
+    int flags,
+    int perms,
+    int protocol_family,
+    int protocol)
+{
+  ACE_TRACE ("ACE_CLASSIX_CLD_Connector::ACE_CLASSIX_CLD_Connector");
+  if (this->connect (new_stream, remote_sap, timeout, local_sap,
+		     reuse_addr, flags, perms, 
+		     protocol_family, protocol) == -1)
+      ACE_ERROR ((LM_ERROR, 
+		  ASYS_TEXT ("%p\n"),  ASYS_TEXT 
+		  ("ACE_CLASSIX_CLD_Connector::ACE_CLASSIX_CLD_Connector")));
+}
+
+// Set up remote port information
+int
+ACE_CLASSIX_CLD_Connector::connect (ACE_CLASSIX_Stream &new_stream, 
+				    const ACE_Addr & theRemote,/* remote_sap */
+				    ACE_Time_Value *, /* timeout */
+				    const ACE_Addr & theLocal,
+                                    int, /* reuse_addr */
+				    int theFlag, /* flags */
+				    int, /* perms */
+				    int theProtocolFamily, 
+				    int /* protocol */)
+
+{
+    ACE_TRACE ("ACE_CLASSIX_CLD_Connector::connect");
+    //
+    // Set up peer SAP
+    // 
+    if (theRemote == ACE_Addr::sap_any ||
+	new_stream.set_peer_sap(theRemote) != 0)
+	ACE_ERROR_RETURN((LM_ERROR, "ACE_CLASSIX_CLD_Connector::connect()::"
+			  "Invalid Connector SAP\n"), -1);
+
+    //
+    // Set up local SAP
+    // 
+    if (theLocal == ACE_Addr::sap_any)
+    {
+	// if local sap has not been configured
+	// create a port and use it as the local SAP 
+	new_stream.open();
+    }
+    else
+    {
+	// replace the local SAP information
+	new_stream.close();
+	new_stream.open(theLocal);
+    }
+    
+    //
+    // Make the local SAP "selectable", if requested via the flag
+    // 
+    if (new_stream.local_sap().is_configured() && 
+	new_stream.peer_sap().is_configured() &&  /* remote sap info exist */
+	theProtocolFamily == ACE_CLASSIX_Addr::AF_CLASSIX)
+    {
+	new_stream.control();
+	// setup the default delivery mode, if applicable
+	if (theFlag & ACE_CLASSIX_CLD_Connector::ENABLE)
+	{
+	    if (new_stream.selectable() == 0)
+		return 0;
+	    else
+		return -1;
+	}
+	return 0;
+    }
+    else
+    {
+	return -1;
+    }
+}
+
+void
+ACE_CLASSIX_CLD_Connector::dump (void) const
+{
+  ACE_TRACE ("ACE_CLASSIX_CLD_Connector::dump");
+}
+
+/* ------------------------------------------------------------------------- */
diff --git a/ace/CLASSIX/CLASSIX_CLD_Connector.h b/ace/CLASSIX/CLASSIX_CLD_Connector.h
new file mode 100644
index 00000000000..3d0f1f7b45b
--- /dev/null
+++ b/ace/CLASSIX/CLASSIX_CLD_Connector.h
@@ -0,0 +1,127 @@
+/* -*- C++ -*- */
+// $Id$
+
+/*
+// ============================================================================
+//
+// = LIBRARY
+//     ace
+// 
+// = FILENAME
+//     CLASSIX_CLD_Connector.h
+//
+// = AUTHOR(S)
+//     Nokia Telecommunications
+// 
+// ============================================================================
+*/
+
+#ifndef ACE_CLASSIX_CLD_CONNECTOR_H
+#define ACE_CLASSIX_CLD_CONNECTOR_H
+
+#include "ace/CLASSIX/CLASSIX_Stream.h"
+/* ------------------------------------------------------------------------- */
+
+class ACE_CLASSIX_CLD_Connector
+    // = TITLE
+    //     Defines an CLASSIX IPC connectionless connection factory for the
+    //     template methods in <ACE_Connector>.
+    //
+    // = DESCRIPTION
+    //     This is used when a client needs to communicate with a server
+    //     whose SAP address is known beforehand.
+    //     
+    //     Although there is a connection
+    //     procedure, no connection is actually taken place
+    //     between the client and server, since Chorus IPC does not have
+    //     connection semantics.
+    //     The connect procedure is necessary for
+    //     compatibility with <ACE_SOCK_Connector> class.
+    //     
+    //     This class will simplify the client's
+    //     program, since it provides connection-like communication
+    //     mechanism.
+    //
+    // = NOTES
+    //     The server in this case trusts everyone who lands on the
+    //     server's SAP.
+    //     
+    // = SEE ALSO
+    //   ACE_CLASSIX_COD_Connector
+{
+  public:
+    // =  Connect options
+    enum OPTIONS
+    {
+        // Do not enable the local SAP
+	// (so that the Reactor will not monitor the port)
+	ENABLE	= 0x1
+    };
+
+    // = Initialization routines.
+    ACE_CLASSIX_CLD_Connector (void);
+    // Default constructor.
+
+    ACE_CLASSIX_CLD_Connector (ACE_CLASSIX_Stream &new_stream, 
+			       const ACE_Addr &remote_sap 
+			       = ACE_Addr::sap_any,
+			       ACE_Time_Value *timeout = 0,
+			       const ACE_Addr &local_sap = ACE_Addr::sap_any,
+			       int reuse_addr = 0,
+			       int flags = 0,
+			       int perms = 0,
+			       int protocol_family 
+			       = ACE_CLASSIX_Addr::AF_CLASSIX, 
+			       int protocol = 0);
+    // Emulates connection semantics so that it can be plugged into
+    // <ACE_Connector>
+    // Actively connect local SAP and remote SAP togeter.
+    // Produce a <new_stream> if things go well.
+    //
+    // <remote_sap> is the peer's address. In ACE_SOCK_Connector it refers to
+    // the acceptor's address.  In connectionless mode, we do not have
+    // an acceptor.  The <remote_sap> address will be copied to the new stream
+    // if things goes well.
+    // 
+    // If <local_sap> refers to any address, a port will be
+    // allocated and will be used as a local SAP.
+    //
+    // The rest parameters are there so that this class can be plugged into
+    // <ACE_Connector>.
+
+    virtual int connect (ACE_CLASSIX_Stream &new_stream, 
+		 const ACE_Addr &remote_sap = ACE_Addr::sap_any,
+		 ACE_Time_Value *timeout = 0,
+		 const ACE_Addr &local_sap = ACE_Addr::sap_any,
+		 int reuse_addr = 0,
+		 int flags = 0,
+		 int perms = 0,
+		 int protocol_family = ACE_CLASSIX_Addr::AF_CLASSIX,
+		 int protocol = 0); 
+
+    // Factory method used in <ACE_Connector>::connect_svc_handler()
+
+    // Initialization method when default constructor is used.
+    // See the comments for the corresponding constructor 
+    
+    virtual int reset_new_handle (ACE_HANDLE handle);
+    // Factory method used in ACE_Connector::handle_output().
+    // Meant for resetting any event associations on this handle
+    // Does nothig.
+
+    // = HELPER
+    void dump(void) const;
+
+ private:
+ 
+    ACE_CLASSIX_CLD_Connector(ACE_CLASSIX_CLD_Connector const&);
+    ACE_CLASSIX_CLD_Connector const& operator=(ACE_CLASSIX_CLD_Connector const&);
+};
+
+/* ------------------------------------------------------------------------- */
+
+#if defined (__ACE_INLINE__)
+#include "ace/CLASSIX/CLASSIX_CLD_Connector.i"
+#endif /* __ACE_INLINE__ */
+
+#endif /* ACE_CLASSIX_CLD_CONNECTOR_H */
diff --git a/ace/CLASSIX/CLASSIX_CLD_Connector.i b/ace/CLASSIX/CLASSIX_CLD_Connector.i
new file mode 100644
index 00000000000..8592b7825d2
--- /dev/null
+++ b/ace/CLASSIX/CLASSIX_CLD_Connector.i
@@ -0,0 +1,24 @@
+/* -*- C++ -*- */
+// $Id$
+//
+// CLASSIX/CLD_Connector.i
+/* ------------------------------------------------------------------------- */
+
+// Do-nothing constructor...
+
+ACE_INLINE
+ACE_CLASSIX_CLD_Connector::ACE_CLASSIX_CLD_Connector (void)
+{
+  ACE_TRACE ("ACE_CLASSIX_CLD_Connector::ACE_CLASSIX_CLD_Connector");
+}
+
+ACE_INLINE
+int 
+ACE_CLASSIX_CLD_Connector::reset_new_handle (ACE_HANDLE /*  handle */)
+{
+  return 0;
+}
+
+/* ------------------------------------------------------------------------- */
+
+
diff --git a/ace/CLASSIX/Acceptor.cpp b/ace/CLASSIX/CLASSIX_CO_Acceptor.cpp
index bf32906ea4c..153bed23e49 100644
--- a/ace/CLASSIX/Acceptor.cpp
+++ b/ace/CLASSIX/CLASSIX_CO_Acceptor.cpp
@@ -1,44 +1,44 @@
 /* -*- C++ -*- */
 // $Id$
 
-#include "CLASSIX/Acceptor.h"
+#include "CLASSIX_CO_Acceptor.h"
 
 #if defined (ACE_LACKS_INLINE_FUNCTIONS)
-#include "CLASSIX/Acceptor.i"
+#include "CLASSIX_CO_Acceptor.i"
 #endif /* ACE_LACKS_INLINE_FUNCTIONS */
 
 #include "ace/Synch.h"
 
-ACE_ALLOC_HOOK_DEFINE (ACE_CLASSIX_Acceptor)
+ACE_ALLOC_HOOK_DEFINE (ACE_CLASSIX_CO_Acceptor)
 
 // General purpose routine for performing server  creation.
 
-ACE_CLASSIX_Acceptor::ACE_CLASSIX_Acceptor (const ACE_Addr &local_sap, 
-					    int reuse_addr, 
-					    int protocol_family,
-					    int backlog, 
-					    int protocol,
-					    ACE_Reactor* theReactor)
+ACE_CLASSIX_CO_Acceptor::ACE_CLASSIX_CO_Acceptor (const ACE_Addr &local_sap, 
+						  int reuse_addr, 
+						  int protocol_family,
+						  int backlog, 
+						  int protocol,
+						  ACE_Reactor* theReactor)
   : port_ (0),
     reactor_ (theReactor)
 {
-  ACE_TRACE ("ACE_CLASSIX_Acceptor::ACE_CLASSIX_Acceptor");
+  ACE_TRACE ("ACE_CLASSIX_CO_Acceptor::ACE_CLASSIX_CO_Acceptor");
   if (this->open (local_sap, reuse_addr, protocol_family, 
 		  backlog, protocol, theReactor) == -1)
     ACE_ERROR ((LM_ERROR, 
                 ASYS_TEXT ("%p\n"), 
-                ASYS_TEXT ("ACE_CLASSIX_Acceptor")));
+                ASYS_TEXT ("ACE_CLASSIX_CO_Acceptor")));
 }
 
 // General purpose routine for performing server creation.
 
 int
-ACE_CLASSIX_Acceptor::open (const ACE_Addr & theLocalSap, 
-			    int /* reuse_addr */,
-			    int theProtocolFamily, 
-			    int /* backlog */, 
-			    int /* protocol */,
-			    ACE_Reactor* theReactor)
+ACE_CLASSIX_CO_Acceptor::open (const ACE_Addr & theLocalSap, 
+			       int /* reuse_addr */,
+			       int theProtocolFamily, 
+			       int /* backlog */, 
+			       int /* protocol */,
+			       ACE_Reactor* theReactor)
 {
   // make sure that the client requests for a "CLASSIX" family.
 
@@ -58,13 +58,13 @@ ACE_CLASSIX_Acceptor::open (const ACE_Addr & theLocalSap,
     error = this->addr_.set (theLocalSap);
 
   if (error != 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "ACE_CLASSIX_Acceptor::open ()::"
+    ACE_ERROR_RETURN ((LM_ERROR, "ACE_CLASSIX_CO_Acceptor::open ()::"
                       "Cannot setup address\n"), -1);
 
   // Make the port "selectable"
 
   if (this->addr_.selectable () != 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "ACE_CLASSIX_Acceptor::open ()::"
+    ACE_ERROR_RETURN ((LM_ERROR, "ACE_CLASSIX_CO_Acceptor::open ()::"
                       "Cannot enable port\n"), -1);
 
   this->reactor_ = theReactor;
@@ -74,28 +74,28 @@ ACE_CLASSIX_Acceptor::open (const ACE_Addr & theLocalSap,
 // General purpose routine for accepting new connections. 
 
 int
-ACE_CLASSIX_Acceptor::accept (ACE_CLASSIX_Stream &new_stream, 
-			      ACE_Addr *remote_addr, 
-			      ACE_Time_Value* /* timeout */, 
-			      int /* restart */,
-			      int /* reset_new_handle */) const
+ACE_CLASSIX_CO_Acceptor::accept (ACE_CLASSIX_Stream &new_stream, 
+				 ACE_Addr *remote_addr, 
+				 ACE_Time_Value* /* timeout */, 
+				 int /* restart */,
+				 int /* reset_new_handle */) const
 {
-  ACE_TRACE ("ACE_CLASSIX_Acceptor::accept");
+  ACE_TRACE ("ACE_CLASSIX_CO_Acceptor::accept");
 
   // Get peer's address info
 
   size_t size = 0;
-  if (this->reactor_->get_current_info (this->get_handle (), size) 
+  if (this->reactor_->current_info (this->get_handle (), size) 
       == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "ACE_CLASSIX_Acceptor:.accept ()::"
+    ACE_ERROR_RETURN ((LM_ERROR, "ACE_CLASSIX_CO_Acceptor:.accept ()::"
                        "Cannot get peer addr\n"), -1);
 
-  ACE_CLASSIX_Acceptor::Peer_Union data;
-  ACE_CLASSIX_Msg rmsg (&data, sizeof (ACE_CLASSIX_Acceptor::Peer_Union));
-  if (size != sizeof (ACE_CLASSIX_Acceptor::Peer_Union) 
+  ACE_CLASSIX_CO_Acceptor::Peer_Union data;
+  ACE_CLASSIX_Msg rmsg (&data, sizeof (ACE_CLASSIX_CO_Acceptor::Peer_Union));
+  if (size != sizeof (ACE_CLASSIX_CO_Acceptor::Peer_Union) 
       || ::ipcGetData (rmsg.get ()) != size)
     ACE_ERROR_RETURN ((LM_ERROR, "%t"
-                       "ACE_CLASSIX_Acceptor::accept::ipcGetData (%d)\n",
+                       "ACE_CLASSIX_CO_Acceptor::accept::ipcGetData (%d)\n",
                        size),
                       -1);
 
@@ -121,12 +121,12 @@ ACE_CLASSIX_Acceptor::accept (ACE_CLASSIX_Stream &new_stream,
       break;
 
     default:
-      ACE_ERROR_RETURN ((LM_ERROR, "ACE_CLASSIX_Accept::accept ()::"
+      ACE_ERROR_RETURN ((LM_ERROR, "ACE_CLASSIX_CO_Accept::accept ()::"
                          "Invalid peer address\n"), -1);
     }
 
   if (error != 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "ACE_CLASSIX_Accept::accept ()::"
+    ACE_ERROR_RETURN ((LM_ERROR, "ACE_CLASSIX_CO_Accept::accept ()::"
                        "cannot set peer address\n"), -1);
 
   // Set up local SAP & tell the peer
@@ -153,10 +153,10 @@ ACE_CLASSIX_Acceptor::accept (ACE_CLASSIX_Stream &new_stream,
   data.choose.port.peer =
     new_stream.get_local_sap ().get_addr ().get_id ();
 
-  ACE_CLASSIX_Msg smsg (&data, sizeof (ACE_CLASSIX_Acceptor::Peer_Union));
+  ACE_CLASSIX_Msg smsg (&data, sizeof (ACE_CLASSIX_CO_Acceptor::Peer_Union));
 
   if (::ipcReply (smsg.get ()) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "ACE_CLASSIX_Accept::accept ()::"
+    ACE_ERROR_RETURN ((LM_ERROR, "ACE_CLASSIX_CO_Accept::accept ()::"
                        "cannot deliver server address to peer\n"), -1);
 
   // Make new_stream's local SAP selectable.
@@ -167,9 +167,9 @@ ACE_CLASSIX_Acceptor::accept (ACE_CLASSIX_Stream &new_stream,
 }
 
 int
-ACE_CLASSIX_Acceptor::close (void)
+ACE_CLASSIX_CO_Acceptor::close (void)
 {
-  ACE_TRACE ("ACE_CLASSIX_ACceptor::close");
+  ACE_TRACE ("ACE_CLASSIX_CO_Acceptor::close");
   int result = 0;
 
   if (this->get_handle () != ACE_INVALID_HANDLE)
@@ -183,7 +183,7 @@ ACE_CLASSIX_Acceptor::close (void)
 
 
 int
-ACE_CLASSIX_Acceptor::get_local_addr (ACE_Addr &theAddr) const
+ACE_CLASSIX_CO_Acceptor::get_local_addr (ACE_Addr &theAddr) const
 {
   int size = theAddr.get_size ();
   if (size < this->addr_.get_addr ().get_size ())
@@ -193,7 +193,7 @@ ACE_CLASSIX_Acceptor::get_local_addr (ACE_Addr &theAddr) const
 }
 
 void
-ACE_CLASSIX_Acceptor::dump (void) const
+ACE_CLASSIX_CO_Acceptor::dump (void) const
 {
-  ACE_TRACE ("ACE_CLASSIX_Acceptor::dump");
+  ACE_TRACE ("ACE_CLASSIX_CO_Acceptor::dump");
 }
diff --git a/ace/CLASSIX/Acceptor.h b/ace/CLASSIX/CLASSIX_CO_Acceptor.h
index 00838fbd00a..264b723c044 100644
--- a/ace/CLASSIX/Acceptor.h
+++ b/ace/CLASSIX/CLASSIX_CO_Acceptor.h
@@ -4,23 +4,23 @@
 // ============================================================================
 //
 // = LIBRARY
-//    ace
+//    ACE
 // 
 // = FILENAME
-//    CLASSIX/Acceptor.h
+//    CLASSIX_CO_Acceptor.h
 //
 // = AUTHOR
-//    Wei Chiang
+//    Nokia Telecommunications
 // 
 // ============================================================================
 
-#if !defined (ACE_CLASSIX_ACCEPTOR_H)
-#define ACE_CLASSIX_ACCEPTOR_H
+#if !defined (ACE_CLASSIX_CO_ACCEPTOR_H)
+#define ACE_CLASSIX_CO_ACCEPTOR_H
 
-#include "CLASSIX/Stream.h"
+#include "ace/CLASSIX/CLASSIX_Stream.h"
 #include "ace/Time_Value.h"
 
-class ACE_Export ACE_CLASSIX_Acceptor
+class ACE_Export ACE_CLASSIX_CO_Acceptor
 {
   // = TITLE
   //     Defines the format and interface for a connection
@@ -65,18 +65,18 @@ public:
   };
 
   // = Initialization methods.
-  ACE_CLASSIX_Acceptor (ACE_Reactor* = ACE_Reactor::instance());
+  ACE_CLASSIX_CO_Acceptor (ACE_Reactor* = ACE_Reactor::instance());
   // Default constructor.
 
-  ACE_CLASSIX_Acceptor (const ACE_Addr &local_sap, 
-                        int reuse_addr = 0, 
-                        int protocol_family = ACE_CLASSIX_Addr::AF_CLASSIX, 
-                        int backlog = 0, 
-                        int protocol = 0,
-                        ACE_Reactor* = ACE_Reactor::instance());
+  ACE_CLASSIX_CO_Acceptor (const ACE_Addr &local_sap, 
+			   int reuse_addr = 0, 
+			   int protocol_family = ACE_CLASSIX_Addr::AF_CLASSIX, 
+			   int backlog = 0, 
+			   int protocol = 0,
+			   ACE_Reactor* = ACE_Reactor::instance());
   // Initiate a passive mode socket.
 
-  virtual ~ACE_CLASSIX_Acceptor (void);
+  virtual ~ACE_CLASSIX_CO_Acceptor (void);
   // Default dtor.
 
   int open (const ACE_Addr &local_sap, 
@@ -122,8 +122,6 @@ public:
 protected:
 
 private:
-  // int get_remote_addr (ACE_Addr &) const; 
-  // Do not allow this function to percolate up to this interface... 
 
   ACE_CLASSIX_Port_Core *port_;
   // optional port.
@@ -135,7 +133,7 @@ private:
 };
 
 #if !defined (ACE_LACKS_INLINE_FUNCTIONS)
-#include "CLASSIX/Acceptor.i"
+#include "ace/CLASSIX/CLASSIX_CO_Acceptor.i"
 #endif /* ACE_LACKS_INLINE_FUNCTIONS */
 
-#endif /* ACE_CLASSIX_ACCEPTOR_H */
+#endif /* ACE_CLASSIX_CO_ACCEPTOR_H */
diff --git a/ace/CLASSIX/Acceptor.i b/ace/CLASSIX/CLASSIX_CO_Acceptor.i
index c8dc9384ada..dcb6a0d2862 100644
--- a/ace/CLASSIX/Acceptor.i
+++ b/ace/CLASSIX/CLASSIX_CO_Acceptor.i
@@ -3,7 +3,7 @@
 
 // Do nothing routine for constructor. 
 ACE_INLINE
-ACE_CLASSIX_Acceptor::ACE_CLASSIX_Acceptor (ACE_Reactor* theReactor)
+ACE_CLASSIX_CO_Acceptor::ACE_CLASSIX_CO_Acceptor (ACE_Reactor* theReactor)
     : port_    (0),
       reactor_ (theReactor)
 {
@@ -11,21 +11,21 @@ ACE_CLASSIX_Acceptor::ACE_CLASSIX_Acceptor (ACE_Reactor* theReactor)
 }
 
 ACE_INLINE
-ACE_CLASSIX_Acceptor::~ACE_CLASSIX_Acceptor(void)
+ACE_CLASSIX_CO_Acceptor::~ACE_CLASSIX_CO_Acceptor(void)
 {
   delete this->port_;
 }
 
 ACE_INLINE
 void
-ACE_CLASSIX_Acceptor::reactor(ACE_Reactor* theReactor)
+ACE_CLASSIX_CO_Acceptor::reactor(ACE_Reactor* theReactor)
 {
   this->reactor_ = theReactor;
 }
 
 ACE_INLINE
 ACE_HANDLE
-ACE_CLASSIX_Acceptor::get_handle(void) const
+ACE_CLASSIX_CO_Acceptor::get_handle(void) const
 {
   return this->addr_.get_handle();
 }
diff --git a/ace/CLASSIX/CLASSIX_CO_Connector.cpp b/ace/CLASSIX/CLASSIX_CO_Connector.cpp
new file mode 100644
index 00000000000..12280142b2b
--- /dev/null
+++ b/ace/CLASSIX/CLASSIX_CO_Connector.cpp
@@ -0,0 +1,118 @@
+// $Id$
+/*
+// ============================================================================
+//
+// = LIBRARY
+//     ace
+// 
+// = FILENAME
+//     CLASSIX_CO_Connector.cpp
+//
+// = AUTHOR(S)
+//     Nokia Telecommunications
+// 
+// ============================================================================
+*/
+#define ACE_BUILD_DLL
+#include "ace/CLASSIX/CLASSIX_CO_Connector.h"
+#include "ace/CLASSIX/CLASSIX_CO_Acceptor.h"
+
+ACE_ALLOC_HOOK_DEFINE(ACE_CLASSIX_CO_Connector)
+
+#if !defined (__ACE_INLINE__)
+#include "ace/CLASSIX/CLASSIX_CO_Connector.i"
+#endif /* __ACE_INLINE__ */
+/* ------------------------------------------------------------------------- */
+
+// Set up remote port information
+    
+int
+ACE_CLASSIX_CO_Connector::connect (ACE_CLASSIX_Stream &new_stream, 
+				   const ACE_Addr & theAcceptor,/* acceptor */
+				   ACE_Time_Value * theTimeout, /* timeout */
+				   const ACE_Addr & theLocal,
+				   int theReuse,
+				   int theFlag,
+				   int thePerm,
+				   int theProtocolFamily, 
+				   int theProtocol)
+
+{
+    //
+    // set up local SAP and connector info in <new_stream>
+    // 
+    if (this->ACE_CLASSIX_CLD_Connector::
+	connect(new_stream,
+		theAcceptor,
+		theTimeout,
+		theLocal,
+		theReuse,
+		theFlag & (~ACE_CLASSIX_CLD_Connector::ENABLE),
+		thePerm,
+		theProtocolFamily,
+		theProtocol) != 0)
+	return -1;
+
+    //
+    // make a connection
+    // 
+    // Tell the connector my own SAP
+    ACE_CLASSIX_CO_Acceptor::Peer_Union peer;
+    size_t size = sizeof (ACE_CLASSIX_CO_Acceptor::Peer_Union);
+    peer.type = ACE_CLASSIX_Addr::PORT;
+    peer.choose.port.peer = new_stream.local_sap().get_addr().get_id();
+
+    if (new_stream.send((void*) &peer, size) != size)
+	ACE_ERROR_RETURN((LM_ERROR, "%t|%P|%p\n",
+			  "ACE_CLASSIX_Connector::connect()::send:"), -1);
+    // Wait for peer SAP information from the acceptor
+    if (new_stream.ipcRecv((void*) &peer, size, 0, theTimeout) != size)
+	ACE_ERROR_RETURN((LM_ERROR, "ACE_CLASSIX_Connector::connect()::"
+			  "unable to receive connect response\n"), -1);
+	
+    int error = 0;
+    switch (peer.type)
+    {
+    case ACE_CLASSIX_Addr::PORT:
+	error = new_stream.set_peer_sap(peer.choose.port.peer);
+	break;
+
+    case ACE_CLASSIX_Addr::GROUP:
+	error = new_stream.set_peer_sap(peer.choose.group.peer);
+	break;
+
+    case ACE_CLASSIX_Addr::STAMP:
+	error = new_stream.set_peer_sap(peer.choose.stamp.peer);
+	break;
+
+    case ACE_CLASSIX_Addr::DYNAMIC:
+	error = new_stream.set_peer_sap(peer.choose.group.peer);
+	break;
+
+    default:
+	ACE_ERROR_RETURN((LM_ERROR, "ACE_CLASSIX_Connect::connect()::"
+			  "Invalid peer address\n"), -1);
+    }
+
+    if (error != 0)
+	ACE_ERROR_RETURN((LM_ERROR, "ACE_CLASSIX_Connector::connect()::"
+			  "unable to receive connect response\n"), -1);
+
+
+    //
+    // Make the local SAP "selectable"
+    // 
+    if (theFlag & ACE_CLASSIX_CO_Connector::ENABLE &&
+	new_stream.selectable() != 0)
+	return -1;
+
+    return 0;
+}
+
+void
+ACE_CLASSIX_CO_Connector::dump (void) const
+{
+    ACE_TRACE ("ACE_CLASSIX_CO_Connector::dump");
+}
+
+/* ------------------------------------------------------------------------- */
diff --git a/ace/CLASSIX/CLASSIX_CO_Connector.h b/ace/CLASSIX/CLASSIX_CO_Connector.h
new file mode 100644
index 00000000000..6b8616e4125
--- /dev/null
+++ b/ace/CLASSIX/CLASSIX_CO_Connector.h
@@ -0,0 +1,111 @@
+/* -*- C++ -*- */
+// $Id$
+
+/*
+// ============================================================================
+//
+// = LIBRARY
+//     ace
+// 
+// = FILENAME
+//     CLASSIX_CO_Connector.h
+//
+// = AUTHOR(S)
+//     Nokia Telecommunications
+// 
+// ============================================================================
+*/
+
+#ifndef ACE_CLASSIX_CO_CONNECTOR_H
+#define ACE_CLASSIX_CO_CONNECTOR_H
+
+#include "ace/CLASSIX/CLASSIX_CLD_Connector.h"
+/* ------------------------------------------------------------------------- */
+
+class ACE_CLASSIX_CO_Connector : public ACE_CLASSIX_CLD_Connector
+    // = TITLE
+    //     Defines an CLASSIX IPC connection factory for the
+    //     template methods in <ACE_Connector>.
+    //
+    // = DESCRIPTION
+    //     This is used when a client needs to communicate with a server
+    //     whose SAP address is unknown.
+    //     
+    //     <ACE_CLASSIX_Connect> and <ACE_CLASSIX_Acceptor> exchanges
+    //     address(SAP) information to establish a logical link.
+    //
+    // = NOTES
+    //      There is no other identifier and sequence information
+    //      passed between the acceptor and the connector.
+    //      Some applications may need to have a
+    //      reliable protocol for the connection setup procedure.
+    //
+    // = SEE ALSO
+    //   ACE_CLASSIX_CLD_Connector
+    //   ACE_CLASSIX_Acceptor
+    //   
+{
+  public:
+    // = Initialization routines.
+    ACE_CLASSIX_CO_Connector (void);
+    // Default constructor.
+
+    ACE_CLASSIX_CO_Connector (ACE_CLASSIX_Stream &new_stream, 
+			       const ACE_Addr &remote_sap 
+			       = ACE_Addr::sap_any,
+			       ACE_Time_Value *timeout = 0,
+			       const ACE_Addr &local_sap = ACE_Addr::sap_any,
+			       int reuse_addr = 0,
+			       int flags = 0,
+			       int perms = 0,
+			       int protocol_family 
+			       = ACE_CLASSIX_Addr::AF_CLASSIX, 
+			       int protocol = 0);
+    // Emulates connection semantics so that it can be plugged into
+    // <ACE_Connector>
+    // Actively connect local SAP and remote SAP togeter.
+    // Produce a <new_stream> if things go well.
+    //
+    // <remote_sap> is the peer's address. In ACE_SOCK_Connector it refers to
+    // the acceptor's address.  In connectionless mode, we do not have
+    // an acceptor.  The <remote_sap> address will be copied to the new stream
+    // if things goes well.
+    // 
+    // If <local_sap> refers to any address, a port will be
+    // allocated and will be used as a local SAP.
+    //
+    // The rest parameters are there so that this class can be plugged into
+    // <ACE_Connector>.
+
+    int connect (ACE_CLASSIX_Stream &new_stream, 
+		 const ACE_Addr &remote_sap = ACE_Addr::sap_any,
+		 ACE_Time_Value *timeout = 0,
+		 const ACE_Addr &local_sap = ACE_Addr::sap_any,
+		 int reuse_addr = 0,
+		 int flags = 0,
+		 int perms = 0,
+		 int protocol_family = ACE_CLASSIX_Addr::AF_CLASSIX,
+		 int protocol = 0); 
+
+    // Factory method used in <ACE_Connector>::connect_svc_handler()
+
+    // Initialization method when default constructor is used.
+    // See the comments for the corresponding constructor 
+    
+    // = HELPER
+    void dump(void) const;
+
+
+ private:
+ 
+    ACE_CLASSIX_CO_Connector(ACE_CLASSIX_CO_Connector const&);
+    ACE_CLASSIX_CO_Connector const& operator=(ACE_CLASSIX_CO_Connector const&);
+};
+
+/* ------------------------------------------------------------------------- */
+
+#if defined (__ACE_INLINE__)
+#include "ace/CLASSIX/CLASSIX_CO_Connector.i"
+#endif /* __ACE_INLINE__ */
+
+#endif /* ACE_CLASSIX_CO_CONNECTOR_H */
diff --git a/ace/CLASSIX/CLASSIX_CO_Connector.i b/ace/CLASSIX/CLASSIX_CO_Connector.i
new file mode 100644
index 00000000000..7f28a66719f
--- /dev/null
+++ b/ace/CLASSIX/CLASSIX_CO_Connector.i
@@ -0,0 +1,36 @@
+/* -*- C++ -*- */
+// $Id$
+//
+// CLASSIX_CO_Connector.i
+/* ------------------------------------------------------------------------- */
+
+ACE_INLINE
+ACE_CLASSIX_CO_Connector::ACE_CLASSIX_CO_Connector (
+    ACE_CLASSIX_Stream &new_stream, 
+    const ACE_Addr &remote_sap, 
+    ACE_Time_Value *timeout,
+    const ACE_Addr &local_sap,
+    int reuse_addr,
+    int flags,
+    int perms,
+    int protocol_family,
+    int protocol)
+    : ACE_CLASSIX_CLD_Connector(new_stream, remote_sap, timeout, local_sap,
+				reuse_addr, flags, perms, 
+				protocol_family, protocol)
+{
+  ACE_TRACE ("ACE_CLASSIX_CO_Connector::ACE_CLASSIX_CO_Connector");
+}
+
+// Do-nothing constructor...
+
+ACE_INLINE
+ACE_CLASSIX_CO_Connector::ACE_CLASSIX_CO_Connector (void)
+    : ACE_CLASSIX_CLD_Connector()
+{
+  ACE_TRACE ("ACE_CLASSIX_CO_Connector::ACE_CLASSIX_CO_Connector");
+}
+
+/* ------------------------------------------------------------------------- */
+
+
diff --git a/ace/CLASSIX/Dgram_Mcast.cpp b/ace/CLASSIX/CLASSIX_Dgram_Mcast.cpp
index 6d2049f2069..112d25956b7 100644
--- a/ace/CLASSIX/Dgram_Mcast.cpp
+++ b/ace/CLASSIX/CLASSIX_Dgram_Mcast.cpp
@@ -17,24 +17,12 @@
 //
 // ============================================================================
 
-#include "CLASSIX/Dgram_Mcast.h"
+#include "ace/CLASSIX/CLASSIX_Dgram_Mcast.h"
 
 #if !defined (__ACE_INLINE__)
-#include "CLASSIX/Dgram_Mcast.i"
+#include "ace/CLASSIX/CLASSIX_Dgram_Mcast.i"
 #endif /* __ACE_INLINE__ */
 /* ------------------------------------------------------------------------- */
-ACE_CLASSIX_Dgram_Mcast::ACE_CLASSIX_Dgram_Mcast(void)
-    : ACE_CLASSIX_Stream()
-{
-}
-
-ACE_CLASSIX_Dgram_Mcast::ACE_CLASSIX_Dgram_Mcast (int theStamp,
-				const ACE_CLASSIX_Port& thePort)
-    : ACE_CLASSIX_Stream()
-{
-    this->set_saps(theStamp, thePort);
-}
-
 int
 ACE_CLASSIX_Dgram_Mcast::set_saps(int theStamp, 
 				    const ACE_CLASSIX_Port& thePort)
diff --git a/ace/CLASSIX/Dgram_Mcast.h b/ace/CLASSIX/CLASSIX_Dgram_Mcast.h
index bf40182c1b3..4edc717e394 100644
--- a/ace/CLASSIX/Dgram_Mcast.h
+++ b/ace/CLASSIX/CLASSIX_Dgram_Mcast.h
@@ -4,24 +4,21 @@
 // ============================================================================
 //
 // = LIBRARY
-//     IPP
+//     ace
 // 
 // = FILENAME
-//     CLASSIX/Dgram_Mcast.h
+//     CLASSIX_Dgram_Mcast.h
 //
 // = AUTHOR(S)
-//     Wei Chiang
+//     Nokia Telecommunications
 // 
-// = COPYRIGHT
-//     Copyright 1998 Nokia Telecommunications
-//
 // ============================================================================
 
-#ifndef IPP_WRAPPER_CLASSIX_DGRAM_MCAST_H
-#define IPP_WRAPPER_CLASSIX_DGRAM_MCAST_H
+#ifndef ACE_CLASSIX_DGRAM_MCAST_H
+#define ACE_CLASSIX_DGRAM_MCAST_H
 
 /* ------------------------------------------------------------------------- */
-#include <CLASSIX/Stream.h>
+#include <ace/CLASSIX/CLASSIX_Stream.h>
 
 class ACE_CLASSIX_Dgram_Mcast : public ACE_CLASSIX_Stream
     // = TITLE
@@ -84,7 +81,7 @@ class ACE_CLASSIX_Dgram_Mcast : public ACE_CLASSIX_Stream
 /* ------------------------------------------------------------------------- */
 
 #if defined (__ACE_INLINE__)
-#include "CLASSIX/Dgram_Mcast.i"
+#include "ace/CLASSIX/CLASSIX_Dgram_Mcast.i"
 #endif /* __ACE_INLINE__ */
 
-#endif /* IPP_WRAPPER_CLASSIX_DGRAM_MCAST_H */
+#endif /* ACE_CLASSIX_DGRAM_MCAST_H */
diff --git a/ace/CLASSIX/CLASSIX_Dgram_Mcast.i b/ace/CLASSIX/CLASSIX_Dgram_Mcast.i
new file mode 100644
index 00000000000..5d9fd3df0d3
--- /dev/null
+++ b/ace/CLASSIX/CLASSIX_Dgram_Mcast.i
@@ -0,0 +1,21 @@
+/* -*- C++ -*- */
+// $Id$
+//
+// ace/CLASSIX_Dgram_Mcast.i
+/* ------------------------------------------------------------------------- */
+ACE_INLINE
+ACE_CLASSIX_Dgram_Mcast::ACE_CLASSIX_Dgram_Mcast(void)
+    : ACE_CLASSIX_Stream()
+{
+}
+
+ACE_INLINE
+ACE_CLASSIX_Dgram_Mcast::ACE_CLASSIX_Dgram_Mcast (int theStamp,
+				const ACE_CLASSIX_Port& thePort)
+    : ACE_CLASSIX_Stream()
+{
+    this->set_saps(theStamp, thePort);
+}
+
+
+/* ------------------------------------------------------------------------- */
diff --git a/ace/CLASSIX/Group.cpp b/ace/CLASSIX/CLASSIX_Group.cpp
index 5df4d934221..cb0064d3298 100644
--- a/ace/CLASSIX/Group.cpp
+++ b/ace/CLASSIX/CLASSIX_Group.cpp
@@ -4,23 +4,20 @@
 // ============================================================================
 //
 // = LIBRARY
-//     ACE
+//     ace
 // 
 // = FILENAME
-//     CLASSIX/Group.cpp
+//     CLASSIX_Group.cpp
 //
 // = AUTHOR(S)
-//     Wei Chiang
+//     Nokia Telecommunications
 // 
-// = COPYRIGHT
-//     Copyright 1998 Nokia Telecommunications
-//
 // ============================================================================
 
-#include "CLASSIX/Group.h"
+#include "ace/CLASSIX/CLASSIX_Group.h"
 
 #if !defined (__ACE_INLINE__)
-#include "CLASSIX/Group.i"
+#include "ace/CLASSIX/CLASSIX_Group.i"
 #endif /* __ACE_INLINE__ */
 /* ------------------------------------------------------------------------- */
 
diff --git a/ace/CLASSIX/Group.h b/ace/CLASSIX/CLASSIX_Group.h
index 1e56e868841..db5d900f633 100644
--- a/ace/CLASSIX/Group.h
+++ b/ace/CLASSIX/CLASSIX_Group.h
@@ -4,25 +4,22 @@
 // ============================================================================
 //
 // = LIBRARY
-//     ACE
+//     ace
 // 
 // = FILENAME
 //     CLASSIX/Group.h
 //
 // = AUTHOR(S)
-//     Wei Chiang
+//     Nokia Telecommunications
 // 
-// = COPYRIGHT
-//     Copyright 1998 Nokia Telecommunications
-//
 // ============================================================================
 
-#ifndef ACE_WRAPPER_CLASSIX_GROUP_H
-#define ACE_WRAPPER_CLASSIX_GROUP_H
+#ifndef ACE_CLASSIX_GROUP_H
+#define ACE_CLASSIX_GROUP_H
 
 /* ------------------------------------------------------------------------- */
-#include "CLASSIX/Addr.h"
-#include "CLASSIX/Port.h"
+#include "ace/CLASSIX/CLASSIX_Addr.h"
+#include "ace/CLASSIX/CLASSIX_Port.h"
 
 class ACE_CLASSIX_Group : public ACE_CLASSIX_Addr
     // = TITLE
@@ -108,7 +105,7 @@ class ACE_CLASSIX_Group : public ACE_CLASSIX_Addr
 /* ------------------------------------------------------------------------- */
 
 #if defined (__ACE_INLINE__)
-#include "CLASSIX/Group.i"
+#include "ace/CLASSIX/CLASSIX_Group.i"
 #endif /* __ACE_INLINE__ */
 
-#endif /* ACE_WRAPPER_CLASSIX_GROUP_H */
+#endif /* ACE_CLASSIX_GROUP_H */
diff --git a/ace/CLASSIX/Group.i b/ace/CLASSIX/CLASSIX_Group.i
index e3650502a10..e3650502a10 100644
--- a/ace/CLASSIX/Group.i
+++ b/ace/CLASSIX/CLASSIX_Group.i
diff --git a/ace/CLASSIX/Group_Dynamic.cpp b/ace/CLASSIX/CLASSIX_Group_Dynamic.cpp
index af45fdc7e67..a0ecbe357e6 100644
--- a/ace/CLASSIX/Group_Dynamic.cpp
+++ b/ace/CLASSIX/CLASSIX_Group_Dynamic.cpp
@@ -4,21 +4,19 @@
 // ============================================================================
 //
 // = LIBRARY
-//     ACE
+//     ace
 // 
 // = FILENAME
-//     CLASSIX/Group_Creator.cpp.1
+//     CLASSIX_Group_Creator.cpp.1
 //
 // = AUTHOR(S)
-//     Wei Chiang
+//     Nokia Telecommunications
 // 
-// = COPYRIGHT
-//     Copyright 1998 Nokia Telecommunications
 //
 // ============================================================================
 
-#include "CLASSIX/Group_Dynamic.h"
+#include "ace/CLASSIX/CLASSIX_Group_Dynamic.h"
 
 #if !defined (__ACE_INLINE__)
-#include "CLASSIX/Group_Dynamic.i"
+#include "ace/CLASSIX/CLASSIX_Group_Dynamic.i"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/CLASSIX/Group_Dynamic.h b/ace/CLASSIX/CLASSIX_Group_Dynamic.h
index 644236b620a..1252cfa1b8b 100644
--- a/ace/CLASSIX/Group_Dynamic.h
+++ b/ace/CLASSIX/CLASSIX_Group_Dynamic.h
@@ -4,24 +4,21 @@
 // ============================================================================
 //
 // = LIBRARY
-//     ACE
+//     ace
 // 
 // = FILENAME
-//     CLASSIX/Group_Dynamic.h
+//     CLASSIX_Group_Dynamic.h
 //
 // = AUTHOR(S)
-//     Wei Chiang
+//     Nokia Telecommunications
 // 
-// = COPYRIGHT
-//     Copyright 1998 Nokia Telecommunications
-//
 // ============================================================================
 
-#ifndef ACE_WRAPPER_CLASSIX_GROUP_DYNAMIC_H
-#define ACE_WRAPPER_CLASSIX_GROUP_DYNAMIC_H
+#ifndef ACE_CLASSIX_GROUP_DYNAMIC_H
+#define ACE_CLASSIX_GROUP_DYNAMIC_H
 
 /* ------------------------------------------------------------------------- */
-#include "CLASSIX/Group.h"
+#include "ace/CLASSIX/CLASSIX_Group.h"
 
 class ACE_CLASSIX_Group_Dynamic : public ACE_CLASSIX_Group
     // = TITLE
@@ -54,7 +51,7 @@ class ACE_CLASSIX_Group_Dynamic : public ACE_CLASSIX_Group
 /* ------------------------------------------------------------------------- */
 
 #if defined (__ACE_INLINE__)
-#include "CLASSIX/Group_Dynamic.i"
+#include "ace/CLASSIX/CLASSIX_Group_Dynamic.i"
 #endif /* __ACE_INLINE__ */
 
-#endif /* ACE_WRAPPER_CLASSIX_GROUP_DYNAMIC_H */
+#endif /* ACE_CLASSIX_GROUP_DYNAMIC_H */
diff --git a/ace/CLASSIX/Group_Dynamic.i b/ace/CLASSIX/CLASSIX_Group_Dynamic.i
index a7974ce45c1..a7974ce45c1 100644
--- a/ace/CLASSIX/Group_Dynamic.i
+++ b/ace/CLASSIX/CLASSIX_Group_Dynamic.i
diff --git a/ace/CLASSIX/Group_Stamp.cpp b/ace/CLASSIX/CLASSIX_Group_Stamp.cpp
index 990c5a05463..b1205ca66ec 100644
--- a/ace/CLASSIX/Group_Stamp.cpp
+++ b/ace/CLASSIX/CLASSIX_Group_Stamp.cpp
@@ -4,23 +4,20 @@
 // ============================================================================
 //
 // = LIBRARY
-//     ACE
+//     ace
 // 
 // = FILENAME
-//     CLASSIX/Group_Stamp.cpp
+//     ace/CLASSIX_Group_Stamp.cpp
 //
 // = AUTHOR(S)
-//     Wei Chiang
+//     Nokia Telecommunications
 // 
-// = COPYRIGHT
-//     Copyright 1998 Nokia Telecommunications
-//
 // ============================================================================
 
-#include "CLASSIX/Group_Stamp.h"
+#include "ace/CLASSIX/CLASSIX_Group_Stamp.h"
 
 #if !defined (__ACE_INLINE__)
-#include "CLASSIX/Group_Stamp.i"
+#include "ace/CLASSIX/CLASSIX_Group_Stamp.i"
 #endif /* __ACE_INLINE__ */
 /* ------------------------------------------------------------------------- */
 void
diff --git a/ace/CLASSIX/Group_Stamp.h b/ace/CLASSIX/CLASSIX_Group_Stamp.h
index f53b7accb98..cf1e818510f 100644
--- a/ace/CLASSIX/Group_Stamp.h
+++ b/ace/CLASSIX/CLASSIX_Group_Stamp.h
@@ -4,24 +4,21 @@
 // ============================================================================
 //
 // = LIBRARY
-//     ACE
+//     ace
 // 
 // = FILENAME
-//     CLASSIX/Group_Stamp.h
+//     CLASSIX_Group_Stamp.h
 //
 // = AUTHOR(S)
-//     Wei Chiang
+//     Nokia Telecommunications
 // 
-// = COPYRIGHT
-//     Copyright 1998 Nokia Telecommunications
-//
 // ============================================================================
 
-#ifndef ACE_WRAPPER_CLASSIX_GROUP_STAMP_H
-#define ACE_WRAPPER_CLASSIX_GROUP_STAMP_H
+#ifndef ACE_CLASSIX_GROUP_STAMP_H
+#define ACE_CLASSIX_GROUP_STAMP_H
 
 /* ------------------------------------------------------------------------- */
-#include "CLASSIX/Group.h"
+#include "ace/CLASSIX/CLASSIX_Group.h"
 
 class ACE_CLASSIX_Group_Stamp : public ACE_CLASSIX_Group
     // = TITLE
@@ -81,7 +78,7 @@ class ACE_CLASSIX_Group_Stamp : public ACE_CLASSIX_Group
 /* ------------------------------------------------------------------------- */
 
 #if defined (__ACE_INLINE__)
-#include "CLASSIX/Group_Stamp.i"
+#include "ace/CLASSIX/CLASSIX_Group_Stamp.i"
 #endif /* __ACE_INLINE__ */
 
-#endif /* ACE_WRAPPER_CLASSIX_GROUP_STAMP_H */
+#endif /* ACE_CLASSIX_GROUP_STAMP_H */
diff --git a/ace/CLASSIX/Group_Stamp.i b/ace/CLASSIX/CLASSIX_Group_Stamp.i
index 0c03d8ab17a..0c03d8ab17a 100644
--- a/ace/CLASSIX/Group_Stamp.i
+++ b/ace/CLASSIX/CLASSIX_Group_Stamp.i
diff --git a/ace/CLASSIX/OS.cpp b/ace/CLASSIX/CLASSIX_OS.cpp
index 58225da3e51..c93b7432d77 100644
--- a/ace/CLASSIX/OS.cpp
+++ b/ace/CLASSIX/CLASSIX_OS.cpp
@@ -4,26 +4,23 @@
 // ============================================================================
 //
 // = LIBRARY
-//     ACE
+//     ace
 // 
 // = FILENAME
 //     CLASSIX_OS.cpp
 //
 // = AUTHOR(S)
-//     Wei Chiang
+//     Nokia Telecommunications
 // 
-// = COPYRIGHT
-//     Copyright 1998 Nokia Telecommunications
-//
 // ============================================================================
 
-#include "CLASSIX/OS.h"
+#include "ace/CLASSIX/CLASSIX_OS.h"
 
 #if !defined (__ACE_INLINE__)
-#include "CLASSIX/OS.i"
+#include "ace/CLASSIX/CLASSIX_OS.i"
 #endif /* __ACE_INLINE__ */
 
-#include "CLASSIX/Reactor.h"
+#include "ace/CLASSIX/CLASSIX_Reactor.h"
 
 /* ------------------------------------------------------------------------- */
 
@@ -60,19 +57,6 @@ ACE_CLASSIX_OS::ACE_CLASSIX_OS(void)
     this->null_KnUniqueId_.uiHead = this->null_KnUniqueId_.uiTail = 0;
 }
 
-const KnUniqueId&
-ACE_CLASSIX_OS::null_KnUniqueId(void)
-{
-    return null_KnUniqueId_;
-}
-
-
-ACE_Recursive_Thread_Mutex&
-ACE_CLASSIX_OS::get_lock_(void)
-{
-    return lock_;
-}
-
 ssize_t
 ACE_CLASSIX_OS::convert_io_error(ssize_t theOriginal)
 {
@@ -117,7 +101,7 @@ ACE_CLASSIX_Msg::dump(void) const
 {
     ACE_DEBUG ((LM_INFO, ACE_BEGIN_DUMP, this));
 
-    char s[400];
+    char s[100];
     ACE_OS::sprintf (s, "flag = %x\n"
 		     "body size = %d\t addr = %x\n"
 		     "annex addr = %x\n"
diff --git a/ace/CLASSIX/OS.h b/ace/CLASSIX/CLASSIX_OS.h
index b9c47eed4ec..6caccfe8a69 100644
--- a/ace/CLASSIX/OS.h
+++ b/ace/CLASSIX/CLASSIX_OS.h
@@ -4,17 +4,14 @@
 // ============================================================================
 //
 // = LIBRARY
-//     ACE
+//     ace
 // 
 // = FILENAME
 //     CLASSIX_OS.h
 //
 // = AUTHOR(S)
-//     Wei Chiang
+//     Nokia Telecommunications
 // 
-// = COPYRIGHT
-//     Copyright 1998 Nokia Telecommunications
-//
 // ============================================================================
 
 #ifndef ACE_CLASSIX_OS_H
@@ -24,9 +21,10 @@
 #include "ace/OS.h"
 #include "ace/Select_Reactor.h"
 #include "ace/Singleton.h"
+#include "ace/CLASSIX/CLASSIX_Port_Core.h"
+
 #include <ipc/chIpc.h>
 
-#include "CLASSIX/Port_Core.h"
 
 #if 0
 class ACE_Export ACE_CLASSIX_Mgr
@@ -123,7 +121,7 @@ class ACE_CLASSIX_Msg
 /* ------------------------------------------------------------------------- */
 
 #if defined (__ACE_INLINE__)
-#include "CLASSIX/OS.i"
+#include "ace/CLASSIX/CLASSIX_OS.i"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_CLASSIX_OS_H */
diff --git a/ace/CLASSIX/OS.i b/ace/CLASSIX/CLASSIX_OS.i
index b32026eec80..d5ded0cc75a 100644
--- a/ace/CLASSIX/OS.i
+++ b/ace/CLASSIX/CLASSIX_OS.i
@@ -1,6 +1,23 @@
 /* -*- C++ -*- */
 // $Id$
 
+/* ------------------------------------------------------------------------- */
+ACE_INLINE
+const KnUniqueId&
+ACE_CLASSIX_OS::null_KnUniqueId(void)
+{
+    return null_KnUniqueId_;
+}
+
+
+ACE_INLINE
+ACE_Recursive_Thread_Mutex&
+ACE_CLASSIX_OS::get_lock_(void)
+{
+    return lock_;
+}
+
+/* ------------------------------------------------------------------------- */
 ACE_INLINE
 ACE_CLASSIX_Msg::ACE_CLASSIX_Msg(void)
 {
diff --git a/ace/CLASSIX/Peer_SAP.cpp b/ace/CLASSIX/CLASSIX_Peer_SAP.cpp
index 95f66045561..9dbddf9c0b1 100644
--- a/ace/CLASSIX/Peer_SAP.cpp
+++ b/ace/CLASSIX/CLASSIX_Peer_SAP.cpp
@@ -4,26 +4,23 @@
 // ============================================================================
 //
 // = LIBRARY
-//     IPP
+//     ace
 // 
 // = FILENAME
-//     CLASSIX/Peer_SAP.cpp
+//     CLASSIX_Peer_SAP.cpp
 //
 // = AUTHOR(S)
-//     Wei Chiang
+//     Nokia Telecommunications
 // 
-// = COPYRIGHT
-//     Copyright 1998 Nokia Telecommunications
-//
 // ============================================================================
 
-#include "CLASSIX/Peer_SAP.h"
+#include "ace/CLASSIX/CLASSIX_Peer_SAP.h"
 
 #if !defined (__ACE_INLINE__)
-#include "CLASSIX/Peer_SAP.i"
+#include "ace/CLASSIX/CLASSIX_Peer_SAP.i"
 #endif /* __ACE_INLINE__ */
 
-#include "CLASSIX/Group_Stamp.h"
+#include "ace/CLASSIX/CLASSIX_Group_Stamp.h"
 /* ------------------------------------------------------------------------- */
 int
 ACE_CLASSIX_Peer_SAP::set(const ACE_CLASSIX_Port_Core& thePeer)
diff --git a/ace/CLASSIX/Peer_SAP.h b/ace/CLASSIX/CLASSIX_Peer_SAP.h
index 7246aa3be4e..5e391c48014 100644
--- a/ace/CLASSIX/Peer_SAP.h
+++ b/ace/CLASSIX/CLASSIX_Peer_SAP.h
@@ -4,25 +4,22 @@
 // ============================================================================
 //
 // = LIBRARY
-//     IPP
+//     ace
 // 
 // = FILENAME
-//     CLASSIX/Peer_SAP.h
+//     CLASSIX_Peer_SAP.h
 //
 // = AUTHOR(S)
-//     Wei Chiang
+//     Nokia Telecommunications
 // 
-// = COPYRIGHT
-//     Copyright 1998 Nokia Telecommunications
-//
 // ============================================================================
 
-#ifndef IPP_WRAPPER_CLASSIX_PEER_SAP_H
-#define IPP_WRAPPER_CLASSIX_PEER_SAP_H
+#ifndef ACE_CLASSIX_PEER_SAP_H
+#define ACE_CLASSIX_PEER_SAP_H
 
 /* ------------------------------------------------------------------------- */
-#include <CLASSIX/SAP.h>
-#include <CLASSIX/Port_Default.h>
+#include <ace/CLASSIX/CLASSIX_SAP.h>
+#include <ace/CLASSIX/CLASSIX_Port_Default.h>
 
 class ACE_CLASSIX_Peer_SAP
     // = TITLE
@@ -98,7 +95,7 @@ class ACE_CLASSIX_Peer_SAP
 /* ------------------------------------------------------------------------- */
 
 #if defined (__ACE_INLINE__)
-#include "CLASSIX/Peer_SAP.i"
+#include "ace/CLASSIX/CLASSIX_Peer_SAP.i"
 #endif /* __ACE_INLINE__ */
 
-#endif /* IPP_WRAPPER_CLASSIX_PEER_SAP_H */
+#endif /* ACE_CLASSIX_PEER_SAP_H */
diff --git a/ace/CLASSIX/Peer_SAP.i b/ace/CLASSIX/CLASSIX_Peer_SAP.i
index a10bcfd12b5..a10bcfd12b5 100644
--- a/ace/CLASSIX/Peer_SAP.i
+++ b/ace/CLASSIX/CLASSIX_Peer_SAP.i
diff --git a/ace/CLASSIX/Port.cpp b/ace/CLASSIX/CLASSIX_Port.cpp
index f1e9203d531..7beb2a13ae6 100644
--- a/ace/CLASSIX/Port.cpp
+++ b/ace/CLASSIX/CLASSIX_Port.cpp
@@ -4,10 +4,10 @@
 // Defines the ClassiX IPC address family address format.
 
 #define ACE_BUILD_DLL
-#include "CLASSIX/Port.h"
+#include "ace/CLASSIX/CLASSIX_Port.h"
 
 #if !defined (__ACE_INLINE__)
-#include "CLASSIX/Port.i"
+#include "ace/CLASSIX/CLASSIX_Port.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_ALLOC_HOOK_DEFINE(ACE_CLASSIX_Port)
diff --git a/ace/CLASSIX/Port.h b/ace/CLASSIX/CLASSIX_Port.h
index db6acc9856d..28d44a24ce5 100644
--- a/ace/CLASSIX/Port.h
+++ b/ace/CLASSIX/CLASSIX_Port.h
@@ -4,25 +4,22 @@
 // ============================================================================
 //
 // = LIBRARY
-//    ipp_ace
+//    ace
 // 
 // = FILENAME
 //    CLASSIX_Port.h
 //
 // = AUTHOR
-//    Wei Chiang
+//    Nokia Telecommunications
 //
-// = COPYRIGHT
-//     Copyright 1998 Nokia Telecommunications
-// 
 // ============================================================================
 
 #if !defined (ACE_CLASSIX_PORT_H)
 #define ACE_CLASSIX_PORT_H
 
 #include "ace/Singleton.h"
-#include "CLASSIX/OS.h"
-#include "CLASSIX/Addr.h"
+#include "ace/CLASSIX/CLASSIX_OS.h"
+#include "ace/CLASSIX/CLASSIX_Addr.h"
 
 
 class ACE_Export ACE_CLASSIX_Port : public ACE_CLASSIX_Addr
@@ -151,7 +148,7 @@ private:
 
 /* ------------------------------------------------------------------------- */
 #if defined (__ACE_INLINE__)
-#include "CLASSIX/Port.i"
+#include "ace/CLASSIX/CLASSIX_Port.i"
 #endif /* __ACE_INLINE__ */
 
 
diff --git a/ace/CLASSIX/Port.i b/ace/CLASSIX/CLASSIX_Port.i
index 762f6ec5794..762f6ec5794 100644
--- a/ace/CLASSIX/Port.i
+++ b/ace/CLASSIX/CLASSIX_Port.i
diff --git a/ace/CLASSIX/Port_Core.cpp b/ace/CLASSIX/CLASSIX_Port_Core.cpp
index 9f5eacd3d1b..4d1903939b9 100644
--- a/ace/CLASSIX/Port_Core.cpp
+++ b/ace/CLASSIX/CLASSIX_Port_Core.cpp
@@ -4,27 +4,24 @@
 // ============================================================================
 //
 // = LIBRARY
-//     ACE
+//     ace
 // 
 // = FILENAME
-//     CLASSIX/Port_Core.cpp
+//     CLASSIX_Port_Core.cpp
 //
 // = AUTHOR(S)
-//     Wei Chiang
+//     Nokia Telecommunications
 // 
-// = COPYRIGHT
-//     Copyright 1998 Nokia Telecommunications
-//
 // ============================================================================
 
-#include "CLASSIX/Port_Core.h"
+#include "ace/CLASSIX/CLASSIX_Port_Core.h"
 
 #if !defined (__ACE_INLINE__)
-#include "CLASSIX/Port_Core.i"
+#include "ace/CLASSIX/CLASSIX_Port_Core.i"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Synch_T.h"
-#include "CLASSIX/OS.h"
+#include "ace/CLASSIX/CLASSIX_OS.h"
 /* ------------------------------------------------------------------------- */
 
 ACE_ALLOC_HOOK_DEFINE(ACE_CLASSIX_Port_Core)
diff --git a/ace/CLASSIX/Port_Core.h b/ace/CLASSIX/CLASSIX_Port_Core.h
index 8b8fb74f46c..e4955063279 100644
--- a/ace/CLASSIX/Port_Core.h
+++ b/ace/CLASSIX/CLASSIX_Port_Core.h
@@ -4,17 +4,14 @@
 // ============================================================================
 //
 // = LIBRARY
-//     ACE
+//     ace
 // 
 // = FILENAME
-//     CLASSIX/Port_Core.h
+//     CLASSIX_Port_Core.h
 //
 // = AUTHOR(S)
-//     Wei Chiang
+//     Nokia Telecommunications
 // 
-// = COPYRIGHT
-//     Copyright 1998 Nokia Telecommunications
-//
 // ============================================================================
 
 #ifndef ACE_CLASSIX_PORT_CORE_H
@@ -93,7 +90,7 @@ private:
 /* ------------------------------------------------------------------------- */
 
 #if defined (__ACE_INLINE__)
-#include "CLASSIX/Port_Core.i"
+#include "ace/CLASSIX/CLASSIX_Port_Core.i"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_CLASSIX_PORT_CORE_H */
diff --git a/ace/CLASSIX/Port_Core.i b/ace/CLASSIX/CLASSIX_Port_Core.i
index 7fd3694d8de..7fd3694d8de 100644
--- a/ace/CLASSIX/Port_Core.i
+++ b/ace/CLASSIX/CLASSIX_Port_Core.i
diff --git a/ace/CLASSIX/Port_Default.cpp b/ace/CLASSIX/CLASSIX_Port_Default.cpp
index 53e3ef737a3..e18d55971e2 100644
--- a/ace/CLASSIX/Port_Default.cpp
+++ b/ace/CLASSIX/CLASSIX_Port_Default.cpp
@@ -4,10 +4,10 @@
 // Defines the ClassiX IPC address family address format.
 
 #define ACE_BUILD_DLL
-#include "CLASSIX/Port_Default.h"
+#include "ace/CLASSIX/CLASSIX_Port_Default.h"
 
 #if !defined (__ACE_INLINE__)
-#include "CLASSIX/Port_Default.i"
+#include "ace/CLASSIX/CLASSIX_Port_Default.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_ALLOC_HOOK_DEFINE(ACE_CLASSIX_Port_Default)
diff --git a/ace/CLASSIX/Port_Default.h b/ace/CLASSIX/CLASSIX_Port_Default.h
index f7d64d08a1e..39229c6b1a0 100644
--- a/ace/CLASSIX/Port_Default.h
+++ b/ace/CLASSIX/CLASSIX_Port_Default.h
@@ -4,24 +4,21 @@
 // ============================================================================
 //
 // = LIBRARY
-//    ipp_ace
+//    ace
 // 
 // = FILENAME
-//    CLASSIX/Port_Default.h
+//    CLASSIX_Port_Default.h
 //
-// = AUTHOR
-//    Wei Chiang
+// = AUTHOR(S)
+//    Nokia Telecommunications
 //
-// = COPYRIGHT
-//     Copyright 1998 Nokia Telecommunications
-// 
 // ============================================================================
 
-#if !defined (ACE_CLASSIX_PORT_DEFAULT_H)
+#if !defined ACE_CLASSIX_PORT_DEFAULT_H
 #define ACE_CLASSIX_PORT_DEFAULT_H
 
 #include "ace/Singleton.h"
-#include "CLASSIX/Port.h"
+#include "ace/CLASSIX/CLASSIX_Port.h"
 
 class ACE_CLASSIX_Port_Default : public ACE_CLASSIX_Port
 {
@@ -65,7 +62,7 @@ protected:
 
 
 #if defined (__ACE_INLINE__)
-#include "CLASSIX/Port_Default.i"
+#include "ace/CLASSIX/CLASSIX_Port_Default.i"
 #endif /* __ACE_INLINE__ */
 
 /* ------------------------------------------------------------------------- */
diff --git a/ace/CLASSIX/Port_Default.i b/ace/CLASSIX/CLASSIX_Port_Default.i
index fac497bace0..fac497bace0 100644
--- a/ace/CLASSIX/Port_Default.i
+++ b/ace/CLASSIX/CLASSIX_Port_Default.i
diff --git a/ace/CLASSIX/Select_Reactor.cpp b/ace/CLASSIX/CLASSIX_Reactor.cpp
index 50ddfbaf5da..8f65557e33e 100644
--- a/ace/CLASSIX/Select_Reactor.cpp
+++ b/ace/CLASSIX/CLASSIX_Reactor.cpp
@@ -1,22 +1,18 @@
-/* -*- C++ -*- */
 // $Id$
-
+/*
 // ============================================================================
 //
 // = LIBRARY
 //     ACE
 // 
 // = FILENAME
-//     CLASSIX/Reactor.cpp
+//     CLASSIX_Reactor.cpp
 //
 // = AUTHOR(S)
-//     Wei Chiang
+//     Nokia Telecommunications
 // 
-// = COPYRIGHT
-//     Copyright 1998 Nokia Telecommunications
-//
 // ============================================================================
-
+*/
 #include "CLASSIX/Reactor.h"
 
 #if !defined (__ACE_INLINE__)
@@ -25,30 +21,10 @@
 
 #include "CLASSIX/OS.h"
 /* ------------------------------------------------------------------------- */
-ACE_CLASSIX_Select_Reactor::ACE_CLASSIX_Select_Reactor(
-    ACE_Timer_Queue *theTimeQ)
-  : ACE_Select_Reactor(0, theTimeQ, 0,
-		       new ACE_CLASSIX_Select_Reactor_Notify()),
-    current_msg_size_ (0),
-    current_handle_   (ACE_INVALID_HANDLE)
-{
-}
-
-ACE_CLASSIX_Select_Reactor::ACE_CLASSIX_Select_Reactor (
-    size_t theSize,
-    int theRs,
-    ACE_Timer_Queue *theTimeQ)
-  : ACE_Select_Reactor (theSize, theRs, 0, theTimeQ, 0,
-			new ACE_CLASSIX_Select_Reactor_Notify() ),
-    current_msg_size_ (0),
-    current_handle_   (ACE_INVALID_HANDLE)
-{
-}
-
 int
 ACE_CLASSIX_Select_Reactor::wait_for_multiple_events 
-                     (ACE_Select_Reactor_Handle_Set &theDispatchSet,
-		      ACE_Time_Value *max_wait_time)
+(ACE_Select_Reactor_Handle_Set &theDispatchSet,
+ ACE_Time_Value *max_wait_time)
 {
 
     ACE_Time_Value timer_buf (0);
@@ -128,8 +104,6 @@ int
 ACE_CLASSIX_Select_Reactor::set_current_info_(ACE_HANDLE thePort, 
 					      size_t theSize)
 {
-//    ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, 
-//			      this->current_lock_, -1));
     ACE_MT(ACE_GUARD_RETURN (ACE_SELECT_REACTOR_MUTEX, ace_mon, 
 			     this->token_, -1));
 
@@ -142,8 +116,6 @@ int
 ACE_CLASSIX_Select_Reactor::get_current_info(ACE_HANDLE thePort, 
 					     size_t& theSize)
 {
-//    ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, 
-//			      this->current_lock_, 0));
     ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_MUTEX, 
 			      ace_mon, this->token_, -1));
 
@@ -161,102 +133,32 @@ ACE_CLASSIX_Select_Reactor::get_current_info(ACE_HANDLE thePort,
     }
 }
 
-#if 0
-ACE_Message_Block*
-ACE_CLASSIX_Select_Reactor::collect_msg(ACE_HANDLE theHandle)
-{
-    ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, 
-			      this->lock_current_, 0));
-  
-    if (this->current_handle_ != ACE_INVALID_HANDLE &&
-	theHandle == this->current_handle_)
-    {
-	ACE_Message_Block *msg = this->current_msg_;
-	this->current_msg_ = 0;
-	this->current_handle_ = ACE_INVALID_HANDLE;
-	return msg;
-    }
-    else
-    {
-	return 0;
-    }
-}
-
-
-int
-ACE_CLASSIX_Select_Reactor::get_data_(ACE_HANDLE theHandle, size_t theSize)
-{
-    ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, 
-			      this->lock_current_, 0));
-
-    // reset current information
-    this->current_error_ = 0;
-    this->current_handle_= theHandle;
-
-    // Remove the previous message that has not been taken
-    if (this->current_msg_)
-	this->current_msg_->release();
-
-    // Read the current message into a block bigger than the actual size
-    // to facilitate adding potential paddings by the handler
-    this->current_msg_ = new ACE_Message_Block(theSize + this->overhead_);
-    char *data = this->current_msg_ == 0 ? 0 : this->current_msg_->rd_ptr();
-    // Invoke the read operation even though we may not have a buffer for it.
-    // This is to clean up the CLASSIX' current message space.
-    ACE_CLASSIX_Msg rmsg(data, data == 0 ? 0 : theSize);
-    int result = ::ipcGetData(rmsg.get());
-
-    if (!this->current_msg_)
-	this->current_error_ = ENOBUFS;
-    else if (result < 0)
-	this->current_error_ = ACE_CLASSIX_OS::convert_io_error(result);
-    else if (result != theSize)
-	this->current_error_ = EFAULT;
-    
-    if (this->current_error_ < 0 && this->current_msg_)
-    {
-	this->current_msg_->release();
-	this->current_msg_ = 0;	
-    }
-    return this->current_error_;
-}
-#endif
-
 int
 ACE_CLASSIX_Select_Reactor::handle_error_ (int thePort)
 {
 
-  // The thread has been aborted
-  if (errno == K_EABORT)
-    return this->restart_;
-  // No port or a (Chorus) handler is attached to the port
-  else if (errno == K_ENOPORT || errno == K_EINVAL)
-    return this->check_handles_ (thePort);
-  else
-    return -1;
+    // The thread has been aborted
+    if (errno == K_EABORT)
+	return this->restart_;
+    // No port or a (Chorus) handler is attached to the port
+    else if (errno == K_ENOPORT || errno == K_EINVAL)
+	return this->check_handles_ (thePort);
+    else
+	return -1;
 }
 
 int
 ACE_CLASSIX_Select_Reactor::check_handles_ (int thePort)
 {
-  ACE_TRACE ("ACE_Select_Reactor::check_handles");
-  if (thePort == K_ANYENABLED)
-      return -1;
-  else
-  // Don't know how to check if a Chorus port has been disabled or deleted.
-      return 0;
+    ACE_TRACE ("ACE_Select_Reactor::check_handles");
+    if (thePort == K_ANYENABLED)
+	return -1;
+    else
+    // Don't know how to check if a Chorus port has been disabled or deleted.
+	return 0;
 }
 
 /* ------------------------------------------------------------------------- */
-
-ACE_CLASSIX_Select_Reactor_Notify::ACE_CLASSIX_Select_Reactor_Notify(void)
-    : ACE_Select_Reactor_Notify()
-{
-    // Get the address for the notification port
-    // this->notification_sap_.set_addr
-    //	(ACE_CLASSIX_Port(this->notification_port_));
-}
-
 void
 ACE_CLASSIX_Select_Reactor_Notify::dump (void) const
 {
@@ -270,12 +172,13 @@ ACE_CLASSIX_Select_Reactor_Notify::dump (void) const
 }
 
 int
-ACE_CLASSIX_Select_Reactor_Notify::open (ACE_Select_Reactor *r,
-					 int disable_notify_pipe)
+ACE_CLASSIX_Select_Reactor_Notify::open (ACE_Reactor_Impl *theReactor,
+					 ACE_Timer_Queue* 
+					 int the_disable_notify_pipe)
 {
-    if (disable_notify_pipe == 0)
+    if (the_disable_notify_pipe == 0)
     {
-	this->select_reactor_ = r;
+	this->select_reactor_ = theReactor;
 
 	if (this->notification_sap_.open (&this->notification_port_) != 0 ||
 	    this->notification_sap_.selectable() != 0)
@@ -292,14 +195,6 @@ ACE_CLASSIX_Select_Reactor_Notify::open (ACE_Select_Reactor *r,
     }
 }
 
-int
-ACE_CLASSIX_Select_Reactor_Notify::close (void)
-{
-  ACE_TRACE ("ACE_Select_Reactor_Notify::close");
-  // deregister handle ???
-  return this->notification_sap_.close ();
-}
-
 ssize_t
 ACE_CLASSIX_Select_Reactor_Notify::notify (ACE_Event_Handler *eh,
                                    ACE_Reactor_Mask mask,
@@ -362,12 +257,12 @@ ACE_CLASSIX_Select_Reactor_Notify::handle_input (ACE_HANDLE handle)
     int                     number_dispatched = 0;
 
     ACE_Notification_Buffer buffer;
-    ACE_CLASSIX_Msg rmsg(&buffer, sizeof (buffer));
+//    ACE_CLASSIX_Msg rmsg(&buffer, sizeof (buffer));
 
     if (this->select_reactor_->get_current_info(handle, n1) == -1 ||
 	n1 != sizeof buffer)
     {
-	// I'm not sure quite what to do at this point.  It's
+	// I'm not quite sure what to do at this point.  It's
 	// probably best just to return -1.
 	ACE_DEBUG((LM_DEBUG, 
 		   "ACE_CLASSIX_Select_Reactor_Notify:: "
@@ -375,7 +270,8 @@ ACE_CLASSIX_Select_Reactor_Notify::handle_input (ACE_HANDLE handle)
 	return -1;
     }
 
-    while ((n = ::ipcGetData(rmsg.get())) > 0)
+//    while ((n = ::ipcGetData(rmsg.get())) > 0)
+    while ((n = ::ipcGetData(&buffer)) > 0)
     {
 	if (n != sizeof buffer)
         {
@@ -438,3 +334,4 @@ ACE_CLASSIX_Select_Reactor_Notify::handle_input (ACE_HANDLE handle)
     this->select_reactor_->renew();
     return number_dispatched;
 }
+/* ------------------------------------------------------------------------- */
diff --git a/ace/CLASSIX/Select_Reactor.h b/ace/CLASSIX/CLASSIX_Reactor.h
index 54d45c687ca..ea9eaca3e95 100644
--- a/ace/CLASSIX/Select_Reactor.h
+++ b/ace/CLASSIX/CLASSIX_Reactor.h
@@ -1,33 +1,33 @@
 /* -*- C++ -*- */
 // $Id$
 
+/*
 // ============================================================================
 //
 // = LIBRARY
 //     ACE
 // 
 // = FILENAME
-//     CLASSIX/Reactor.h
+//     CLASSIX_Reactor.h
 //
 // = AUTHOR(S)
-//     Wei Chiang
+//     Nokia Telecommunications
 // 
-// = COPYRIGHT
-//     Copyright 1998 Nokia Telecommunications
-//
 // ============================================================================
+*/
 
-#ifndef ACE_WRAPPER_CLASSIX_REACTOR_H
-#define ACE_WRAPPER_CLASSIX_REACTOR_H
+#ifndef ACE_CLASSIX_REACTOR_H
+#define ACE_CLASSIX_REACTOR_H
 
 /* ------------------------------------------------------------------------- */
+#include "ace/Timer_Queue.h"
 #include "ace/Select_Reactor.h"
 #include "ace/Message_Block.h"
-#include "CLASSIX/SAP.h"
+#include "ace/CLASSIX/CLASSIX_SAP.h"
 
 
 class ACE_Export ACE_CLASSIX_Select_Reactor_Notify : 
-    public ACE_Select_Reactor_Notify
+    public ACE_Reactor_Notify
 {
   // = TITLE
   //     Unblock the <ACE_CLASSIX_Select_Reactor> from its event loop.
@@ -40,7 +40,9 @@ class ACE_Export ACE_CLASSIX_Select_Reactor_Notify :
 public:
     // = Initialization and termination methods.
     ACE_CLASSIX_Select_Reactor_Notify(void);
-    virtual int open (ACE_Select_Reactor *, int /* dusable_notify_pip */);
+    virtual int open (ACE_Reactor_Impl *,
+		      ACE_Timer_Queue * = 0,
+		      int  = 0 /* dusable_notify_pip */);
     // Enables the notification port and register it with the reactor 
     virtual int close (void);
     // Disables the notification port
@@ -66,6 +68,16 @@ public:
     virtual int handle_input (ACE_HANDLE handle);
     // Called back by the Select_Reactor when a thread wants to unblock us.
 
+    virtual void max_notify_iterations (int);
+    // Set the maximum number of times that the
+    // <ACE_CLASSIX_Reactor_Notify::handle_input> method will iterate
+    // Always 1.
+
+    virtual int max_notify_iterations (void);
+    // Get the maximum number of times that the
+    // <ACE_Select_Reactor_Notify::handle_input> method will iterate.
+    // Always 1
+
     void dump (void) const;
     // Dump the state of an object.
 
@@ -73,6 +85,10 @@ public:
     // Declare the dynamic allocation hooks.
 
 private:
+    ACE_Select_Reactor *select_reactor_;
+    // Keep a back pointer to the <ACE_Select_Reactor>.  If this value
+    // if NULL then the <ACE_Select_Reactor> has been initialized with
+    // <disable_notify_pipe>.
     ACE_CLASSIX_Port_Core    notification_port_; // CLASSIX' IPC port
     ACE_CLASSIX_SAP          notification_sap_;
     // The HANDLE that the Select_Reactor is listening on and 
@@ -177,7 +193,7 @@ class ACE_CLASSIX_Select_Reactor : public ACE_Select_Reactor
 /* ------------------------------------------------------------------------- */
 
 #if defined (__ACE_INLINE__)
-#include "CLASSIX/Reactor.i"
+#include "ace/CLASSIX/CLASSIX_Reactor.i"
 #endif /* __ACE_INLINE__ */
 
-#endif /* ACE_WRAPPER_CLASSIX_REACTOR_H */
+#endif /* ACE_CLASSIX_REACTOR_H */
diff --git a/ace/CLASSIX/CLASSIX_Reactor.i b/ace/CLASSIX/CLASSIX_Reactor.i
new file mode 100644
index 00000000000..002fc94af1e
--- /dev/null
+++ b/ace/CLASSIX/CLASSIX_Reactor.i
@@ -0,0 +1,57 @@
+/* -*- C++ -*- */
+// $Id$
+//
+// CLASSIX/Reactor.i
+/* ------------------------------------------------------------------------- */
+
+/* ------------------------------------------------------------------------- */
+ACE_INLINE
+ACE_CLASSIX_Select_Reactor_Notify::ACE_CLASSIX_Select_Reactor_Notify(void)
+    : ACE_Reactor_Notify()
+{
+}
+
+ACE_INLINE
+ACE_CLASSIX_Select_Reactor::ACE_CLASSIX_Select_Reactor(
+    ACE_Timer_Queue *theTimeQ)
+  : ACE_Select_Reactor(0, theTimeQ, 0,
+		       new ACE_CLASSIX_Select_Reactor_Notify()),
+    current_msg_size_ (0),
+    current_handle_   (ACE_INVALID_HANDLE)
+{
+}
+
+ACE_INLINE
+ACE_CLASSIX_Select_Reactor::ACE_CLASSIX_Select_Reactor (
+    size_t theSize,
+    int theRs,
+    ACE_Timer_Queue *theTimeQ)
+  : ACE_Select_Reactor (theSize, theRs, 0, theTimeQ, 0,
+			new ACE_CLASSIX_Select_Reactor_Notify() ),
+    current_msg_size_ (0),
+    current_handle_   (ACE_INVALID_HANDLE)
+{
+}
+
+ACE_INLINE
+int
+ACE_CLASSIX_Select_Reactor_Notify::close (void)
+{
+  // deregister handle ???
+  return this->notification_sap_.close ();
+}
+
+ACE_INLINE
+void
+ACE_Select_Reactor::max_notify_iterations (int iterations)
+{
+}
+
+int
+ACE_Select_Reactor::max_notify_iterations (void)
+{
+    return 1;
+}
+
+
+/* ------------------------------------------------------------------------- */
diff --git a/ace/CLASSIX/SAP.cpp b/ace/CLASSIX/CLASSIX_SAP.cpp
index d876498ffb7..55a9c8183a0 100644
--- a/ace/CLASSIX/SAP.cpp
+++ b/ace/CLASSIX/CLASSIX_SAP.cpp
@@ -4,23 +4,20 @@
 // ============================================================================
 //
 // = LIBRARY
-//     ACE
+//     ace
 // 
 // = FILENAME
 //     CLASSIX_SAP.cpp
 //
 // = AUTHOR(S)
-//     Wei Chiang
+//     Nokia Telecommunications
 // 
-// = COPYRIGHT
-//     Copyright 1998 ???
-//
 // ============================================================================
 
-#include "CLASSIX/SAP.h"
+#include "ace/CLASSIX/CLASSIX_SAP.h"
 
 #if !defined (__ACE_INLINE__)
-#include "CLASSIX/SAP.i"
+#include "ace/CLASSIX/CLASSIX_SAP.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_ALLOC_HOOK_DEFINE(ACE_CLASSIX_SAP)
diff --git a/ace/CLASSIX/SAP.h b/ace/CLASSIX/CLASSIX_SAP.h
index 749b8b72fff..5301c2e226e 100644
--- a/ace/CLASSIX/SAP.h
+++ b/ace/CLASSIX/CLASSIX_SAP.h
@@ -4,24 +4,21 @@
 // ============================================================================
 //
 // = LIBRARY
-//     ACE
+//     ace
 // 
 // = FILENAME
 //     CLASSIX_SAP.h
 //
 // = AUTHOR(S)
-//     Wei Chiang
+//     Nokia Telecommunications
 // 
-// = COPYRIGHT
-//     Copyright 1998 Nokia Telecommunications
-//
 // ============================================================================
 
 #ifndef ACE_CLASSIX_SAP_H
 #define ACE_CLASSIX_SAP_H
 
 /* ------------------------------------------------------------------------- */
-#include "CLASSIX/Port.h"
+#include "ace/CLASSIX/CLASSIX_Port.h"
 
 class ACE_CLASSIX_SAP
     // = TITLE
@@ -136,7 +133,7 @@ class ACE_CLASSIX_SAP
 /* ------------------------------------------------------------------------- */
 
 #if defined (__ACE_INLINE__)
-#include "CLASSIX/SAP.i"
+#include "ace/CLASSIX/CLASSIX_SAP.i"
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_CLASSIX_SAP_H */
diff --git a/ace/CLASSIX/SAP.i b/ace/CLASSIX/CLASSIX_SAP.i
index 105570b363b..105570b363b 100644
--- a/ace/CLASSIX/SAP.i
+++ b/ace/CLASSIX/CLASSIX_SAP.i
diff --git a/ace/CLASSIX/Stream.cpp b/ace/CLASSIX/CLASSIX_Stream.cpp
index 886d81ac5d5..5d1ba095853 100644
--- a/ace/CLASSIX/Stream.cpp
+++ b/ace/CLASSIX/CLASSIX_Stream.cpp
@@ -4,23 +4,20 @@
 // ============================================================================
 //
 // = LIBRARY
-//     IPP
+//     ace
 // 
 // = FILENAME
-//     CLASSIX/Stream.cpp
+//     CLASSIX_Stream.cpp
 //
 // = AUTHOR(S)
-//     Wei Chiang
+//     Nokia Telecommunications
 // 
-// = COPYRIGHT
-//     Copyright 1998 Nokia Telecommunications
-//
 // ============================================================================
 
-#include "CLASSIX/Stream.h"
+#include "ace/CLASSIX/CLASSIX_Stream.h"
 
 #if !defined (__ACE_INLINE__)
-#include "CLASSIX/Stream.i"
+#include "ace/CLASSIX/CLASSIX_Stream.i"
 #endif /* __ACE_INLINE__ */
 /* ------------------------------------------------------------------------- */
 ACE_CLASSIX_Stream::ACE_CLASSIX_Stream(void)
diff --git a/ace/CLASSIX/Stream.h b/ace/CLASSIX/CLASSIX_Stream.h
index fb53ddc24fc..b9282e4450b 100644
--- a/ace/CLASSIX/Stream.h
+++ b/ace/CLASSIX/CLASSIX_Stream.h
@@ -4,26 +4,23 @@
 // ============================================================================
 //
 // = LIBRARY
-//     ACE
+//     ace
 // 
 // = FILENAME
-//     CLASSIX/Stream.h
+//     CLASSIX_Stream.h
 //
 // = AUTHOR(S)
-//     Wei Chiang
+//     Nokia Telecommunications
 // 
-// = COPYRIGHT
-//     Copyright 1998 Nokia Telecommunications
-//
 // ============================================================================
 
 #ifndef ACE_CLASSIX_STREAM_H
 #define ACE_CLASSIX_STREAM_H
 
 /* ------------------------------------------------------------------------- */
-#include <CLASSIX/SAP.h>
-#include <CLASSIX/Peer_SAP.h>
-#include <CLASSIX/Port_Default.h>
+#include "ace/CLASSIX/CLASSIX_SAP.h"
+#include "ace/CLASSIX/CLASSIX_Peer_SAP.h"
+#include "ace/CLASSIX/CLASSIX_Port_Default.h"
 
 class ACE_CLASSIX_Stream
     // = TITLE
@@ -210,8 +207,8 @@ class ACE_CLASSIX_Stream
 
  protected:
     friend class ACE_CLASSIX_CLD_Connector;
-    friend class ACE_CLASSIX_Connector;
-    friend class ACE_CLASSIX_Acceptor;
+    friend class ACE_CLASSIX_CO_Connector;
+    friend class ACE_CLASSIX_CO_Acceptor;
     ACE_CLASSIX_SAP&  get_local_sap(void);
     // Returns local sap
     ACE_CLASSIX_Peer_SAP& get_peer_sap(void);
@@ -262,7 +259,7 @@ class ACE_CLASSIX_Stream
 /* ------------------------------------------------------------------------- */
 
 #if defined (__ACE_INLINE__)
-#include "CLASSIX/Stream.i"
+#include "ace/CLASSIX/CLASSIX_Stream.i"
 #endif /* __ACE_INLINE__ */
 
-#endif /* ACE_CLASSIX_CLDGRAM_H */
+#endif /* ACE_CLASSIX_Stream_H */
diff --git a/ace/CLASSIX/Stream.i b/ace/CLASSIX/CLASSIX_Stream.i
index a876a3d78c9..a876a3d78c9 100644
--- a/ace/CLASSIX/Stream.i
+++ b/ace/CLASSIX/CLASSIX_Stream.i
diff --git a/ace/CLASSIX/Connector.cpp b/ace/CLASSIX/Connector.cpp
deleted file mode 100644
index 5ad52369fa9..00000000000
--- a/ace/CLASSIX/Connector.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     ace
-// 
-// = FILENAME
-//     CLASSIX/CLD_Connector.cpp
-//
-// = AUTHOR(S)
-//     Wei Chiang
-// 
-// = COPYRIGHT
-//     Copyright 1998 Nokia Telecommunications
-//
-// ============================================================================
-
-#define ACE_BUILD_DLL
-#include "CLASSIX/CLD_Connector.h"
-#include "CLASSIX/Addr.h"
-
-ACE_ALLOC_HOOK_DEFINE(ACE_CLASSIX_CLD_Connector)
-
-#if !defined (__ACE_INLINE__)
-#include "CLASSIX/CLD_Connector.i"
-#endif /* __ACE_INLINE__ */
-
-// Set up remote port information
-
-int
-ACE_CLASSIX_CLD_Connector::connect (ACE_CLASSIX_Stream &new_stream, 
-				    const ACE_Addr & theRemote,/* remote_sap */
-				    ACE_Time_Value *, /* timeout */
-				    const ACE_Addr & theLocal,
-                                    int, /* reuse_addr */
-				    int theFlag, /* flags */
-				    int, /* perms */
-				    int theProtocolFamily, 
-				    int /* protocol */)
-
-{
-  ACE_TRACE ("ACE_CLASSIX_CLD_Connector::connect");
-
-  // Set up peer SAP
-  if (theRemote == ACE_Addr::sap_any ||
-      new_stream.set_peer_sap(theRemote) != 0)
-    ACE_ERROR_RETURN((LM_ERROR, "ACE_CLASSIX_CLD_Connector::connect()::"
-                      "Invalid Connector SAP\n"), -1);
-
-  // Set up local SAP
-
-  if (theLocal == ACE_Addr::sap_any)
-    {
-      // if local sap has not been configured
-      // create a port and use it as the local SAP 
-      new_stream.open();
-    }
-  else
-    {
-      // replace the local SAP information
-      new_stream.close();
-      new_stream.open(theLocal);
-    }
-    
-  // Make the local SAP "selectable", if requested via the flag
-
-  if (new_stream.local_sap().is_configured() && 
-      new_stream.peer_sap().is_configured() &&  /* remote sap info exist */
-      theProtocolFamily == ACE_CLASSIX_Addr::AF_CLASSIX)
-    {
-      new_stream.control();
-      // setup the default delivery mode, if applicable
-      if (theFlag & ACE_CLASSIX_CLD_Connector::ENABLE)
-	{
-          if (new_stream.selectable() == 0)
-            return 0;
-          else
-            return -1;
-	}
-      return 0;
-    }
-  else
-    return -1;
-}
-
-void
-ACE_CLASSIX_CLD_Connector::dump (void) const
-{
-  ACE_TRACE ("ACE_CLASSIX_CLD_Connector::dump");
-}
diff --git a/ace/CLASSIX/Connector.h b/ace/CLASSIX/Connector.h
deleted file mode 100644
index c7fedc39598..00000000000
--- a/ace/CLASSIX/Connector.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     ace
-// 
-// = FILENAME
-//     CLASSIX/CLD_Connector.h
-//
-// = AUTHOR(S)
-//     Wei Chiang
-// 
-// = COPYRIGHT
-//     Copyright 1998 Nokia Telecommunications
-//
-// ============================================================================
-
-#ifndef ACE_CLASSIX_CLD_CONNECTOR_H
-#define ACE_CLASSIX_CLD_CONNECTOR_H
-
-#include "CLASSIX/Stream.h"
-
-class ACE_CLASSIX_CLD_Connector
-{
-  // = TITLE
-  //     Defines an CLASSIX IPC connectionless connection factory for the
-  //     template methods in <ACE_Connector>.
-  //
-  // = DESCRIPTION
-  //     This is used when a client needs to communicate with a server
-  //     whose SAP address is known beforehand.
-  //     
-  //     Although there is a connection
-  //     procedure, no connection is actually taken place
-  //     between the client and server, since Chorus IPC does not have
-  //     connection semantics.
-  //     The connect procedure is necessary for
-  //     compatibility with <ACE_SOCK_Connector> class.
-  //     
-  //     This class will simplify the client's
-  //     program, since it provides connection-like communication
-  //     mechanism.
-  //
-  // = NOTES
-  //     The server in this case trusts everyone who lands on the
-  //     server's SAP.
-  //     
-  // = SEE ALSO
-  //   ACE_CLASSIX_COD_Connector
-public:
-  // =  Connect options
-  enum OPTIONS
-  {
-    // Do not enable the local SAP
-    // (so that the Reactor will not monitor the port)
-    ENABLE	= 0x1
-  };
-
-  // = Initialization routines.
-  ACE_CLASSIX_CLD_Connector (void);
-  // Default constructor.
-
-  ACE_CLASSIX_CLD_Connector (ACE_CLASSIX_Stream &new_stream, 
-                             const ACE_Addr &remote_sap 
-                             = ACE_Addr::sap_any,
-                             ACE_Time_Value *timeout = 0,
-                             const ACE_Addr &local_sap = ACE_Addr::sap_any,
-                             int reuse_addr = 0,
-                             int flags = 0,
-                             int perms = 0,
-                             int protocol_family 
-                             = ACE_CLASSIX_Addr::AF_CLASSIX, 
-                             int protocol = 0);
-  // Emulates connection semantics so that it can be plugged into
-  // <ACE_Connector>
-  // Actively connect local SAP and remote SAP togeter.
-  // Produce a <new_stream> if things go well.
-  //
-  // <remote_sap> is the peer's address. In ACE_SOCK_Connector it refers to
-  // the acceptor's address.  In connectionless mode, we do not have
-  // an acceptor.  The <remote_sap> address will be copied to the new stream
-  // if things goes well.
-  // 
-  // If <local_sap> refers to any address, a port will be
-  // allocated and will be used as a local SAP.
-  //
-  // The rest parameters are there so that this class can be plugged into
-  // <ACE_Connector>.
-
-  virtual int connect (ACE_CLASSIX_Stream &new_stream, 
-                       const ACE_Addr &remote_sap = ACE_Addr::sap_any,
-                       ACE_Time_Value *timeout = 0,
-                       const ACE_Addr &local_sap = ACE_Addr::sap_any,
-                       int reuse_addr = 0,
-                       int flags = 0,
-                       int perms = 0,
-                       int protocol_family = ACE_CLASSIX_Addr::AF_CLASSIX,
-                       int protocol = 0); 
-
-  // Factory method used in <ACE_Connector>::connect_svc_handler()
-
-  // Initialization method when default constructor is used.
-  // See the comments for the corresponding constructor 
-    
-  virtual int reset_new_handle (ACE_HANDLE handle);
-  // Factory method used in ACE_Connector::handle_output().
-  // Meant for resetting any event associations on this handle
-  // Does nothig.
-
-  // = HELPER
-  void dump(void) const;
-
-private:
- 
-  ACE_CLASSIX_CLD_Connector(ACE_CLASSIX_CLD_Connector const&);
-  ACE_CLASSIX_CLD_Connector const& operator=(ACE_CLASSIX_CLD_Connector const&);
-};
-
-/* ------------------------------------------------------------------------- */
-
-#if defined (__ACE_INLINE__)
-#include "CLASSIX/CLD_Connector.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* ACE_CLASSIX_CLD_CONNECTOR_H */
diff --git a/ace/CLASSIX/Connector.i b/ace/CLASSIX/Connector.i
deleted file mode 100644
index 66cac167cab..00000000000
--- a/ace/CLASSIX/Connector.i
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-ACE_INLINE
-ACE_CLASSIX_CLD_Connector::ACE_CLASSIX_CLD_Connector (ACE_CLASSIX_Stream &new_stream, 
-                                                      const ACE_Addr &remote_sap, 
-                                                      ACE_Time_Value *timeout,
-                                                      const ACE_Addr &local_sap,
-                                                      int reuse_addr,
-                                                      int flags,
-                                                      int perms,
-                                                      int protocol_family,
-                                                      int protocol)
-{
-  ACE_TRACE ("ACE_CLASSIX_CLD_Connector::ACE_CLASSIX_CLD_Connector");
-  if (this->connect (new_stream, remote_sap, timeout, local_sap,
-		     reuse_addr, flags, perms, 
-		     protocol_family, protocol) == -1)
-    ACE_ERROR ((LM_ERROR, 
-                ASYS_TEXT ("%p\n"),  ASYS_TEXT 
-                ("ACE_CLASSIX_CLD_Connector::ACE_CLASSIX_CLD_Connector")));
-}
-
-// Do-nothing constructor...
-
-ACE_INLINE
-ACE_CLASSIX_CLD_Connector::ACE_CLASSIX_CLD_Connector (void)
-{
-  ACE_TRACE ("ACE_CLASSIX_CLD_Connector::ACE_CLASSIX_CLD_Connector");
-}
-
-ACE_INLINE
-int 
-ACE_CLASSIX_CLD_Connector::reset_new_handle (ACE_HANDLE /*  handle */)
-{
-  return 0;
-}
diff --git a/ace/CLASSIX/Makefile b/ace/CLASSIX/Makefile
new file mode 100644
index 00000000000..e58e41601f2
--- /dev/null
+++ b/ace/CLASSIX/Makefile
@@ -0,0 +1,98 @@
+#----------------------------------------------------------------------------
+#       $Id$
+#
+#       Makefile for the entire ACE release
+#----------------------------------------------------------------------------
+
+MAKEFILE = Makefile
+LIB      = libCLASSIX.a
+
+FILES    = \
+        CLASSIX_OS            \
+        CLASSIX_Addr          \
+        CLASSIX_Port_Core     \
+        CLASSIX_Port          \
+        CLASSIX_Port_Default  \
+        CLASSIX_Group         \
+        CLASSIX_Group_Stamp   \
+        CLASSIX_Group_Dynamic \
+        CLASSIX_SAP           \
+        CLASSIX_Peer_SAP      \
+        CLASSIX_Stream        \
+        CLASSIX_Dgram_Mcast   \
+        CLASSIX_CO_Acceptor   \
+        CLASSIX_CO_Connector  \
+        CLASSIX_CLD_Connector
+
+
+TEMPLATE_FILES =
+
+DEFS    = $(addsuffix .h,$(FILES)) Svc_Conf_Tokens.h
+DEFS    += $(addsuffix .i,$(FILES))
+LSRC    = $(addsuffix .cpp,$(FILES))
+LSRC2   = $(addsuffix .cpp,$(TEMPLATE_FILES))
+
+BUILD   = $(VLIB)
+
+#----------------------------------------------------------------------------
+#       Include macros and targets
+#----------------------------------------------------------------------------
+
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+
+ifneq ($(GHS),)
+  ifeq ($(CPU),86)
+    FILES += gethrtime
+    LSRC += gethrtime.cpp
+  endif # 86
+endif # GHS
+
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
+#### Disable installs in this ($(ACE_ROOT)/ace) directory, because this
+#### is the (default) destination of installs anyways.  And this will prevent
+#### creation of a link from the ACE library to itself when the build of
+#### the ACE library fails.
+INSTALL =
+include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+
+#----------------------------------------------------------------------------
+#       Local targets
+#----------------------------------------------------------------------------
+
+#### Setting ACELIB to null allows it to be used for building shared libraries,
+#### including libACE.$(SOEXT,) on certain platforms.
+ACELIB =
+
+
+ifeq ($(SUPPRESS_DASH_G),1)
+#### Build this target without -g on some platforms.
+  $(COMPILE-NO_DASH_G.cc) -o $@ $<
+endif # SUPPRESS_DASH_G
+
+ifeq ($(CHORUS),1)
+  ifeq ($(CC),$(GHS_DIR)/build -driver ch68)
+    #### Build this target without -g, because it causes ghs 1.8.8 to core
+    #### dump.
+    $(VDIR)Select_Reactor.o .obj/Select_Reactor.so .shobj/Select_Reactor.o .shobj/Select_Reactor.so:
+    $(COMPILE-NO_DASH_G.cc) -o $@ $<
+  endif # CC
+endif # CHORUS
+
+ifneq ($(GHS),)
+  ifeq ($(CPU),86)
+    $(VDIR)gethrtime.$(OBJEXT):
+	make $@ ghs=0
+  endif # 86
+endif # GHS
+
+#----------------------------------------------------------------------------
+#       Dependencies
+#----------------------------------------------------------------------------
+# DO NOT DELETE THIS LINE -- g++dep uses it.
+# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+
+
+# IF YOU PUT ANYTHING HERE IT WILL GO AWAY