This commit was manufactured by cvs2svn to create tag 'ACE-4_5_11'.ACE-4_5_11

5 files changed, 0 insertions, 387 deletions

diff --git a/TAO/orbsvcs/Event_Service/Event_Service.cpp b/TAO/orbsvcs/Event_Service/Event_Service.cpp
deleted file mode 100644
index c7827794ca5..00000000000
--- a/TAO/orbsvcs/Event_Service/Event_Service.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-//
-// $Id$
-//
-
-#include "ace/Get_Opt.h"
-#include "tao/corba.h"
-
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/Scheduler_Factory.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event/Event_Channel.h"
-
-const char* service_name = "EventService";
-
-int
-parse_args (int argc, char *argv [])
-{
-  ACE_Get_Opt get_opt (argc, argv, "n:");
-  int opt;
-
-  while ((opt = get_opt ()) != EOF)
-    {
-      switch (opt)
-	{
-	case 'n':
-	  service_name = get_opt.optarg;
-	  break;
-	case '?':
-	default:
-	  ACE_DEBUG ((LM_DEBUG,
-		      "Usage: %s "
-		      "-n service_name "
-		      "\n",
-		      argv[0]));
-	  return -1;
-	}
-    }
-
-  return 0;
-}
-
-
-int main (int argc, char *argv[])
-{
-  TAO_TRY
-    {
-      // Initialize ORB.
-      CORBA::ORB_var orb = 
-	CORBA::ORB_init (argc, argv, "internet", TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      if (parse_args (argc, argv) == -1)
-	return 1;
-
-      CORBA::Object_var poa_object = 
-	orb->resolve_initial_references("RootPOA");
-      if (CORBA::is_nil (poa_object.in ()))
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   " (%P|%t) Unable to initialize the POA.\n"),
-			  1);
-
-      PortableServer::POA_var root_poa =
-	PortableServer::POA::_narrow (poa_object.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      PortableServer::POAManager_var poa_manager =
-	root_poa->the_POAManager (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      CORBA::Object_var naming_obj =
-	orb->resolve_initial_references ("NameService");
-      if (CORBA::is_nil (naming_obj.in ()))
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   " (%P|%t) Unable to initialize the Naming Service.\n"),
-			  1);
-
-      CosNaming::NamingContext_var naming_context = 
-        CosNaming::NamingContext::_narrow (naming_obj.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      ACE_Scheduler_Factory::use_config (naming_context.in ());
-
-      // Register Event_Service with Naming Service.
-      ACE_EventChannel ec_impl;
-
-      RtecEventChannelAdmin::EventChannel_var ec = 
-	ec_impl._this (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      CORBA::String_var str =
-	orb->object_to_string (ec.in (), TAO_TRY_ENV);
-
-      ACE_DEBUG ((LM_DEBUG, "The EC IOR is <%s>\n", str.in ()));
-
-      CosNaming::Name channel_name (1);
-      channel_name.length (1);
-      channel_name[0].id = CORBA::string_dup (service_name);
-      naming_context->bind (channel_name, ec.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      poa_manager->activate (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      ACE_DEBUG ((LM_DEBUG, "running event service\n"));
-      if (orb->run () == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "run"), 1);
-
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("EC");
-    }
-  TAO_ENDTRY;
-
-
-  return 0;
-}
diff --git a/TAO/orbsvcs/Event_Service/Event_Service.dsp b/TAO/orbsvcs/Event_Service/Event_Service.dsp
deleted file mode 100644
index b2cccaa3eee..00000000000
--- a/TAO/orbsvcs/Event_Service/Event_Service.dsp
+++ /dev/null
@@ -1,147 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Event_Service" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=Event_Service - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "Event_Service.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "Event_Service.mak" CFG="Event_Service - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "Event_Service - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "Event_Service - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "Event_Service - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\.." /I "..\..\.." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 orbsvcs.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Event_Service - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /I "..\.." /I "..\..\.." /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 orbsvcs.lib TAO.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "Event_Service - Win32 Release"

-# Name "Event_Service - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\Event_Service.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\BCU.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\CORBA_Utils_T.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Debug_Macros.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Dispatching_Modules.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event_Channel.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Fast_Reactor.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\GPlot_File.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Local_ESTypes.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Memory_Pools.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ReactorTask.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\RT_Task.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Task_Manager.h

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/orbsvcs/Event_Service/Event_Service.dsw b/TAO/orbsvcs/Event_Service/Event_Service.dsw
deleted file mode 100644
index 2b2901a9725..00000000000
--- a/TAO/orbsvcs/Event_Service/Event_Service.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

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

-

-Project: "Event_Service"=.\Event_Service.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

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

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

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

-

diff --git a/TAO/orbsvcs/Event_Service/Makefile b/TAO/orbsvcs/Event_Service/Makefile
deleted file mode 100644
index 0073d3534f9..00000000000
--- a/TAO/orbsvcs/Event_Service/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# $Id$
-#
-
-BIN = Event_Service
-BUILD = $(BIN)
-
-LSRC = 	\
-	Event_Service.cpp \
-
-ES_OBJS=$(LSRC:.cpp=.o)
-
-LDLIBS = -lorbsvcs -lTAO
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-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.bin.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-ifndef TAO_ROOT
-TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE
-LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
-CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG)#-H
-
-Event_Service: $(addprefix $(VDIR),$(ES_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-#----------------------------------------------------------------------------
-#	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
diff --git a/TAO/orbsvcs/Event_Service/svc.conf b/TAO/orbsvcs/Event_Service/svc.conf
deleted file mode 100644
index 43c6a486c92..00000000000
--- a/TAO/orbsvcs/Event_Service/svc.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id$
-#
-# This file contains a sample ACE_Service_Config configuration
-# file specifying the strategy factories utilized by an application
-# using TAO.  There are currently only two possible factories:
-# Client_Strategy_Factory and Server_Strategy_Factory.  These names
-# must be used as the second argument to their corresponding line,
-# because that's what the ORB uses to find the desired factory.
-#
-# Note that there are two unordinary characteristics of the way *this*
-# file is set up:
-#   - both client and server strategies are specified in the same
-#     file, which would only make sense for co-located clients & servers
-#   - both of the factories are actually sourced out of libTAO.so
-#     (TAO.DLL on Win32), and they would normally be in a separate
-#     dll from the TAO ORB Core.
-#
-# The options which can be passed to the Resource Factory are:
-#
-#   -ORBresources <which>
-#       where <which> can be 'global' to specify globally-held resources,
-#       or 'tss' to specify thread-specific resources.
-#
-# The options which can be passed to the Client are:
-#     <none currently>
-#
-# The options which can be passed to the Server are:
-#
-#   -ORBconcurrency <which>
-#       where <which> can be 'thread-per-connection' to specify
-#       use of the ACE_Threaded_Strategy concurrency strategy,
-#       or 'reactive' to specify use of the ACE_Reactive_Strategy
-#       concurrency strategy.
-#
-#   -ORBthreadflags  <flags>
-#       specifies the default thread flags to use, where <flags> is a
-#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
-#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
-#       on every platform.
-#
-#   -ORBdemuxstrategy <which>
-#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
-#       and specifies the type of object lookup strategy used internally.
-#   -ORBtablesize <unsigned>
-#       specifies the size of the object table
-#
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
-dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
-dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"