*** empty log message ***

17 files changed, 158 insertions, 406 deletions

diff --git a/ace/Acceptor.cpp b/ace/Acceptor.cpp
index 7edb5537e54..b75355070d0 100644
--- a/ace/Acceptor.cpp
+++ b/ace/Acceptor.cpp
@@ -159,6 +159,13 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::resume (void)
 // <reactor>.
 
 template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
+ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::close (void)
+{
+  ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::close");
+  return this->handle_close ();
+}
+
+template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
 ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_close (ACE_HANDLE,
 							      ACE_Reactor_Mask)
 {
@@ -712,6 +719,13 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::~ACE_Oneshot_Acceptor (v
 }
 
 template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
+ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::close (void)
+{
+  ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::close");
+  return this->handle_close ();
+}
+
+template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
 ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_close (ACE_HANDLE,
 								      ACE_Reactor_Mask)
 {
diff --git a/ace/Acceptor.h b/ace/Acceptor.h
index bae7562abea..72339eddaa6 100644
--- a/ace/Acceptor.h
+++ b/ace/Acceptor.h
@@ -83,6 +83,9 @@ public:
   virtual ACE_HANDLE get_handle (void) const;
   // Returns the listening acceptor's <ACE_HANDLE>.
 
+  virtual int close (void);
+  // Close down the Acceptor
+
   void dump (void) const;
   // Dump the state of an object.
 
@@ -381,6 +384,9 @@ public:
   virtual ACE_PEER_ACCEPTOR &acceptor (void) const;
   // Return the underlying PEER_ACCEPTOR object.
 
+  virtual int close (void);
+  // Close down the Acceptor
+
   void dump (void) const;
   // Dump the state of an object.
 
diff --git a/ace/Connector.cpp b/ace/Connector.cpp
index a5f405de623..ae92348f775 100644
--- a/ace/Connector.cpp
+++ b/ace/Connector.cpp
@@ -479,6 +479,13 @@ fail1:
 // recursively!
 
 template <class SH, PR_CO_1> int
+ACE_Connector<SH, PR_CO_2>::close (void)
+{
+  ACE_TRACE ("ACE_Connector<SH, PR_CO_2>::close");
+  return this->handle_close ();
+}
+
+template <class SH, PR_CO_1> int
 ACE_Connector<SH, PR_CO_2>::handle_close (ACE_HANDLE, ACE_Reactor_Mask mask)
 {
   ACE_TRACE ("ACE_Connector<SH, PR_CO_2>::handle_close");
diff --git a/ace/Connector.h b/ace/Connector.h
index 4085937db45..641d565ab8f 100644
--- a/ace/Connector.h
+++ b/ace/Connector.h
@@ -151,6 +151,9 @@ public:
   ACE_PEER_CONNECTOR &connector (void) const;
   // Return the underlying PEER_CONNECTOR object.
 
+  virtual int close (void);
+  // Close down the Connector
+
   void dump (void) const;
   // Dump the state of an object.
 
diff --git a/apps/Gateway/Gateway/Event_Channel.cpp b/apps/Gateway/Gateway/Event_Channel.cpp
index 186f686006b..7b8055cb29d 100644
--- a/apps/Gateway/Gateway/Event_Channel.cpp
+++ b/apps/Gateway/Gateway/Event_Channel.cpp
@@ -201,9 +201,15 @@ ACE_Event_Channel::svc (void)
 }
 
 int
-ACE_Event_Channel::initiate_proxy_connection (Proxy_Handler *proxy_handler,
-					      ACE_Synch_Options &synch_options)
+ACE_Event_Channel::initiate_proxy_connection (Proxy_Handler *proxy_handler)
 {
+  ACE_Synch_Options synch_options;
+  
+  if (this->options ().blocking_semantics_ == ACE_NONBLOCK)
+    synch_options = ACE_Synch_Options::asynch;
+  else 
+    synch_options = ACE_Synch_Options::synch;
+
   return this->connector_.initiate_connection (proxy_handler, 
 					       synch_options);
 }
@@ -248,28 +254,24 @@ ACE_Event_Channel::complete_proxy_connection (Proxy_Handler *proxy_handler)
 int
 ACE_Event_Channel::reinitiate_proxy_connection (Proxy_Handler *proxy_handler)
 {
-  int result = this->proxy_map_.unbind (proxy_handler->id ());
-  if (result != 0)
-    ACE_ERROR ((LM_ERROR, "Could not remove proxy from map, potential trouble\n"));
-  
   // Skip over proxies with deactivated handles.
   if (proxy_handler->get_handle () != ACE_INVALID_HANDLE)
     {
       // Make sure to close down peer to reclaim descriptor.
       proxy_handler->peer ().close ();
+    }
 
-      if (proxy_handler->state () != Proxy_Handler::DISCONNECTING)
-	{
-	  ACE_DEBUG ((LM_DEBUG, 
-		      "(%t) scheduling reinitiation of Proxy_Handler %d\n",
-		      proxy_handler->id ()));
-
-	  // Reschedule ourselves to try and connect again.
-	  if (ACE_Service_Config::reactor ()->schedule_timer 
-	      (proxy_handler, 0, proxy_handler->timeout ()) == -1)
-	    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-			       "schedule_timer"), -1);
-	}
+  if (proxy_handler->state () != Proxy_Handler::DISCONNECTING)
+    {
+      ACE_DEBUG ((LM_DEBUG, 
+		  "(%t) scheduling reinitiation of Proxy_Handler %d\n",
+		  proxy_handler->id ()));
+      
+      // Reschedule ourselves to try and connect again.
+      if (ACE_Service_Config::reactor ()->schedule_timer 
+	  (proxy_handler, 0, proxy_handler->timeout ()) == -1)
+	ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
+			   "schedule_timer"), -1);
     }
   return 0;
 }
@@ -281,13 +283,6 @@ ACE_Event_Channel::initiate_connector (void)
 {
   PROXY_MAP_ITERATOR cmi (this->proxy_map_);
 				
-  ACE_Synch_Options synch_options;
-  
-  if (this->options ().blocking_semantics_ == ACE_NONBLOCK)
-    synch_options = ACE_Synch_Options::asynch;
-  else 
-    synch_options = ACE_Synch_Options::synch;
-
   // Iterate through the Consumer Map connecting all the
   // Proxy_Handlers.
 
@@ -297,8 +292,7 @@ ACE_Event_Channel::initiate_connector (void)
     {
       Proxy_Handler *proxy_handler = me->int_id_;
 
-      if (this->initiate_proxy_connection 
-	  (proxy_handler, synch_options) == -1)
+      if (this->initiate_proxy_connection (proxy_handler) == -1)
 	continue; // Failures are handled elsewhere...
     }
 }
@@ -328,26 +322,47 @@ ACE_Event_Channel::close (u_long)
       ACE_DEBUG ((LM_DEBUG, "(%t) suspending all threads\n"));
     }
 
-  PROXY_MAP_ITERATOR cmi (this->proxy_map_);
-
-  // Iterate over all the handlers and shut them down.
-
-  for (PROXY_MAP_ENTRY *me;
-       cmi.next (me) != 0; 
-       cmi.advance ())
-    {
-      Proxy_Handler *proxy_handler = me->int_id_;
-
-      ACE_DEBUG ((LM_DEBUG, "(%t) closing down connection %d\n",
-		 proxy_handler->id ()));
-
-      // Mark Proxy_Handler as DISCONNECTING so we don't try to
-      // reconnect...
-      proxy_handler->state (Proxy_Handler::DISCONNECTING);
-
-      // Deallocate Proxy_Handler resources.
-      proxy_handler->destroy (); // Will trigger a delete.
-    }
+  // Tell everyone that the spaceship is here
+  {
+    PROXY_MAP_ITERATOR cmi (this->proxy_map_);
+    
+    // Iterate over all the handlers and shut them down.
+    
+    for (PROXY_MAP_ENTRY *me;
+	 cmi.next (me) != 0; 
+	 cmi.advance ())
+      {
+	Proxy_Handler *proxy_handler = me->int_id_;
+	
+	ACE_DEBUG ((LM_DEBUG, "(%t) closing down connection %d\n",
+		    proxy_handler->id ()));
+	
+	// Mark Proxy_Handler as DISCONNECTING so we don't try to
+	// reconnect...
+	proxy_handler->state (Proxy_Handler::DISCONNECTING);	
+      }
+  }
+
+  // Close down the connector
+  connector_.close ();
+
+  // Close down the acceptor
+  acceptor_.close ();
+
+  // Tell everyone that it is now time to commit suicide
+  {
+    PROXY_MAP_ITERATOR cmi (this->proxy_map_);
+    
+    for (PROXY_MAP_ENTRY *me;
+	 cmi.next (me) != 0; 
+	 cmi.advance ())
+      {
+	Proxy_Handler *proxy_handler = me->int_id_;
+
+	// Deallocate Proxy_Handler resources.
+	proxy_handler->destroy (); // Will trigger a delete.
+      }
+  }
 
   return 0;
 }
diff --git a/apps/Gateway/Gateway/Event_Channel.h b/apps/Gateway/Gateway/Event_Channel.h
index bdce1e13463..d377fb94871 100644
--- a/apps/Gateway/Gateway/Event_Channel.h
+++ b/apps/Gateway/Gateway/Event_Channel.h
@@ -92,8 +92,7 @@ public:
   // Close down the Channel.
 
   // = Proxy management methods.
-  int initiate_proxy_connection (Proxy_Handler *, 
-				 ACE_Synch_Options & = ACE_Synch_Options::synch);
+  int initiate_proxy_connection (Proxy_Handler *);
   // Initiate the connection of the <Proxy_Handler> to its peer.
 
   int complete_proxy_connection (Proxy_Handler *);
diff --git a/apps/Gateway/Gateway/Gateway.mak b/apps/Gateway/Gateway/Gateway.mak
index 54dc4658864..1a52f4fd131 100644
--- a/apps/Gateway/Gateway/Gateway.mak
+++ b/apps/Gateway/Gateway/Gateway.mak
@@ -31,6 +31,7 @@ NULL=nul
 !ENDIF 

 ################################################################################

 # Begin Project

+# PROP Target_Last_Scanned "Gateway - Win32 Debug"

 

 !IF  "$(CFG)" == "gatewayd - Win32 Debug"

 

@@ -137,7 +138,6 @@ CLEAN :
 	-@erase "$(INTDIR)\Config_Files.obj"

 	-@erase "$(INTDIR)\Event_Channel.obj"

 	-@erase "$(INTDIR)\Event_Forwarding_Discriminator.obj"

-	-@erase "$(INTDIR)\File_Parser.obj"

 	-@erase "$(INTDIR)\Gateway.obj"

 	-@erase "$(INTDIR)\Proxy_Handler.obj"

 	-@erase "$(INTDIR)\Proxy_Handler_Acceptor.obj"

@@ -208,7 +208,6 @@ LINK32_OBJS= \
 	"$(INTDIR)\Config_Files.obj" \

 	"$(INTDIR)\Event_Channel.obj" \

 	"$(INTDIR)\Event_Forwarding_Discriminator.obj" \

-	"$(INTDIR)\File_Parser.obj" \

 	"$(INTDIR)\Gateway.obj" \

 	"$(INTDIR)\Proxy_Handler.obj" \

 	"$(INTDIR)\Proxy_Handler_Acceptor.obj" \

@@ -242,9 +241,6 @@ LINK32_OBJS= \
 # Begin Source File

 

 SOURCE=.\gatewayd.cpp

-

-!IF  "$(CFG)" == "gatewayd - Win32 Debug"

-

 DEP_CPP_GATEW=\

 	".\Gateway.h"\

 	{$(INCLUDE)}"\ace\ACE.h"\

@@ -360,8 +356,6 @@ DEP_CPP_GATEW=\
 "$(INTDIR)\gatewayd.obj" : $(SOURCE) $(DEP_CPP_GATEW) "$(INTDIR)"

 

 

-!ENDIF 

-

 # End Source File

 # End Target

 ################################################################################

@@ -372,6 +366,9 @@ DEP_CPP_GATEW=\
 # Begin Source File

 

 SOURCE=.\Proxy_Handler_Connector.cpp

+

+!IF  "$(CFG)" == "Gateway - Win32 Debug"

+

 DEP_CPP_PROXY=\

 	".\Config_Files.h"\

 	".\Event.h"\

@@ -380,11 +377,8 @@ DEP_CPP_PROXY=\
 	".\Proxy_Handler.h"\

 	".\Proxy_Handler_Connector.h"\

 	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

 	{$(INCLUDE)}"\ace\Addr.h"\

 	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Asynch_IO.h"\

-	{$(INCLUDE)}"\ace\Asynch_IO.i"\

 	{$(INCLUDE)}"\ace\config-win32-common.h"\

 	{$(INCLUDE)}"\ace\config.h"\

 	{$(INCLUDE)}"\ace\Connector.cpp"\

@@ -397,8 +391,6 @@ DEP_CPP_PROXY=\
 	{$(INCLUDE)}"\ace\Dynamic.i"\

 	{$(INCLUDE)}"\ace\Event_Handler.h"\

 	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

 	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

 	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

 	{$(INCLUDE)}"\ace\INET_Addr.h"\

@@ -406,8 +398,6 @@ DEP_CPP_PROXY=\
 	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

 	{$(INCLUDE)}"\ace\IPC_SAP.h"\

 	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Local_Tokens.h"\

-	{$(INCLUDE)}"\ace\Local_Tokens.i"\

 	{$(INCLUDE)}"\ace\Log_Msg.h"\

 	{$(INCLUDE)}"\ace\Log_Priority.h"\

 	{$(INCLUDE)}"\ace\Log_Record.h"\

@@ -434,20 +424,9 @@ DEP_CPP_PROXY=\
 	{$(INCLUDE)}"\ace\Module.i"\

 	{$(INCLUDE)}"\ace\OS.h"\

 	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Pipe.h"\

-	{$(INCLUDE)}"\ace\Pipe.i"\

-	{$(INCLUDE)}"\ace\Proactor.h"\

-	{$(INCLUDE)}"\ace\Proactor.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\ReactorEx.h"\

-	{$(INCLUDE)}"\ace\ReactorEx.i"\

 	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

 	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

 	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

 	{$(INCLUDE)}"\ace\Signal.h"\

 	{$(INCLUDE)}"\ace\Signal.i"\

 	{$(INCLUDE)}"\ace\SOCK.h"\

@@ -471,7 +450,6 @@ DEP_CPP_PROXY=\
 	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

 	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

 	{$(INCLUDE)}"\ace\Svc_Handler.h"\

 	{$(INCLUDE)}"\ace\Svc_Handler.i"\

@@ -491,21 +469,6 @@ DEP_CPP_PROXY=\
 	{$(INCLUDE)}"\ace\Thread_Manager.h"\

 	{$(INCLUDE)}"\ace\Thread_Manager.i"\

 	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Heap.h"\

-	{$(INCLUDE)}"\ace\Timer_Heap_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Heap_T.h"\

-	{$(INCLUDE)}"\ace\Timer_List.h"\

-	{$(INCLUDE)}"\ace\Timer_List_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_List_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Timer_Wheel.h"\

-	{$(INCLUDE)}"\ace\Timer_Wheel_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Wheel_T.h"\

-	{$(INCLUDE)}"\ace\Token.h"\

-	{$(INCLUDE)}"\ace\Token.i"\

 	{$(INCLUDE)}"\ace\Trace.h"\

 	{$(INCLUDE)}"\ace\ws2tcpip.h"\

 	

@@ -514,17 +477,21 @@ DEP_CPP_PROXY=\
  "$(INTDIR)" ".\File_Parser.cpp"

 

 

+!ENDIF 

+

 # End Source File

 ################################################################################

 # Begin Source File

 

 SOURCE=.\Config_Files.cpp

+

+!IF  "$(CFG)" == "Gateway - Win32 Debug"

+

 DEP_CPP_CONFI=\

 	".\Config_Files.h"\

 	".\File_Parser.cpp"\

 	".\File_Parser.h"\

 	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

 	{$(INCLUDE)}"\ace\config-win32-common.h"\

 	{$(INCLUDE)}"\ace\config.h"\

 	{$(INCLUDE)}"\ace\Log_Msg.h"\

@@ -540,15 +507,19 @@ DEP_CPP_CONFI=\
 	{$(INCLUDE)}"\ace\ws2tcpip.h"\

 	

 

-"$(INTDIR)\Config_Files.obj" : $(SOURCE) $(DEP_CPP_CONFI) "$(INTDIR)"\

- ".\File_Parser.cpp"

+"$(INTDIR)\Config_Files.obj" : $(SOURCE) $(DEP_CPP_CONFI) "$(INTDIR)"

 

 

+!ENDIF 

+

 # End Source File

 ################################################################################

 # Begin Source File

 

 SOURCE=.\Event_Channel.cpp

+

+!IF  "$(CFG)" == "Gateway - Win32 Debug"

+

 DEP_CPP_EVENT=\

 	".\Config_Files.h"\

 	".\Consumer_Dispatch_Set.h"\

@@ -564,11 +535,8 @@ DEP_CPP_EVENT=\
 	{$(INCLUDE)}"\ace\Acceptor.h"\

 	{$(INCLUDE)}"\ace\Acceptor.i"\

 	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

 	{$(INCLUDE)}"\ace\Addr.h"\

 	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Asynch_IO.h"\

-	{$(INCLUDE)}"\ace\Asynch_IO.i"\

 	{$(INCLUDE)}"\ace\config-win32-common.h"\

 	{$(INCLUDE)}"\ace\config.h"\

 	{$(INCLUDE)}"\ace\Connector.cpp"\

@@ -581,8 +549,6 @@ DEP_CPP_EVENT=\
 	{$(INCLUDE)}"\ace\Dynamic.i"\

 	{$(INCLUDE)}"\ace\Event_Handler.h"\

 	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

 	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

 	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

 	{$(INCLUDE)}"\ace\INET_Addr.h"\

@@ -590,8 +556,6 @@ DEP_CPP_EVENT=\
 	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

 	{$(INCLUDE)}"\ace\IPC_SAP.h"\

 	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Local_Tokens.h"\

-	{$(INCLUDE)}"\ace\Local_Tokens.i"\

 	{$(INCLUDE)}"\ace\Log_Msg.h"\

 	{$(INCLUDE)}"\ace\Log_Priority.h"\

 	{$(INCLUDE)}"\ace\Log_Record.h"\

@@ -618,20 +582,9 @@ DEP_CPP_EVENT=\
 	{$(INCLUDE)}"\ace\Module.i"\

 	{$(INCLUDE)}"\ace\OS.h"\

 	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Pipe.h"\

-	{$(INCLUDE)}"\ace\Pipe.i"\

-	{$(INCLUDE)}"\ace\Proactor.h"\

-	{$(INCLUDE)}"\ace\Proactor.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\ReactorEx.h"\

-	{$(INCLUDE)}"\ace\ReactorEx.i"\

 	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

 	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

 	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

 	{$(INCLUDE)}"\ace\Signal.h"\

 	{$(INCLUDE)}"\ace\Signal.i"\

 	{$(INCLUDE)}"\ace\SOCK.h"\

@@ -657,7 +610,6 @@ DEP_CPP_EVENT=\
 	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

 	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

 	{$(INCLUDE)}"\ace\Svc_Handler.h"\

 	{$(INCLUDE)}"\ace\Svc_Handler.i"\

@@ -677,44 +629,28 @@ DEP_CPP_EVENT=\
 	{$(INCLUDE)}"\ace\Thread_Manager.h"\

 	{$(INCLUDE)}"\ace\Thread_Manager.i"\

 	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Heap.h"\

-	{$(INCLUDE)}"\ace\Timer_Heap_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Heap_T.h"\

-	{$(INCLUDE)}"\ace\Timer_List.h"\

-	{$(INCLUDE)}"\ace\Timer_List_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_List_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Timer_Wheel.h"\

-	{$(INCLUDE)}"\ace\Timer_Wheel_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Wheel_T.h"\

-	{$(INCLUDE)}"\ace\Token.h"\

-	{$(INCLUDE)}"\ace\Token.i"\

 	{$(INCLUDE)}"\ace\Trace.h"\

 	{$(INCLUDE)}"\ace\ws2tcpip.h"\

 	

 

-"$(INTDIR)\Event_Channel.obj" : $(SOURCE) $(DEP_CPP_EVENT) "$(INTDIR)"\

- ".\File_Parser.cpp"

+"$(INTDIR)\Event_Channel.obj" : $(SOURCE) $(DEP_CPP_EVENT) "$(INTDIR)"

 

 

+!ENDIF 

+

 # End Source File

 ################################################################################

 # Begin Source File

 

 SOURCE=.\Event_Forwarding_Discriminator.cpp

+

+!IF  "$(CFG)" == "Gateway - Win32 Debug"

+

 DEP_CPP_EVENT_=\

 	".\Consumer_Dispatch_Set.h"\

 	".\Event.h"\

 	".\Event_Forwarding_Discriminator.h"\

 	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Asynch_IO.h"\

-	{$(INCLUDE)}"\ace\Asynch_IO.i"\

 	{$(INCLUDE)}"\ace\config-win32-common.h"\

 	{$(INCLUDE)}"\ace\config.h"\

 	{$(INCLUDE)}"\ace\Containers.cpp"\

@@ -722,17 +658,6 @@ DEP_CPP_EVENT_=\
 	{$(INCLUDE)}"\ace\Containers.i"\

 	{$(INCLUDE)}"\ace\Event_Handler.h"\

 	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Local_Tokens.h"\

-	{$(INCLUDE)}"\ace\Local_Tokens.i"\

 	{$(INCLUDE)}"\ace\Log_Msg.h"\

 	{$(INCLUDE)}"\ace\Log_Priority.h"\

 	{$(INCLUDE)}"\ace\Log_Record.h"\

@@ -749,72 +674,27 @@ DEP_CPP_EVENT_=\
 	{$(INCLUDE)}"\ace\Mem_Map.i"\

 	{$(INCLUDE)}"\ace\Memory_Pool.h"\

 	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

 	{$(INCLUDE)}"\ace\OS.h"\

 	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Pipe.h"\

-	{$(INCLUDE)}"\ace\Pipe.i"\

-	{$(INCLUDE)}"\ace\Proactor.h"\

-	{$(INCLUDE)}"\ace\Proactor.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\ReactorEx.h"\

-	{$(INCLUDE)}"\ace\ReactorEx.i"\

 	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

 	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

 	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

 	{$(INCLUDE)}"\ace\Signal.h"\

 	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

 	{$(INCLUDE)}"\ace\SString.h"\

 	{$(INCLUDE)}"\ace\SString.i"\

 	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

 	{$(INCLUDE)}"\ace\Synch.h"\

 	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

 	{$(INCLUDE)}"\ace\Synch_T.cpp"\

 	{$(INCLUDE)}"\ace\Synch_T.h"\

 	{$(INCLUDE)}"\ace\Synch_T.i"\

 	{$(INCLUDE)}"\ace\Thread.h"\

 	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Heap.h"\

-	{$(INCLUDE)}"\ace\Timer_Heap_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Heap_T.h"\

-	{$(INCLUDE)}"\ace\Timer_List.h"\

-	{$(INCLUDE)}"\ace\Timer_List_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_List_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Timer_Wheel.h"\

-	{$(INCLUDE)}"\ace\Timer_Wheel_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Wheel_T.h"\

-	{$(INCLUDE)}"\ace\Token.h"\

-	{$(INCLUDE)}"\ace\Token.i"\

 	{$(INCLUDE)}"\ace\Trace.h"\

 	{$(INCLUDE)}"\ace\ws2tcpip.h"\

 	

@@ -823,20 +703,16 @@ DEP_CPP_EVENT_=\
  "$(INTDIR)"

 

 

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\File_Parser.cpp

-

-"$(INTDIR)\File_Parser.obj" : $(SOURCE) "$(INTDIR)"

-

+!ENDIF 

 

 # End Source File

 ################################################################################

 # Begin Source File

 

 SOURCE=.\Gateway.cpp

+

+!IF  "$(CFG)" == "Gateway - Win32 Debug"

+

 DEP_CPP_GATEWA=\

 	".\Config_Files.h"\

 	".\Consumer_Dispatch_Set.h"\

@@ -853,16 +729,11 @@ DEP_CPP_GATEWA=\
 	{$(INCLUDE)}"\ace\Acceptor.h"\

 	{$(INCLUDE)}"\ace\Acceptor.i"\

 	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

 	{$(INCLUDE)}"\ace\Addr.h"\

 	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Asynch_IO.h"\

-	{$(INCLUDE)}"\ace\Asynch_IO.i"\

 	{$(INCLUDE)}"\ace\config-win32-common.h"\

 	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

 	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

 	{$(INCLUDE)}"\ace\Containers.cpp"\

 	{$(INCLUDE)}"\ace\Containers.h"\

 	{$(INCLUDE)}"\ace\Containers.i"\

@@ -872,8 +743,6 @@ DEP_CPP_GATEWA=\
 	{$(INCLUDE)}"\ace\Event_Handler.i"\

 	{$(INCLUDE)}"\ace\Get_Opt.h"\

 	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

 	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

 	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

 	{$(INCLUDE)}"\ace\INET_Addr.h"\

@@ -881,8 +750,6 @@ DEP_CPP_GATEWA=\
 	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

 	{$(INCLUDE)}"\ace\IPC_SAP.h"\

 	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Local_Tokens.h"\

-	{$(INCLUDE)}"\ace\Local_Tokens.i"\

 	{$(INCLUDE)}"\ace\Log_Msg.h"\

 	{$(INCLUDE)}"\ace\Log_Priority.h"\

 	{$(INCLUDE)}"\ace\Log_Record.h"\

@@ -909,20 +776,9 @@ DEP_CPP_GATEWA=\
 	{$(INCLUDE)}"\ace\Module.i"\

 	{$(INCLUDE)}"\ace\OS.h"\

 	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Pipe.h"\

-	{$(INCLUDE)}"\ace\Pipe.i"\

-	{$(INCLUDE)}"\ace\Proactor.h"\

-	{$(INCLUDE)}"\ace\Proactor.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\ReactorEx.h"\

-	{$(INCLUDE)}"\ace\ReactorEx.i"\

 	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

 	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

 	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

 	{$(INCLUDE)}"\ace\Signal.h"\

 	{$(INCLUDE)}"\ace\Signal.i"\

 	{$(INCLUDE)}"\ace\SOCK.h"\

@@ -948,7 +804,6 @@ DEP_CPP_GATEWA=\
 	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

 	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

 	{$(INCLUDE)}"\ace\Svc_Handler.h"\

 	{$(INCLUDE)}"\ace\Svc_Handler.i"\

@@ -968,21 +823,6 @@ DEP_CPP_GATEWA=\
 	{$(INCLUDE)}"\ace\Thread_Manager.h"\

 	{$(INCLUDE)}"\ace\Thread_Manager.i"\

 	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Heap.h"\

-	{$(INCLUDE)}"\ace\Timer_Heap_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Heap_T.h"\

-	{$(INCLUDE)}"\ace\Timer_List.h"\

-	{$(INCLUDE)}"\ace\Timer_List_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_List_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Timer_Wheel.h"\

-	{$(INCLUDE)}"\ace\Timer_Wheel_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Wheel_T.h"\

-	{$(INCLUDE)}"\ace\Token.h"\

-	{$(INCLUDE)}"\ace\Token.i"\

 	{$(INCLUDE)}"\ace\Trace.h"\

 	{$(INCLUDE)}"\ace\ws2tcpip.h"\

 	

@@ -991,11 +831,16 @@ DEP_CPP_GATEWA=\
  ".\File_Parser.cpp"

 

 

+!ENDIF 

+

 # End Source File

 ################################################################################

 # Begin Source File

 

 SOURCE=.\Proxy_Handler.cpp

+

+!IF  "$(CFG)" == "Gateway - Win32 Debug"

+

 DEP_CPP_PROXY_=\

 	".\Concrete_Proxy_Handlers.h"\

 	".\Config_Files.h"\

@@ -1012,11 +857,8 @@ DEP_CPP_PROXY_=\
 	{$(INCLUDE)}"\ace\Acceptor.h"\

 	{$(INCLUDE)}"\ace\Acceptor.i"\

 	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

 	{$(INCLUDE)}"\ace\Addr.h"\

 	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Asynch_IO.h"\

-	{$(INCLUDE)}"\ace\Asynch_IO.i"\

 	{$(INCLUDE)}"\ace\config-win32-common.h"\

 	{$(INCLUDE)}"\ace\config.h"\

 	{$(INCLUDE)}"\ace\Connector.cpp"\

@@ -1029,8 +871,6 @@ DEP_CPP_PROXY_=\
 	{$(INCLUDE)}"\ace\Dynamic.i"\

 	{$(INCLUDE)}"\ace\Event_Handler.h"\

 	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

 	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

 	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

 	{$(INCLUDE)}"\ace\INET_Addr.h"\

@@ -1038,8 +878,6 @@ DEP_CPP_PROXY_=\
 	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

 	{$(INCLUDE)}"\ace\IPC_SAP.h"\

 	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Local_Tokens.h"\

-	{$(INCLUDE)}"\ace\Local_Tokens.i"\

 	{$(INCLUDE)}"\ace\Log_Msg.h"\

 	{$(INCLUDE)}"\ace\Log_Priority.h"\

 	{$(INCLUDE)}"\ace\Log_Record.h"\

@@ -1066,20 +904,9 @@ DEP_CPP_PROXY_=\
 	{$(INCLUDE)}"\ace\Module.i"\

 	{$(INCLUDE)}"\ace\OS.h"\

 	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Pipe.h"\

-	{$(INCLUDE)}"\ace\Pipe.i"\

-	{$(INCLUDE)}"\ace\Proactor.h"\

-	{$(INCLUDE)}"\ace\Proactor.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\ReactorEx.h"\

-	{$(INCLUDE)}"\ace\ReactorEx.i"\

 	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

 	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

 	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

 	{$(INCLUDE)}"\ace\Signal.h"\

 	{$(INCLUDE)}"\ace\Signal.i"\

 	{$(INCLUDE)}"\ace\SOCK.h"\

@@ -1105,7 +932,6 @@ DEP_CPP_PROXY_=\
 	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

 	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

 	{$(INCLUDE)}"\ace\Svc_Handler.h"\

 	{$(INCLUDE)}"\ace\Svc_Handler.i"\

@@ -1125,21 +951,6 @@ DEP_CPP_PROXY_=\
 	{$(INCLUDE)}"\ace\Thread_Manager.h"\

 	{$(INCLUDE)}"\ace\Thread_Manager.i"\

 	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Heap.h"\

-	{$(INCLUDE)}"\ace\Timer_Heap_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Heap_T.h"\

-	{$(INCLUDE)}"\ace\Timer_List.h"\

-	{$(INCLUDE)}"\ace\Timer_List_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_List_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Timer_Wheel.h"\

-	{$(INCLUDE)}"\ace\Timer_Wheel_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Wheel_T.h"\

-	{$(INCLUDE)}"\ace\Token.h"\

-	{$(INCLUDE)}"\ace\Token.i"\

 	{$(INCLUDE)}"\ace\Trace.h"\

 	{$(INCLUDE)}"\ace\ws2tcpip.h"\

 	

@@ -1148,11 +959,16 @@ DEP_CPP_PROXY_=\
  ".\File_Parser.cpp"

 

 

+!ENDIF 

+

 # End Source File

 ################################################################################

 # Begin Source File

 

 SOURCE=.\Proxy_Handler_Acceptor.cpp

+

+!IF  "$(CFG)" == "Gateway - Win32 Debug"

+

 DEP_CPP_PROXY_H=\

 	".\Config_Files.h"\

 	".\Consumer_Dispatch_Set.h"\

@@ -1168,16 +984,11 @@ DEP_CPP_PROXY_H=\
 	{$(INCLUDE)}"\ace\Acceptor.h"\

 	{$(INCLUDE)}"\ace\Acceptor.i"\

 	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

 	{$(INCLUDE)}"\ace\Addr.h"\

 	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Asynch_IO.h"\

-	{$(INCLUDE)}"\ace\Asynch_IO.i"\

 	{$(INCLUDE)}"\ace\config-win32-common.h"\

 	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

 	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

 	{$(INCLUDE)}"\ace\Containers.cpp"\

 	{$(INCLUDE)}"\ace\Containers.h"\

 	{$(INCLUDE)}"\ace\Containers.i"\

@@ -1185,8 +996,6 @@ DEP_CPP_PROXY_H=\
 	{$(INCLUDE)}"\ace\Dynamic.i"\

 	{$(INCLUDE)}"\ace\Event_Handler.h"\

 	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

 	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

 	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

 	{$(INCLUDE)}"\ace\INET_Addr.h"\

@@ -1194,8 +1003,6 @@ DEP_CPP_PROXY_H=\
 	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

 	{$(INCLUDE)}"\ace\IPC_SAP.h"\

 	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Local_Tokens.h"\

-	{$(INCLUDE)}"\ace\Local_Tokens.i"\

 	{$(INCLUDE)}"\ace\Log_Msg.h"\

 	{$(INCLUDE)}"\ace\Log_Priority.h"\

 	{$(INCLUDE)}"\ace\Log_Record.h"\

@@ -1222,20 +1029,9 @@ DEP_CPP_PROXY_H=\
 	{$(INCLUDE)}"\ace\Module.i"\

 	{$(INCLUDE)}"\ace\OS.h"\

 	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Pipe.h"\

-	{$(INCLUDE)}"\ace\Pipe.i"\

-	{$(INCLUDE)}"\ace\Proactor.h"\

-	{$(INCLUDE)}"\ace\Proactor.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\ReactorEx.h"\

-	{$(INCLUDE)}"\ace\ReactorEx.i"\

 	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

 	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

 	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

 	{$(INCLUDE)}"\ace\Signal.h"\

 	{$(INCLUDE)}"\ace\Signal.i"\

 	{$(INCLUDE)}"\ace\SOCK.h"\

@@ -1261,7 +1057,6 @@ DEP_CPP_PROXY_H=\
 	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

 	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

 	{$(INCLUDE)}"\ace\Svc_Handler.h"\

 	{$(INCLUDE)}"\ace\Svc_Handler.i"\

@@ -1281,21 +1076,6 @@ DEP_CPP_PROXY_H=\
 	{$(INCLUDE)}"\ace\Thread_Manager.h"\

 	{$(INCLUDE)}"\ace\Thread_Manager.i"\

 	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Heap.h"\

-	{$(INCLUDE)}"\ace\Timer_Heap_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Heap_T.h"\

-	{$(INCLUDE)}"\ace\Timer_List.h"\

-	{$(INCLUDE)}"\ace\Timer_List_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_List_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Timer_Wheel.h"\

-	{$(INCLUDE)}"\ace\Timer_Wheel_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Wheel_T.h"\

-	{$(INCLUDE)}"\ace\Token.h"\

-	{$(INCLUDE)}"\ace\Token.i"\

 	{$(INCLUDE)}"\ace\Trace.h"\

 	{$(INCLUDE)}"\ace\ws2tcpip.h"\

 	

@@ -1304,11 +1084,16 @@ DEP_CPP_PROXY_H=\
  "$(INTDIR)" ".\File_Parser.cpp"

 

 

+!ENDIF 

+

 # End Source File

 ################################################################################

 # Begin Source File

 

 SOURCE=.\Concrete_Proxy_Handlers.cpp

+

+!IF  "$(CFG)" == "Gateway - Win32 Debug"

+

 DEP_CPP_CONCR=\

 	".\Concrete_Proxy_Handlers.h"\

 	".\Config_Files.h"\

@@ -1325,16 +1110,11 @@ DEP_CPP_CONCR=\
 	{$(INCLUDE)}"\ace\Acceptor.h"\

 	{$(INCLUDE)}"\ace\Acceptor.i"\

 	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

 	{$(INCLUDE)}"\ace\Addr.h"\

 	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Asynch_IO.h"\

-	{$(INCLUDE)}"\ace\Asynch_IO.i"\

 	{$(INCLUDE)}"\ace\config-win32-common.h"\

 	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

 	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

 	{$(INCLUDE)}"\ace\Containers.cpp"\

 	{$(INCLUDE)}"\ace\Containers.h"\

 	{$(INCLUDE)}"\ace\Containers.i"\

@@ -1342,8 +1122,6 @@ DEP_CPP_CONCR=\
 	{$(INCLUDE)}"\ace\Dynamic.i"\

 	{$(INCLUDE)}"\ace\Event_Handler.h"\

 	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

 	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

 	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

 	{$(INCLUDE)}"\ace\INET_Addr.h"\

@@ -1351,8 +1129,6 @@ DEP_CPP_CONCR=\
 	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

 	{$(INCLUDE)}"\ace\IPC_SAP.h"\

 	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Local_Tokens.h"\

-	{$(INCLUDE)}"\ace\Local_Tokens.i"\

 	{$(INCLUDE)}"\ace\Log_Msg.h"\

 	{$(INCLUDE)}"\ace\Log_Priority.h"\

 	{$(INCLUDE)}"\ace\Log_Record.h"\

@@ -1379,20 +1155,9 @@ DEP_CPP_CONCR=\
 	{$(INCLUDE)}"\ace\Module.i"\

 	{$(INCLUDE)}"\ace\OS.h"\

 	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Pipe.h"\

-	{$(INCLUDE)}"\ace\Pipe.i"\

-	{$(INCLUDE)}"\ace\Proactor.h"\

-	{$(INCLUDE)}"\ace\Proactor.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\ReactorEx.h"\

-	{$(INCLUDE)}"\ace\ReactorEx.i"\

 	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

 	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

 	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

 	{$(INCLUDE)}"\ace\Signal.h"\

 	{$(INCLUDE)}"\ace\Signal.i"\

 	{$(INCLUDE)}"\ace\SOCK.h"\

@@ -1418,7 +1183,6 @@ DEP_CPP_CONCR=\
 	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

 	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

 	{$(INCLUDE)}"\ace\Svc_Handler.h"\

 	{$(INCLUDE)}"\ace\Svc_Handler.i"\

@@ -1438,21 +1202,6 @@ DEP_CPP_CONCR=\
 	{$(INCLUDE)}"\ace\Thread_Manager.h"\

 	{$(INCLUDE)}"\ace\Thread_Manager.i"\

 	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Heap.h"\

-	{$(INCLUDE)}"\ace\Timer_Heap_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Heap_T.h"\

-	{$(INCLUDE)}"\ace\Timer_List.h"\

-	{$(INCLUDE)}"\ace\Timer_List_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_List_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Timer_Wheel.h"\

-	{$(INCLUDE)}"\ace\Timer_Wheel_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Wheel_T.h"\

-	{$(INCLUDE)}"\ace\Token.h"\

-	{$(INCLUDE)}"\ace\Token.i"\

 	{$(INCLUDE)}"\ace\Trace.h"\

 	{$(INCLUDE)}"\ace\ws2tcpip.h"\

 	

@@ -1461,6 +1210,8 @@ DEP_CPP_CONCR=\
  "$(INTDIR)" ".\File_Parser.cpp"

 

 

+!ENDIF 

+

 # End Source File

 # End Target

 # End Project

diff --git a/apps/Gateway/Gateway/Gateway.mdp b/apps/Gateway/Gateway/Gateway.mdp
index 0226a75537e..b9f313f099e 100644
--- a/apps/Gateway/Gateway/Gateway.mdp
+++ b/apps/Gateway/Gateway/Gateway.mdp
diff --git a/apps/Gateway/Gateway/Proxy_Handler.cpp b/apps/Gateway/Gateway/Proxy_Handler.cpp
index 2eea1d5695a..106ec52f9c7 100644
--- a/apps/Gateway/Gateway/Proxy_Handler.cpp
+++ b/apps/Gateway/Gateway/Proxy_Handler.cpp
@@ -118,8 +118,9 @@ Proxy_Handler::handle_timeout (const ACE_Time_Value &,
              this->id (), this->timeout_));
 
   // Delegate the re-connection attempt to the Event Channel.
-  return this->event_channel_->initiate_proxy_connection 
-    (this, ACE_Synch_Options::asynch);
+  this->event_channel_->initiate_proxy_connection (this);
+  
+  return 0;
 }
 
 // Handle shutdown of the Proxy_Handler object.
diff --git a/apps/Gateway/Gateway/Proxy_Handler_Connector.cpp b/apps/Gateway/Gateway/Proxy_Handler_Connector.cpp
index 3b0cee18794..a7ba6683f55 100644
--- a/apps/Gateway/Gateway/Proxy_Handler_Connector.cpp
+++ b/apps/Gateway/Gateway/Proxy_Handler_Connector.cpp
@@ -6,32 +6,6 @@ Proxy_Handler_Connector::Proxy_Handler_Connector (void)
 {
 }
 
-// Override the connection-failure method to add timer support.
-// Note that these timers perform "expoential backoff" to 
-// avoid rapidly trying to reestablish connections when a link
-// goes down.
-
-int
-Proxy_Handler_Connector::handle_close (ACE_HANDLE sd, ACE_Reactor_Mask)
-{
-  ACE_Connector<Proxy_Handler, ACE_SOCK_CONNECTOR>::AST *stp = 0;
-
-  // Locate the ACE_Svc_Handler corresponding to the socket descriptor.
-  if (this->handler_map_.find (sd, stp) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) can't locate proxy %d in connector map, %p\n",
-		      sd, "find"), -1);
-
-  Proxy_Handler *proxy_handler = stp->svc_handler ();
-
-  // Schedule a reconnection request at some point in the future
-  // (note that proxy_handler uses an exponential backoff scheme).
-  if (ACE_Service_Config::reactor ()->schedule_timer 
-      (proxy_handler, 0, proxy_handler->timeout ()) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
-		      "schedule_timer"), -1);
-  return 0;
-}
-
 // Initiate (or reinitiate) a connection to the Proxy_Handler.
 
 int
@@ -59,35 +33,23 @@ Proxy_Handler_Connector::initiate_connection (Proxy_Handler *proxy_handler,
 	{
 	  proxy_handler->state (Proxy_Handler::FAILED);
 	  ACE_DEBUG ((LM_DEBUG, "(%t) %p on address %s\n", 
-		     "connect", addr_buf));
+		      "connect", addr_buf));
 
-	  // Reschedule ourselves to try and connect again.
-	  if (synch_options[ACE_Synch_Options::USE_REACTOR])
-	    {
-	      if (ACE_Service_Config::reactor ()->schedule_timer 
-		  (proxy_handler, 0, proxy_handler->timeout ()) == -1)
-		ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n",
-				  "schedule_timer"), -1);
-	    }
-	  else 
-	    // Failures on synchronous connects are reported as errors
-	    // so that the caller can decide how to proceed.
-	    return -1;
+	  return -1;
 	}
       else
 	{
 	  proxy_handler->state (Proxy_Handler::CONNECTING);
 	  ACE_DEBUG ((LM_DEBUG, 
-		     "(%t) in the process of connecting %s to %s\n",
-		     synch_options[ACE_Synch_Options::USE_REACTOR] 
-		     ? "asynchronously" : "synchronously", addr_buf));
+		      "(%t) in the process of connecting to %s\n",
+		      addr_buf));
 	}
     }
   else 
     {
       proxy_handler->state (Proxy_Handler::ESTABLISHED);
       ACE_DEBUG ((LM_DEBUG, "(%t) connected to %s on %d\n", 
-		 addr_buf, proxy_handler->get_handle ()));
+		  addr_buf, proxy_handler->get_handle ()));
     }
   return 0;
 }
diff --git a/apps/Gateway/Gateway/Proxy_Handler_Connector.h b/apps/Gateway/Gateway/Proxy_Handler_Connector.h
index c53579f9ec4..fb2b3c7e547 100644
--- a/apps/Gateway/Gateway/Proxy_Handler_Connector.h
+++ b/apps/Gateway/Gateway/Proxy_Handler_Connector.h
@@ -33,9 +33,6 @@ public:
   int initiate_connection (Proxy_Handler *, 
 			   ACE_Synch_Options & = ACE_Synch_Options::synch);
 
-protected:  
-  // Override the connection-failure method to add timer support.
-  virtual int handle_close (ACE_HANDLE sd, ACE_Reactor_Mask);
 };
 
 #endif /* _IO_HANDLER_CONNECTOR */
diff --git a/apps/Gateway/Gateway/proxy_config b/apps/Gateway/Gateway/proxy_config
index 54343cb0e73..35460115b23 100644
--- a/apps/Gateway/Gateway/proxy_config
+++ b/apps/Gateway/Gateway/proxy_config
@@ -34,8 +34,8 @@
 # Proxy Host         Remote  Proxy  Max Retry  Local  Priority 
 # ID		     Port    Role   Timeout    Port   
 # ----  --------     ------  ------ ---------- -----  --------
-   1    merengue.cs  10010   S	    32	       0      1
-   2    flamenco.cs  10010   C	    32	       0      1
+   1    localhost    10002   S	    32	       0      1
+   2    localhost    10003   C	    32	       0      1
 #  3    mambo.cs     10002   C	    32	       0      1
 #  4    lambada.cs   10002   C	    32	       0      1
 #  5    lambada.cs   10002   C	    32	       0      1
diff --git a/apps/Gateway/Gateway/svc.conf b/apps/Gateway/Gateway/svc.conf
index c822713287b..5bad734d296 100644
--- a/apps/Gateway/Gateway/svc.conf
+++ b/apps/Gateway/Gateway/svc.conf
@@ -1,3 +1,3 @@
 #static Svc_Manager "-d -p 2913"
-dynamic Gateway Service_Object * ./Gateway:_make_Gateway() active "-d -c -P proxy_config -C consumer_config"
+dynamic Gateway Service_Object * ./Gateway:_make_Gateway() active "-b -d -c -P proxy_config -C consumer_config"
 
diff --git a/apps/Gateway/Peer/Makefile b/apps/Gateway/Peer/Makefile
index 20df0bdea70..0184c4dd16d 100644
--- a/apps/Gateway/Peer/Makefile
+++ b/apps/Gateway/Peer/Makefile
@@ -9,18 +9,21 @@
 #----------------------------------------------------------------------------
 
 BIN   	= peerd
+LIB   	= libPeer.a
+SHLIB	= libPeer.so
 
-FILES  	= Peer
+FILES	= Peer 
 
-LSRC	= $(addsuffix .cpp,$(FILES))
+LSRC	= $(addsuffix .cpp,$(FILES)) 
 LOBJ	= $(addsuffix .o,$(FILES))
 SHOBJ	= $(addsuffix .so,$(FILES))
 
-LDLIBS	=  $(addprefix .shobj/,$(SHOBJ))
-
+LDLIBS	= -lPeer
+LIBS	= -lACE
+ 
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 
-BUILD 	= $(VBIN)
+BUILD 	= $(VLIB) $(VSHLIB) $(SHLIBA) $(VBIN)
 
 #----------------------------------------------------------------------------
 #	Include macros and targets
diff --git a/apps/Gateway/Peer/Peer.mak b/apps/Gateway/Peer/Peer.mak
index 1fb6a43741a..e8a0eb1ba39 100644
--- a/apps/Gateway/Peer/Peer.mak
+++ b/apps/Gateway/Peer/Peer.mak
@@ -31,6 +31,7 @@ NULL=nul
 !ENDIF 

 ################################################################################

 # Begin Project

+# PROP Target_Last_Scanned "Peer - Win32 Debug"

 

 !IF  "$(CFG)" == "peerd - Win32 Debug"

 

@@ -226,9 +227,6 @@ LINK32_OBJS= \
 # Begin Source File

 

 SOURCE=.\peerd.cpp

-

-!IF  "$(CFG)" == "peerd - Win32 Debug"

-

 DEP_CPP_PEERD=\

 	".\Peer.h"\

 	{$(INCLUDE)}"\ace\ACE.h"\

@@ -344,8 +342,6 @@ DEP_CPP_PEERD=\
 "$(INTDIR)\peerd.obj" : $(SOURCE) $(DEP_CPP_PEERD) "$(INTDIR)"

 

 

-!ENDIF 

-

 # End Source File

 # End Target

 ################################################################################

@@ -357,6 +353,7 @@ DEP_CPP_PEERD=\
 

 SOURCE=.\Peer.cpp

 DEP_CPP_PEER_=\

+	"..\Gateway\Event.h"\

 	".\Peer.h"\

 	{$(INCLUDE)}"\ace\Acceptor.cpp"\

 	{$(INCLUDE)}"\ace\Acceptor.h"\

@@ -490,9 +487,6 @@ DEP_CPP_PEER_=\
 	{$(INCLUDE)}"\ace\Trace.h"\

 	{$(INCLUDE)}"\ace\ws2tcpip.h"\

 	

-NODEP_CPP_PEER_=\

-	".\Event.h"\

-	

 

 "$(INTDIR)\Peer.obj" : $(SOURCE) $(DEP_CPP_PEER_) "$(INTDIR)"

 

diff --git a/apps/Gateway/Peer/Peer.mdp b/apps/Gateway/Peer/Peer.mdp
index d93d67c8b6f..45fb6890d1c 100644
--- a/apps/Gateway/Peer/Peer.mdp
+++ b/apps/Gateway/Peer/Peer.mdp
diff --git a/apps/Gateway/Peer/svc.conf b/apps/Gateway/Peer/svc.conf
index 6c9bc3bc3d7..4bc462ca58f 100644
--- a/apps/Gateway/Peer/svc.conf
+++ b/apps/Gateway/Peer/svc.conf
@@ -1,3 +1,3 @@
 #static Svc_Manager "-d -p 291"
-dynamic Peer1 Service_Object *.shobj/Peer:_make_Peer_Acceptor() active "-p 10004"
-#dynamic Peer2 Service_Object *.shobj/Peer:_make_Peer_Acceptor() active "-p 10003"
+dynamic Peer1 Service_Object * ./Peer:_make_Peer_Acceptor() active "-p 10004"
+#dynamic Peer2 Service_Object * ./Peer:_make_Peer_Acceptor() active "-p 10003"