diff options
author | msmit <msmit@remedy.nl> | 2011-04-22 12:41:50 +0000 |
---|---|---|
committer | msmit <msmit@remedy.nl> | 2011-04-22 12:41:50 +0000 |
commit | e3f804511d2fc41e111d80465e1544896e58050f (patch) | |
tree | a61f0e807d772b81c96b2456024e1ca1b08271d4 /TAO | |
parent | b6b9509e3b72550d2024e3f10659469baafaec7f (diff) | |
download | ATCD-e3f804511d2fc41e111d80465e1544896e58050f.tar.gz |
Fri Apr 22 12:41:53 UTC 2011 Marcel Smit <msmit@remedy.nl>
* orbsvcs/tests/Bug_3418_Regression/b.conf:
* orbsvcs/tests/HTIOP/HT_Config.conf:
* orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/windows.conf:
* orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/non-windows.conf:
* orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/windows.conf:
* orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/non-windows.conf:
* orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/windows.conf:
* orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/windows.conf:
* orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/windows.conf:
* orbsvcs/tests/Notify/Lanes/consumer.conf:
* orbsvcs/tests/Notify/Lanes/notify.conf:
* performance-tests/Protocols/lksctp_params.conf:
* performance-tests/Protocols/sctp_params.conf:
* performance-tests/RTCorba/Thread_Pool/native-svc.conf:
* tests/Bug_3068_Regression/server.conf:
* tests/ORB_Local_Config/Bug_1459/m.conf:
* tests/ORB_Local_Config/Two_DLL_ORB/secondary-empty.conf:
* tests/RTCORBA/Explicit_Binding/svc.conf:
Fuzz: added $Id string
Diffstat (limited to 'TAO')
19 files changed, 54 insertions, 13 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index ff46431c26b..bb5dc901ead 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,25 @@ +Fri Apr 22 12:41:53 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * orbsvcs/tests/Bug_3418_Regression/b.conf: + * orbsvcs/tests/HTIOP/HT_Config.conf: + * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/windows.conf: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/non-windows.conf: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/windows.conf: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/non-windows.conf: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/windows.conf: + * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/windows.conf: + * orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/windows.conf: + * orbsvcs/tests/Notify/Lanes/consumer.conf: + * orbsvcs/tests/Notify/Lanes/notify.conf: + * performance-tests/Protocols/lksctp_params.conf: + * performance-tests/Protocols/sctp_params.conf: + * performance-tests/RTCorba/Thread_Pool/native-svc.conf: + * tests/Bug_3068_Regression/server.conf: + * tests/ORB_Local_Config/Bug_1459/m.conf: + * tests/ORB_Local_Config/Two_DLL_ORB/secondary-empty.conf: + * tests/RTCORBA/Explicit_Binding/svc.conf: + Fuzz: added $Id string + Fri Apr 22 12:14:18 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> * tao/Connection_Handler.cpp: diff --git a/TAO/orbsvcs/tests/Bug_3418_Regression/b.conf b/TAO/orbsvcs/tests/Bug_3418_Regression/b.conf index 039fbc84c51..5847fa22a03 100644 --- a/TAO/orbsvcs/tests/Bug_3418_Regression/b.conf +++ b/TAO/orbsvcs/tests/Bug_3418_Regression/b.conf @@ -1,2 +1,4 @@ +# $Id$ + dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:client_key.pem -SSLCertificate PEM:client_cert.pem" static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory" diff --git a/TAO/orbsvcs/tests/HTIOP/HT_Config.conf b/TAO/orbsvcs/tests/HTIOP/HT_Config.conf index 353b30b2af8..722033221ce 100644 --- a/TAO/orbsvcs/tests/HTIOP/HT_Config.conf +++ b/TAO/orbsvcs/tests/HTIOP/HT_Config.conf @@ -1,3 +1,5 @@ +# $Id$ + [htbp] # The Proxy_port and proxy_host values control how the HTIOP "inside" peers # to connect to "outside" peers. In situations where the process inside a diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/windows.conf b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/windows.conf index 06c425e3ecf..e02d5089fce 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/windows.conf +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/windows.conf @@ -1,3 +1,3 @@ -# $Id $ +# $Id$ dynamic Advanced_Resource_Factory Service_Object* TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBReactorType select_mt" diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/non-windows.conf b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/non-windows.conf index ceefb555c38..687382aac65 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/non-windows.conf +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/non-windows.conf @@ -1,4 +1,4 @@ -# $Id $ +# $Id$ static Client_Strategy_Factory "-ORBWaitStrategy rw -ORBTransportMuxStrategy exclusive -ORBConnectStrategy blocked -ORBConnectionHandlerCleanup 1" diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/windows.conf b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/windows.conf index 4521e5070db..0cc4559a431 100755 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/windows.conf +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/windows.conf @@ -1,4 +1,4 @@ -# $Id $ +# $Id$ dynamic Advanced_Resource_Factory Service_Object* TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBReactorType select_mt" static Client_Strategy_Factory "-ORBWaitStrategy rw -ORBTransportMuxStrategy exclusive -ORBConnectStrategy blocked -ORBConnectionHandlerCleanup 1" diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/non-windows.conf b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/non-windows.conf index ceefb555c38..687382aac65 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/non-windows.conf +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/non-windows.conf @@ -1,4 +1,4 @@ -# $Id $ +# $Id$ static Client_Strategy_Factory "-ORBWaitStrategy rw -ORBTransportMuxStrategy exclusive -ORBConnectStrategy blocked -ORBConnectionHandlerCleanup 1" diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/windows.conf b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/windows.conf index 4521e5070db..0cc4559a431 100755 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/windows.conf +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/windows.conf @@ -1,4 +1,4 @@ -# $Id $ +# $Id$ dynamic Advanced_Resource_Factory Service_Object* TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBReactorType select_mt" static Client_Strategy_Factory "-ORBWaitStrategy rw -ORBTransportMuxStrategy exclusive -ORBConnectStrategy blocked -ORBConnectionHandlerCleanup 1" diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/windows.conf b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/windows.conf index 06c425e3ecf..e02d5089fce 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/windows.conf +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/windows.conf @@ -1,3 +1,3 @@ -# $Id $ +# $Id$ dynamic Advanced_Resource_Factory Service_Object* TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBReactorType select_mt" diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/windows.conf b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/windows.conf index 06c425e3ecf..e02d5089fce 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/windows.conf +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/windows.conf @@ -1,3 +1,3 @@ -# $Id $ +# $Id$ dynamic Advanced_Resource_Factory Service_Object* TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBReactorType select_mt" diff --git a/TAO/orbsvcs/tests/Notify/Lanes/consumer.conf b/TAO/orbsvcs/tests/Notify/Lanes/consumer.conf index 805ed188cd2..b1cb8925002 100644 --- a/TAO/orbsvcs/tests/Notify/Lanes/consumer.conf +++ b/TAO/orbsvcs/tests/Notify/Lanes/consumer.conf @@ -1,7 +1,7 @@ # $Id$ ##---- Load the Factories------ -dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBPriorityMapping continuous" +dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBPriorityMapping continuous" # # Uncomment this line to use SCHED_FIFO #dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous" diff --git a/TAO/orbsvcs/tests/Notify/Lanes/notify.conf b/TAO/orbsvcs/tests/Notify/Lanes/notify.conf index 85d6b72357e..d1479eec5d8 100644 --- a/TAO/orbsvcs/tests/Notify/Lanes/notify.conf +++ b/TAO/orbsvcs/tests/Notify/Lanes/notify.conf @@ -1,8 +1,9 @@ -dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBPriorityMapping continuous" +# $Id$ + +dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBPriorityMapping continuous" # # Uncomment this line to use SCHED_FIFO -#dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous" +#dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous" # -dynamic TAO_Notify_FilterFactory Service_Object* TAO_RT_NotifyTests_Filter:_make_TAO_Notify_Tests_RT_Test_FilterFactory () "" -dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () "" - +dynamic TAO_Notify_FilterFactory Service_Object* TAO_RT_NotifyTests_Filter:_make_TAO_Notify_Tests_RT_Test_FilterFactory () "" +dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () "" diff --git a/TAO/performance-tests/Protocols/lksctp_params.conf b/TAO/performance-tests/Protocols/lksctp_params.conf index 45205a956f5..e5a5f0e0954 100644 --- a/TAO/performance-tests/Protocols/lksctp_params.conf +++ b/TAO/performance-tests/Protocols/lksctp_params.conf @@ -1,3 +1,5 @@ +# $Id$ + PREFIX= association_max_retrans=25 hb_interval=10 diff --git a/TAO/performance-tests/Protocols/sctp_params.conf b/TAO/performance-tests/Protocols/sctp_params.conf index a786b188072..096e1da08bb 100644 --- a/TAO/performance-tests/Protocols/sctp_params.conf +++ b/TAO/performance-tests/Protocols/sctp_params.conf @@ -1,3 +1,5 @@ +# $Id$ + PREFIX=sctp_ assoc_max_retrans=25 heartbeat_itvl=1 diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/native-svc.conf b/TAO/performance-tests/RTCorba/Thread_Pool/native-svc.conf index cfda9a19500..5445ce233d8 100644 --- a/TAO/performance-tests/RTCorba/Thread_Pool/native-svc.conf +++ b/TAO/performance-tests/RTCorba/Thread_Pool/native-svc.conf @@ -1,3 +1,5 @@ +# $Id$ + # For testing of RT threads (with native priority) static RT_ORB_Loader "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy SYSTEM" diff --git a/TAO/tests/Bug_3068_Regression/server.conf b/TAO/tests/Bug_3068_Regression/server.conf index f39d729f6d4..d85c5c22234 100644 --- a/TAO/tests/Bug_3068_Regression/server.conf +++ b/TAO/tests/Bug_3068_Regression/server.conf @@ -1,3 +1,5 @@ +# $Id$ + static Resource_Factory "-ORBMuxedConnectionMax 1" static Client_Strategy_Factory "-ORBTransportMuxStrategy muxed -ORBConnectStrategy blocked" diff --git a/TAO/tests/ORB_Local_Config/Bug_1459/m.conf b/TAO/tests/ORB_Local_Config/Bug_1459/m.conf index e69de29bb2d..9406b2e4163 100644 --- a/TAO/tests/ORB_Local_Config/Bug_1459/m.conf +++ b/TAO/tests/ORB_Local_Config/Bug_1459/m.conf @@ -0,0 +1,2 @@ +# $Id$ +
\ No newline at end of file diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/secondary-empty.conf b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/secondary-empty.conf index 477c4795007..bacce361960 100644 --- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/secondary-empty.conf +++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/secondary-empty.conf @@ -1 +1,3 @@ +# $Id$ + # Nothing so far diff --git a/TAO/tests/RTCORBA/Explicit_Binding/svc.conf b/TAO/tests/RTCORBA/Explicit_Binding/svc.conf index 57fc20f1023..74be1affa18 100644 --- a/TAO/tests/RTCORBA/Explicit_Binding/svc.conf +++ b/TAO/tests/RTCORBA/Explicit_Binding/svc.conf @@ -1,2 +1,4 @@ +# $Id$ + # Options for SHMIOP protocol static SHMIOP_Factory "-MMAPFilePrefix server_shmiop" |