[openrtm-commit:00066] r2102 - trunk/OpenRTM-aist/src/lib/rtm

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2011-05-22 22:56:17 +0900 (Sun, 22 May 2011)
New Revision: 2102

Modified:
   trunk/OpenRTM-aist/src/lib/rtm/ManagerConfig.cpp
   trunk/OpenRTM-aist/src/lib/rtm/ManagerConfig.h
Log:
Property values "manager.os.*" are now "os.*".
refs #2107


Modified: trunk/OpenRTM-aist/src/lib/rtm/ManagerConfig.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/ManagerConfig.cpp	2011-05-22 13:52:13 UTC (rev 2101)
+++ trunk/OpenRTM-aist/src/lib/rtm/ManagerConfig.cpp	2011-05-22 13:56:17 UTC (rev 2102)
@@ -243,11 +243,11 @@
     char pidc[8];
     sprintf(pidc, "%d", pid);
     
-    prop.setProperty("manager.os.name",     sysinfo.sysname);
-    prop.setProperty("manager.os.release",  sysinfo.release);
-    prop.setProperty("manager.os.version",  sysinfo.version);
-    prop.setProperty("manager.os.arch",     sysinfo.machine);
-    prop.setProperty("manager.os.hostname", sysinfo.nodename);
+    prop.setProperty("os.name",     sysinfo.sysname);
+    prop.setProperty("os.release",  sysinfo.release);
+    prop.setProperty("os.version",  sysinfo.version);
+    prop.setProperty("os.arch",     sysinfo.machine);
+    prop.setProperty("os.hostname", sysinfo.nodename);
     prop.setProperty("manager.pid",         pidc);
     
     return;

Modified: trunk/OpenRTM-aist/src/lib/rtm/ManagerConfig.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/ManagerConfig.h	2011-05-22 13:52:13 UTC (rev 2101)
+++ trunk/OpenRTM-aist/src/lib/rtm/ManagerConfig.h	2011-05-22 13:56:17 UTC (rev 2102)
@@ -317,11 +317,11 @@
      * @brief システム情報を設定する
      *
      * システム情報を取得しプロパティにセットする。設定されるキーは以下の通り。
-     *  - manager.os.name    : OS名
-     *  - manager.os.release : OSリリース名
-     *  - maanger.os.version : OSバージョン名
-     *  - manager.os.arch    : OSアーキテクチャ
-     *  - manager.os.hostname: ホスト名
+     *  - os.name    : OS名
+     *  - os.release : OSリリース名
+     *  - os.version : OSバージョン名
+     *  - os.arch    : OSアーキテクチャ
+     *  - os.hostname: ホスト名
      *  - manager.pid        : プロセスID
      * 
      * @param prop システム情報を設定したプロパティ
@@ -330,11 +330,11 @@
      * @brief Set system information
      * 
      * Get the following system info. and set them to Manager's properties.
-     *  - manager.os.name    : OS name
-     *  - manager.os.release : OS release name
-     *  - manager.os.version : OS version
-     *  - manager.os.arch    : OS architecture
-     *  - manager.os.hostname: Hostname
+     *  - os.name    : OS name
+     *  - os.release : OS release name
+     *  - os.version : OS version
+     *  - os.arch    : OS architecture
+     *  - os.hostname: Hostname
      *  - manager.pid        : process ID
      *
      * @param prop Properties to set system information