[openrtm-commit:01925] r816 - in branches/RELENG_1_1/OpenRTM-aist-Java: . jp.go.aist.rtm.RTC jp.go.aist.rtm.RTC/Source/examples jp.go.aist.rtm.RTC/installer/resources/Source/examples

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2016-05-02 17:14:18 +0900 (Mon, 02 May 2016)
New Revision: 816

Modified:
   branches/RELENG_1_1/OpenRTM-aist-Java/
   branches/RELENG_1_1/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/
   branches/RELENG_1_1/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/Source/examples/set_classpath.bat
   branches/RELENG_1_1/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/installer/resources/Source/examples/set_classpath.bat
Log:
[merge] r815 has been merged from trunk.



Property changes on: branches/RELENG_1_1/OpenRTM-aist-Java
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk/OpenRTM-aist-Java:815


Property changes on: branches/RELENG_1_1/OpenRTM-aist-Java/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/DesignChangeOfEC/jp.go.aist.rtm.RTC:648-660
/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/LoggerService/jp.go.aist.rtm.RTC:666-669
/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
   + /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/DesignChangeOfEC/jp.go.aist.rtm.RTC:648-660
/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/LoggerService/jp.go.aist.rtm.RTC:666-669
/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/OpenRTM-aist-Java/jp.go.aist.rtm.RTC:815

Modified: branches/RELENG_1_1/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/Source/examples/set_classpath.bat
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/Source/examples/set_classpath.bat	2016-05-02 07:13:34 UTC (rev 815)
+++ branches/RELENG_1_1/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/Source/examples/set_classpath.bat	2016-05-02 08:14:18 UTC (rev 816)
@@ -1,5 +1,5 @@
- at echo off
-set JAR_BASE=%RTM_JAVA_ROOT%\jar\
-for /F %%A in ('dir "%JAR_BASE%OpenRTM*" /B') do (set FILE1=%%A)
-for /F %%A in ('dir "%JAR_BASE%commons-cli*" /B') do (set FILE2=%%A)
-set CLASSPATH=.;%JAR_BASE%%FILE1%;%JAR_BASE%%FILE2%
\ No newline at end of file
+ at call set rtm_java_root=%RTM_JAVA_ROOT%
+ at set JAR_BASE=%rtm_java_root%\jar\
+ at for /F %%A in ('dir "%JAR_BASE%OpenRTM*" /B') do (set FILE1=%%A)
+ at for /F %%A in ('dir "%JAR_BASE%commons-cli*" /B') do (set FILE2=%%A)
+ at set CLASSPATH=.;%JAR_BASE%%FILE1%;%JAR_BASE%%FILE2%

Modified: branches/RELENG_1_1/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/installer/resources/Source/examples/set_classpath.bat
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/installer/resources/Source/examples/set_classpath.bat	2016-05-02 07:13:34 UTC (rev 815)
+++ branches/RELENG_1_1/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/installer/resources/Source/examples/set_classpath.bat	2016-05-02 08:14:18 UTC (rev 816)
@@ -1,5 +1,5 @@
- at echo off
-set JAR_BASE=%RTM_JAVA_ROOT%\jar\
-for /F %%A in ('dir "%JAR_BASE%OpenRTM*" /B') do (set FILE1=%%A)
-for /F %%A in ('dir "%JAR_BASE%commons-cli*" /B') do (set FILE2=%%A)
-set CLASSPATH=.;%JAR_BASE%%FILE1%;%JAR_BASE%%FILE2%
\ No newline at end of file
+ at call set rtm_java_root=%RTM_JAVA_ROOT%
+ at set JAR_BASE=%rtm_java_root%\jar\
+ at for /F %%A in ('dir "%JAR_BASE%OpenRTM*" /B') do (set FILE1=%%A)
+ at for /F %%A in ('dir "%JAR_BASE%commons-cli*" /B') do (set FILE2=%%A)
+ at set CLASSPATH=.;%JAR_BASE%%FILE1%;%JAR_BASE%%FILE2%