*** empty log message ***

1 files changed, 0 insertions, 232 deletions

diff --git a/netsvcs/lib/Token_Handler.cpp b/netsvcs/lib/Token_Handler.cpp
index e8165cd0ef4..bd79e90fc71 100644
--- a/netsvcs/lib/Token_Handler.cpp
+++ b/netsvcs/lib/Token_Handler.cpp
@@ -5,240 +5,8 @@
 #define ACE_BUILD_SVC_DLL
 
 #include "ace/Get_Opt.h"
-#include "ace/Acceptor.h"
-#include "ace/SOCK_Acceptor.h"
-#include "ace/Token_Request_Reply.h"
-#include "ace/Token_Collection.h"
-#include "ace/Local_Tokens.h"
 #include "Token_Handler.h"
 
-class ACE_Svc_Export ACE_Token_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-  // = TITLE
-  //    Product object created by an <ACE_Token_Acceptor>.  A
-  //    <Token_Handler> exchanges messages with a <Token_Proxy> object
-  //    on the client-side.
-  //
-  // = DESCRIPTION
-  //   This class is the main workhorse of the ACE Token service.  It
-  //   receives token operation requests from remote clients and turns
-  //   them into calls on local tokens (acquire, release, renew, and
-  //   remove).  In OMG CORBA terms, it is an object adapter. It also
-  //   schedules and handles timeouts that are used to support "timed
-  //   waits."  Clients used timed waits to bound the amount of time
-  //   they block trying to get a token.
-
-{
-public:
-  // = Initialization and termination.
-
-  ACE_Token_Handler (ACE_Thread_Manager * = 0);
-  // Default constructor.
-
-  // = Accessor and mutator methods.
-
-  // = Remote operations "exported" to a client.
-  virtual int acquire (ACE_Token_Proxy *proxy);
-  // Try to acquire the token.
-  // Precondition: client *may* hold the token already (i.e.,
-  // supports recursive acquisitions).
-
-  virtual int try_acquire (ACE_Token_Proxy *proxy);
-  // Try to acquire the token.
-
-  virtual int release (ACE_Token_Proxy *proxy);
-  // Release the token and allow the next client that is waiting to
-  // proceed.  Preconditions: client must hold the token.
-
-  virtual int renew (ACE_Token_Proxy *proxy);
-  // Yield the token if any clients are waiting, otherwise keep the
-  // token.  Preconditions: client must hold the token.
-
-  virtual int remove (ACE_Token_Proxy *proxy);
-  // Remove the specified token from the Token_Map.  Preconditions:
-  // ACE_Token must exist.  @@ Any other preconditions, e.g., must
-  // client hold token, must there be no waiters, etc.?
-
-  void sleep_hook (void);
-  // Called by TS_[Mutex,RLock,WLock] when we hold the mutex and
-  // someone wants it.
-
-  void token_acquired (ACE_TPQ_Entry *);
-  // Called by TS_[Mutex,RLock,WLock] when we are waiting and acquire
-  // the mutex.
-
-protected:
-  // = Low level routines for framing requests, dispatching
-  // operations, and returning replies.
-
-  virtual int abandon (int send_error);
-  // Our connection has been closed.
-
-  virtual int recv_request (void);
-  // Receive, frame, and decode the client's request.
-  
-  virtual int dispatch (void);
-  // Dispatch the appropriate operation to handle the client's
-  // request.
-  
-  virtual int send_reply (ACE_UINT32 errnum);
-  // Create and send a reply to the client.
-
-  // = Demultiplexing hooks.
-  virtual int handle_input (ACE_HANDLE);
-  // Callback method invoked by the <ACE_Reactor> when client events
-  // arrive.
-
-  // = Timer hook.
-  virtual int handle_timeout (const ACE_Time_Value &tv, const void *arg);
-  // Enable clients to limit the amount of time they wait for a token.
-
-  ACE_Token_Proxy *get_proxy (void);
-  // return a proxy for the calling client_id and token name.
-
-private:
-
-  virtual ACE_Token_Proxy *create_proxy (void);
-  // Switches on the type of token_request_ and creates a new
-  // Token_Proxy. 
-
-  ACE_Synch_Options request_options_;
-  // Keeps track of the synchronization options (i.e., the timeout
-  // interval).
-
-  ACE_Token_Collection collection_;
-  // collection of the client's token proxies.
-
-  int timeout_id_;
-  // ID returned by the Reactor that is used to kill registered timers
-  // when a token operation times out.
-
-  ACE_Token_Request token_request_;
-  // Cache request from the client.
-
-  ACE_Token_Reply token_reply_;
-  // Cache reply to the client.
-};
-
-// = DESCRIPTION of ACE_TS_* classes:
-//     When Tokens are released, waiting token proxies are notified
-//     when the releasing thread calls token_acquired on the waiting
-//     proxy.  The Token Server specializes ACE_Token_Proxy to
-//     redefine the implementation of token_acquired.  When
-//     token_acquired is called, the Token_Handler can then send the
-//     response back over the socket connection to unblock the
-//     client side.
-//     Since only the Token_Handler uses ACE_TS_Mutex, we've moved
-//     the definition to the .cpp file.
-
-class ACE_TS_Mutex : public ACE_Local_Mutex
-  // = TITLE
-  //     ACE_TS_Mutex  -- ACE_*T*oken_*S*erver_Mutex
-{
-public:
-  ACE_TS_Mutex (const char *name,
-		ACE_Token_Handler *th);
-  // Creation.
-
-protected:
-  virtual void sleep_hook (void);
-  // Somebody wants our token!
-
-  virtual void token_acquired (ACE_TPQ_Entry *);
-  // We've been taken off the waiters list and given the token!  Call
-  // the Token_Handler associated at construction, so it can tell the
-  // remote client.
-
-  ACE_TS_Mutex (const ACE_TS_Mutex &);
-  // Duplication.
-
-  virtual ACE_Token_Proxy *clone (void) const;
-  // Return a deep copy.
-
-private:
-  ACE_Token_Handler* th_;
-  // The Token Handler associated with this proxy.  Set at
-  // construction and notified when blocking acquires succeed.
-};
-
-class ACE_TS_RLock : public ACE_Local_RLock
-  // = TITLE
-  //     ACE_TS_RLock  -- ACE_*T*oken_*S*erver_RLock
-{
-public:
-  ACE_TS_RLock (const char *name,
-		ACE_Token_Handler *th);
-  // Creation.
-
-protected:
-  virtual void sleep_hook (void);
-  // Somebody wants our token!
-
-  virtual void token_acquired (ACE_TPQ_Entry *);
-  // We've been taken off the waiters list and given the token!  Call
-  // the Token_Handler associated at construction, so it can tell the
-  // remote client.
-
-  ACE_TS_RLock (const ACE_TS_RLock&);
-  // Duplication.
-
-  virtual ACE_Token_Proxy *clone (void) const;
-  // Return a deep copy.
-
-private:
-  ACE_Token_Handler* th_;
-  // the Token Handler associated with this proxy.  Set at
-  // construction and notified when blocking acquires succeed.
-};
-
-class ACE_TS_WLock : public ACE_Local_WLock
-  // = TITLE
-  //     ACE_TS_WLock  -- ACE_*T*oken_*S*erver_WLock
-{
-public:
-  ACE_TS_WLock (const char *name,
-		ACE_Token_Handler *th);
-  // Creation.
-
-protected:
-  virtual void sleep_hook (void);
-  // Somebody wants our token!
-
-  virtual void token_acquired (ACE_TPQ_Entry *);
-  // We've been taken off the waiters list and given the token!  Call
-  // the Token_Handler associated at construction, so it can tell the
-  // remote client.
-
-  ACE_TS_WLock (const ACE_TS_WLock&);
-  // Duplication.
-
-  virtual ACE_Token_Proxy *clone (void) const;
-  // Return a deep copy.
-
-private:
-  ACE_Token_Handler* th_;
-  // the Token Handler associated with this proxy.  Set at
-  // construction and notified when blocking acquires succeed.
-};
-
-// ************************************************************
-
-class ACE_Token_Acceptor : public ACE_Strategy_Acceptor<ACE_Token_Handler, ACE_SOCK_ACCEPTOR>
-  // = TITLE
-  //     This class contains the service-specific methods that can't
-  //     easily be factored into the <ACE_Strategy_Acceptor>.
-{
-public:
-  virtual int init (int argc, char *argv[]);
-  // Dynamic linking hook.
-
-  int parse_args (int argc, char *argv[]);
-  // Parse svc.conf arguments.
-
-private:
-  ACE_Schedule_All_Reactive_Strategy<ACE_Token_Handler> scheduling_strategy_;
-  // The scheduling strategy is designed for Reactive services.
-};
-
 int
 ACE_Token_Acceptor::parse_args (int argc, char *argv[])
 {