6 files changed, 3 insertions, 144 deletions
diff --git a/performance-tests/Callback/Callback_i.cpp b/performance-tests/Callback/Callback_i.cpp
index 74416a50d0b..f2ca5619ba6 100644
--- a/performance-tests/Callback/Callback_i.cpp
+++ b/performance-tests/Callback/Callback_i.cpp
@@ -8,8 +8,6 @@
 
 #include "ace/OS_NS_time.h"
 
-ACE_RCSID(Callback, Callback_i, "$Id$")
-
 int
 Callback_i::done (void)
 {
diff --git a/performance-tests/Callback/Makefile.am b/performance-tests/Callback/Makefile.am
deleted file mode 100644
index 6801739baf3..00000000000
--- a/performance-tests/Callback/Makefile.am
+++ /dev/null
@@ -1,133 +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.Callback_Perf_IDL.am
-
-if BUILD_EXCEPTIONS
-
-BUILT_SOURCES = \
-  callbackC.cpp \
-  callbackC.h \
-  callbackC.inl \
-  callbackS.cpp \
-  callbackS.h \
-  callbackS.inl
-
-CLEANFILES = \
-  callback-stamp \
-  callbackC.cpp \
-  callbackC.h \
-  callbackC.inl \
-  callbackS.cpp \
-  callbackS.h \
-  callbackS.inl
-
-callbackC.cpp callbackC.h callbackC.inl callbackS.cpp callbackS.h callbackS.inl: callback-stamp
-
-callback-stamp: $(srcdir)/callback.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/callback.idl
-	@touch $@
-
-noinst_HEADERS = \
-  callback.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Callback_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  Callback_i.cpp \
-  callbackC.cpp \
-  callbackS.cpp \
-  client.cpp \
-  Callback_i.h \
-  Callback_i.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(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_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Callback_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  Server_i.cpp \
-  callbackC.cpp \
-  callbackS.cpp \
-  server.cpp \
-  Server_i.h \
-  Server_i.inl
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(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_ACE_FOR_TAO
-endif BUILD_EXCEPTIONS
-endif BUILD_CORBA_MESSAGING
-
-## 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/performance-tests/Callback/Server_i.cpp b/performance-tests/Callback/Server_i.cpp
index 354be854fb7..1deaefea278 100644
--- a/performance-tests/Callback/Server_i.cpp
+++ b/performance-tests/Callback/Server_i.cpp
@@ -6,8 +6,6 @@
 #include "Server_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Callback, Server_i, "$Id$")
-
 void
 Server_i::set_callback (Test::Callback_ptr callback)
 {
diff --git a/performance-tests/Callback/callback.idl b/performance-tests/Callback/callback.idl
index 7ac2851dc01..690687b4287 100644
--- a/performance-tests/Callback/callback.idl
+++ b/performance-tests/Callback/callback.idl
@@ -9,7 +9,7 @@ module Test {
   /// we stick the native high resolution timer value there.
   typedef unsigned long long TimeStamp;
 
-  /// Simulated 
+  /// Simulated
   typedef sequence<octet> Payload;
 
   /// Define the callback interface
diff --git a/performance-tests/Callback/client.cpp b/performance-tests/Callback/client.cpp
index ec8fe1f4791..d0768ef335f 100644
--- a/performance-tests/Callback/client.cpp
+++ b/performance-tests/Callback/client.cpp
@@ -15,8 +15,6 @@
 #include "ace/Task.h"
 #include "ace/OS_NS_errno.h"
 
-ACE_RCSID(Callback, client, "$Id$")
-
 int iterations = 1000;
 int do_dump_history = 0;
 const ACE_TCHAR *ior = ACE_TEXT("file://server.ior");
@@ -221,7 +219,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/performance-tests/Callback/server.cpp b/performance-tests/Callback/server.cpp
index bd90e183963..aa4900c158c 100644
--- a/performance-tests/Callback/server.cpp
+++ b/performance-tests/Callback/server.cpp
@@ -9,8 +9,6 @@
 #include "ace/Sched_Params.h"
 #include "ace/OS_NS_errno.h"
 
-ACE_RCSID(Callback, server, "$Id$")
-
 const ACE_TCHAR *ior_file_name = ACE_TEXT("test.ior");
 
 /// Parse the arguments.
@@ -144,6 +142,6 @@ 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;
 }