[openrtm-commit:00551] r236 - in trunk/rtmtools/jp.go.aist.rtm.rtcbuilder: src/jp/go/aist/rtm/rtcbuilder/generator/param src/jp/go/aist/rtm/rtcbuilder/manager src/jp/go/aist/rtm/rtcbuilder/template/common test/jp/go/aist/rtm/rtcbuilder/_test/_100

[openrtm ＠ openrtm.org]

Author: sakamoto
Date: 2012-01-06 02:09:47 +0900 (Fri, 06 Jan 2012)
New Revision: 236

Modified:
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/RtcParam.java
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CommonGenerateManager.java
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/common/rtc.conf.vsl
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBaseClass.java
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBasicTest.java
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBuildTest.java
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDataPortIDLTest.java
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLInheritTest.java
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLModuleTest.java
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLPathTest.java
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLType.java
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXImplTest.java
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXLibraryTest.java
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXMultiTest.java
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXTemplateTestAIST2.java
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXVariableTest.java
Log:
modify XXX.conf #2299

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/RtcParam.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/RtcParam.java	2012-01-05 16:43:25 UTC (rev 235)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/RtcParam.java	2012-01-05 17:09:47 UTC (rev 236)
@@ -773,8 +773,8 @@
 	public void setIsTest(boolean isTest) {
 		this.test_version = isTest;
 	}
-	public boolean checkConstraint() {
-		if( 0<configParams.size() ) {
+	public boolean checkConfig() {
+		if( 0<configParams.size() || 0<configParameterParams.size() || 0.0<executionRate ) {
 			return true;
 		}
 		return false;

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CommonGenerateManager.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CommonGenerateManager.java	2012-01-05 16:43:25 UTC (rev 235)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CommonGenerateManager.java	2012-01-05 17:09:47 UTC (rev 236)
@@ -59,11 +59,8 @@
 
 		GeneratedResult gr;
 
-		if (rtcParam.getExecutionRate() > 0.0 || rtcParam.checkConstraint()
-				|| rtcParam.getConfigParameterParams().size() > 0) {
-			gr = generateRTCConf(contextMap);
-			result.add(gr);
-		}
+		gr = generateRTCConf(contextMap);
+		result.add(gr);
 
 		gr = generateComponentConf(contextMap);
 		result.add(gr);
@@ -81,8 +78,7 @@
 		gr = generateREADME_04(contextMap);
 		result.add(gr);
 
-		if (rtcParam.getExecutionRate() > 0.0 || rtcParam.checkConstraint()
-				|| rtcParam.getConfigParameterParams().size() > 0) {
+		if (rtcParam.getExecutionRate() > 0.0 || rtcParam.checkConfig()) {
 			gr = generateRTCConf(contextMap);
 			result.add(gr);
 		}

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/common/rtc.conf.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/common/rtc.conf.vsl	2012-01-05 16:43:25 UTC (rev 235)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/common/rtc.conf.vsl	2012-01-05 17:09:47 UTC (rev 236)
@@ -33,7 +33,7 @@
 ${sharp}
 ${sharp}------------------------------------------------------------
 
-#if(${rtcParam.checkConstraint()})${rtcParam.category}.${rtcParam.name}.config_file: ${rtcParam.name}.conf
+#if(${rtcParam.checkConfig()})${rtcParam.category}.${rtcParam.name}.config_file: ${rtcParam.name}.conf
 #end
 
 ${sharp}

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBaseClass.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBaseClass.java	2012-01-05 16:43:25 UTC (rev 235)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBaseClass.java	2012-01-05 17:09:47 UTC (rev 236)
@@ -65,7 +65,7 @@
 	}
 	
 	private void checkResults(List<GeneratedResult> result, String resourceDir) {
-		assertEquals(13, result.size());
+		assertEquals(14, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBasicTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBasicTest.java	2012-01-05 16:43:25 UTC (rev 235)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBasicTest.java	2012-01-05 17:09:47 UTC (rev 236)
@@ -62,7 +62,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/basic/operation/";
 
-		assertEquals(12, result.size());
+		assertEquals(13, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");
@@ -96,7 +96,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/basic/attribute/";
 
-		assertEquals(12, result.size());
+		assertEquals(13, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");
@@ -149,7 +149,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/basic/service2/";
 
-		assertEquals(14, result.size());
+		assertEquals(15, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");
@@ -193,7 +193,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/basic/service1/";
 
-		assertEquals(14, result.size());
+		assertEquals(15, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");
@@ -226,7 +226,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/basic/outport2/";
 
-		assertEquals(12, result.size());
+		assertEquals(13, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");
@@ -256,7 +256,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/basic/outport1/";
 
-		assertEquals(12, result.size());
+		assertEquals(13, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");
@@ -283,7 +283,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/basic/inport2/";
 
-		assertEquals(12, result.size());
+		assertEquals(13, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");
@@ -309,7 +309,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/basic/inport1/";
 
-		assertEquals(12, result.size());
+		assertEquals(13, result.size());
 		checkCode(result, resourceDir, "testComp.cpp");
 		checkCode(result, resourceDir, "test.h");
 		checkCode(result, resourceDir, "test.cpp");
@@ -331,7 +331,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/basic/name/";
 
-		assertEquals(12, result.size());
+		assertEquals(13, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBuildTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBuildTest.java	2012-01-05 16:43:25 UTC (rev 235)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBuildTest.java	2012-01-05 17:09:47 UTC (rev 236)
@@ -91,7 +91,7 @@
 
 		String resourceDir = fixturePath(name) + "/";
 
-		assertEquals(15, result.size());
+		assertEquals(16, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");
@@ -174,7 +174,7 @@
 
 		String resourceDir = fixturePath(name) + "/";
 
-		assertEquals(17, result.size());
+		assertEquals(18, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");
@@ -253,7 +253,7 @@
 
 		String resourceDir = fixturePath(name) + "/";
 
-		assertEquals(14, result.size());
+		assertEquals(15, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");
@@ -332,7 +332,7 @@
 
 		String resourceDir = fixturePath(name) + "/";
 
-		assertEquals(16, result.size());
+		assertEquals(17, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDataPortIDLTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDataPortIDLTest.java	2012-01-05 16:43:25 UTC (rev 235)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDataPortIDLTest.java	2012-01-05 17:09:47 UTC (rev 236)
@@ -60,7 +60,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/DataPortIDL/";
 
-		assertEquals(12, result.size());
+		assertEquals(13, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLInheritTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLInheritTest.java	2012-01-05 16:43:25 UTC (rev 235)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLInheritTest.java	2012-01-05 17:09:47 UTC (rev 236)
@@ -78,7 +78,7 @@
 
 		String resourceDir = fixturePath(name) + "/";
 
-		assertEquals(14, result.size());
+		assertEquals(15, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");
@@ -127,7 +127,7 @@
 
 		String resourceDir = fixturePath(name) + "/";
 
-		assertEquals(16, result.size());
+		assertEquals(17, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLModuleTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLModuleTest.java	2012-01-05 16:43:25 UTC (rev 235)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLModuleTest.java	2012-01-05 17:09:47 UTC (rev 236)
@@ -54,7 +54,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/idlmodule/serviceM/";
 
-		assertEquals(14, result.size());
+		assertEquals(15, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");
@@ -89,7 +89,7 @@
 		String resourceDir = rootPath
 				+ "/resource/100/CXX/idlmodule/serviceCon/";
 
-		assertEquals(12, result.size());
+		assertEquals(13, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");
@@ -124,7 +124,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/idlmodule/serviceArg/";
 
-		assertEquals(14, result.size());
+		assertEquals(15, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");
@@ -158,7 +158,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/idlmodule/serviceArgStruct/";
 
-		assertEquals(14, result.size());
+		assertEquals(15, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLPathTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLPathTest.java	2012-01-05 16:43:25 UTC (rev 235)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLPathTest.java	2012-01-05 17:09:47 UTC (rev 236)
@@ -76,7 +76,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/idlpath/IDLPath3/";
 
-		assertEquals(14, result.size());
+		assertEquals(15, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");
@@ -131,7 +131,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/idlpath/IDLPath2/";
 
-		assertEquals(14, result.size());
+		assertEquals(15, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");
@@ -185,7 +185,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/idlpath/IDLPath1/";
 
-		assertEquals(14, result.size());
+		assertEquals(15, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLType.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLType.java	2012-01-05 16:43:25 UTC (rev 235)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLType.java	2012-01-05 17:09:47 UTC (rev 236)
@@ -92,7 +92,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/idltype/SeqString/";
 
-		assertEquals(14, result.size());
+		assertEquals(15, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXImplTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXImplTest.java	2012-01-05 16:43:25 UTC (rev 235)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXImplTest.java	2012-01-05 17:09:47 UTC (rev 236)
@@ -53,7 +53,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/impl/all/";
 
-		assertEquals(12, result.size());
+		assertEquals(13, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");
@@ -80,7 +80,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/impl/execute/";
 
-		assertEquals(12, result.size());
+		assertEquals(13, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");
@@ -106,7 +106,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/impl/finalize/";
 
-		assertEquals(12, result.size());
+		assertEquals(13, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");
@@ -129,7 +129,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/impl/initialize/";
 
-		assertEquals(12, result.size());
+		assertEquals(13, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXLibraryTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXLibraryTest.java	2012-01-05 16:43:25 UTC (rev 235)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXLibraryTest.java	2012-01-05 17:09:47 UTC (rev 236)
@@ -47,7 +47,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/library/library2/";
 
-		assertEquals(12, result.size());
+		assertEquals(13, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");
@@ -73,7 +73,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/library/library1/";
 
-		assertEquals(12, result.size());
+		assertEquals(13, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXMultiTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXMultiTest.java	2012-01-05 16:43:25 UTC (rev 235)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXMultiTest.java	2012-01-05 17:09:47 UTC (rev 236)
@@ -87,7 +87,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/Multi/ProConMulti/";
 
-		assertEquals(16, result.size());
+		assertEquals(17, result.size());
 		checkResults(result, resourceDir);
 		checkCode(result, resourceDir, "MyServiceSVC_impl.h");
 		checkCode(result, resourceDir, "MyServiceSVC_impl.cpp");
@@ -119,7 +119,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/Multi/ConMulti/";
 
-		assertEquals(12, result.size());
+		assertEquals(13, result.size());
 		checkResults(result, resourceDir);
 		nonexist(result, resourceDir, "MyServiceSVC_impl.h");
 		nonexist(result, resourceDir, "MyServiceSVC_impl.cpp");
@@ -151,7 +151,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/Multi/ProMulti/";
 
-		assertEquals(16, result.size());
+		assertEquals(17, result.size());
 		checkResults(result, resourceDir);
 		checkCode(result, resourceDir, "MyServiceSVC_impl.h");
 		checkCode(result, resourceDir, "MyServiceSVC_impl.cpp");

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXTemplateTestAIST2.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXTemplateTestAIST2.java	2012-01-05 16:43:25 UTC (rev 235)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXTemplateTestAIST2.java	2012-01-05 17:09:47 UTC (rev 236)
@@ -53,7 +53,7 @@
 		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
 
 		String targetDir = rootPath + "/resource/100/CXX/AIST2/";
-		assertEquals(14, result.size());
+		assertEquals(15, result.size());
 		checkCode(result, targetDir, "ModuleNameComp.cpp");
 		checkCode(result, targetDir, "ModuleName.h");
 		checkCode(result, targetDir, "ModuleName.cpp");

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXVariableTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXVariableTest.java	2012-01-05 16:43:25 UTC (rev 235)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXVariableTest.java	2012-01-05 17:09:47 UTC (rev 236)
@@ -76,7 +76,7 @@
 		String resourceDir = rootPath
 				+ "/resource/100/CXX/Variable/ServicePort2/";
 
-		assertEquals(14, result.size());
+		assertEquals(15, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");
@@ -131,7 +131,7 @@
 		String resourceDir = rootPath
 				+ "/resource/100/CXX/Variable/ServicePort1/";
 
-		assertEquals(14, result.size());
+		assertEquals(15, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");
@@ -167,7 +167,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/Variable/DataPort/";
 
-		assertEquals(12, result.size());
+		assertEquals(13, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");