5 files changed, 22 insertions, 142 deletions
diff --git a/tests/MProfile/Makefile.am b/tests/MProfile/Makefile.am
deleted file mode 100644
index 519fa6b84d9..00000000000
--- a/tests/MProfile/Makefile.am
+++ /dev/null
@@ -1,112 +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.MProfile_Idl.am
-
-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) $(srcdir)/test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  test.idl
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.MProfile_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.MProfile_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.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
-
-## 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/MProfile/client.cpp b/tests/MProfile/client.cpp
index e610b16c39a..f3f1dfeb84d 100644
--- a/tests/MProfile/client.cpp
+++ b/tests/MProfile/client.cpp
@@ -6,8 +6,6 @@
 #include "ace/OS_NS_unistd.h"
 #include "testC.h"
 
-ACE_RCSID(MT_Server, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int do_shutdown = 0;
 
@@ -44,7 +42,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/MProfile/server.cpp b/tests/MProfile/server.cpp
index f9991fc9952..fa3c1874c6e 100644
--- a/tests/MProfile/server.cpp
+++ b/tests/MProfile/server.cpp
@@ -5,8 +5,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(MT_Client, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = 0;
 
 int
@@ -30,7 +28,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/MProfile/test_i.cpp b/tests/MProfile/test_i.cpp
index b3f4772e9fa..9c6d464b6ab 100644
--- a/tests/MProfile/test_i.cpp
+++ b/tests/MProfile/test_i.cpp
@@ -2,8 +2,6 @@
 
 #include "test_i.h"
 
-ACE_RCSID(MT_Client, test_i, "$Id$")
-
 Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb)),
     val_ (1)
diff --git a/tests/MProfile/test_i.h b/tests/MProfile/test_i.h
index 07f971408ac..58cc6ea1bb9 100644
--- a/tests/MProfile/test_i.h
+++ b/tests/MProfile/test_i.h
@@ -1,37 +1,35 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/Mprofile
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Carlos O'Ryan <coryan@uci.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan <coryan@uci.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_MPROFILE_TEST_I_H
 #define TAO_MPROFILE_TEST_I_H
 
 #include "testS.h"
 
+/**
+ * @class Simple_Server_i
+ *
+ * @brief Simpler Server implementation
+ *
+ * Implements the Simple_Server interface in test.idl
+ */
 class Simple_Server_i : public POA_Simple_Server
 {
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
 public:
+  /// ctor
   Simple_Server_i (CORBA::ORB_ptr orb);
-  // ctor
 
+  /// ctor
   Simple_Server_i (void);
-  // ctor
 
   // = The Simple_Server methods.
   CORBA::Long remote_call (void);