[openrtm-commit:00365] r549 - in trunk: . jp.go.aist.rtm.RTC jp.go.aist.rtm.RTC/src/jp/go/aist/rtm jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2011年 8月 22日 (月) 14:39:04 JST
Author: fsi-katami
Date: 2011-08-22 14:39:04 +0900 (Mon, 22 Aug 2011)
New Revision: 549
Modified:
trunk/
trunk/jp.go.aist.rtm.RTC/
trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/DefaultConfiguration.java
trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java
trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ManagerConfig.java
trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/RTObject_impl.java
trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/Version.java
Log:
To get the value of m_properties by get_component_profile(). refs #2125
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/RELENG_1_0_0:60-401
/branches/work/ForComponentActionListener:521-522
/branches/work/ForComponentObserverConsumer:534-543
/branches/work/ForConfigurationListener:524-526
/branches/work/ForLogFormat:518-519
/branches/work/ForPortConnectListener:528-532
/branches/work/ForSDOServiceAdminClass:505-507
/branches/work/ToIFR_ID:509-514
+ /branches/RELENG_1_0_0:60-401
/branches/work/ForComponentActionListener:521-522
/branches/work/ForComponentObserverConsumer:534-543
/branches/work/ForConfigurationListener:524-526
/branches/work/ForLogFormat:518-519
/branches/work/ForPortConnectListener:528-532
/branches/work/ForSDOServiceAdminClass:505-507
/branches/work/ToGetProperties:545-548
/branches/work/ToIFR_ID:509-514
Property changes on: trunk/jp.go.aist.rtm.RTC
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/RELENG_1_0/jp.go.aist.rtm.RTC:408-498
/branches/RELENG_1_0_0/jp.go.aist.rtm.RTC:60-401
/branches/work/ForComponentActionListener/jp.go.aist.rtm.RTC:521-522
/branches/work/ForComponentObserverConsumer/jp.go.aist.rtm.RTC:534-543
/branches/work/ForConfigurationListener/jp.go.aist.rtm.RTC:524-526
/branches/work/ForLogFormat/jp.go.aist.rtm.RTC:518-519
/branches/work/ForPortConnectListener/jp.go.aist.rtm.RTC:528-532
/branches/work/ForSDOServiceAdminClass/jp.go.aist.rtm.RTC:505-507
/branches/work/ToIFR_ID/jp.go.aist.rtm.RTC:509-514
+ /branches/RELENG_1_0/jp.go.aist.rtm.RTC:408-498
/branches/RELENG_1_0_0/jp.go.aist.rtm.RTC:60-401
/branches/work/ForComponentActionListener/jp.go.aist.rtm.RTC:521-522
/branches/work/ForComponentObserverConsumer/jp.go.aist.rtm.RTC:534-543
/branches/work/ForConfigurationListener/jp.go.aist.rtm.RTC:524-526
/branches/work/ForLogFormat/jp.go.aist.rtm.RTC:518-519
/branches/work/ForPortConnectListener/jp.go.aist.rtm.RTC:528-532
/branches/work/ForSDOServiceAdminClass/jp.go.aist.rtm.RTC:505-507
/branches/work/ToGetProperties/jp.go.aist.rtm.RTC:545-548
/branches/work/ToIFR_ID/jp.go.aist.rtm.RTC:509-514
Modified: trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/DefaultConfiguration.java
===================================================================
--- trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/DefaultConfiguration.java 2011-08-22 05:36:43 UTC (rev 548)
+++ trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/DefaultConfiguration.java 2011-08-22 05:39:04 UTC (rev 549)
@@ -15,7 +15,8 @@
public static final String[] default_config = {
"config.version", Version.openrtm_version,
- "openrtm.version", Version.openrtm_name,
+ "openrtm.name", Version.openrtm_name,
+ "openrtm.version", Version.openrtm_version,
"manager.instance_name", "manager",
"manager.name", "manager",
"manager.naming_formats", "%h.host_cxt/%n.mgr",
Modified: trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java
===================================================================
--- trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java 2011-08-22 05:36:43 UTC (rev 548)
+++ trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java 2011-08-22 05:39:04 UTC (rev 549)
@@ -932,6 +932,16 @@
final String[] inherit_prop = {
+ "config.version",
+ "openrtm.name",
+ "openrtm.version",
+ "os.name",
+ "os.release",
+ "os.version",
+ "os.arch",
+ "os.hostname",
+ "corba.endpoint",
+ "corba.id",
"exec_cxt.periodic.type",
"exec_cxt.periodic.rate",
"exec_cxt.evdriven.type",
Modified: trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ManagerConfig.java
===================================================================
--- trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ManagerConfig.java 2011-08-22 05:36:43 UTC (rev 548)
+++ trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ManagerConfig.java 2011-08-22 05:39:04 UTC (rev 549)
@@ -353,21 +353,21 @@
* {@.ja システム情報を取得しプロパティにセットする。
* 設定されるキーは以下の通り。
* <ul>
- * <li> manager.os.name : OS名
- * <li> manager.os.release : OSリリース名
- * <li> maanger.os.version : OSバージョン名
- * <li> manager.os.arch : OSアーキテクチャ
- * <li> manager.os.hostname: ホスト名
+ * <li> os.name : OS名
+ * <li> os.release : OSリリース名
+ * <li> os.version : OSバージョン名
+ * <li> os.arch : OSアーキテクチャ
+ * <li> os.hostname: ホスト名
* <li> manager.pid : プロセスID
* </ul>}
* {@.en Get the following system info. and set them to Manager's
* properties.
* <ul>
- * <li> manager.os.name : OS name
- * <li> manager.os.release : OS release name
- * <li> manager.os.version : OS version
- * <li> manager.os.arch : OS architecture
- * <li> manager.os.hostname: Hostname
+ * <li> os.name : OS name
+ * <li> os.release : OS release name
+ * <li> os.version : OS version
+ * <li> os.arch : OS architecture
+ * <li> os.hostname: Hostname
* <li> manager.pid : process ID
* </ul>}
*
@@ -412,11 +412,11 @@
ignored.printStackTrace();
}
- properties.setProperty("manager.os.name", osName);
- properties.setProperty("manager.os.release", osRelease);
- properties.setProperty("manager.os.version", osVersion);
- properties.setProperty("manager.os.arch", osArch);
- properties.setProperty("manager.os.hostname", hostName);
+ properties.setProperty("os.name", osName);
+ properties.setProperty("os.release", osRelease);
+ properties.setProperty("os.version", osVersion);
+ properties.setProperty("os.arch", osArch);
+ properties.setProperty("os.hostname", hostName);
properties.setProperty("manager.pid", pid);
}
Modified: trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/RTObject_impl.java
===================================================================
--- trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/RTObject_impl.java 2011-08-22 05:36:43 UTC (rev 548)
+++ trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/RTObject_impl.java 2011-08-22 05:39:04 UTC (rev 549)
@@ -1098,6 +1098,10 @@
profile.parent = m_profile.parent;
profile.properties = m_profile.properties;
profile.port_profiles = m_portAdmin.getPortProfileList().value;
+ NVListHolder nvholder =
+ new NVListHolder(profile.properties);
+ NVUtil.copyFromProperties(nvholder, m_properties);
+ profile.properties = nvholder.value;
return profile;
} catch (Exception ex) {
; // This operation throws no exception.
Modified: trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/Version.java
===================================================================
--- trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/Version.java 2011-08-22 05:36:43 UTC (rev 548)
+++ trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/Version.java 2011-08-22 05:39:04 UTC (rev 549)
@@ -5,8 +5,8 @@
*/
public interface Version {
- public static final String openrtm_name = "OpenRTM-aist-1.0.0";
- public static final String openrtm_version = "1.0.0";
+ public static final String openrtm_name = "OpenRTM-aist-1.1.0";
+ public static final String openrtm_version = "1.1.0";
public static final String corba_name = "omniORB";
}
openrtm-commit メーリングリストの案内