[openrtm-commit:01871] r805 - trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC

[openrtm ＠ openrtm.org]

Author: win-ei
Date: 2016-03-24 08:46:06 +0900 (Thu, 24 Mar 2016)
New Revision: 805

Modified:
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/DefaultConfiguration.java
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/NamingManager.java
Log:
Added string_to_component() to NamingManager. ref #3396

Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/DefaultConfiguration.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/DefaultConfiguration.java	2016-03-22 10:02:06 UTC (rev 804)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/DefaultConfiguration.java	2016-03-23 23:46:06 UTC (rev 805)
@@ -62,6 +62,7 @@
         "manager.auto_shutdown_duration",        "10.0",
         "manager.name",                     "manager",
         "manager.command",                  "rtcd",
+        "manager.nameservers",              "default",
         "sdo.service.provider.enabled_services",  "ALL",
         "sdo.service.consumer.enabled_services",  "ALL",
         "manager.local_service.enabled_services","ALL",

Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java	2016-03-22 10:02:06 UTC (rev 804)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java	2016-03-23 23:46:06 UTC (rev 805)
@@ -768,8 +768,29 @@
         self._rtcout.RTC_ERROR("Connection error in topic connection.")
 
 */
+
     /**
      *
+     * {@.ja ManagerServantを取得する}
+     * {@.en Gets ManagerServant Managfer has.}
+     *
+     *
+     * @return 
+     *   {@.ja ManagerServant}
+     *   {@.en ManagerServant}
+     *
+     * # ManagerServant* getManagerServant()
+     */
+    public ManagerServant  getManagerServant(){
+
+        rtcout.println(Logbuf.TRACE, "Manager.getManagerServant()");
+        return m_mgrservant;
+    }
+
+
+
+    /**
+     *
      * {@.ja NamingManagerを取得する}
      * {@.en Gets NamingManager Managfer has.}
      *
@@ -2592,6 +2613,30 @@
             }
         }
 
+        // To load SSL communication modules.
+        // ex)
+        //   manager.modules.preload: SSLTransport
+        String[] mods
+            = m_config.getProperty("manager.preload.modules").split(",");
+
+        for (int ic=0; ic < mods.length; ++ic) {
+            if ( mods[ic].length() == 0) {
+                continue;
+            }
+	    mods[ic] = mods[ic].trim();
+            String[] str = mods[ic].split("\\.");
+            String basename = str[0]+"Init";
+            try {
+                m_module.load(mods[ic], basename);
+            } catch (IllegalArgumentException e) {
+                e.printStackTrace();
+                rtcout.println(Logbuf.ERROR, "Module load error: " + mods[ic]);
+            } catch (ClassNotFoundException e) {
+                rtcout.println(Logbuf.ERROR, "Module not found: " + mods[ic]);
+            } catch (Exception ex) {
+                rtcout.println(Logbuf.ERROR, "Unknown Exception");
+            }
+        }
     }
     
     /**

Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/NamingManager.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/NamingManager.java	2016-03-22 10:02:06 UTC (rev 804)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/NamingManager.java	2016-03-23 23:46:06 UTC (rev 805)
@@ -472,6 +472,13 @@
                 return null;
             }
         }
+        else if( m.endsWith("manager")) {
+            NamingBase name = new NamingOnManager(m_manager.getORB(),m_manager);
+            if( name == null ) {
+                return null;
+            }
+            return name;
+        }
         return null;
     }