[openrtm-commit:01640] r741 - in branches/RELENG_1_1: . jp.go.aist.rtm.RTC jp.go.aist.rtm.RTC/src/Extension/LocalService/nameservice_file jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2015-10-29 15:36:36 +0900 (Thu, 29 Oct 2015)
New Revision: 741

Modified:
   branches/RELENG_1_1/
   branches/RELENG_1_1/jp.go.aist.rtm.RTC/
   branches/RELENG_1_1/jp.go.aist.rtm.RTC/src/Extension/LocalService/nameservice_file/FileNameservice.java
   branches/RELENG_1_1/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java
Log:
[compat,merge] r638 merged from trunk.


Property changes on: branches/RELENG_1_1
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/RELENG_1_0_0:60-401
/branches/work/ConfigurationCallback:631-635
/branches/work/ForComponentActionListener:521-522
/branches/work/ForComponentObserverConsumer:534-543
/branches/work/ForConfigurationListener:524-526
/branches/work/ForFileNameservice:623-628
/branches/work/ForLogFormat:518-519
/branches/work/ForPortConnectListener:528-532
/branches/work/ForSDOServiceAdminClass:505-507
/branches/work/SourceSharing:591-603
/branches/work/ToGetProperties:545-548
/branches/work/ToIFR_ID:509-514
/trunk:621-622,629-637,639-658
   + /branches/RELENG_1_0_0:60-401
/branches/work/ConfigurationCallback:631-635
/branches/work/ForComponentActionListener:521-522
/branches/work/ForComponentObserverConsumer:534-543
/branches/work/ForConfigurationListener:524-526
/branches/work/ForFileNameservice:623-628
/branches/work/ForLogFormat:518-519
/branches/work/ForPortConnectListener:528-532
/branches/work/ForSDOServiceAdminClass:505-507
/branches/work/SourceSharing:591-603
/branches/work/ToGetProperties:545-548
/branches/work/ToIFR_ID:509-514
/trunk:621-622,629-658


Property changes on: branches/RELENG_1_1/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/ConfigurationCallback/jp.go.aist.rtm.RTC:631-635
/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/ForFileNameservice/jp.go.aist.rtm.RTC:623-628
/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/SourceSharing/jp.go.aist.rtm.RTC:591-603
/branches/work/ToGetProperties/jp.go.aist.rtm.RTC:545-548
/branches/work/ToIFR_ID/jp.go.aist.rtm.RTC:509-514
/trunk/jp.go.aist.rtm.RTC:621-622,629-637,639-658
   + /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/ConfigurationCallback/jp.go.aist.rtm.RTC:631-635
/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/ForFileNameservice/jp.go.aist.rtm.RTC:623-628
/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/SourceSharing/jp.go.aist.rtm.RTC:591-603
/branches/work/ToGetProperties/jp.go.aist.rtm.RTC:545-548
/branches/work/ToIFR_ID/jp.go.aist.rtm.RTC:509-514
/trunk/jp.go.aist.rtm.RTC:621-622,629-658

Modified: branches/RELENG_1_1/jp.go.aist.rtm.RTC/src/Extension/LocalService/nameservice_file/FileNameservice.java
===================================================================
--- branches/RELENG_1_1/jp.go.aist.rtm.RTC/src/Extension/LocalService/nameservice_file/FileNameservice.java	2015-10-29 06:34:25 UTC (rev 740)
+++ branches/RELENG_1_1/jp.go.aist.rtm.RTC/src/Extension/LocalService/nameservice_file/FileNameservice.java	2015-10-29 06:36:36 UTC (rev 741)
@@ -13,6 +13,7 @@
 import jp.go.aist.rtm.RTC.Manager;
 import jp.go.aist.rtm.RTC.ObjectCreator;
 import jp.go.aist.rtm.RTC.ObjectDestructor;
+import jp.go.aist.rtm.RTC.RegisterModuleFunc;
 import jp.go.aist.rtm.RTC.log.Logbuf;
 import jp.go.aist.rtm.RTC.util.CallbackFunction;
 import jp.go.aist.rtm.RTC.util.Properties;
@@ -22,7 +23,7 @@
      * {@.ja FileNameservice クラス}
      * {@.en FileNameservice class}
      */
-public class FileNameservice implements LocalServiceBase, CallbackFunction, ObjectCreator<LocalServiceBase>, ObjectDestructor{
+public class FileNameservice implements LocalServiceBase, CallbackFunction, ObjectCreator<LocalServiceBase>, ObjectDestructor, RegisterModuleFunc{
 
     private static String service_name 
             = "org.openrtm.local_service.nameservice.file_nameservice";
@@ -342,7 +343,7 @@
      * {@.en This initialization function registers FileNameservice to the factory.}
      *
      */
-    public static void FileNameserviceInit() {
+    public void registerModule() {
         final LocalServiceFactory<LocalServiceBase,String> factory
           = LocalServiceFactory.instance();
         factory.addFactory(service_name,

Modified: branches/RELENG_1_1/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java
===================================================================
--- branches/RELENG_1_1/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java	2015-10-29 06:34:25 UTC (rev 740)
+++ branches/RELENG_1_1/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java	2015-10-29 06:36:36 UTC (rev 741)
@@ -391,10 +391,15 @@
 
         bindManagerServant();
 
+        String[] lsvc 
+            = m_config.getProperty("manager.local_service.modules").split(",");
+        loadComponent(lsvc);
+
         initLocalService();
+         
+        lsvc = m_config.getProperty("manager.modules.preload").split(",");
+        loadComponent(lsvc);
 
-        preloadComponent();
-
         if (m_initProc != null) {
             m_initProc.myModuleInit(this);
         }
@@ -407,15 +412,18 @@
     /**
      * {@.ja コンポーネントをロードする。}
      * {@.en Loads components.}
+     * 
+     * <p>
+     * {@.ja コンポーネントをロードする。}
+     * {@.en This method loads components .}
      *
-     * <p>
-     * {@.ja このメソッドは、"manager.modules.preload"に設定されている
-     * コンポーネントをロードする。}
-     * {@.en This method loads components set to "Manager.modules.preload".}
+     * @param mods
+     *   {@.ja ロードするモジュール名}
+     *   {@.en Loaded module names}
+     * 
      */
-    private void preloadComponent() {
-        String[] mods 
-                = m_config.getProperty("manager.modules.preload").split(",");
+    private void loadComponent(String[] mods) {
+
         for (int i=0; i < mods.length; ++i) {
             if ( mods[i].length() == 0) {
                 continue;
@@ -434,7 +442,6 @@
             }
         }
     }
-
     /**
      * {@.ja コンポーネントを生成する。}
      * {@.en Creates components}