12 files changed, 67 insertions, 215 deletions
diff --git a/tests/Exposed_Policies/Counter_i.cpp b/tests/Exposed_Policies/Counter_i.cpp
index fc0b34451e7..9ec2282ccda 100644
--- a/tests/Exposed_Policies/Counter_i.cpp
+++ b/tests/Exposed_Policies/Counter_i.cpp
@@ -2,8 +2,6 @@
 
 #include "Counter_i.h"
 
-ACE_RCSID(tao, Counter_Servant, "$Id$")
-
 // Dtor-Ctor Implementation.
 
 Counter_Servant::Counter_Servant (Policy_Tester *policy_tester)
diff --git a/tests/Exposed_Policies/Counter_i.h b/tests/Exposed_Policies/Counter_i.h
index 8703a2d95a9..18e32d1c90b 100644
--- a/tests/Exposed_Policies/Counter_i.h
+++ b/tests/Exposed_Policies/Counter_i.h
@@ -1,20 +1,17 @@
-//$Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Exposed_Policies
-//
-// = FILENAME
-//    Counter_i.h
-//
-// = DESCRIPTION
-//     This class implements the Counter IDL interface.
-//
-// = AUTHOR
-//     Angelo Corsaro <corsaro@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Counter_i.h
+ *
+ *  $Id$
+ *
+ *   This class implements the Counter IDL interface.
+ *
+ *
+ *  @author  Angelo Corsaro <corsaro@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef COUNTER_I_H_
 #define COUNTER_I_H_
diff --git a/tests/Exposed_Policies/Makefile.am b/tests/Exposed_Policies/Makefile.am
deleted file mode 100644
index a87f6d18d2b..00000000000
--- a/tests/Exposed_Policies/Makefile.am
+++ /dev/null
@@ -1,130 +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.Exposed_Policies_Idl.am
-
-BUILT_SOURCES = \
-  CounterC.cpp \
-  CounterC.h \
-  CounterC.inl \
-  CounterS.cpp \
-  CounterS.h \
-  CounterS.inl
-
-CLEANFILES = \
-  Counter-stamp \
-  CounterC.cpp \
-  CounterC.h \
-  CounterC.inl \
-  CounterS.cpp \
-  CounterS.h \
-  CounterS.inl
-
-CounterC.cpp CounterC.h CounterC.inl CounterS.cpp CounterS.h CounterS.inl: Counter-stamp
-
-Counter-stamp: $(srcdir)/Counter.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Counter.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Counter.idl
-
-## Makefile.Exposed_Policies_Client.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  CounterC.cpp \
-  Policy_Tester.cpp \
-  Policy_Verifier.cpp \
-  RT_Properties.cpp \
-  client.cpp \
-  Policy_Tester.h \
-  Policy_Verifier.h \
-  RT_Properties.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-endif BUILD_EXCEPTIONS
-
-## Makefile.Exposed_Policies_Server.am
-
-if BUILD_EXCEPTIONS
-if BUILD_RT_CORBA
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
-  CounterC.cpp \
-  CounterS.cpp \
-  Policy_Tester.cpp \
-  Policy_Verifier.cpp \
-  RT_Properties.cpp \
-  server.cpp \
-  Policy_Tester.h \
-  Policy_Verifier.h \
-  RT_Properties.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_RT_CORBA
-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/Exposed_Policies/Policy_Tester.cpp b/tests/Exposed_Policies/Policy_Tester.cpp
index 83d40afff39..f49887a77b8 100644
--- a/tests/Exposed_Policies/Policy_Tester.cpp
+++ b/tests/Exposed_Policies/Policy_Tester.cpp
@@ -18,8 +18,6 @@
 #include "tao/ORB_Constants.h"
 #include "tao/ORB_Core.h"
 
-ACE_RCSID (tao, Policy_Tester, "$Id$")
-
 Policy_Tester::Policy_Tester (void)
   : rt_object_properties_ (0),
     rt_poa_properties_ (0)
diff --git a/tests/Exposed_Policies/Policy_Tester.h b/tests/Exposed_Policies/Policy_Tester.h
index 1a659c8c01c..8ca8eed1c75 100644
--- a/tests/Exposed_Policies/Policy_Tester.h
+++ b/tests/Exposed_Policies/Policy_Tester.h
@@ -1,21 +1,16 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Exposed_Policies
-//
-// = FILENAME
-//    Policy_Verifier.h
-//
-// = DESCRIPTION
-//     This class verifies that the policy are correctly embedded
-//     in the IOR.
-//
-// = AUTHOR
-//     Angelo Corsaro <corsaro@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Policy_Tester.h
+ *
+ *  $Id$
+ *
+ *   This class verifies that the policy are correctly embedded
+ *   in the IOR.
+ *
+ *  @author  Angelo Corsaro <corsaro@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef POLICY_TESTER_H_
 #define POLICY_TESTER_H_
@@ -35,8 +30,8 @@ public:
   Policy_Tester (void);
   ~Policy_Tester (void);
 
+  /// Runs the test.
   void run (void);
-  // Runs the test.
 
   int init (int argc,
             ACE_TCHAR *argv[]);
diff --git a/tests/Exposed_Policies/Policy_Verifier.cpp b/tests/Exposed_Policies/Policy_Verifier.cpp
index 3215c2ef7b8..0fdb414c1c1 100644
--- a/tests/Exposed_Policies/Policy_Verifier.cpp
+++ b/tests/Exposed_Policies/Policy_Verifier.cpp
@@ -1,8 +1,7 @@
+// $Id$
 #include "Policy_Verifier.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (tao, Policy_Verifier, "$Id$")
-
 Policy_Verifier::Policy_Verifier (void)
   : rt_object_properties_ (0)
   , rt_poa_properties_ (0)
diff --git a/tests/Exposed_Policies/Policy_Verifier.h b/tests/Exposed_Policies/Policy_Verifier.h
index 52d06f1cdcb..ba7a03d7180 100644
--- a/tests/Exposed_Policies/Policy_Verifier.h
+++ b/tests/Exposed_Policies/Policy_Verifier.h
@@ -1,21 +1,17 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Exposed_Policies
-//
-// = FILENAME
-//    Policy_Verifier.h
-//
-// = DESCRIPTION
-//     This class verifies that the policy are correctly embedded
-//     in the IOR.
-//
-// = AUTHOR
-//     Angelo Corsaro <corsaro@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Policy_Verifier.h
+ *
+ *  $Id$
+ *
+ *   This class verifies that the policy are correctly embedded
+ *   in the IOR.
+ *
+ *
+ *  @author  Angelo Corsaro <corsaro@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef POLICY_VERIFIER_H_
 #define POLICY_VERIFIER_H_
diff --git a/tests/Exposed_Policies/RT_Properties.cpp b/tests/Exposed_Policies/RT_Properties.cpp
index e50ee9913a3..e943914b047 100644
--- a/tests/Exposed_Policies/RT_Properties.cpp
+++ b/tests/Exposed_Policies/RT_Properties.cpp
@@ -7,8 +7,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (ExposedPolicies, RT_Properties, "$Id$")
-
 RT_Properties::RT_Properties (void)
   : priority_ (10)
 {
@@ -43,20 +41,28 @@ RT_Properties::read_from (const ACE_TCHAR *file_name)
       if (ACE_OS::strcmp (string_field, "Priority") == 0)
         {
           n_matched = fscanf (fp, "%d", &int_field);
+          ACE_UNUSED_ARG (n_matched);
+
           rt_properties->priority (int_field);
         }
       else if (ACE_OS::strcmp (string_field, "Priority_Bands") == 0)
         {
           n_matched = fscanf (fp, "%d", &int_field);
+          ACE_UNUSED_ARG (n_matched);
+
           rt_properties->priority_bands_.length (int_field);
 
         }
       else if (ACE_OS::strcmp (string_field, "Priority_Range") == 0)
         {
           n_matched = fscanf (fp, "%d", &int_field);
+          ACE_UNUSED_ARG (n_matched);
+
           rt_properties->priority_bands_[i].low = int_field;
 
           n_matched = fscanf (fp, "%d", &int_field);
+          ACE_UNUSED_ARG (n_matched);
+
           rt_properties->priority_bands_[i].high = int_field;
 
           ++i;
diff --git a/tests/Exposed_Policies/RT_Properties.h b/tests/Exposed_Policies/RT_Properties.h
index 5184952e4cd..e37728ae291 100644
--- a/tests/Exposed_Policies/RT_Properties.h
+++ b/tests/Exposed_Policies/RT_Properties.h
@@ -1,21 +1,17 @@
-//$Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    RT_Properties.h
-//
-// = DESCRIPTION
-//     Defines a series of "real time" property that an Object
-//     or a POA created on a RT-ORB can have.
-//
-// = AUTHOR
-//     Angelo Corsaro <corsaro@cs.wustl.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    RT_Properties.h
+ *
+ *  $Id$
+ *
+ *   Defines a series of "real time" property that an Object
+ *   or a POA created on a RT-ORB can have.
+ *
+ *
+ *  @author  Angelo Corsaro <corsaro@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef RT_PROPERTIES_H_
 #define RT_PROPERTIES_H_
diff --git a/tests/Exposed_Policies/client.cpp b/tests/Exposed_Policies/client.cpp
index 92ef57a48c3..dddf5c131c4 100644
--- a/tests/Exposed_Policies/client.cpp
+++ b/tests/Exposed_Policies/client.cpp
@@ -9,8 +9,6 @@
 
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(tao, client, "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/tests/Exposed_Policies/server.cpp b/tests/Exposed_Policies/server.cpp
index 80dd35351b3..370dde2c27a 100644
--- a/tests/Exposed_Policies/server.cpp
+++ b/tests/Exposed_Policies/server.cpp
@@ -15,9 +15,6 @@
 
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(tao, server, "$Id$")
-
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/tests/Exposed_Policies/svc.conf b/tests/Exposed_Policies/svc.conf
index 37973382e2c..c72881a107c 100644
--- a/tests/Exposed_Policies/svc.conf
+++ b/tests/Exposed_Policies/svc.conf
@@ -1,2 +1,4 @@
+# $Id$
+
 # Regular test
 static RT_ORB_Loader "-ORBSchedPolicy SCHED_FIFO"