Fri Nov 23 08:08:57 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>

        * orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp:
        * orbsvcs/tests/Bug_3486_Regression/server.cpp:
        * orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp:
        * orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp:
        * orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp:
        * orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp:
        * orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp:
        * orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp:
        * orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp:
        * tao/CSD_Framework/CSD_ORBInitializer.cpp:
        * tao/Codeset/Codeset_Manager_i.cpp:
        * tao/ORBInitializer_Registry.cpp:
        * tao/ORB_Core.cpp:
        * tao/PI/ORBInitInfo.cpp:
        * tao/PortableServer/LifespanStrategyPersistent.cpp:
        * tao/RTCORBA/RT_ORBInitializer.cpp:
        * tao/TAO_Internal.cpp:
        * tao/params.cpp:
        * tests/Bug_2677_Regression/server.cpp:
        * tests/Bug_2936_Regression/bug2936.cpp:
        * tests/Bug_3542_Regression/server.cpp:
        * tests/DLL_ORB/client.cpp:
        * tests/DLL_ORB/server.cpp:
        * tests/ORB_Local_Config/Bug_2612/Test.cpp:
        * tests/ORB_Local_Config/Service_Dependency/Test.cpp:
        * tests/TransportCurrent/Framework/simple.cpp:
          Use ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE with the
TAO_VERSION
          so that with Debian/Ubuntu packaged distro's we try to load
          the correct library which for example are named
libTAO-6.1.1.so

27 files changed, 133 insertions, 53 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index ca1bd514ef0..a8aa2d0cc0e 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,35 @@
+Fri Nov 23 08:08:57 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp:
+        * orbsvcs/tests/Bug_3486_Regression/server.cpp:
+        * orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp:
+        * orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp:
+        * orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp:
+        * orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp:
+        * orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp:
+        * orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp:
+        * orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp:
+        * tao/CSD_Framework/CSD_ORBInitializer.cpp:
+        * tao/Codeset/Codeset_Manager_i.cpp:
+        * tao/ORBInitializer_Registry.cpp:
+        * tao/ORB_Core.cpp:
+        * tao/PI/ORBInitInfo.cpp:
+        * tao/PortableServer/LifespanStrategyPersistent.cpp:
+        * tao/RTCORBA/RT_ORBInitializer.cpp:
+        * tao/TAO_Internal.cpp:
+        * tao/params.cpp:
+        * tests/Bug_2677_Regression/server.cpp:
+        * tests/Bug_2936_Regression/bug2936.cpp:
+        * tests/Bug_3542_Regression/server.cpp:
+        * tests/DLL_ORB/client.cpp:
+        * tests/DLL_ORB/server.cpp:
+        * tests/ORB_Local_Config/Bug_2612/Test.cpp:
+        * tests/ORB_Local_Config/Service_Dependency/Test.cpp:
+        * tests/TransportCurrent/Framework/simple.cpp:
+          Use ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE with the TAO_VERSION
+          so that with Debian/Ubuntu packaged distro's we try to load
+          the correct library which for example are named libTAO-6.1.1.so
+
 Tue Nov 20 19:32:42 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tao/Utils/PolicyList_Destroyer.cpp:
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
index 8d134432c58..fb2b02000fe 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
@@ -9,8 +9,8 @@
 #include "tao/debug.h"
 
 static const char pg_poa_factory_name[] = "TAO_GOA";
-static const ACE_TCHAR pg_poa_factory_directive[] = ACE_DYNAMIC_SERVICE_DIRECTIVE(
-  "TAO_GOA", "TAO_PortableGroup", "_make_TAO_PG_Object_Adapter_Factory", "");
+static const ACE_TCHAR pg_poa_factory_directive[] = ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE(
+  "TAO_GOA", "TAO_PortableGroup", TAO_VERSION , "_make_TAO_PG_Object_Adapter_Factory", "");
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/tests/Bug_3486_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3486_Regression/server.cpp
index 3360f87fe7e..6da6a2ea136 100644
--- a/TAO/orbsvcs/tests/Bug_3486_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_3486_Regression/server.cpp
@@ -7,18 +7,20 @@
 
 char const * const scpc_orbId = "testDllOrb";
 
-ACE_TCHAR const * const scpc_loadOrb = ACE_DYNAMIC_SERVICE_DIRECTIVE(
+ACE_TCHAR const * const scpc_loadOrb = ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE(
   "testDllOrb",
   "bug3486",
+  TAO_VERSION,
   "_make_DllORB",
   "testDllOrb -ORBDebugLevel 0 -ORBId testDllOrb -ORBDottedDecimalAddresses 1"
 );
 
 ACE_TCHAR const * const scpc_unloadOrb = ACE_REMOVE_SERVICE_DIRECTIVE("testDllOrb");
 
-ACE_TCHAR const * const scpc_loadNamingService = ACE_DYNAMIC_SERVICE_DIRECTIVE(
+ACE_TCHAR const * const scpc_loadNamingService = ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE(
   "testNamingService",
   "TAO_CosNaming_Serv",
+  TAO_VERSION,
   "_make_TAO_Naming_Loader",
   ""
 );
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp
index 5fc7d89a1f8..ab00ada7dfd 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp
@@ -9,18 +9,20 @@
 
 char const * const scpc_orbId = "testDllOrb";
 
-ACE_TCHAR const * const scpc_loadOrb = ACE_DYNAMIC_SERVICE_DIRECTIVE(
+ACE_TCHAR const * const scpc_loadOrb = ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE(
   "testDllOrb",
   "bug2926",
+  TAO_VERSION
   "_make_DllORB",
   "testDllOrb -ORBDebugLevel 0 -ORBId testDllOrb -ORBDottedDecimalAddresses 1"
 );
 
 ACE_TCHAR const * const scpc_unloadOrb = ACE_REMOVE_SERVICE_DIRECTIVE("testDllOrb");
 
-ACE_TCHAR const * const scpc_loadNotifyService = ACE_DYNAMIC_SERVICE_DIRECTIVE(
+ACE_TCHAR const * const scpc_loadNotifyService = ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE(
   "testNotifyService",
   "TAO_CosNotification_Serv",
+  TAO_VERSION,
   "_make_TAO_CosNotify_Service",
   ""
 );
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp
index 7d3320078be..452fe3b43b7 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp
@@ -12,18 +12,20 @@
 
 #include "DllOrb.h"
 
-ACE_TCHAR const * const scpc_loadOrb = ACE_DYNAMIC_SERVICE_DIRECTIVE(
+ACE_TCHAR const * const scpc_loadOrb = ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE(
   "testDllOrb",
   "Bug_3252",
+  TAO_VERSION,
   "_make_DllOrb",
   "testDllOrb -ORBDebugLevel 0 -ORBId testDllOrb -NumThreads 2 -ORBDottedDecimalAddresses 1 -ORBCollocationStrategy thru_poa"
 );
 
 ACE_TCHAR const * const scpc_unloadOrb = ACE_REMOVE_SERVICE_DIRECTIVE("testDllOrb");
 
-ACE_TCHAR const * const scpc_loadNotifyService = ACE_DYNAMIC_SERVICE_DIRECTIVE(
+ACE_TCHAR const * const scpc_loadNotifyService = ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE(
   "testNotifyService",
   "TAO_CosNotification_Serv",
+  TAO_VERSION,
   "_make_TAO_CosNotify_Service",
   "-UseSeparateDispatchingORB 1"
 );
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp
index d25ac609f5a..2f5932b870c 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp
@@ -9,18 +9,20 @@
 
 char const * const scpc_orbId = "testDllOrb";
 
-ACE_TCHAR const * const scpc_loadOrb = ACE_DYNAMIC_SERVICE_DIRECTIVE(
+ACE_TCHAR const * const scpc_loadOrb = ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE(
   "testDllOrb",
   "bug3646b",
+  TAO_VERSION,
   "_make_DllORB",
   "testDllOrb -ORBDebugLevel 0 -ORBId testDllOrb -ORBDottedDecimalAddresses 1"
 );
 
 ACE_TCHAR const * const scpc_unloadOrb = ACE_REMOVE_SERVICE_DIRECTIVE("testDllOrb");
 
-ACE_TCHAR const * const scpc_loadNotifyService = ACE_DYNAMIC_SERVICE_DIRECTIVE(
+ACE_TCHAR const * const scpc_loadNotifyService = ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE(
   "testNotifyService",
   "TAO_Notify_Service",
+  TAO_VERSION,
   "_make_TAO_Notify_Service_Driver",
   "-NoNameSvc -RunThreads 0"
 );
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp
index e1f8cf2af79..faf35b8fc10 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp
@@ -12,18 +12,20 @@ char const * const scpc_orbId = "testDllOrb";
 
 const int max_length = 1000;
 
-ACE_TCHAR scpc_loadOrb[max_length] = ACE_DYNAMIC_SERVICE_DIRECTIVE(
+ACE_TCHAR scpc_loadOrb[max_length] = ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE(
   "testDllOrb",
   "bug3646c",
+  TAO_VERSION,
   "_make_DllORB",
   "testDllOrb -ORBDebugLevel 0 -ORBId testDllOrb -ORBDottedDecimalAddresses 1 -ORBInitRef NameService=iioploc://%s:%s/NameService"
 );
 
 ACE_TCHAR const * const scpc_unloadOrb = ACE_REMOVE_SERVICE_DIRECTIVE("testDllOrb");
 
-ACE_TCHAR scpc_loadNotifyService[max_length] = ACE_DYNAMIC_SERVICE_DIRECTIVE(
+ACE_TCHAR scpc_loadNotifyService[max_length] = ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE(
   "testNotifyService",
   "TAO_Notify_Service",
+  TAO_VERSION,
   "_make_TAO_Notify_Service_Driver",
   "-Channel -ChannelName Channel1 -ChannelName Channel2 -RunThreads 0 -ORBInitRef NameService=iioploc://%s:%s/NameService -IORoutput %s"
 );
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp
index 8a922af1a48..92c0813c661 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp
@@ -9,27 +9,30 @@
 
 char const * const scpc_orbId = "testDllOrb";
 
-ACE_TCHAR const * const scpc_loadOrb = ACE_DYNAMIC_SERVICE_DIRECTIVE(
+ACE_TCHAR const * const scpc_loadOrb = ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE(
   "testDllOrb",
   "bug3646d",
+  TAO_VERSION,
   "_make_DllORB",
   "testDllOrb -ORBDebugLevel 0 -ORBId testDllOrb -ORBDottedDecimalAddresses 1 -ORBInitRef NameService=file://naming.ior"
 );
 
 ACE_TCHAR const * const scpc_unloadOrb = ACE_REMOVE_SERVICE_DIRECTIVE("testDllOrb");
 
-ACE_TCHAR const * const scpc_loadNotifyService = ACE_DYNAMIC_SERVICE_DIRECTIVE(
+ACE_TCHAR const * const scpc_loadNotifyService = ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE(
   "testNotifyService",
   "TAO_Notify_Service",
+  TAO_VERSION,
   "_make_TAO_Notify_Service_Driver",
   "-Channel -ChannelName Channel1 -ChannelName Channel2 -RunThreads 10 -ORBInitRef NameService=file://naming.ior -IORoutput notify.ior"
 );
 
 ACE_TCHAR const * const scpc_unloadNotifyService = ACE_REMOVE_SERVICE_DIRECTIVE("testNotifyService");
 
-ACE_TCHAR const * const scpc_loadNameService = ACE_DYNAMIC_SERVICE_DIRECTIVE(
+ACE_TCHAR const * const scpc_loadNameService = ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE(
   "testNamingService",
   "TAO_CosNaming_Serv",
+  TAO_VERSION,
   "_make_TAO_Naming_Loader",
   "testNameService testNameService -ORBId testDllOrb -m 0 -o naming.ior"
 );
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp
index 6434be8a632..209cdb31747 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp
@@ -9,18 +9,20 @@
 
 char const * const scpc_orbId = "testDllOrb";
 
-ACE_TCHAR const * const scpc_loadOrb = ACE_DYNAMIC_SERVICE_DIRECTIVE(
+ACE_TCHAR const * const scpc_loadOrb = ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE(
   "testDllOrb",
   "bug3663",
+  TAO_VERSION,
   "_make_DllORB",
   "testDllOrb -ORBDebugLevel 0 -ORBId testDllOrb -ORBDottedDecimalAddresses 1"
 );
 
 ACE_TCHAR const * const scpc_unloadOrb = ACE_REMOVE_SERVICE_DIRECTIVE("testDllOrb");
 
-ACE_TCHAR const * const scpc_loadNotifyService = ACE_DYNAMIC_SERVICE_DIRECTIVE(
+ACE_TCHAR const * const scpc_loadNotifyService = ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE(
   "testNotifyService",
   "TAO_Notify_Service",
+  TAO_VERSION,
   "_make_TAO_Notify_Service_Driver_INCORRECT",
   "-NoNameSvc -RunThreads 0"
 );
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp
index e0e602895c2..e5bc65f9de8 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp
@@ -13,18 +13,20 @@
 
 char const * const scpc_orbId = "testDllOrb";
 
-ACE_TCHAR const * const scpc_loadOrb = ACE_DYNAMIC_SERVICE_DIRECTIVE(
+ACE_TCHAR const * const scpc_loadOrb = ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE(
   "testDllOrb",
   "bug3688",
+  TAO_VERSION,
   "_make_DllORB",
   "testDllOrb -ORBDebugLevel 0 -ORBId testDllOrb -ORBDottedDecimalAddresses 1 -ORBInitRef NameService=file://naming.ior"
 );
 
 ACE_TCHAR const * const scpc_unloadOrb = ACE_REMOVE_SERVICE_DIRECTIVE("testDllOrb");
 
-ACE_TCHAR const * const scpc_loadNameService = ACE_DYNAMIC_SERVICE_DIRECTIVE(
+ACE_TCHAR const * const scpc_loadNameService = ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE(
   "testNamingService",
   "TAO_CosNaming_Serv",
+  TAO_VERSION,
   "_make_TAO_Naming_Loader",
   "testNameService testNameService -ORBId testDllOrb -m 0 -o naming.ior"
 );
@@ -32,9 +34,10 @@ ACE_TCHAR const * const scpc_loadNameService = ACE_DYNAMIC_SERVICE_DIRECTIVE(
 ACE_TCHAR const * const scpc_unloadNameService = ACE_REMOVE_SERVICE_DIRECTIVE("testNamingService");
 
 
-ACE_TCHAR const * const scpc_loadNotifyService = ACE_DYNAMIC_SERVICE_DIRECTIVE(
+ACE_TCHAR const * const scpc_loadNotifyService = ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE(
   "testNotifyService",
   "TAO_Notify_Service",
+  TAO_VERSION,
   "_make_TAO_Notify_Service_Driver",
   "-Channel -ChannelName Channel1 -ChannelName Channel2 -RunThreads 1 -ORBInitRef NameService=file://naming.ior -IORoutput notify.ior"
 );
diff --git a/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp b/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp
index bd92317f7ed..142da69b110 100644
--- a/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp
+++ b/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp
@@ -8,9 +8,10 @@
 #include "tao/debug.h"
 
 static const ACE_TCHAR csd_poa_factory_directive[] =
-  ACE_DYNAMIC_SERVICE_DIRECTIVE(
+  ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE(
     "TAO_CSD_Object_Adapter_Factory",
     "TAO_CSD_Framework",
+    TAO_VERSION,
     "_make_TAO_CSD_Object_Adapter_Factory",
     "");
 
diff --git a/TAO/tao/Codeset/Codeset_Manager_i.cpp b/TAO/tao/Codeset/Codeset_Manager_i.cpp
index a7be918442f..1264a62973e 100644
--- a/TAO/tao/Codeset/Codeset_Manager_i.cpp
+++ b/TAO/tao/Codeset/Codeset_Manager_i.cpp
@@ -352,8 +352,9 @@ TAO_Codeset_Manager_i::open(TAO_ORB_Core& core)
     instance ("UTF8_Latin1_Factory");
   if (fact == 0)
     ACE_Service_Config::process_directive
-      (ACE_DYNAMIC_SERVICE_DIRECTIVE ("UTF8_Latin1_Factory",
+      (ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE ("UTF8_Latin1_Factory",
                                       "TAO_Codeset",
+                                      TAO_VERSION,
                                       "_make_TAO_UTF8_Latin1_Factory",
                                       ""));
   else
@@ -369,8 +370,9 @@ TAO_Codeset_Manager_i::open(TAO_ORB_Core& core)
     instance ("UTF16_BOM_Factory");
   if (fact == 0)
     ACE_Service_Config::process_directive
-      (ACE_DYNAMIC_SERVICE_DIRECTIVE ("UTF16_BOM_Factory",
+      (ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE ("UTF16_BOM_Factory",
                                       "TAO_Codeset",
+                                      TAO_VERSION,
                                       "_make_TAO_UTF16_BOM_Factory",
                                       ""));
   else
diff --git a/TAO/tao/ORBInitializer_Registry.cpp b/TAO/tao/ORBInitializer_Registry.cpp
index de84e437005..0ec90d435f8 100644
--- a/TAO/tao/ORBInitializer_Registry.cpp
+++ b/TAO/tao/ORBInitializer_Registry.cpp
@@ -47,8 +47,9 @@ namespace PortableInterceptor
     if (orbinitializer_registry_ == 0)
       {
         ACE_Service_Config::process_directive (
-          ACE_DYNAMIC_SERVICE_DIRECTIVE("ORBInitializer_Registry",
+          ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("ORBInitializer_Registry",
                                         "TAO_PI",
+                                        TAO_VERSION,
                                         "_make_ORBInitializer_Registry",
                                         ""));
         orbinitializer_registry_ =
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index 4780828ac48..6fa0711bba6 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -1666,8 +1666,9 @@ TAO_ORB_Core::policy_factory_registry_i (void)
   if (loader == 0)
     {
       this->configuration ()->process_directive (
-        ACE_DYNAMIC_SERVICE_DIRECTIVE("PolicyFactory_Loader",
+        ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("PolicyFactory_Loader",
                                       "TAO_PI",
+                                      TAO_VERSION,
                                       "_make_TAO_PolicyFactory_Loader",
                                       ""));
       loader =
@@ -1718,8 +1719,9 @@ TAO_ORB_Core::orbinitializer_registry_i (void)
   if (this->orbinitializer_registry_ == 0)
     {
       this->configuration ()->process_directive (
-        ACE_DYNAMIC_SERVICE_DIRECTIVE ("ORBInitializer_Registry",
+        ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE ("ORBInitializer_Registry",
                                        "TAO_PI",
+                                       TAO_VERSION,
                                        "_make_ORBInitializer_Registry",
                                        ""));
       this->orbinitializer_registry_ =
@@ -2473,8 +2475,9 @@ TAO_ORB_Core::resolve_typecodefactory_i (void)
   if (loader == 0)
     {
       this->configuration ()->process_directive
-        (ACE_DYNAMIC_SERVICE_DIRECTIVE("TypeCodeFactory",
+        (ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("TypeCodeFactory",
                                        "TAO_TypeCodeFactory",
+                                       TAO_VERSION,
                                        "_make_TAO_TypeCodeFactory_Loader",
                                        ""));
       loader =
@@ -2506,8 +2509,9 @@ TAO_ORB_Core::resolve_codecfactory_i (void)
   if (loader == 0)
     {
       this->configuration()->process_directive
-        (ACE_DYNAMIC_SERVICE_DIRECTIVE("CodecFactory",
+        (ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("CodecFactory",
                                        "TAO_CodecFactory",
+                                       TAO_VERSION,
                                        "_make_TAO_CodecFactory_Loader",
                                        ""));
       loader =
@@ -2533,8 +2537,9 @@ TAO_ORB_Core::resolve_compression_manager_i (void)
   if (loader == 0)
     {
       this->configuration()->process_directive
-        (ACE_DYNAMIC_SERVICE_DIRECTIVE("Compression",
+        (ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("Compression",
                                        "TAO_Compression",
+                                       TAO_VERSION,
                                        "_make_TAO_Compression_Loader",
                                        ""));
       loader =
@@ -2559,8 +2564,9 @@ TAO_ORB_Core::resolve_poa_current_i (void)
   if (loader == 0)
     {
       this->configuration()->process_directive
-        (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_POA_Current_Factory",
+        (ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("TAO_POA_Current_Factory",
                                        "TAO_PortableServer",
+                                       TAO_VERSION,
                                        "_make_TAO_POA_Current_Factory",
                                        ""));
       loader =
@@ -2588,8 +2594,9 @@ TAO_ORB_Core::resolve_picurrent_i (void)
   if (loader == 0)
     {
       this->configuration ()->process_directive
-        (ACE_DYNAMIC_SERVICE_DIRECTIVE("PICurrent_Loader",
+        (ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("PICurrent_Loader",
                                        "TAO_PI",
+                                       TAO_VERSION,
                                        "_make_TAO_PICurrent_Loader",
                                        ""));
       loader =
@@ -2619,8 +2626,9 @@ TAO_ORB_Core::resolve_dynanyfactory_i (void)
   if (loader == 0)
     {
       this->configuration ()->process_directive
-        (ACE_DYNAMIC_SERVICE_DIRECTIVE("DynamicAny_Loader",
+        (ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("DynamicAny_Loader",
                                        "TAO_DynamicAny",
+                                       TAO_VERSION,
                                        "_make_TAO_DynamicAny_Loader",
                                        ""));
       loader =
@@ -2646,8 +2654,9 @@ TAO_ORB_Core::resolve_iormanipulation_i (void)
   if (loader == 0)
     {
       this->configuration()->process_directive
-        (ACE_DYNAMIC_SERVICE_DIRECTIVE("IORManip_Loader",
+        (ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("IORManip_Loader",
                                        "TAO_IORManip",
+                                       TAO_VERSION,
                                        "_make_TAO_IORManip_Loader",
                                        ""));
       loader =
@@ -2672,8 +2681,9 @@ TAO_ORB_Core::resolve_ior_table_i (void)
   if (factory == 0)
     {
       this->configuration ()->process_directive
-        (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_IORTable",
+        (ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("TAO_IORTable",
                                        "TAO_IORTable",
+                                       TAO_VERSION,
                                        "_make_TAO_Table_Adapter_Factory",
                                        ""));
       factory =
@@ -2707,8 +2717,9 @@ TAO_ORB_Core::resolve_monitor_i (void)
   if (loader == 0)
     {
       this->configuration ()->process_directive
-        (ACE_DYNAMIC_SERVICE_DIRECTIVE("Monitor_Init",
+        (ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("Monitor_Init",
                                        "TAO_Monitor",
+                                       TAO_VERSION,
                                        "_make_TAO_Monitor_Init",
                                        ""));
       loader =
diff --git a/TAO/tao/PI/ORBInitInfo.cpp b/TAO/tao/PI/ORBInitInfo.cpp
index cb1f7e5b9da..18e844abf28 100644
--- a/TAO/tao/PI/ORBInitInfo.cpp
+++ b/TAO/tao/PI/ORBInitInfo.cpp
@@ -116,8 +116,9 @@ TAO_ORBInitInfo::codec_factory (void)
       if (loader == 0)
         {
           ACE_Service_Config::process_directive (
-            ACE_DYNAMIC_SERVICE_DIRECTIVE("CodecFactory",
+            ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("CodecFactory",
                                           "TAO_CodecFactory",
+                                          TAO_VERSION,
                                           "_make_TAO_CodecFactory_Loader",
                                           ""));
           loader =
diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
index 7d8eb1d7cb2..093c7c5ef9e 100644
--- a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
@@ -78,8 +78,8 @@ namespace TAO
           if (adapter == 0)
             {
               ACE_Service_Config::process_directive (
-                ACE_DYNAMIC_SERVICE_DIRECTIVE(
-                  "ImR_Client_Adapter", "TAO_ImR_Client",
+                ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE(
+                  "ImR_Client_Adapter", "TAO_ImR_Client", TAO_VERSION,
                   "_make_ImR_Client_Adapter_Impl", ""));
 
               adapter =
diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
index 0fb917121dc..7e406b772f1 100644
--- a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
+++ b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
@@ -36,9 +36,10 @@
 
 static const char rt_poa_factory_name[] = "TAO_RT_Object_Adapter_Factory";
 static const ACE_TCHAR rt_poa_factory_directive[] =
-  ACE_DYNAMIC_SERVICE_DIRECTIVE(
+  ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE(
     "TAO_RT_Object_Adapter_Factory",
     "TAO_RTPortableServer",
+    TAO_VERSION,
     "_make_TAO_RT_Object_Adapter_Factory",
     "");
 
diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp
index 3940142bbfa..aeb47f3d6c8 100644
--- a/TAO/tao/TAO_Internal.cpp
+++ b/TAO/tao/TAO_Internal.cpp
@@ -607,9 +607,10 @@ namespace
               ACE_REMOVE_SERVICE_DIRECTIVE ("TAO_Codeset"));
 
             ACE_Service_Config::process_directive (
-              ACE_DYNAMIC_SERVICE_DIRECTIVE (
+              ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE (
                 "TAO_Codeset",
                 "TAO_Codeset",
+                TAO_VERSION,
                 "_make_TAO_Codeset_Manager_Factory",
                 ""));
 
diff --git a/TAO/tao/params.cpp b/TAO/tao/params.cpp
index 32a1df4b65b..7adbe9e5cff 100644
--- a/TAO/tao/params.cpp
+++ b/TAO/tao/params.cpp
@@ -2,6 +2,7 @@
 
 #include "tao/params.h"
 #include "tao/orbconf.h"
+#include "tao/Version.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/params.inl"
@@ -58,8 +59,9 @@ TAO_ORB_Parameters::TAO_ORB_Parameters (void)
   , thread_lane_resources_manager_factory_name_ ("Default_Thread_Lane_Resources_Manager_Factory")
   , poa_factory_name_ ("TAO_Object_Adapter_Factory")
   , poa_factory_directive_
-      (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_Object_Adapter_Factory",
+      (ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("TAO_Object_Adapter_Factory",
                                      "TAO_PortableServer",
+                                     TAO_VERSION,
                                      "_make_TAO_Object_Adapter_Factory",
                                      ""))
   , forward_invocation_on_object_not_exist_ (false)
diff --git a/TAO/tests/Bug_2677_Regression/server.cpp b/TAO/tests/Bug_2677_Regression/server.cpp
index b2554023954..943d1da62c4 100644
--- a/TAO/tests/Bug_2677_Regression/server.cpp
+++ b/TAO/tests/Bug_2677_Regression/server.cpp
@@ -7,8 +7,9 @@ int
 ACE_TMAIN(int, ACE_TCHAR *[])
 {
   ACE_TCHAR const * const scpc_loadOrb =
-    ACE_DYNAMIC_SERVICE_DIRECTIVE ("testDllORB",
+    ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE ("testDllORB",
                                    "Bug_2677_Regression",
+                                   TAO_VERSION,
                                    "_make_DllORB",
                                    "testDllORB -ORBId testORB");
 
diff --git a/TAO/tests/Bug_2936_Regression/bug2936.cpp b/TAO/tests/Bug_2936_Regression/bug2936.cpp
index bd982c6a498..26a264e2ba0 100644
--- a/TAO/tests/Bug_2936_Regression/bug2936.cpp
+++ b/TAO/tests/Bug_2936_Regression/bug2936.cpp
@@ -6,9 +6,10 @@
 
 char const * const scpc_orbId = "testDllOrb";
 
-ACE_TCHAR const * const scpc_loadOrb = ACE_DYNAMIC_SERVICE_DIRECTIVE(
+ACE_TCHAR const * const scpc_loadOrb = ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE(
   "testDllOrb",
   "bug2936",
+  TAO_VERSION,
   "_make_DllORB",
   "testDllOrb -ORBDebugLevel 0 -ORBId testDllOrb -ORBDottedDecimalAddresses 1"
 );
@@ -16,9 +17,10 @@ ACE_TCHAR const * const scpc_loadOrb = ACE_DYNAMIC_SERVICE_DIRECTIVE(
 ACE_TCHAR const * const scpc_unloadOrb = ACE_REMOVE_SERVICE_DIRECTIVE("testDllOrb");
 
 
-ACE_TCHAR const * const scpc_loadPersistentPoa = ACE_DYNAMIC_SERVICE_DIRECTIVE(
+ACE_TCHAR const * const scpc_loadPersistentPoa = ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE(
   "testPersistentPoa",
   "bug2936",
+  TAO_VERSION,
   "_make_PersistentPoa",
   "testPersistentPoa testDllOrb"
 );
diff --git a/TAO/tests/Bug_3542_Regression/server.cpp b/TAO/tests/Bug_3542_Regression/server.cpp
index 88ec7288fe0..c2c302e0dd0 100644
--- a/TAO/tests/Bug_3542_Regression/server.cpp
+++ b/TAO/tests/Bug_3542_Regression/server.cpp
@@ -6,9 +6,10 @@
 #include "ace/Service_Config.h"
 #include "ace/Log_Msg.h"
 
-ACE_TCHAR const * const scpc_loadOrb = ACE_DYNAMIC_SERVICE_DIRECTIVE(
+ACE_TCHAR const * const scpc_loadOrb = ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE(
   "testDllOrb",
   "Bug_3542",
+  TAO_VERSION,
   "_make_DllOrb",
   "testDllOrb -ORBDebugLevel 0 -ORBId testDllOrb -NumThreads 2 -ORBDottedDecimalAddresses 1 -ORBCollocationStrategy thru_poa"
 );
diff --git a/TAO/tests/DLL_ORB/client.cpp b/TAO/tests/DLL_ORB/client.cpp
index 590432ba7eb..6ea2ac1955b 100644
--- a/TAO/tests/DLL_ORB/client.cpp
+++ b/TAO/tests/DLL_ORB/client.cpp
@@ -28,9 +28,10 @@ ACE_TMAIN(int, ACE_TCHAR *[])
   // In the process of doing this, the Test method provided by target
   // CORBA object will be invoked.
   if (ACE_Service_Config::process_directive (
-        ACE_DYNAMIC_SERVICE_DIRECTIVE(
+        ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE(
           "Client_Module",
           "Test_Client_Module",
+          TAO_VERSION,
           "_make_Test_Client_Module",
           "-k file://test.ior")) != 0)
     {
diff --git a/TAO/tests/DLL_ORB/server.cpp b/TAO/tests/DLL_ORB/server.cpp
index 268e1b0d546..522c8f59826 100644
--- a/TAO/tests/DLL_ORB/server.cpp
+++ b/TAO/tests/DLL_ORB/server.cpp
@@ -28,8 +28,8 @@ ACE_TMAIN(int, ACE_TCHAR *[])
   // In the process of doing this, the Test CORBA object will be
   // activated, and the ORB will be run.
   if (ACE_Service_Config::process_directive (
-        ACE_DYNAMIC_SERVICE_DIRECTIVE("Server_Module",
-          "Test_Server_Module", "_make_Test_Server_Module", "")) != 0)
+        ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("Server_Module",
+          "Test_Server_Module", TAO_VERSION, "_make_Test_Server_Module", "")) != 0)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "%p\n",
diff --git a/TAO/tests/ORB_Local_Config/Bug_2612/Test.cpp b/TAO/tests/ORB_Local_Config/Bug_2612/Test.cpp
index 33fcae3e2a7..2787fec934f 100644
--- a/TAO/tests/ORB_Local_Config/Bug_2612/Test.cpp
+++ b/TAO/tests/ORB_Local_Config/Bug_2612/Test.cpp
@@ -12,8 +12,9 @@
 ACE_TCHAR const * const scpc_loadOrb = // NOTE due to the way ACE_DYNAMIC_SERVICE_DIRECTIVE() macro is defined,
   // each parameter CANNOT be split into multiple quoted strings "line1" "nextline" with the expectation that
   // they will be join together. Hence the long parameter 4.
-  ACE_DYNAMIC_SERVICE_DIRECTIVE ("testDllOrb",
+  ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE ("testDllOrb",
                                  "DllOrb",
+                                 TAO_VERSION,
                                  "_make_DllOrb",
 "DllOrb -t 1 -ORBGestalt Local -ORBDebugLevel 3 -ORBId testORB -ORBInitRef NameService=file:///tmp/test-ns.ior -ORBDottedDecimalAddresses 1"
                                  );
diff --git a/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp b/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp
index b8e310f35f2..338701e06fa 100644
--- a/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp
+++ b/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp
@@ -152,8 +152,9 @@ testORBInitializer_Registry (int , ACE_TCHAR *[])
   if (oir == 0)
     {
       one->process_directive (
-        ACE_DYNAMIC_SERVICE_DIRECTIVE("ORBInitializer_Registry",
+        ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("ORBInitializer_Registry",
                                       "TAO_PI",
+                                      TAO_VERSION,
                                       "_make_ORBInitializer_Registry",
                                       ""));
       oir =
@@ -251,8 +252,9 @@ testORBInitializer_Registry (int , ACE_TCHAR *[])
               " (although ORBInitializer_Registry already did it) ...\n"));
 
   one->process_directive
-    (ACE_DYNAMIC_SERVICE_DIRECTIVE("PolicyFactory_Loader",
+    (ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("PolicyFactory_Loader",
                                    "TAO_PI",
+                                   TAO_VERSION,
                                    "_make_TAO_PolicyFactory_Loader",
                                    ""));
 
@@ -291,8 +293,9 @@ testServiceDependency (int , ACE_TCHAR *[])
     ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt_Test> one (new ACE_Service_Gestalt_Test (10));
 
     int result = one->process_directive
-      (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_Codeset",
+      (ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("TAO_Codeset",
                                      "TAO_Codeset",
+                                     TAO_VERSION,
                                      "_make_TAO_Codeset_Manager_Factory",
                                      ""));
     if (result != 0)
diff --git a/TAO/tests/TransportCurrent/Framework/simple.cpp b/TAO/tests/TransportCurrent/Framework/simple.cpp
index 0b5d3a458b2..4a121500240 100644
--- a/TAO/tests/TransportCurrent/Framework/simple.cpp
+++ b/TAO/tests/TransportCurrent/Framework/simple.cpp
@@ -55,8 +55,9 @@ testCurrentLoader (int, char *[])
 
 #if !defined (TAO_AS_STATIC_LIBS)
           int ret = ACE_Service_Config::process_directive
-            (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_Transport_Current_Loader",
+            (ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("TAO_Transport_Current_Loader",
                                            "TAO_Transport_Current",
+                                           TAO_VERSION
                                            "_make_TAO_Transport_Current_Loader",
                                            ""));
           ACE_ASSERT (ret == 0);