Merge pull request #1729 from jwillemsen/jwi-orbsvcsinclude

Installed tree doesn't have double orbvsvcs path

23 files changed, 13 insertions, 62 deletions

diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/README b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/README
index c94e0e6e3bc..bab74b14b3d 100644
--- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/README
+++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/README
@@ -1,5 +1,3 @@
-
-
 The service is registered with the naming service with the name
 "BasicLogFactory" .
 
diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/README b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/README
index dc8c4c9ab93..48461592ca0 100644
--- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/README
+++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/README
@@ -1,5 +1,3 @@
-
-
 The service is registered with the naming service with the name
 "EventLogFactory" .
 
@@ -11,6 +9,5 @@ To run the Event Logging Service:
 2. execute the Event_Logging_Service
    at $TAO_ROOT/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service
 
-
 The idl spec is $TAO_ROOT/orbsvcs/orbsvcs/DsEventLogAdmin.idl
 see also $TAO_ROOT/orbsvcs/orbsvcs/DsLogNotification.idl
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/README b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/README
index 4c51dde6743..63354001c67 100644
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/README
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/README
@@ -1,5 +1,3 @@
-
-
 The service is registered with the naming service with the name
 "NotifyLogFactory" .
 
@@ -11,6 +9,5 @@ To run the Notify Logging Service:
 2. execute the Notify_Logging_Service
    at $TAO_ROOT/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service
 
-
 The idl spec is $TAO_ROOT/orbsvcs/orbsvcs/DsNotifyLogAdmin.idl
 see also $TAO_ROOT/orbsvcs/orbsvcs/DsLogNotification.idl
diff --git a/TAO/orbsvcs/Logging_Service/README b/TAO/orbsvcs/Logging_Service/README
index 755974f732b..0131feaa447 100644
--- a/TAO/orbsvcs/Logging_Service/README
+++ b/TAO/orbsvcs/Logging_Service/README
@@ -1,5 +1,3 @@
-
-
                         Telecom Log Service
                         -------------------
 
diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/README b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/README
index 3f4e7722fd5..af717a02e95 100644
--- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/README
+++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/README
@@ -1,5 +1,3 @@
-
-
 The service is registered with the naming service with the name
 "RTEventLogFactory" .
 
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Server.cpp b/TAO/orbsvcs/Notify_Service/Notify_Server.cpp
index 6a0394be9aa..14b5d40e773 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Server.cpp
+++ b/TAO/orbsvcs/Notify_Service/Notify_Server.cpp
@@ -1,6 +1,6 @@
 #include "orbsvcs/Log_Macros.h"
 #include "Notify_Service.h"
-#include "orbsvcs/orbsvcs/Notify/Properties.h"
+#include "orbsvcs/Notify/Properties.h"
 
 // Must include this file to get a static initializer
 #include "tao/Valuetype/Valuetype_Adapter_Impl.h"
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
index b3f2afec4ac..f46860dbcec 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
@@ -12,8 +12,8 @@
 
 #if defined (TAO_HAS_NOTIFICATION_MONITOR_CONTROL) && defined (TAO_AS_STATIC_LIBS)
 // for static builds, be sure the library is included
-#include "orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.h"
-#include "orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h"
+#include "orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.h"
+#include "orbsvcs/Notify/MonitorControl/MonitorManager.h"
 #endif
 
 #if defined (TAO_EXPLICIT_NEGOTIATE_CODESETS)
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.h
index e1833019aaa..1902a6b572b 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.h
@@ -8,14 +8,13 @@
  */
 //=============================================================================
 
-
 #ifndef TAO_FT_PERSISTENT_NAMING_CONTEXT_H
 #define TAO_FT_PERSISTENT_NAMING_CONTEXT_H
 #include /**/ "ace/pre.h"
 
 #include "orbsvcs/Naming/Persistent_Naming_Context.h"
 #include "orbsvcs/Naming/FaultTolerant/ftnaming_export.h"
-#include "orbsvcs/orbsvcs/PortableGroupC.h"
+#include "orbsvcs/PortableGroupC.h"
 #include "orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.h
index af00704fb9b..0bd6ff8862e 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.h
@@ -9,14 +9,13 @@
  */
 //=============================================================================
 
-
 #ifndef TAO_FT_STORABLE_NAMING_CONTEXT_H
 #define TAO_FT_STORABLE_NAMING_CONTEXT_H
 #include /**/ "ace/pre.h"
 
 #include "orbsvcs/Naming/Storable_Naming_Context.h"
 #include "orbsvcs/Naming/FaultTolerant/ftnaming_export.h"
-#include "orbsvcs/orbsvcs/PortableGroupC.h"
+#include "orbsvcs/PortableGroupC.h"
 #include "orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h"
 #include "orbsvcs/FT_NamingReplicationC.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.cpp
index 7ff8ac5455d..f115e8dae29 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.cpp
@@ -1,4 +1,4 @@
-#include "orbsvcs/orbsvcs/Notify/MonitorControl/Control.h"
+#include "orbsvcs/Notify/MonitorControl/Control.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.h
index 71b48b13451..23d3eeadc0a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.h
@@ -7,7 +7,7 @@
 
 #include "tao/Monitor/Monitor.h"
 
-#include "orbsvcs/orbsvcs/Notify/MonitorControl/Control.h"
+#include "orbsvcs/Notify/MonitorControl/Control.h"
 
 #include "ace/Hash_Map_Manager_T.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp
index e5ca866f620..d8806831e2e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp
@@ -1,6 +1,6 @@
 #include "orbsvcs/Log_Macros.h"
 #include "orbsvcs/Log_Macros.h"
-#include "orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.h"
+#include "orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.h"
 
 #include "tao/Monitor/Monitor_Impl.h"
 #include "ace/Auto_Ptr.h"
@@ -9,7 +9,7 @@
 
 #if defined (TAO_HAS_MONITOR_FRAMEWORK) && (TAO_HAS_MONITOR_FRAMEWORK == 1)
 
-#include "orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.h"
+#include "orbsvcs/Notify/MonitorControl/Control_Registry.h"
 
 using namespace ACE_VERSIONED_NAMESPACE_NAME::ACE::Monitor_Control;
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.cpp
index 348dedc6c8d..0ff57ebd2e4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.cpp
@@ -1,4 +1,4 @@
-#include "orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.h"
+#include "orbsvcs/Notify/MonitorControl/Timestamp_Monitor.h"
 
 #if defined (TAO_HAS_MONITOR_FRAMEWORK) && (TAO_HAS_MONITOR_FRAMEWORK == 1)
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.h
index b93e4150e2a..7c091ba5e10 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.h
@@ -14,7 +14,7 @@
 
 #if defined (TAO_HAS_MONITOR_FRAMEWORK) && (TAO_HAS_MONITOR_FRAMEWORK == 1)
 
-#include "orbsvcs/orbsvcs/Notify/MonitorControl/notify_mc_export.h"
+#include "orbsvcs/Notify/MonitorControl/notify_mc_export.h"
 
 using namespace ACE_VERSIONED_NAMESPACE_NAME::ACE::Monitor_Control;
 
diff --git a/TAO/orbsvcs/tests/AVStreams/README b/TAO/orbsvcs/tests/AVStreams/README
index 0da167d0893..f8afb0c5fe8 100644
--- a/TAO/orbsvcs/tests/AVStreams/README
+++ b/TAO/orbsvcs/tests/AVStreams/README
@@ -1,5 +1,3 @@
-
-
 TAO Audio/Video Streaming service
 ---------------------------------
 
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/README b/TAO/orbsvcs/tests/Event/Mcast/Complex/README
index 54848f4c07d..854669c83ae 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Complex/README
+++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/README
@@ -1,5 +1,3 @@
-
-
 Goals:
 ------
 This is a step up from the Simple mcast test.  There are still two
@@ -49,7 +47,3 @@ $gateway-ec -ORBsvcconf consumer-ec.conf -i consumer-ec.ior
 $consumer -ORBInitRef Event_Service=file://consumer-ec.ior
 $gateway-ec -ORBsvcconf supplier-ec.conf -i supplier-ec.ior
 $supplier -ORBInitRef Event_Service=file://supplier-ec.ior
-
-
-
-
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/README b/TAO/orbsvcs/tests/Event/Mcast/Simple/README
index ba52b7dc019..86cbcb1b82e 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Simple/README
+++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/README
@@ -1,5 +1,3 @@
-
-
 Goals:
 ------
 This is the most basic test for federating Event Channels via
@@ -57,6 +55,3 @@ $gateway-ec -ORBsvcconf udp-consumer-ec.conf -i consumer-ec.ior
 $consumer -ORBInitRef Event_Service=file://consumer-ec.ior
 $gateway-ec -ORBsvcconf udp-supplier-ec.conf -i supplier-ec.ior
 $supplier -ORBInitRef Event_Service=file://supplier-ec.ior
-
-
-
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/README b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/README
index c98720e3dc8..1766c36e8db 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/README
+++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/README
@@ -1,5 +1,3 @@
-
-
 Goals:
 ------
 The goal of this test is to verify that federation of Event Channels
@@ -50,8 +48,3 @@ Manually:
 As many times as desired (using a different ior file name each time) do
 $gateway-ec -ORBsvcconf gateway.conf -i ec.ior
 $application -ORBInitRef Event_Service=file://ec.ior -d
-
-
-
-
-
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/README b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/README
index 3a54de29adf..5466d5d9eeb 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/README
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/README
@@ -1,5 +1,3 @@
-
-
 This is a simple test showing that Interface inheritance
 is supported by the Interface Repository.
 
@@ -31,8 +29,6 @@ library in TAO/orbsvcs/orbsvcs.
 
 To run this test, either use the Perl script run_test.pl, or
 
-
-
 (Windows)
 start the Interface Repository by typing
 
@@ -72,4 +68,4 @@ and
 
  ./IFR_Inheritance_Test
 
-- Scott Harris <harris_s@ociweb.com>
\ No newline at end of file
+- Scott Harris <harris_s@ociweb.com>
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/README b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/README
index 4e1e9b570f9..6a2cb175173 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/README
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/README
@@ -1,5 +1,3 @@
-
-
 Admin_Client is a class containing several functions which test
 the methods in various IFR object classes. Since automatic
 administration of the TAO Interface Repository has not yet been
@@ -28,8 +26,6 @@ library in TAO/orbsvcs/orbsvcs.
 
 To run this test, either use the Perl script run_test.pl, or
 
-
-
 (Windows)
 start the Interface Repository by typing
 
@@ -110,4 +106,4 @@ ensure that future modifications to IFR code don't cause deadlocks.
 More information about the Interface Repository can be found in
 TAO/docs/releasenotes.index.html.
 
--Jeff Parsons <parsons@cs.wustl.edu>
\ No newline at end of file
+-Jeff Parsons <parsons@cs.wustl.edu>
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/README.txt b/TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/README.txt
index bcb742f7819..4de56a9ff97 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/README.txt
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/README.txt
@@ -1,5 +1,3 @@
-
-
 This test illustrates a problem with the IFR service in that it cannot
 properly handle forward declared unions.
 
@@ -37,4 +35,3 @@ Here is a stack trace relative to the IFR service in TAO 1.6.6:
 #10 0x00007f68cc47dc25 in POA_CORBA::AttributeDef::_get_type_skel (
     server_request=@0x7fffd4cdda90, servant_upcall=0x7fffd4cdd3d0,
     servant=0x672150) at IFRService/IFR_BasicS.cpp:14111
-
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/README b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/README
index e67c18073f3..107953609c2 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/README
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/README
@@ -1,5 +1,3 @@
-
-
 This program tests the application controlled membership support
 of the Cygnus load balancer. The aim is to allow the application
 to create the replicas and then forcefully add them as the members
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/README b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/README
index a7bf7d017f6..679b3d67b4b 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/README
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/README
@@ -1,5 +1,3 @@
-
-
 This program tests the infrastructure controlled membership support
 of the Cygnus Load Balancer. The aim is to allow Cygnus to set the
 factories needed to create the "replicas", when the object group