[openrtm-commit:01639] r740 - in branches/RELENG_1_1: . jp.go.aist.rtm.RTC jp.go.aist.rtm.RTC/src jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2015-10-29 15:34:25 +0900 (Thu, 29 Oct 2015)
New Revision: 740

Added:
   branches/RELENG_1_1/jp.go.aist.rtm.RTC/src/Extension/
Modified:
   branches/RELENG_1_1/
   branches/RELENG_1_1/jp.go.aist.rtm.RTC/
   branches/RELENG_1_1/jp.go.aist.rtm.RTC/build.xml
   branches/RELENG_1_1/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/LocalServiceProfile.java
Log:
[compat,merge] r629 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/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,630-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-637,639-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/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,630-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-637,639-658

Modified: branches/RELENG_1_1/jp.go.aist.rtm.RTC/build.xml
===================================================================
--- branches/RELENG_1_1/jp.go.aist.rtm.RTC/build.xml	2015-10-29 06:26:17 UTC (rev 739)
+++ branches/RELENG_1_1/jp.go.aist.rtm.RTC/build.xml	2015-10-29 06:34:25 UTC (rev 740)
@@ -26,6 +26,8 @@
 
 	<property name="source.examples" value="src/RTMExamples"/>
 
+	<property name="source.extension" value="src/Extension"/>
+
 	<property name="source.examplestemp" value="src/RTMExamplesTemp"/>
 
 	<property name="source.main" value="src/jp"/>
@@ -616,8 +618,12 @@
 
 		<javac srcdir="${source.sdo}:${source.rtc}:${source.rtm}:${source.openrtm}" destdir="${build.dir}" classpath="lib/commons-cli-1.1.jar" encoding="UTF-8" />
 
+
 		<javac srcdir="${source.main}:${source.rtcd}:${source.rtcprof}" destdir="${build.dir}" classpath="lib/commons-cli-1.1.jar"  encoding="UTF-8"  includes="go/aist/**" excludes="go/aist/ForSunOrb/**,go/aist/ForJacOrb/**"  />
 
+
+		<javac srcdir="${source.extension}:" destdir="${build.dir}" classpath="lib/commons-cli-1.1.jar"  encoding="UTF-8" />
+
 		<delete dir="${source.examplestemp}" />
 
 		<native2ascii encoding="UTF-8" src="${source.examples}" dest="${source.examplestemp}" >
@@ -646,80 +652,6 @@
 
 		<javac srcdir="${source.examples}:" destdir="${build.dir}" classpath="lib/commons-cli-1.1.jar"  encoding="UTF-8" />
 
-		<native2ascii encoding="UTF-8" src="${source.sdo}" dest="${source.sdotemp}" >
-
-	            <include name="**/*.java" />
-
-	        </native2ascii>
-
-		<copy todir="${source.sdo}">
-
-		    <fileset dir="${source.sdotemp}" >
-
-		        <include name="**/*.java" />
-
-		    </fileset>
-
-		</copy>
-
-		<delete dir="${source.sdotemp}" />
-
-		<native2ascii encoding="UTF-8" src="${source.rtc}" dest="${source.rtctemp}" >
-
-	            <include name="**/*.java" />
-
-	        </native2ascii>
-
-		<copy todir="${source.rtc}">
-
-		    <fileset dir="${source.rtctemp}" >
-
-		        <include name="**/*.java" />
-
-		    </fileset>
-
-		</copy>
-
-		<delete dir="${source.rtctemp}" />
-
-		<native2ascii encoding="UTF-8" src="${source.rtm}" dest="${source.rtmtemp}" >
-
-	            <include name="**/*.java" />
-
-	        </native2ascii>
-
-		<copy todir="${source.rtm}">
-
-		    <fileset dir="${source.rtmtemp}" >
-
-		        <include name="**/*.java" />
-
-		    </fileset>
-
-		</copy>
-
-		<delete dir="${source.rtmtemp}" />
-
-		<native2ascii encoding="UTF-8" src="${source.openrtm}" dest="${source.openrtmtemp}" >
-
-	            <include name="**/*.java" />
-
-	        </native2ascii>
-
-		<copy todir="${source.openrtm}">
-
-		    <fileset dir="${source.openrtmtemp}" >
-
-		        <include name="**/*.java" />
-
-		    </fileset>
-
-		</copy>
-
-		<delete dir="${source.openrtmtemp}" />
-
-		<javac srcdir="${source.sdo}:${source.rtc}:${source.rtm}:${source.openrtm}" destdir="${build.dir}" classpath="lib/commons-cli-1.1.jar" encoding="UTF-8" />
-
 		<copy todir="${source.common}" overwrite="true">
 
 		    <fileset dir="${source.sunorb}" >
@@ -760,6 +692,8 @@
 
 		<javac srcdir="${source.examples}:" destdir="${build.dir}" classpath="lib/commons-cli-1.1.jar"  encoding="UTF-8" />
 
+
+
 	</target>
 
 

Modified: branches/RELENG_1_1/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/LocalServiceProfile.java
===================================================================
--- branches/RELENG_1_1/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/LocalServiceProfile.java	2015-10-29 06:26:17 UTC (rev 739)
+++ branches/RELENG_1_1/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/LocalServiceProfile.java	2015-10-29 06:34:25 UTC (rev 740)
@@ -5,7 +5,7 @@
    * {@.ja LocalServiceのプロファイルデータ}
    * {@.en Profile data structure of LocalService}
    */
-public interface LocalServiceProfile {
+public class LocalServiceProfile {
     /**
      * {@.ja LocalServiceのサービス名}
      * {@.en The name of LocalService}