[openrtm-commit:00268] r420 - branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist

[openrtm ＠ openrtm.org]

Author: kurihara
Date: 2011-07-27 21:44:32 +0900 (Wed, 27 Jul 2011)
New Revision: 420

Modified:
   branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/DefaultConfiguration.py
Log:
Default property values now include openrtm.name.
openrtm.version is "x.y.z" version, openrtm.name is "OpenRTM-aist-x.y.z".

New option "manager.auto_shutdown_duration" has been added.

Modified: branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/DefaultConfiguration.py
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/DefaultConfiguration.py	2011-07-27 12:26:37 UTC (rev 419)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/DefaultConfiguration.py	2011-07-27 12:44:32 UTC (rev 420)
@@ -29,7 +29,8 @@
 # @else
 # @endif
 default_config =["config.version",                   OpenRTM_aist.openrtm_version,
-                 "openrtm.version",                  OpenRTM_aist.openrtm_name,
+                 "openrtm.name",                     OpenRTM_aist.openrtm_name,
+                 "openrtm.version",                  OpenRTM_aist.openrtm_version,
                  "manager.instance_name",            "manager",
                  "manager.name",                     "manager",
                  "manager.naming_formats",           "%h.host_cxt/%n.mgr",
@@ -70,7 +71,10 @@
                  "manager.corba_servant",            "YES",
                  "manager.shutdown_on_nortcs",       "YES",
                  "manager.shutdown_auto",            "YES",
+                 "manager.auto_shutdown_duration",   "10.0",
                  "manager.name",                     "manager",
                  "manager.command",                  "rtcd",
                  "manager.language",                 "Python",
+                 "sdo.service.provider.enabled_service",  "ALL",
+                 "sdo.service.consumer.enabled_service",  "ALL",
                  ""]