diff options
Diffstat (limited to 'ACE/debian/patches/34-bts386713.dpatch')
| -rw-r--r-- | ACE/debian/patches/34-bts386713.dpatch | 406 |
1 files changed, 406 insertions, 0 deletions
diff --git a/ACE/debian/patches/34-bts386713.dpatch b/ACE/debian/patches/34-bts386713.dpatch new file mode 100644 index 00000000000..8f3aca63c55 --- /dev/null +++ b/ACE/debian/patches/34-bts386713.dpatch @@ -0,0 +1,406 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 34-bts386713.dpatch by Pau Garcia i Quiles <pgquiles@elpauer.org> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: load libraries with their complete name + +@DPATCH@ +diff -rupd ACE_wrappers.orig/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp ACE_wrappers/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp +--- ACE_wrappers.orig/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp 2009-12-14 00:42:05.534162607 +0100 ++++ ACE_wrappers/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp 2009-12-14 00:59:12.215257079 +0100 +@@ -14,7 +14,7 @@ ACE_RCSID (PortableGroup, + + 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", ""); ++ "TAO_GOA", "libTAO_PortableGroup-1.7.7.so", "_make_TAO_PG_Object_Adapter_Factory", ""); + + TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +diff -rupd ACE_wrappers.orig/TAO/orbsvcs/tests/Bug_3486_Regression/server.cpp ACE_wrappers/TAO/orbsvcs/tests/Bug_3486_Regression/server.cpp +--- ACE_wrappers.orig/TAO/orbsvcs/tests/Bug_3486_Regression/server.cpp 2009-12-14 00:42:06.382162746 +0100 ++++ ACE_wrappers/TAO/orbsvcs/tests/Bug_3486_Regression/server.cpp 2009-12-14 00:59:12.215257079 +0100 +@@ -18,7 +18,7 @@ ACE_TCHAR const * const scpc_unloadOrb = + + ACE_TCHAR const * const scpc_loadNamingService = ACE_DYNAMIC_SERVICE_DIRECTIVE( + "testNamingService", +- "TAO_CosNaming_Serv", ++ "libTAO_CosNaming_Serv-1.7.7.so", + "_make_TAO_Naming_Loader", + "" + ); +diff -rupd ACE_wrappers.orig/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp ACE_wrappers/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp +--- ACE_wrappers.orig/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp 2009-12-14 00:42:06.030162565 +0100 ++++ ACE_wrappers/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp 2009-12-14 00:59:12.215257079 +0100 +@@ -20,7 +20,7 @@ ACE_TCHAR const * const scpc_unloadOrb = + + ACE_TCHAR const * const scpc_loadNotifyService = ACE_DYNAMIC_SERVICE_DIRECTIVE( + "testNotifyService", +- "TAO_CosNotification_Serv", ++ "libTAO_CosNotification_Serv-1.7.7.so", + "_make_TAO_CosNotify_Service", + "" + ); +diff -rupd ACE_wrappers.orig/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp ACE_wrappers/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp +--- ACE_wrappers.orig/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp 2009-12-14 00:42:06.026162764 +0100 ++++ ACE_wrappers/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp 2009-12-14 00:59:12.215257079 +0100 +@@ -24,7 +24,7 @@ ACE_TCHAR const * const scpc_unloadOrb = + + ACE_TCHAR const * const scpc_loadNotifyService = ACE_DYNAMIC_SERVICE_DIRECTIVE( + "testNotifyService", +- "TAO_CosNotification_Serv", ++ "libTAO_CosNotification_Serv-1.7.7.so", + "_make_TAO_CosNotify_Service", + "-UseSeparateDispatchingORB 1" + ); +diff -rupd ACE_wrappers.orig/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp ACE_wrappers/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp +--- ACE_wrappers.orig/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp 2009-12-14 00:42:06.018162604 +0100 ++++ ACE_wrappers/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp 2009-12-14 00:59:12.219164079 +0100 +@@ -20,7 +20,7 @@ ACE_TCHAR const * const scpc_unloadOrb = + + ACE_TCHAR const * const scpc_loadNotifyService = ACE_DYNAMIC_SERVICE_DIRECTIVE( + "testNotifyService", +- "TAO_Notify_Service", ++ "libTAO_Notify_Service-1.7.7.so", + "_make_TAO_Notify_Service_Driver", + "-NoNameSvc -RunThreads 0" + ); +diff -rupd ACE_wrappers.orig/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp ACE_wrappers/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp +--- ACE_wrappers.orig/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp 2009-12-14 00:42:06.046162766 +0100 ++++ ACE_wrappers/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp 2009-12-14 00:59:12.219164079 +0100 +@@ -23,7 +23,7 @@ ACE_TCHAR const * const scpc_unloadOrb = + + ACE_TCHAR scpc_loadNotifyService[max_length] = ACE_DYNAMIC_SERVICE_DIRECTIVE( + "testNotifyService", +- "TAO_Notify_Service", ++ "libTAO_Notify_Service-1.7.7.so", + "_make_TAO_Notify_Service_Driver", + "-Channel -ChannelName Channel1 -ChannelName Channel2 -RunThreads 0 -ORBInitRef NameService=iioploc://%s:%s/NameService -IORoutput %s" + ); +diff -rupd ACE_wrappers.orig/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp ACE_wrappers/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp +--- ACE_wrappers.orig/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp 2009-12-14 00:42:06.074162491 +0100 ++++ ACE_wrappers/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp 2009-12-14 00:59:12.219164079 +0100 +@@ -20,7 +20,7 @@ ACE_TCHAR const * const scpc_unloadOrb = + + ACE_TCHAR const * const scpc_loadNotifyService = ACE_DYNAMIC_SERVICE_DIRECTIVE( + "testNotifyService", +- "TAO_Notify_Service", ++ "libTAO_Notify_Service-1.7.7.so", + "_make_TAO_Notify_Service_Driver", + "-Channel -ChannelName Channel1 -ChannelName Channel2 -RunThreads 10 -ORBInitRef NameService=file://naming.ior -IORoutput notify.ior" + ); +@@ -29,7 +29,7 @@ ACE_TCHAR const * const scpc_unloadNotif + + ACE_TCHAR const * const scpc_loadNameService = ACE_DYNAMIC_SERVICE_DIRECTIVE( + "testNamingService", +- "TAO_CosNaming_Serv", ++ "libTAO_CosNaming_Serv-1.7.7.so", + "_make_TAO_Naming_Loader", + "testNameService testNameService -ORBId testDllOrb -m 0 -o naming.ior" + ); +diff -rupd ACE_wrappers.orig/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp ACE_wrappers/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp +--- ACE_wrappers.orig/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp 2009-12-14 00:42:06.038162926 +0100 ++++ ACE_wrappers/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp 2009-12-14 00:59:12.219164079 +0100 +@@ -20,7 +20,7 @@ ACE_TCHAR const * const scpc_unloadOrb = + + ACE_TCHAR const * const scpc_loadNotifyService = ACE_DYNAMIC_SERVICE_DIRECTIVE( + "testNotifyService", +- "TAO_Notify_Service", ++ "libTAO_Notify_Service-1.7.7.so", + "_make_TAO_Notify_Service_Driver_INCORRECT", + "-NoNameSvc -RunThreads 0" + ); +diff -rupd ACE_wrappers.orig/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp ACE_wrappers/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp +--- ACE_wrappers.orig/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp 2009-12-14 00:42:06.062163609 +0100 ++++ ACE_wrappers/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp 2009-12-14 00:59:12.219164079 +0100 +@@ -24,7 +24,7 @@ ACE_TCHAR const * const scpc_unloadOrb = + + ACE_TCHAR const * const scpc_loadNameService = ACE_DYNAMIC_SERVICE_DIRECTIVE( + "testNamingService", +- "TAO_CosNaming_Serv", ++ "libTAO_CosNaming_Serv-1.7.7.so", + "_make_TAO_Naming_Loader", + "testNameService testNameService -ORBId testDllOrb -m 0 -o naming.ior" + ); +@@ -34,7 +34,7 @@ ACE_TCHAR const * const scpc_unloadNameS + + ACE_TCHAR const * const scpc_loadNotifyService = ACE_DYNAMIC_SERVICE_DIRECTIVE( + "testNotifyService", +- "TAO_Notify_Service", ++ "libTAO_Notify_Service-1.7.7.so", + "_make_TAO_Notify_Service_Driver", + "-Channel -ChannelName Channel1 -ChannelName Channel2 -RunThreads 1 -ORBInitRef NameService=file://naming.ior -IORoutput notify.ior" + ); +diff -rupd ACE_wrappers.orig/TAO/tao/Codeset/Codeset_Manager_i.cpp ACE_wrappers/TAO/tao/Codeset/Codeset_Manager_i.cpp +--- ACE_wrappers.orig/TAO/tao/Codeset/Codeset_Manager_i.cpp 2009-12-14 00:42:09.538164079 +0100 ++++ ACE_wrappers/TAO/tao/Codeset/Codeset_Manager_i.cpp 2009-12-14 00:59:12.219164079 +0100 +@@ -358,7 +358,7 @@ TAO_Codeset_Manager_i::open(TAO_ORB_Core + if (fact == 0) + ACE_Service_Config::process_directive + (ACE_DYNAMIC_SERVICE_DIRECTIVE ("UTF8_Latin1_Factory", +- "TAO_Codeset", ++ "libTAO_Codeset-1.7.7.so", + "_make_TAO_UTF8_Latin1_Factory", + "")); + else +@@ -375,7 +375,7 @@ TAO_Codeset_Manager_i::open(TAO_ORB_Core + if (fact == 0) + ACE_Service_Config::process_directive + (ACE_DYNAMIC_SERVICE_DIRECTIVE ("UTF16_BOM_Factory", +- "TAO_Codeset", ++ "libTAO_Codeset-1.7.7.so", + "_make_TAO_UTF16_BOM_Factory", + "")); + else +diff -rupd ACE_wrappers.orig/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp ACE_wrappers/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp +--- ACE_wrappers.orig/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp 2009-12-14 00:42:09.426163271 +0100 ++++ ACE_wrappers/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp 2009-12-14 00:59:12.219164079 +0100 +@@ -13,7 +13,7 @@ ACE_RCSID (CSD, + static const ACE_TCHAR csd_poa_factory_directive[] = + ACE_DYNAMIC_SERVICE_DIRECTIVE( + "TAO_CSD_Object_Adapter_Factory", +- "TAO_CSD_Framework", ++ "libTAO_CSD_Framework-1.7.7.so", + "_make_TAO_CSD_Object_Adapter_Factory", + ""); + +diff -rupd ACE_wrappers.orig/TAO/tao/ORB_Core.cpp ACE_wrappers/TAO/tao/ORB_Core.cpp +--- ACE_wrappers.orig/TAO/tao/ORB_Core.cpp 2009-12-14 00:42:09.538164079 +0100 ++++ ACE_wrappers/TAO/tao/ORB_Core.cpp 2009-12-14 00:59:12.219164079 +0100 +@@ -1643,7 +1643,7 @@ TAO_ORB_Core::policy_factory_registry_i + { + this->configuration ()->process_directive ( + ACE_DYNAMIC_SERVICE_DIRECTIVE("PolicyFactory_Loader", +- "TAO_PI", ++ "libTAO_PI-1.7.7.so", + "_make_TAO_PolicyFactory_Loader", + "")); + loader = +@@ -1695,7 +1695,7 @@ TAO_ORB_Core::orbinitializer_registry_i + { + this->configuration ()->process_directive ( + ACE_DYNAMIC_SERVICE_DIRECTIVE ("ORBInitializer_Registry", +- "TAO_PI", ++ "libTAO_PI-1.7.7.so", + "_make_ORBInitializer_Registry", + "")); + this->orbinitializer_registry_ = +@@ -2429,7 +2429,7 @@ TAO_ORB_Core::resolve_typecodefactory_i + { + this->configuration ()->process_directive + (ACE_DYNAMIC_SERVICE_DIRECTIVE("TypeCodeFactory", +- "TAO_TypeCodeFactory", ++ "libTAO_TypeCodeFactory-1.7.7.so", + "_make_TAO_TypeCodeFactory_Loader", + "")); + loader = +@@ -2462,7 +2462,7 @@ TAO_ORB_Core::resolve_codecfactory_i (vo + { + this->configuration()->process_directive + (ACE_DYNAMIC_SERVICE_DIRECTIVE("CodecFactory", +- "TAO_CodecFactory", ++ "libTAO_CodecFactory-1.7.7.so", + "_make_TAO_CodecFactory_Loader", + "")); + loader = +@@ -2489,7 +2489,7 @@ TAO_ORB_Core::resolve_compression_manage + { + this->configuration()->process_directive + (ACE_DYNAMIC_SERVICE_DIRECTIVE("Compression", +- "TAO_Compression", ++ "libTAO_Compression-1.7.7.so", + "_make_TAO_Compression_Loader", + "")); + loader = +@@ -2515,7 +2515,7 @@ TAO_ORB_Core::resolve_poa_current_i (voi + { + this->configuration()->process_directive + (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_POA_Current_Factory", +- "TAO_PortableServer", ++ "libTAO_PortableServer-1.7.7.so", + "_make_TAO_POA_Current_Factory", + "")); + loader = +@@ -2544,7 +2544,7 @@ TAO_ORB_Core::resolve_picurrent_i (void) + { + this->configuration ()->process_directive + (ACE_DYNAMIC_SERVICE_DIRECTIVE("PICurrent_Loader", +- "TAO_PI", ++ "libTAO_PI-1.7.7.so", + "_make_TAO_PICurrent_Loader", + "")); + loader = +@@ -2575,7 +2575,7 @@ TAO_ORB_Core::resolve_dynanyfactory_i (v + { + this->configuration ()->process_directive + (ACE_DYNAMIC_SERVICE_DIRECTIVE("DynamicAny_Loader", +- "TAO_DynamicAny", ++ "libTAO_DynamicAny-1.7.7.so", + "_make_TAO_DynamicAny_Loader", + "")); + loader = +@@ -2602,7 +2602,7 @@ TAO_ORB_Core::resolve_iormanipulation_i + { + this->configuration()->process_directive + (ACE_DYNAMIC_SERVICE_DIRECTIVE("IORManip_Loader", +- "TAO_IORManip", ++ "libTAO_IORManip-1.7.7.so", + "_make_TAO_IORManip_Loader", + "")); + loader = +@@ -2628,7 +2628,7 @@ TAO_ORB_Core::resolve_ior_table_i (void) + { + this->configuration ()->process_directive + (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_IORTable", +- "TAO_IORTable", ++ "libTAO_IORTable-1.7.7.so", + "_make_TAO_Table_Adapter_Factory", + "")); + factory = +@@ -2663,7 +2663,7 @@ TAO_ORB_Core::resolve_monitor_i (void) + { + this->configuration ()->process_directive + (ACE_DYNAMIC_SERVICE_DIRECTIVE("Monitor_Init", +- "TAO_Monitor", ++ "libTAO_Monitor-1.7.7.so", + "_make_TAO_Monitor_Init", + "")); + loader = +diff -rupd ACE_wrappers.orig/TAO/tao/ORBInitializer_Registry.cpp ACE_wrappers/TAO/tao/ORBInitializer_Registry.cpp +--- ACE_wrappers.orig/TAO/tao/ORBInitializer_Registry.cpp 2009-12-14 00:42:09.662163328 +0100 ++++ ACE_wrappers/TAO/tao/ORBInitializer_Registry.cpp 2009-12-14 00:59:12.219164079 +0100 +@@ -53,7 +53,7 @@ namespace PortableInterceptor + { + ACE_Service_Config::process_directive ( + ACE_DYNAMIC_SERVICE_DIRECTIVE("ORBInitializer_Registry", +- "TAO_PI", ++ "libTAO_PI-1.7.7.so", + "_make_ORBInitializer_Registry", + "")); + orbinitializer_registry_ = +diff -rupd ACE_wrappers.orig/TAO/tao/params.cpp ACE_wrappers/TAO/tao/params.cpp +--- ACE_wrappers.orig/TAO/tao/params.cpp 2009-12-14 00:42:09.170163692 +0100 ++++ ACE_wrappers/TAO/tao/params.cpp 2009-12-14 00:59:12.259162724 +0100 +@@ -59,7 +59,7 @@ TAO_ORB_Parameters::TAO_ORB_Parameters ( + , poa_factory_name_ ("TAO_Object_Adapter_Factory") + , poa_factory_directive_ + (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_Object_Adapter_Factory", +- "TAO_PortableServer", ++ "libTAO_PortableServer-1.7.7.so", + "_make_TAO_Object_Adapter_Factory", + "")) + , forward_invocation_on_object_not_exist_ (false) +diff -rupd ACE_wrappers.orig/TAO/tao/PI/ORBInitInfo.cpp ACE_wrappers/TAO/tao/PI/ORBInitInfo.cpp +--- ACE_wrappers.orig/TAO/tao/PI/ORBInitInfo.cpp 2009-12-14 00:42:09.534163639 +0100 ++++ ACE_wrappers/TAO/tao/PI/ORBInitInfo.cpp 2009-12-14 00:59:12.223163120 +0100 +@@ -121,7 +121,7 @@ TAO_ORBInitInfo::codec_factory (void) + { + ACE_Service_Config::process_directive ( + ACE_DYNAMIC_SERVICE_DIRECTIVE("CodecFactory", +- "TAO_CodecFactory", ++ "libTAO_CodecFactory-1.7.7.so", + "_make_TAO_CodecFactory_Loader", + "")); + loader = +diff -rupd ACE_wrappers.orig/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp ACE_wrappers/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp +--- ACE_wrappers.orig/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp 2009-12-14 00:42:09.422163150 +0100 ++++ ACE_wrappers/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp 2009-12-14 00:59:12.223163120 +0100 +@@ -83,7 +83,7 @@ namespace TAO + { + ACE_Service_Config::process_directive ( + ACE_DYNAMIC_SERVICE_DIRECTIVE( +- "ImR_Client_Adapter", "TAO_ImR_Client", ++ "ImR_Client_Adapter", "libTAO_ImR_Client-1.7.7.so", + "_make_ImR_Client_Adapter_Impl", "")); + + adapter = +diff -rupd ACE_wrappers.orig/TAO/tao/RTCORBA/RT_ORBInitializer.cpp ACE_wrappers/TAO/tao/RTCORBA/RT_ORBInitializer.cpp +--- ACE_wrappers.orig/TAO/tao/RTCORBA/RT_ORBInitializer.cpp 2009-12-14 00:42:09.774162647 +0100 ++++ ACE_wrappers/TAO/tao/RTCORBA/RT_ORBInitializer.cpp 2009-12-14 00:59:12.223163120 +0100 +@@ -41,7 +41,7 @@ static const char rt_poa_factory_name[] + static const ACE_TCHAR rt_poa_factory_directive[] = + ACE_DYNAMIC_SERVICE_DIRECTIVE( + "TAO_RT_Object_Adapter_Factory", +- "TAO_RTPortableServer", ++ "libTAO_RTPortableServer-1.7.7.so", + "_make_TAO_RT_Object_Adapter_Factory", + ""); + +diff -rupd ACE_wrappers.orig/TAO/tao/TAO_Internal.cpp ACE_wrappers/TAO/tao/TAO_Internal.cpp +--- ACE_wrappers.orig/TAO/tao/TAO_Internal.cpp 2009-12-14 00:42:10.002163319 +0100 ++++ ACE_wrappers/TAO/tao/TAO_Internal.cpp 2009-12-14 00:59:12.223163120 +0100 +@@ -534,7 +534,7 @@ namespace + ACE_Service_Config::process_directive ( + ACE_DYNAMIC_SERVICE_DIRECTIVE ( + "TAO_Codeset", +- "TAO_Codeset", ++ "libTAO_Codeset-1.7.7.so", + "_make_TAO_Codeset_Manager_Factory", + "")); + +diff -rupd ACE_wrappers.orig/TAO/tests/DLL_ORB/client.cpp ACE_wrappers/TAO/tests/DLL_ORB/client.cpp +--- ACE_wrappers.orig/TAO/tests/DLL_ORB/client.cpp 2009-12-14 00:42:12.254247172 +0100 ++++ ACE_wrappers/TAO/tests/DLL_ORB/client.cpp 2009-12-14 01:19:12.378162468 +0100 +@@ -30,7 +30,7 @@ ACE_TMAIN(int, ACE_TCHAR *[]) + if (ACE_Service_Config::process_directive ( + ACE_DYNAMIC_SERVICE_DIRECTIVE( + "Client_Module", +- "Test_Client_Module", ++ "libTest_Client_Module-1.7.7.so", + "_make_Test_Client_Module", + "-k file://test.ior")) != 0) + { +diff -rupd ACE_wrappers.orig/TAO/tests/ORB_Local_Config/Bug_2612/Test.cpp ACE_wrappers/TAO/tests/ORB_Local_Config/Bug_2612/Test.cpp +--- ACE_wrappers.orig/TAO/tests/ORB_Local_Config/Bug_2612/Test.cpp 2009-12-14 00:42:13.546163086 +0100 ++++ ACE_wrappers/TAO/tests/ORB_Local_Config/Bug_2612/Test.cpp 2009-12-14 01:26:03.054181888 +0100 +@@ -13,7 +13,7 @@ ACE_TCHAR const * const scpc_loadOrb = / + // 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", +- "DllOrb", ++ "DllOrb.so", + "_make_DllOrb", + "DllOrb -t 1 -ORBGestalt Local -ORBDebugLevel 3 -ORBId testORB -ORBInitRef NameService=file:///tmp/test-ns.ior -ORBDottedDecimalAddresses 1" + ); +diff -rupd ACE_wrappers.orig/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp ACE_wrappers/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp +--- ACE_wrappers.orig/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp 2009-12-14 00:42:13.650166654 +0100 ++++ ACE_wrappers/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp 2009-12-14 00:59:12.259162724 +0100 +@@ -153,7 +153,7 @@ testORBInitializer_Registry (int , ACE_T + { + one->process_directive ( + ACE_DYNAMIC_SERVICE_DIRECTIVE("ORBInitializer_Registry", +- "TAO_PI", ++ "libTAO_PI-1.7.7.so", + "_make_ORBInitializer_Registry", + "")); + oir = +@@ -252,7 +252,7 @@ testORBInitializer_Registry (int , ACE_T + + one->process_directive + (ACE_DYNAMIC_SERVICE_DIRECTIVE("PolicyFactory_Loader", +- "TAO_PI", ++ "libTAO_PI-1.7.7.so", + "_make_TAO_PolicyFactory_Loader", + "")); + +@@ -292,7 +292,7 @@ testServiceDependency (int , ACE_TCHAR * + + int result = one->process_directive + (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_Codeset", +- "TAO_Codeset", ++ "libTAO_Codeset-1.7.7.so", + "_make_TAO_Codeset_Manager_Factory", + "")); + if (result != 0) +diff -rupd ACE_wrappers.orig/TAO/tests/TransportCurrent/Framework/simple.cpp ACE_wrappers/TAO/tests/TransportCurrent/Framework/simple.cpp +--- ACE_wrappers.orig/TAO/tests/TransportCurrent/Framework/simple.cpp 2009-12-14 00:42:10.274245769 +0100 ++++ ACE_wrappers/TAO/tests/TransportCurrent/Framework/simple.cpp 2009-12-14 00:59:12.259162724 +0100 +@@ -59,7 +59,7 @@ testCurrentLoader (int, char *[]) + #if !defined (TAO_AS_STATIC_LIBS) + int ret = ACE_Service_Config::process_directive + (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_Transport_Current_Loader", +- "TAO_Transport_Current", ++ "libTAO_Transport_Current-1.7.7.so", + "_make_TAO_Transport_Current_Loader", + "")); + ACE_ASSERT (ret == 0); |