9 files changed, 4 insertions, 229 deletions
diff --git a/tests/LongUpcalls/AMI_Manager.cpp b/tests/LongUpcalls/AMI_Manager.cpp
index 97bac4aba5b..a8a17609364 100644
--- a/tests/LongUpcalls/AMI_Manager.cpp
+++ b/tests/LongUpcalls/AMI_Manager.cpp
@@ -5,10 +5,6 @@
 #include "AMI_Manager.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (LongUpcalls,
-           AMI_Manager,
-           "$Id$")
-
 static void
 validate_connection (Test::Controller_ptr controller)
 {
diff --git a/tests/LongUpcalls/Controller.cpp b/tests/LongUpcalls/Controller.cpp
index cb65f340fcb..81eb5edbc9b 100644
--- a/tests/LongUpcalls/Controller.cpp
+++ b/tests/LongUpcalls/Controller.cpp
@@ -3,8 +3,6 @@
 //
 #include "Controller.h"
 
-ACE_RCSID(LongUpcalls, Controller, "$Id$")
-
 Controller::Controller (void)
   :  start_count_ (0)
   ,  finish_count_ (0)
diff --git a/tests/LongUpcalls/Makefile.am b/tests/LongUpcalls/Makefile.am
deleted file mode 100644
index 584f04c4fc0..00000000000
--- a/tests/LongUpcalls/Makefile.am
+++ /dev/null
@@ -1,205 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.LongUpcalls_Idl.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES = \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Test.idl
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.LongUpcalls_AMI_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += ami_client
-
-ami_client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-ami_client_SOURCES = \
-  Controller.cpp \
-  Manager_Handler.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  ami_client.cpp \
-  Controller.h \
-  Manager_Handler.h
-
-ami_client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.LongUpcalls_AMI_Server.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += ami_server
-
-ami_server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-ami_server_SOURCES = \
-  AMI_Manager.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  ami_server.cpp \
-  AMI_Manager.h
-
-ami_server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.LongUpcalls_Client.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += blocking_client
-
-blocking_client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-blocking_client_SOURCES = \
-  Controller.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  blocking_client.cpp \
-  Controller.h
-
-blocking_client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Makefile.LongUpcalls_Server.am
-
-if BUILD_AMI
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += blocking_server
-
-blocking_server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-blocking_server_SOURCES = \
-  Manager.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  blocking_server.cpp \
-  Manager.h
-
-blocking_server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_AMI
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/LongUpcalls/Manager.cpp b/tests/LongUpcalls/Manager.cpp
index d6fcbbea8cb..8bb3ea0fe05 100644
--- a/tests/LongUpcalls/Manager.cpp
+++ b/tests/LongUpcalls/Manager.cpp
@@ -5,10 +5,6 @@
 #include "Manager.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (LongUpcalls,
-           Manager,
-           "$Id$")
-
 static void
 validate_connection (Test::Controller_ptr controller)
 {
diff --git a/tests/LongUpcalls/Manager_Handler.cpp b/tests/LongUpcalls/Manager_Handler.cpp
index a38e2edbc36..3e8ea30e8ea 100644
--- a/tests/LongUpcalls/Manager_Handler.cpp
+++ b/tests/LongUpcalls/Manager_Handler.cpp
@@ -4,8 +4,6 @@
 
 #include "Manager_Handler.h"
 
-ACE_RCSID(LongUpcalls, Manager_Handler, "$Id$")
-
 Manager_Handler::Manager_Handler (Test::Manager_ptr manager,
                                   Test::Controller_ptr controller)
   : manager_ (Test::Manager::_duplicate (manager))
diff --git a/tests/LongUpcalls/ami_client.cpp b/tests/LongUpcalls/ami_client.cpp
index 6a0b42b598a..b5f1efc52a2 100644
--- a/tests/LongUpcalls/ami_client.cpp
+++ b/tests/LongUpcalls/ami_client.cpp
@@ -4,8 +4,6 @@
 #include "Controller.h"
 #include "Manager_Handler.h"
 
-ACE_RCSID(LongUpcalls, ami_client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
@@ -29,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/LongUpcalls/ami_server.cpp b/tests/LongUpcalls/ami_server.cpp
index 3f0db7273cf..94164a1eb6a 100644
--- a/tests/LongUpcalls/ami_server.cpp
+++ b/tests/LongUpcalls/ami_server.cpp
@@ -3,8 +3,6 @@
 #include "ace/Get_Opt.h"
 #include "AMI_Manager.h"
 
-ACE_RCSID(LongUpcalls, ami_server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -28,7 +26,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/LongUpcalls/blocking_client.cpp b/tests/LongUpcalls/blocking_client.cpp
index aab93fa66ab..ceb750ed3b3 100644
--- a/tests/LongUpcalls/blocking_client.cpp
+++ b/tests/LongUpcalls/blocking_client.cpp
@@ -3,8 +3,6 @@
 #include "ace/Get_Opt.h"
 #include "Controller.h"
 
-ACE_RCSID(LongUpcalls, blocking_client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
@@ -28,7 +26,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/tests/LongUpcalls/blocking_server.cpp b/tests/LongUpcalls/blocking_server.cpp
index 142d7fef6a3..128c91f59f1 100644
--- a/tests/LongUpcalls/blocking_server.cpp
+++ b/tests/LongUpcalls/blocking_server.cpp
@@ -3,8 +3,6 @@
 #include "ace/Get_Opt.h"
 #include "Manager.h"
 
-ACE_RCSID(LongUpcalls, blocking_server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
@@ -28,7 +26,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }