[openrtm-commit:00391] r554 - in trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm: . RTC

[openrtm ＠ openrtm.org]

Author: fsi-katami
Date: 2011-09-07 17:43:54 +0900 (Wed, 07 Sep 2011)
New Revision: 554

Modified:
   trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ModuleManager.java
   trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/NamingOnCorba.java
   trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/SdoServiceAdmin.java
   trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/Version.java
Log:
Some various corrections were done.  refs #2224

Modified: trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ModuleManager.java
===================================================================
--- trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ModuleManager.java	2011-09-06 09:03:35 UTC (rev 553)
+++ trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ModuleManager.java	2011-09-07 08:43:54 UTC (rev 554)
@@ -130,7 +130,7 @@
      * ロードするモジュールをURLで指定することができる。
      *
      * file_name は絶対パスで指定することができる。
-     * manager.modules.allowAbsolutePath が no の場合、
+     * manager.modules.abs_path_allowed が no の場合、
      * 既定のモジュールロードパスから、file_name のモジュールを探しロードする。}
      * {@.en Load file_name as DLL or a shared liblary.
      * The file_name is specified by the relative path to default load
@@ -142,7 +142,7 @@
      * the load module can be specified with URL.
      *
      * The file_name can be specified by the absolute path.
-     * If manager.modules.allowAbsolutePath is no, module of file_name
+     * If manager.modules.abs_path_allowed is no, module of file_name
      * will be searched from the default module load path and loaded.}
      * 
      * @param moduleName 

Modified: trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/NamingOnCorba.java
===================================================================
--- trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/NamingOnCorba.java	2011-09-06 09:03:35 UTC (rev 553)
+++ trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/NamingOnCorba.java	2011-09-07 08:43:54 UTC (rev 554)
@@ -79,6 +79,7 @@
      *
      */
     public void bindObject(final String name, final RTObject_impl rtobj) {
+        rtcout.println(Logbuf.TRACE, "bindObject(" + name + ",rtobj)");
         try{
             m_cosnaming.rebindByString(name, rtobj.getObjRef(), true);
         } catch ( Exception ex ) {
@@ -97,6 +98,7 @@
      *   {@.en The target ManagerServants for the binding}
      */
     public void bindObject(final String name, final ManagerServant mgr) {
+        rtcout.println(Logbuf.TRACE, "bindObject(" + name + ",mgr)");
         try{
             m_cosnaming.rebindByString(name, mgr.getObjRef(), true);
         } catch ( Exception ex ) {
@@ -119,7 +121,7 @@
      *
      */
     public void unbindObject(final String name) {
-        rtcout.println(Logbuf.INFO, "unbindObject(name  = " +name+")");
+        rtcout.println(Logbuf.TRACE, "unbindObject(name  = " +name+")");
         try {
             m_cosnaming.unbind(name);
         } catch (Exception ex) {

Modified: trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/SdoServiceAdmin.java
===================================================================
--- trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/SdoServiceAdmin.java	2011-09-06 09:03:35 UTC (rev 553)
+++ trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/SdoServiceAdmin.java	2011-09-07 08:43:54 UTC (rev 554)
@@ -166,11 +166,6 @@
         }
     }
 
-    /**
-     * {@.ja 仮想デストラクタ}
-     * {@.en Virtual destractor}
-     */
-    //public ~SdoServiceAdmin();
     
     /**
      *

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-09-06 09:03:35 UTC (rev 553)
+++ trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/Version.java	2011-09-07 08:43:54 UTC (rev 554)
@@ -7,6 +7,6 @@
 
     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";
+    public static final String corba_name = "orbd";
     
 }