2016年 3月 7日 (月) 19:41:53 JST

Author: ga
Date: 2016-03-07 19:41:53 +0900 (Mon, 07 Mar 2016)
New Revision: 572

Modified:
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/AIST2/ModuleName.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/AIST2/MyServiceSVC_impl.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/AIST2/MyServiceSVC_impl.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/ConfigType/foo.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/ConfigType/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset1/foo.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset1/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset2/foo.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset2/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset3/foo.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset3/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Content/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/DataPortIDL/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/MyServiceSVC_impl.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/MyServiceSVC_impl.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/foo.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ExecutionCxt/foo.conf
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ExecutionCxt/foo.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ExecutionCxt/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Manip/ManipulatorCommonInterface_MiddleLevelSVC_impl.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Manip/ManipulatorCommonInterface_MiddleLevelSVC_impl.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Manip/ModuleName.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ConMulti/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProConMulti/MyService2SVC_impl.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProConMulti/MyService2SVC_impl.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProConMulti/MyServiceSVC_impl.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProConMulti/MyServiceSVC_impl.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProConMulti/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProMulti/DAQServiceSVC_impl.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProMulti/DAQServiceSVC_impl.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProMulti/MyServiceSVC_impl.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProMulti/MyServiceSVC_impl.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProMulti/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confprefix/MyServiceSVC_impl.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confprefix/MyServiceSVC_impl.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confprefix/foo.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confprefix/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confsuffix/MyServiceSVC_impl.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confsuffix/MyServiceSVC_impl.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confsuffix/foo.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confsuffix/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtprefix/MyServiceSVC_impl.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtprefix/MyServiceSVC_impl.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtprefix/foo.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtprefix/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtsuffix/MyServiceSVC_impl.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtsuffix/MyServiceSVC_impl.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtsuffix/foo.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtsuffix/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/prefix/MyServiceSVC_impl.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/prefix/MyServiceSVC_impl.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/prefix/foo.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/prefix/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/siprefix/MyServiceSVC_impl.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/siprefix/MyServiceSVC_impl.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/siprefix/foo.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/siprefix/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/sisuffix/MyServiceSVC_impl.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/sisuffix/MyServiceSVC_impl.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/sisuffix/foo.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/sisuffix/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/suffix/MyServiceSVC_impl.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/suffix/MyServiceSVC_impl.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/suffix/foo.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/suffix/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svprefix/MyServiceSVC_impl.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svprefix/MyServiceSVC_impl.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svprefix/foo.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svprefix/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svsuffix/MyServiceSVC_impl.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svsuffix/MyServiceSVC_impl.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svsuffix/foo.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svsuffix/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/SystemConfig/foo.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/SystemConfig/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/DataPort/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort1/MyServiceSVC_impl.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort1/MyServiceSVC_impl.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort1/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort2/MyServiceSVC_impl.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort2/MyServiceSVC_impl.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort2/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/attribute/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/inport1/test.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/inport2/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/name/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/operation/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/outport1/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/outport2/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service1/MyServiceSVC_impl.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service1/MyServiceSVC_impl.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service1/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service2/MyServiceSVC_impl.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service2/MyServiceSVC_impl.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service2/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/DFFSMMM/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/DataFlow/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/FSM/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/include/foo/MyServiceSVC_impl.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/include/foo/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/src/MyServiceSVC_impl.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/include/foo/MyServiceChildMultiSVC_impl.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/include/foo/MyServiceChildWithTypeSVC_impl.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/include/foo/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/src/MyServiceChildMultiSVC_impl.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/src/MyServiceChildWithTypeSVC_impl.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc1/MyServiceSVC_impl.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc1/MyServiceSVC_impl.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc1/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc2/MyServiceChildMultiSVC_impl.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc2/MyServiceChildMultiSVC_impl.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc2/MyServiceChildWithTypeSVC_impl.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc2/MyServiceChildWithTypeSVC_impl.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc2/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint1/foo.conf
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint1/foo.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint1/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint2/foo.conf
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint2/foo.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint2/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint3/foo.conf
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint3/foo.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint3/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit1/MyServiceChildMultiSVC_impl.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit1/MyServiceChildMultiSVC_impl.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit1/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit2/MyServiceChildMultiSVC_impl.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit2/MyServiceChildMultiSVC_impl.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit2/MyServiceChildWithTypeSVC_impl.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit2/MyServiceChildWithTypeSVC_impl.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit2/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceArg/MyServiceModuleTypeDefSVC_impl.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceArg/MyServiceModuleTypeDefSVC_impl.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceArg/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceArgStruct/MyServiceModuleTypeDefSVC_impl.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceArgStruct/MyServiceModuleTypeDefSVC_impl.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceArgStruct/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceCon/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceM/MyServiceSVC_impl.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceM/MyServiceSVC_impl.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceM/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath1/MyServiceSVC_impl.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath1/MyServiceSVC_impl.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath1/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath2/MyServiceSVC_impl.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath2/MyServiceSVC_impl.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath2/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath3/MyServiceSVC_impl.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath3/MyServiceSVC_impl.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath3/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlstruct/TestModule.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlstruct/module_ysuga_netSVC_impl.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlstruct/module_ysuga_netSVC_impl.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/IDLType1/ModuleName.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/IDLType1/TestIDLSVC_impl.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/IDLType1/TestIDLSVC_impl.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/SeqString/MyServiceSVC_impl.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/SeqString/MyServiceSVC_impl.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/SeqString/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/Struct/ModuleName.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/Struct2/ModuleName.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/type/MyServiceSVC_impl.cpp
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/type/MyServiceSVC_impl.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/type/test.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/all/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/execute/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/finalize/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/initialize/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/library/library1/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/library/library2/foo.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/CORBAParseCommentTest.java
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/CORBAParseInheritTest.java
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/CORBAParseMethodTypeTest.java
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/CORBAParseTypeDefTest.java
Log:
Modified unit test results

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/AIST2/ModuleName.h
===================================================================

--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/AIST2/ModuleName.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/AIST2/ModuleName.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef MODULENAME_H
 #define MODULENAME_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -30,6 +25,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/AIST2/MyServiceSVC_impl.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/AIST2/MyServiceSVC_impl.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/AIST2/MyServiceSVC_impl.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,13 +10,13 @@
 /*
  * Example implementational code for IDL interface Test::MyService
  */
-MyServiceSVC_impl::MyServiceSVC_impl()
+Test_MyServiceSVC_impl::Test_MyServiceSVC_impl()
 {
   // Please add extra constructor code here.
 }
 
 
-MyServiceSVC_impl::~MyServiceSVC_impl()
+Test_MyServiceSVC_impl::~Test_MyServiceSVC_impl()
 {
   // Please add extra destructor code here.
 }
@@ -25,46 +25,46 @@
 /*
  * Methods corresponding to IDL attributes and operations
  */
-char* MyServiceSVC_impl::echo(const char* msg)
+char* Test_MyServiceSVC_impl::echo(const char* msg)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <char* MyServiceSVC_impl::echo(const char* msg)>"
+  #warning "Code missing in function <char* Test_MyServiceSVC_impl::echo(const char* msg)>"
 #endif
   return 0;
 }
 
-Test::EchoList* MyServiceSVC_impl::get_echo_history()
+Test::EchoList* Test_MyServiceSVC_impl::get_echo_history()
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <Test::EchoList* MyServiceSVC_impl::get_echo_history()>"
+  #warning "Code missing in function <Test::EchoList* Test_MyServiceSVC_impl::get_echo_history()>"
 #endif
   return 0;
 }
 
-void MyServiceSVC_impl::set_value(CORBA::Float value)
+void Test_MyServiceSVC_impl::set_value(::CORBA::Float value)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <void MyServiceSVC_impl::set_value(CORBA::Float value)>"
+  #warning "Code missing in function <void Test_MyServiceSVC_impl::set_value(::CORBA::Float value)>"
 #endif
 }
 
-CORBA::Float MyServiceSVC_impl::get_value()
+::CORBA::Float Test_MyServiceSVC_impl::get_value()
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::Float MyServiceSVC_impl::get_value()>"
+  #warning "Code missing in function <::CORBA::Float Test_MyServiceSVC_impl::get_value()>"
 #endif
   return 0;
 }
 
-Test::ValueList* MyServiceSVC_impl::get_value_history()
+Test::ValueList* Test_MyServiceSVC_impl::get_value_history()
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <Test::ValueList* MyServiceSVC_impl::get_value_history()>"
+  #warning "Code missing in function <Test::ValueList* Test_MyServiceSVC_impl::get_value_history()>"
 #endif
   return 0;
 }

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/AIST2/MyServiceSVC_impl.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/AIST2/MyServiceSVC_impl.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/AIST2/MyServiceSVC_impl.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -14,7 +14,7 @@
  * @class MyServiceSVC_impl
  * Example class implementing IDL interface Test::MyService
  */
-class MyServiceSVC_impl
+class Test_MyServiceSVC_impl
  : public virtual POA_Test::MyService,
    public virtual PortableServer::RefCountServantBase
 {
@@ -31,13 +31,13 @@
   /*!
    * @brief destructor
    */
-   virtual ~MyServiceSVC_impl();
+   virtual ~Test_MyServiceSVC_impl();
 
    // attributes and operations
    char* echo(const char* msg);
    Test::EchoList* get_echo_history();
-   void set_value(CORBA::Float value);
-   CORBA::Float get_value();
+   void set_value(::CORBA::Float value);
+   ::CORBA::Float get_value();
    Test::ValueList* get_value_history();
 
 };

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/ConfigType/foo.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/ConfigType/foo.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/ConfigType/foo.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -32,8 +32,18 @@
     "conf.default.double_param", "4.11",
     "conf.default.str_param0", "hoge",
     "conf.default.str_param1", "dara",
+
     // Widget
     // Constraints
+
+    "conf.__type__.short_param", "short",
+    "conf.__type__.int_param", "int",
+    "conf.__type__.long_param", "long",
+    "conf.__type__.float_param", "float",
+    "conf.__type__.double_param", "double",
+    "conf.__type__.str_param0", "string",
+    "conf.__type__.str_param1", "string",
+
     ""
   };
 // </rtc-template>

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/ConfigType/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/ConfigType/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/ConfigType/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -29,6 +24,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset1/foo.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset1/foo.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset1/foo.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -26,8 +26,12 @@
     "lang_type",         "compile",
     // Configuration variables
     "conf.default.int_param0", "0",
+
     // Widget
     // Constraints
+
+    "conf.__type__.int_param0", "int",
+
     ""
   };
 // </rtc-template>

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset1/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset1/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset1/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -29,6 +24,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset2/foo.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset2/foo.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset2/foo.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -27,8 +27,13 @@
     // Configuration variables
     "conf.default.int_param0", "0",
     "conf.default.int_param1", "1",
+
     // Widget
     // Constraints
+
+    "conf.__type__.int_param0", "int",
+    "conf.__type__.int_param1", "int",
+
     ""
   };
 // </rtc-template>

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset2/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset2/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset2/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -29,6 +24,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset3/foo.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset3/foo.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset3/foo.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -30,8 +30,16 @@
     "conf.default.double_param0", "0.11",
     "conf.default.str_param0", "hoge",
     "conf.default.str_param1", "dara",
+
     // Widget
     // Constraints
+
+    "conf.__type__.int_param0", "int",
+    "conf.__type__.int_param1", "int",
+    "conf.__type__.double_param0", "double",
+    "conf.__type__.str_param0", "std::string",
+    "conf.__type__.str_param1", "std::string",
+
     ""
   };
 // </rtc-template>

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset3/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset3/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset3/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -29,6 +24,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Content/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Content/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Content/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -29,6 +24,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/DataPortIDL/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/DataPortIDL/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/DataPortIDL/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -30,9 +25,19 @@
 
 // </rtc-template>
 
-using namespace RTC;
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
 using namespace MyType;
+// </rtc-template>
 
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
+using namespace RTC;
+
 /*!
  * @class foo
  * @brief MDesc

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/MyServiceSVC_impl.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/MyServiceSVC_impl.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/MyServiceSVC_impl.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -31,19 +31,19 @@
 /*
  * Methods corresponding to IDL attributes and operations
  */
-void MyServiceSVC_impl::setGain(CORBA::Float gain)
+void MyServiceSVC_impl::setGain(::CORBA::Float gain)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <void MyServiceSVC_impl::setGain(CORBA::Float gain)>"
+  #warning "Code missing in function <void MyServiceSVC_impl::setGain(::CORBA::Float gain)>"
 #endif
 }
 
-CORBA::Float MyServiceSVC_impl::getGain()
+::CORBA::Float MyServiceSVC_impl::getGain()
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::Float MyServiceSVC_impl::getGain()>"
+  #warning "Code missing in function <::CORBA::Float MyServiceSVC_impl::getGain()>"
 #endif
   return 0;
 }

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/MyServiceSVC_impl.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/MyServiceSVC_impl.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/MyServiceSVC_impl.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -40,8 +40,8 @@
    virtual ~MyServiceSVC_impl();
 
    // attributes and operations
-   void setGain(CORBA::Float gain);
-   CORBA::Float getGain();
+   void setGain(::CORBA::Float gain);
+   ::CORBA::Float getGain();
 
 };
 

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/foo.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/foo.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/foo.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -36,8 +36,16 @@
     "conf.default.double_param0", "0.11",
     "conf.default.str_param0", "hoge",
     "conf.default.str_param1", "dara",
+
     // Widget
     // Constraints
+
+    "conf.__type__.int_param0", "int",
+    "conf.__type__.int_param1", "int",
+    "conf.__type__.double_param0", "double",
+    "conf.__type__.str_param0", "std::string",
+    "conf.__type__.str_param1", "std::string",
+
     ""
   };
 // </rtc-template>

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -16,11 +16,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -37,6 +32,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ExecutionCxt/foo.conf
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ExecutionCxt/foo.conf	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ExecutionCxt/foo.conf	2016-03-07 10:41:53 UTC (rev 572)
@@ -111,6 +111,12 @@
 # conf.__constraints__.vector_param0: (dog,monky,pheasant,cat)
 # conf.__constraints__.vector_param1: (pita,gora,switch)
 
+# conf.__type__.int_param0: int
+# conf.__type__.int_param1: int
+# conf.__type__.double_param0: double
+# conf.__type__.str_param0: std::string
+# conf.__type__.str_param1: std::string
+
 ##============================================================
 ## Execution context settings
 ##============================================================

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ExecutionCxt/foo.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ExecutionCxt/foo.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ExecutionCxt/foo.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -30,8 +30,16 @@
     "conf.default.double_param0", "0.11",
     "conf.default.str_param0", "hoge",
     "conf.default.str_param1", "dara",
+
     // Widget
     // Constraints
+
+    "conf.__type__.int_param0", "int",
+    "conf.__type__.int_param1", "int",
+    "conf.__type__.double_param0", "double",
+    "conf.__type__.str_param0", "std::string",
+    "conf.__type__.str_param1", "std::string",
+
     ""
   };
 // </rtc-template>

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ExecutionCxt/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ExecutionCxt/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ExecutionCxt/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -29,6 +24,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Manip/ManipulatorCommonInterface_MiddleLevelSVC_impl.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Manip/ManipulatorCommonInterface_MiddleLevelSVC_impl.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Manip/ManipulatorCommonInterface_MiddleLevelSVC_impl.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -75,22 +75,22 @@
   return result;
 }
 
-RTC::RETURN_ID* ManipulatorCommonInterface_MiddleSVC_impl::getMinAccelTimeCartesian(CORBA::Double& aclTime)
+RTC::RETURN_ID* ManipulatorCommonInterface_MiddleSVC_impl::getMinAccelTimeCartesian(::CORBA::Double& aclTime)
 {
 	RTC::RETURN_ID* result;
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <RTC::RETURN_ID* ManipulatorCommonInterface_MiddleSVC_impl::getMinAccelTimeCartesian(CORBA::Double& aclTime)>"
+  #warning "Code missing in function <RTC::RETURN_ID* ManipulatorCommonInterface_MiddleSVC_impl::getMinAccelTimeCartesian(::CORBA::Double& aclTime)>"
 #endif
   return result;
 }
 
-RTC::RETURN_ID* ManipulatorCommonInterface_MiddleSVC_impl::getMinAccelTimeJoint(CORBA::Double& aclTime)
+RTC::RETURN_ID* ManipulatorCommonInterface_MiddleSVC_impl::getMinAccelTimeJoint(::CORBA::Double& aclTime)
 {
 	RTC::RETURN_ID* result;
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <RTC::RETURN_ID* ManipulatorCommonInterface_MiddleSVC_impl::getMinAccelTimeJoint(CORBA::Double& aclTime)>"
+  #warning "Code missing in function <RTC::RETURN_ID* ManipulatorCommonInterface_MiddleSVC_impl::getMinAccelTimeJoint(::CORBA::Double& aclTime)>"
 #endif
   return result;
 }
@@ -215,22 +215,22 @@
   return result;
 }
 
-RTC::RETURN_ID* ManipulatorCommonInterface_MiddleSVC_impl::setAccelTimeCartesian(CORBA::Double aclTime)
+RTC::RETURN_ID* ManipulatorCommonInterface_MiddleSVC_impl::setAccelTimeCartesian(::CORBA::Double aclTime)
 {
 	RTC::RETURN_ID* result;
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <RTC::RETURN_ID* ManipulatorCommonInterface_MiddleSVC_impl::setAccelTimeCartesian(CORBA::Double aclTime)>"
+  #warning "Code missing in function <RTC::RETURN_ID* ManipulatorCommonInterface_MiddleSVC_impl::setAccelTimeCartesian(::CORBA::Double aclTime)>"
 #endif
   return result;
 }
 
-RTC::RETURN_ID* ManipulatorCommonInterface_MiddleSVC_impl::setAccelTimeJoint(CORBA::Double aclTime)
+RTC::RETURN_ID* ManipulatorCommonInterface_MiddleSVC_impl::setAccelTimeJoint(::CORBA::Double aclTime)
 {
 	RTC::RETURN_ID* result;
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <RTC::RETURN_ID* ManipulatorCommonInterface_MiddleSVC_impl::setAccelTimeJoint(CORBA::Double aclTime)>"
+  #warning "Code missing in function <RTC::RETURN_ID* ManipulatorCommonInterface_MiddleSVC_impl::setAccelTimeJoint(::CORBA::Double aclTime)>"
 #endif
   return result;
 }
@@ -275,22 +275,22 @@
   return result;
 }
 
-RTC::RETURN_ID* ManipulatorCommonInterface_MiddleSVC_impl::setMinAccelTimeCartesian(CORBA::Double aclTime)
+RTC::RETURN_ID* ManipulatorCommonInterface_MiddleSVC_impl::setMinAccelTimeCartesian(::CORBA::Double aclTime)
 {
 	RTC::RETURN_ID* result;
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <RTC::RETURN_ID* ManipulatorCommonInterface_MiddleSVC_impl::setMinAccelTimeCartesian(CORBA::Double aclTime)>"
+  #warning "Code missing in function <RTC::RETURN_ID* ManipulatorCommonInterface_MiddleSVC_impl::setMinAccelTimeCartesian(::CORBA::Double aclTime)>"
 #endif
   return result;
 }
 
-RTC::RETURN_ID* ManipulatorCommonInterface_MiddleSVC_impl::setMinAccelTimeJoint(CORBA::Double aclTime)
+RTC::RETURN_ID* ManipulatorCommonInterface_MiddleSVC_impl::setMinAccelTimeJoint(::CORBA::Double aclTime)
 {
 	RTC::RETURN_ID* result;
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <RTC::RETURN_ID* ManipulatorCommonInterface_MiddleSVC_impl::setMinAccelTimeJoint(CORBA::Double aclTime)>"
+  #warning "Code missing in function <RTC::RETURN_ID* ManipulatorCommonInterface_MiddleSVC_impl::setMinAccelTimeJoint(::CORBA::Double aclTime)>"
 #endif
   return result;
 }

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Manip/ManipulatorCommonInterface_MiddleLevelSVC_impl.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Manip/ManipulatorCommonInterface_MiddleLevelSVC_impl.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Manip/ManipulatorCommonInterface_MiddleLevelSVC_impl.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -42,8 +42,8 @@
    RTC::RETURN_ID* getFeedbackPosCartesian(RTC::CarPosWithElbow& pos);
    RTC::RETURN_ID* getMaxSpeedCartesian(RTC::CartesianSpeed& speed);
    RTC::RETURN_ID* getMaxSpeedJoint(RTC::DoubleSeq_out speed);
-   RTC::RETURN_ID* getMinAccelTimeCartesian(CORBA::Double& aclTime);
-   RTC::RETURN_ID* getMinAccelTimeJoint(CORBA::Double& aclTime);
+   RTC::RETURN_ID* getMinAccelTimeCartesian(::CORBA::Double& aclTime);
+   RTC::RETURN_ID* getMinAccelTimeJoint(::CORBA::Double& aclTime);
    RTC::RETURN_ID* getSoftLimitCartesian(RTC::LimitValue& xLimit, RTC::LimitValue& yLimit, RTC::LimitValue& zLimit);
    RTC::RETURN_ID* moveGripper(RTC::ULONG angleRatio);
    RTC::RETURN_ID* moveLinearCartesianAbs(const RTC::CarPosWithElbow& carPoint);
@@ -56,14 +56,14 @@
    RTC::RETURN_ID* pause();
    RTC::RETURN_ID* resume();
    RTC::RETURN_ID* stop();
-   RTC::RETURN_ID* setAccelTimeCartesian(CORBA::Double aclTime);
-   RTC::RETURN_ID* setAccelTimeJoint(CORBA::Double aclTime);
+   RTC::RETURN_ID* setAccelTimeCartesian(::CORBA::Double aclTime);
+   RTC::RETURN_ID* setAccelTimeJoint(::CORBA::Double aclTime);
    RTC::RETURN_ID* setBaseOffset(const RTC::HgMatrix offset);
    RTC::RETURN_ID* setControlPointOffset(const RTC::HgMatrix offset);
    RTC::RETURN_ID* setMaxSpeedCartesian(const RTC::CartesianSpeed& speed);
    RTC::RETURN_ID* setMaxSpeedJoint(const RTC::DoubleSeq& speed);
-   RTC::RETURN_ID* setMinAccelTimeCartesian(CORBA::Double aclTime);
-   RTC::RETURN_ID* setMinAccelTimeJoint(CORBA::Double aclTime);
+   RTC::RETURN_ID* setMinAccelTimeCartesian(::CORBA::Double aclTime);
+   RTC::RETURN_ID* setMinAccelTimeJoint(::CORBA::Double aclTime);
    RTC::RETURN_ID* setSoftLimitCartesian(const RTC::LimitValue& xLimit, const RTC::LimitValue& yLimit, const RTC::LimitValue& zLimit);
    RTC::RETURN_ID* setSpeedCartesian(RTC::ULONG spdRatio);
    RTC::RETURN_ID* setSpeedJoint(RTC::ULONG spdRatio);

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Manip/ModuleName.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Manip/ModuleName.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Manip/ModuleName.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef MODULENAME_H
 #define MODULENAME_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -30,6 +25,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ConMulti/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ConMulti/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ConMulti/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -31,6 +26,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProConMulti/MyService2SVC_impl.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProConMulti/MyService2SVC_impl.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProConMulti/MyService2SVC_impl.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -25,19 +25,19 @@
 /*
  * Methods corresponding to IDL attributes and operations
  */
-void MyService2SVC_impl::setKpGain(CORBA::Float gainkp)
+void MyService2SVC_impl::setKpGain(::CORBA::Float gainkp)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <void MyService2SVC_impl::setKpGain(CORBA::Float gainkp)>"
+  #warning "Code missing in function <void MyService2SVC_impl::setKpGain(::CORBA::Float gainkp)>"
 #endif
 }
 
-CORBA::Float MyService2SVC_impl::getKpGain()
+::CORBA::Float MyService2SVC_impl::getKpGain()
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::Float MyService2SVC_impl::getKpGain()>"
+  #warning "Code missing in function <::CORBA::Float MyService2SVC_impl::getKpGain()>"
 #endif
   return 0;
 }

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProConMulti/MyService2SVC_impl.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProConMulti/MyService2SVC_impl.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProConMulti/MyService2SVC_impl.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -34,8 +34,8 @@
    virtual ~MyService2SVC_impl();
 
    // attributes and operations
-   void setKpGain(CORBA::Float gainkp);
-   CORBA::Float getKpGain();
+   void setKpGain(::CORBA::Float gainkp);
+   ::CORBA::Float getKpGain();
 
 };
 

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProConMulti/MyServiceSVC_impl.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProConMulti/MyServiceSVC_impl.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProConMulti/MyServiceSVC_impl.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -25,19 +25,19 @@
 /*
  * Methods corresponding to IDL attributes and operations
  */
-void MyServiceSVC_impl::setGain(CORBA::Float gain)
+void MyServiceSVC_impl::setGain(::CORBA::Float gain)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <void MyServiceSVC_impl::setGain(CORBA::Float gain)>"
+  #warning "Code missing in function <void MyServiceSVC_impl::setGain(::CORBA::Float gain)>"
 #endif
 }
 
-CORBA::Float MyServiceSVC_impl::getGain()
+::CORBA::Float MyServiceSVC_impl::getGain()
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::Float MyServiceSVC_impl::getGain()>"
+  #warning "Code missing in function <::CORBA::Float MyServiceSVC_impl::getGain()>"
 #endif
   return 0;
 }

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProConMulti/MyServiceSVC_impl.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProConMulti/MyServiceSVC_impl.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProConMulti/MyServiceSVC_impl.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -34,8 +34,8 @@
    virtual ~MyServiceSVC_impl();
 
    // attributes and operations
-   void setGain(CORBA::Float gain);
-   CORBA::Float getGain();
+   void setGain(::CORBA::Float gain);
+   ::CORBA::Float getGain();
 
 };
 

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProConMulti/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProConMulti/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProConMulti/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -32,6 +27,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProMulti/DAQServiceSVC_impl.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProMulti/DAQServiceSVC_impl.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProMulti/DAQServiceSVC_impl.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -25,20 +25,20 @@
 /*
  * Methods corresponding to IDL attributes and operations
  */
-CORBA::Long DAQServiceSVC_impl::setCommand(CORBA::Long com, CORBA::Double par)
+::CORBA::Long DAQServiceSVC_impl::setCommand(::CORBA::Long com, ::CORBA::Double par)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::Long DAQServiceSVC_impl::setCommand(CORBA::Long com, CORBA::Double par)>"
+  #warning "Code missing in function <::CORBA::Long DAQServiceSVC_impl::setCommand(::CORBA::Long com, ::CORBA::Double par)>"
 #endif
   return 0;
 }
 
-CORBA::Short DAQServiceSVC_impl::getCommand()
+::CORBA::Short DAQServiceSVC_impl::getCommand()
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::Short DAQServiceSVC_impl::getCommand()>"
+  #warning "Code missing in function <::CORBA::Short DAQServiceSVC_impl::getCommand()>"
 #endif
   return 0;
 }

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProMulti/DAQServiceSVC_impl.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProMulti/DAQServiceSVC_impl.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProMulti/DAQServiceSVC_impl.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -34,8 +34,8 @@
    virtual ~DAQServiceSVC_impl();
 
    // attributes and operations
-   CORBA::Long setCommand(CORBA::Long com, CORBA::Double par);
-   CORBA::Short getCommand();
+   ::CORBA::Long setCommand(::CORBA::Long com, ::CORBA::Double par);
+   ::CORBA::Short getCommand();
 
 };
 

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProMulti/MyServiceSVC_impl.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProMulti/MyServiceSVC_impl.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProMulti/MyServiceSVC_impl.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -25,19 +25,19 @@
 /*
  * Methods corresponding to IDL attributes and operations
  */
-void MyServiceSVC_impl::setGain(CORBA::Float gain)
+void MyServiceSVC_impl::setGain(::CORBA::Float gain)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <void MyServiceSVC_impl::setGain(CORBA::Float gain)>"
+  #warning "Code missing in function <void MyServiceSVC_impl::setGain(::CORBA::Float gain)>"
 #endif
 }
 
-CORBA::Float MyServiceSVC_impl::getGain()
+::CORBA::Float MyServiceSVC_impl::getGain()
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::Float MyServiceSVC_impl::getGain()>"
+  #warning "Code missing in function <::CORBA::Float MyServiceSVC_impl::getGain()>"
 #endif
   return 0;
 }

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProMulti/MyServiceSVC_impl.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProMulti/MyServiceSVC_impl.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProMulti/MyServiceSVC_impl.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -34,8 +34,8 @@
    virtual ~MyServiceSVC_impl();
 
    // attributes and operations
-   void setGain(CORBA::Float gain);
-   CORBA::Float getGain();
+   void setGain(::CORBA::Float gain);
+   ::CORBA::Float getGain();
 
 };
 

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProMulti/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProMulti/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProMulti/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -31,6 +26,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confprefix/MyServiceSVC_impl.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confprefix/MyServiceSVC_impl.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confprefix/MyServiceSVC_impl.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -25,19 +25,19 @@
 /*
  * Methods corresponding to IDL attributes and operations
  */
-void MyServiceSVC_impl::setGain(CORBA::Float gain)
+void MyServiceSVC_impl::setGain(::CORBA::Float gain)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <void MyServiceSVC_impl::setGain(CORBA::Float gain)>"
+  #warning "Code missing in function <void MyServiceSVC_impl::setGain(::CORBA::Float gain)>"
 #endif
 }
 
-CORBA::Float MyServiceSVC_impl::getGain()
+::CORBA::Float MyServiceSVC_impl::getGain()
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::Float MyServiceSVC_impl::getGain()>"
+  #warning "Code missing in function <::CORBA::Float MyServiceSVC_impl::getGain()>"
 #endif
   return 0;
 }

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confprefix/MyServiceSVC_impl.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confprefix/MyServiceSVC_impl.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confprefix/MyServiceSVC_impl.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -34,8 +34,8 @@
    virtual ~MyServiceSVC_impl();
 
    // attributes and operations
-   void setGain(CORBA::Float gain);
-   CORBA::Float getGain();
+   void setGain(::CORBA::Float gain);
+   ::CORBA::Float getGain();
 
 };
 

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confprefix/foo.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confprefix/foo.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confprefix/foo.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -26,8 +26,12 @@
     "lang_type",         "compile",
     // Configuration variables
     "conf.default.int_param0", "0",
+
     // Widget
     // Constraints
+
+    "conf.__type__.int_param0", "int",
+
     ""
   };
 // </rtc-template>

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confprefix/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confprefix/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confprefix/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -31,6 +26,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confsuffix/MyServiceSVC_impl.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confsuffix/MyServiceSVC_impl.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confsuffix/MyServiceSVC_impl.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -25,19 +25,19 @@
 /*
  * Methods corresponding to IDL attributes and operations
  */
-void MyServiceSVC_impl::setGain(CORBA::Float gain)
+void MyServiceSVC_impl::setGain(::CORBA::Float gain)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <void MyServiceSVC_impl::setGain(CORBA::Float gain)>"
+  #warning "Code missing in function <void MyServiceSVC_impl::setGain(::CORBA::Float gain)>"
 #endif
 }
 
-CORBA::Float MyServiceSVC_impl::getGain()
+::CORBA::Float MyServiceSVC_impl::getGain()
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::Float MyServiceSVC_impl::getGain()>"
+  #warning "Code missing in function <::CORBA::Float MyServiceSVC_impl::getGain()>"
 #endif
   return 0;
 }

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confsuffix/MyServiceSVC_impl.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confsuffix/MyServiceSVC_impl.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confsuffix/MyServiceSVC_impl.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -34,8 +34,8 @@
    virtual ~MyServiceSVC_impl();
 
    // attributes and operations
-   void setGain(CORBA::Float gain);
-   CORBA::Float getGain();
+   void setGain(::CORBA::Float gain);
+   ::CORBA::Float getGain();
 
 };
 

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confsuffix/foo.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confsuffix/foo.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confsuffix/foo.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -26,8 +26,12 @@
     "lang_type",         "compile",
     // Configuration variables
     "conf.default.int_param0", "0",
+
     // Widget
     // Constraints
+
+    "conf.__type__.int_param0", "int",
+
     ""
   };
 // </rtc-template>

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confsuffix/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confsuffix/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confsuffix/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -31,6 +26,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtprefix/MyServiceSVC_impl.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtprefix/MyServiceSVC_impl.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtprefix/MyServiceSVC_impl.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -25,19 +25,19 @@
 /*
  * Methods corresponding to IDL attributes and operations
  */
-void MyServiceSVC_impl::setGain(CORBA::Float gain)
+void MyServiceSVC_impl::setGain(::CORBA::Float gain)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <void MyServiceSVC_impl::setGain(CORBA::Float gain)>"
+  #warning "Code missing in function <void MyServiceSVC_impl::setGain(::CORBA::Float gain)>"
 #endif
 }
 
-CORBA::Float MyServiceSVC_impl::getGain()
+::CORBA::Float MyServiceSVC_impl::getGain()
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::Float MyServiceSVC_impl::getGain()>"
+  #warning "Code missing in function <::CORBA::Float MyServiceSVC_impl::getGain()>"
 #endif
   return 0;
 }

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtprefix/MyServiceSVC_impl.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtprefix/MyServiceSVC_impl.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtprefix/MyServiceSVC_impl.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -34,8 +34,8 @@
    virtual ~MyServiceSVC_impl();
 
    // attributes and operations
-   void setGain(CORBA::Float gain);
-   CORBA::Float getGain();
+   void setGain(::CORBA::Float gain);
+   ::CORBA::Float getGain();
 
 };
 

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtprefix/foo.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtprefix/foo.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtprefix/foo.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -26,8 +26,12 @@
     "lang_type",         "compile",
     // Configuration variables
     "conf.default.int_param0", "0",
+
     // Widget
     // Constraints
+
+    "conf.__type__.int_param0", "int",
+
     ""
   };
 // </rtc-template>

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtprefix/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtprefix/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtprefix/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -31,6 +26,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtsuffix/MyServiceSVC_impl.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtsuffix/MyServiceSVC_impl.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtsuffix/MyServiceSVC_impl.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -25,19 +25,19 @@
 /*
  * Methods corresponding to IDL attributes and operations
  */
-void MyServiceSVC_impl::setGain(CORBA::Float gain)
+void MyServiceSVC_impl::setGain(::CORBA::Float gain)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <void MyServiceSVC_impl::setGain(CORBA::Float gain)>"
+  #warning "Code missing in function <void MyServiceSVC_impl::setGain(::CORBA::Float gain)>"
 #endif
 }
 
-CORBA::Float MyServiceSVC_impl::getGain()
+::CORBA::Float MyServiceSVC_impl::getGain()
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::Float MyServiceSVC_impl::getGain()>"
+  #warning "Code missing in function <::CORBA::Float MyServiceSVC_impl::getGain()>"
 #endif
   return 0;
 }

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtsuffix/MyServiceSVC_impl.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtsuffix/MyServiceSVC_impl.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtsuffix/MyServiceSVC_impl.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -34,8 +34,8 @@
    virtual ~MyServiceSVC_impl();
 
    // attributes and operations
-   void setGain(CORBA::Float gain);
-   CORBA::Float getGain();
+   void setGain(::CORBA::Float gain);
+   ::CORBA::Float getGain();
 
 };
 

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtsuffix/foo.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtsuffix/foo.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtsuffix/foo.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -26,8 +26,12 @@
     "lang_type",         "compile",
     // Configuration variables
     "conf.default.int_param0", "0",
+
     // Widget
     // Constraints
+
+    "conf.__type__.int_param0", "int",
+
     ""
   };
 // </rtc-template>

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtsuffix/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtsuffix/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtsuffix/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -31,6 +26,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/prefix/MyServiceSVC_impl.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/prefix/MyServiceSVC_impl.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/prefix/MyServiceSVC_impl.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -25,19 +25,19 @@
 /*
  * Methods corresponding to IDL attributes and operations
  */
-void MyServiceSVC_impl::setGain(CORBA::Float gain)
+void MyServiceSVC_impl::setGain(::CORBA::Float gain)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <void MyServiceSVC_impl::setGain(CORBA::Float gain)>"
+  #warning "Code missing in function <void MyServiceSVC_impl::setGain(::CORBA::Float gain)>"
 #endif
 }
 
-CORBA::Float MyServiceSVC_impl::getGain()
+::CORBA::Float MyServiceSVC_impl::getGain()
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::Float MyServiceSVC_impl::getGain()>"
+  #warning "Code missing in function <::CORBA::Float MyServiceSVC_impl::getGain()>"
 #endif
   return 0;
 }

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/prefix/MyServiceSVC_impl.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/prefix/MyServiceSVC_impl.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/prefix/MyServiceSVC_impl.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -34,8 +34,8 @@
    virtual ~MyServiceSVC_impl();
 
    // attributes and operations
-   void setGain(CORBA::Float gain);
-   CORBA::Float getGain();
+   void setGain(::CORBA::Float gain);
+   ::CORBA::Float getGain();
 
 };
 

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/prefix/foo.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/prefix/foo.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/prefix/foo.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -26,8 +26,12 @@
     "lang_type",         "compile",
     // Configuration variables
     "conf.default.int_param0", "0",
+
     // Widget
     // Constraints
+
+    "conf.__type__.int_param0", "int",
+
     ""
   };
 // </rtc-template>

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/prefix/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/prefix/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/prefix/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -31,6 +26,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/siprefix/MyServiceSVC_impl.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/siprefix/MyServiceSVC_impl.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/siprefix/MyServiceSVC_impl.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -25,19 +25,19 @@
 /*
  * Methods corresponding to IDL attributes and operations
  */
-void MyServiceSVC_impl::setGain(CORBA::Float gain)
+void MyServiceSVC_impl::setGain(::CORBA::Float gain)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <void MyServiceSVC_impl::setGain(CORBA::Float gain)>"
+  #warning "Code missing in function <void MyServiceSVC_impl::setGain(::CORBA::Float gain)>"
 #endif
 }
 
-CORBA::Float MyServiceSVC_impl::getGain()
+::CORBA::Float MyServiceSVC_impl::getGain()
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::Float MyServiceSVC_impl::getGain()>"
+  #warning "Code missing in function <::CORBA::Float MyServiceSVC_impl::getGain()>"
 #endif
   return 0;
 }

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/siprefix/MyServiceSVC_impl.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/siprefix/MyServiceSVC_impl.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/siprefix/MyServiceSVC_impl.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -34,8 +34,8 @@
    virtual ~MyServiceSVC_impl();
 
    // attributes and operations
-   void setGain(CORBA::Float gain);
-   CORBA::Float getGain();
+   void setGain(::CORBA::Float gain);
+   ::CORBA::Float getGain();
 
 };
 

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/siprefix/foo.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/siprefix/foo.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/siprefix/foo.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -26,8 +26,12 @@
     "lang_type",         "compile",
     // Configuration variables
     "conf.default.int_param0", "0",
+
     // Widget
     // Constraints
+
+    "conf.__type__.int_param0", "int",
+
     ""
   };
 // </rtc-template>

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/siprefix/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/siprefix/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/siprefix/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -31,6 +26,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/sisuffix/MyServiceSVC_impl.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/sisuffix/MyServiceSVC_impl.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/sisuffix/MyServiceSVC_impl.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -25,19 +25,19 @@
 /*
  * Methods corresponding to IDL attributes and operations
  */
-void MyServiceSVC_impl::setGain(CORBA::Float gain)
+void MyServiceSVC_impl::setGain(::CORBA::Float gain)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <void MyServiceSVC_impl::setGain(CORBA::Float gain)>"
+  #warning "Code missing in function <void MyServiceSVC_impl::setGain(::CORBA::Float gain)>"
 #endif
 }
 
-CORBA::Float MyServiceSVC_impl::getGain()
+::CORBA::Float MyServiceSVC_impl::getGain()
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::Float MyServiceSVC_impl::getGain()>"
+  #warning "Code missing in function <::CORBA::Float MyServiceSVC_impl::getGain()>"
 #endif
   return 0;
 }

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/sisuffix/MyServiceSVC_impl.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/sisuffix/MyServiceSVC_impl.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/sisuffix/MyServiceSVC_impl.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -34,8 +34,8 @@
    virtual ~MyServiceSVC_impl();
 
    // attributes and operations
-   void setGain(CORBA::Float gain);
-   CORBA::Float getGain();
+   void setGain(::CORBA::Float gain);
+   ::CORBA::Float getGain();
 
 };
 

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/sisuffix/foo.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/sisuffix/foo.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/sisuffix/foo.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -26,8 +26,12 @@
     "lang_type",         "compile",
     // Configuration variables
     "conf.default.int_param0", "0",
+
     // Widget
     // Constraints
+
+    "conf.__type__.int_param0", "int",
+
     ""
   };
 // </rtc-template>

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/sisuffix/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/sisuffix/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/sisuffix/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -31,6 +26,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/suffix/MyServiceSVC_impl.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/suffix/MyServiceSVC_impl.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/suffix/MyServiceSVC_impl.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -25,19 +25,19 @@
 /*
  * Methods corresponding to IDL attributes and operations
  */
-void MyServiceSVC_impl::setGain(CORBA::Float gain)
+void MyServiceSVC_impl::setGain(::CORBA::Float gain)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <void MyServiceSVC_impl::setGain(CORBA::Float gain)>"
+  #warning "Code missing in function <void MyServiceSVC_impl::setGain(::CORBA::Float gain)>"
 #endif
 }
 
-CORBA::Float MyServiceSVC_impl::getGain()
+::CORBA::Float MyServiceSVC_impl::getGain()
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::Float MyServiceSVC_impl::getGain()>"
+  #warning "Code missing in function <::CORBA::Float MyServiceSVC_impl::getGain()>"
 #endif
   return 0;
 }

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/suffix/MyServiceSVC_impl.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/suffix/MyServiceSVC_impl.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/suffix/MyServiceSVC_impl.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -34,8 +34,8 @@
    virtual ~MyServiceSVC_impl();
 
    // attributes and operations
-   void setGain(CORBA::Float gain);
-   CORBA::Float getGain();
+   void setGain(::CORBA::Float gain);
+   ::CORBA::Float getGain();
 
 };
 

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/suffix/foo.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/suffix/foo.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/suffix/foo.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -26,8 +26,12 @@
     "lang_type",         "compile",
     // Configuration variables
     "conf.default.int_param0", "0",
+
     // Widget
     // Constraints
+
+    "conf.__type__.int_param0", "int",
+
     ""
   };
 // </rtc-template>

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/suffix/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/suffix/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/suffix/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -31,6 +26,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svprefix/MyServiceSVC_impl.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svprefix/MyServiceSVC_impl.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svprefix/MyServiceSVC_impl.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -25,19 +25,19 @@
 /*
  * Methods corresponding to IDL attributes and operations
  */
-void MyServiceSVC_impl::setGain(CORBA::Float gain)
+void MyServiceSVC_impl::setGain(::CORBA::Float gain)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <void MyServiceSVC_impl::setGain(CORBA::Float gain)>"
+  #warning "Code missing in function <void MyServiceSVC_impl::setGain(::CORBA::Float gain)>"
 #endif
 }
 
-CORBA::Float MyServiceSVC_impl::getGain()
+::CORBA::Float MyServiceSVC_impl::getGain()
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::Float MyServiceSVC_impl::getGain()>"
+  #warning "Code missing in function <::CORBA::Float MyServiceSVC_impl::getGain()>"
 #endif
   return 0;
 }

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svprefix/MyServiceSVC_impl.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svprefix/MyServiceSVC_impl.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svprefix/MyServiceSVC_impl.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -34,8 +34,8 @@
    virtual ~MyServiceSVC_impl();
 
    // attributes and operations
-   void setGain(CORBA::Float gain);
-   CORBA::Float getGain();
+   void setGain(::CORBA::Float gain);
+   ::CORBA::Float getGain();
 
 };
 

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svprefix/foo.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svprefix/foo.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svprefix/foo.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -26,8 +26,12 @@
     "lang_type",         "compile",
     // Configuration variables
     "conf.default.int_param0", "0",
+
     // Widget
     // Constraints
+
+    "conf.__type__.int_param0", "int",
+
     ""
   };
 // </rtc-template>

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svprefix/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svprefix/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svprefix/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -31,6 +26,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svsuffix/MyServiceSVC_impl.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svsuffix/MyServiceSVC_impl.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svsuffix/MyServiceSVC_impl.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -25,19 +25,19 @@
 /*
  * Methods corresponding to IDL attributes and operations
  */
-void MyServiceSVC_impl::setGain(CORBA::Float gain)
+void MyServiceSVC_impl::setGain(::CORBA::Float gain)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <void MyServiceSVC_impl::setGain(CORBA::Float gain)>"
+  #warning "Code missing in function <void MyServiceSVC_impl::setGain(::CORBA::Float gain)>"
 #endif
 }
 
-CORBA::Float MyServiceSVC_impl::getGain()
+::CORBA::Float MyServiceSVC_impl::getGain()
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::Float MyServiceSVC_impl::getGain()>"
+  #warning "Code missing in function <::CORBA::Float MyServiceSVC_impl::getGain()>"
 #endif
   return 0;
 }

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svsuffix/MyServiceSVC_impl.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svsuffix/MyServiceSVC_impl.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svsuffix/MyServiceSVC_impl.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -34,8 +34,8 @@
    virtual ~MyServiceSVC_impl();
 
    // attributes and operations
-   void setGain(CORBA::Float gain);
-   CORBA::Float getGain();
+   void setGain(::CORBA::Float gain);
+   ::CORBA::Float getGain();
 
 };
 

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svsuffix/foo.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svsuffix/foo.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svsuffix/foo.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -26,8 +26,12 @@
     "lang_type",         "compile",
     // Configuration variables
     "conf.default.int_param0", "0",
+
     // Widget
     // Constraints
+
+    "conf.__type__.int_param0", "int",
+
     ""
   };
 // </rtc-template>

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svsuffix/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svsuffix/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svsuffix/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -31,6 +26,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/SystemConfig/foo.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/SystemConfig/foo.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/SystemConfig/foo.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -30,8 +30,16 @@
     "conf.default.double_param0", "0.11",
     "conf.default.str_param0", "hoge",
     "conf.default.str_param1", "dara",
+
     // Widget
     // Constraints
+
+    "conf.__type__.int_param0", "int",
+    "conf.__type__.int_param1", "int",
+    "conf.__type__.double_param0", "double",
+    "conf.__type__.str_param0", "std::string",
+    "conf.__type__.str_param1", "std::string",
+
     // System Configuration
     "timer.tick", "0.1",
     "naming.update.interval", "10.0",

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/SystemConfig/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/SystemConfig/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/SystemConfig/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -29,6 +24,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/DataPort/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/DataPort/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/DataPort/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -29,6 +24,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort1/MyServiceSVC_impl.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort1/MyServiceSVC_impl.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort1/MyServiceSVC_impl.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -25,19 +25,19 @@
 /*
  * Methods corresponding to IDL attributes and operations
  */
-void MyServiceSVC_impl::setGain(CORBA::Float gain)
+void MyServiceSVC_impl::setGain(::CORBA::Float gain)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <void MyServiceSVC_impl::setGain(CORBA::Float gain)>"
+  #warning "Code missing in function <void MyServiceSVC_impl::setGain(::CORBA::Float gain)>"
 #endif
 }
 
-CORBA::Float MyServiceSVC_impl::getGain()
+::CORBA::Float MyServiceSVC_impl::getGain()
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::Float MyServiceSVC_impl::getGain()>"
+  #warning "Code missing in function <::CORBA::Float MyServiceSVC_impl::getGain()>"
 #endif
   return 0;
 }

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort1/MyServiceSVC_impl.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort1/MyServiceSVC_impl.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort1/MyServiceSVC_impl.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -34,8 +34,8 @@
    virtual ~MyServiceSVC_impl();
 
    // attributes and operations
-   void setGain(CORBA::Float gain);
-   CORBA::Float getGain();
+   void setGain(::CORBA::Float gain);
+   ::CORBA::Float getGain();
 
 };
 

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort1/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort1/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort1/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -31,6 +26,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort2/MyServiceSVC_impl.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort2/MyServiceSVC_impl.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort2/MyServiceSVC_impl.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -25,19 +25,19 @@
 /*
  * Methods corresponding to IDL attributes and operations
  */
-void MyServiceSVC_impl::setGain(CORBA::Float gain)
+void MyServiceSVC_impl::setGain(::CORBA::Float gain)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <void MyServiceSVC_impl::setGain(CORBA::Float gain)>"
+  #warning "Code missing in function <void MyServiceSVC_impl::setGain(::CORBA::Float gain)>"
 #endif
 }
 
-CORBA::Float MyServiceSVC_impl::getGain()
+::CORBA::Float MyServiceSVC_impl::getGain()
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::Float MyServiceSVC_impl::getGain()>"
+  #warning "Code missing in function <::CORBA::Float MyServiceSVC_impl::getGain()>"
 #endif
   return 0;
 }

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort2/MyServiceSVC_impl.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort2/MyServiceSVC_impl.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort2/MyServiceSVC_impl.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -34,8 +34,8 @@
    virtual ~MyServiceSVC_impl();
 
    // attributes and operations
-   void setGain(CORBA::Float gain);
-   CORBA::Float getGain();
+   void setGain(::CORBA::Float gain);
+   ::CORBA::Float getGain();
 
 };
 

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort2/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort2/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort2/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -31,6 +26,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/attribute/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/attribute/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/attribute/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -29,6 +24,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/inport1/test.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/inport1/test.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/inport1/test.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef TEST_H
 #define TEST_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -29,6 +24,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/inport2/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/inport2/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/inport2/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -29,6 +24,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/name/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/name/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/name/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -29,6 +24,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/operation/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/operation/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/operation/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -29,6 +24,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/outport1/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/outport1/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/outport1/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -29,6 +24,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/outport2/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/outport2/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/outport2/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -29,6 +24,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service1/MyServiceSVC_impl.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service1/MyServiceSVC_impl.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service1/MyServiceSVC_impl.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -25,19 +25,19 @@
 /*
  * Methods corresponding to IDL attributes and operations
  */
-void MyServiceSVC_impl::setGain(CORBA::Float gain)
+void MyServiceSVC_impl::setGain(::CORBA::Float gain)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <void MyServiceSVC_impl::setGain(CORBA::Float gain)>"
+  #warning "Code missing in function <void MyServiceSVC_impl::setGain(::CORBA::Float gain)>"
 #endif
 }
 
-CORBA::Float MyServiceSVC_impl::getGain()
+::CORBA::Float MyServiceSVC_impl::getGain()
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::Float MyServiceSVC_impl::getGain()>"
+  #warning "Code missing in function <::CORBA::Float MyServiceSVC_impl::getGain()>"
 #endif
   return 0;
 }

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service1/MyServiceSVC_impl.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service1/MyServiceSVC_impl.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service1/MyServiceSVC_impl.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -34,8 +34,8 @@
    virtual ~MyServiceSVC_impl();
 
    // attributes and operations
-   void setGain(CORBA::Float gain);
-   CORBA::Float getGain();
+   void setGain(::CORBA::Float gain);
+   ::CORBA::Float getGain();
 
 };
 

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service1/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service1/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service1/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -30,6 +25,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service2/MyServiceSVC_impl.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service2/MyServiceSVC_impl.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service2/MyServiceSVC_impl.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -25,19 +25,19 @@
 /*
  * Methods corresponding to IDL attributes and operations
  */
-void MyServiceSVC_impl::setGain(CORBA::Float gain)
+void MyServiceSVC_impl::setGain(::CORBA::Float gain)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <void MyServiceSVC_impl::setGain(CORBA::Float gain)>"
+  #warning "Code missing in function <void MyServiceSVC_impl::setGain(::CORBA::Float gain)>"
 #endif
 }
 
-CORBA::Float MyServiceSVC_impl::getGain()
+::CORBA::Float MyServiceSVC_impl::getGain()
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::Float MyServiceSVC_impl::getGain()>"
+  #warning "Code missing in function <::CORBA::Float MyServiceSVC_impl::getGain()>"
 #endif
   return 0;
 }

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service2/MyServiceSVC_impl.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service2/MyServiceSVC_impl.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service2/MyServiceSVC_impl.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -34,8 +34,8 @@
    virtual ~MyServiceSVC_impl();
 
    // attributes and operations
-   void setGain(CORBA::Float gain);
-   CORBA::Float getGain();
+   void setGain(::CORBA::Float gain);
+   ::CORBA::Float getGain();
 
 };
 

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service2/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service2/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service2/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -31,6 +26,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/DFFSMMM/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/DFFSMMM/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/DFFSMMM/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowFiniteStateMachineMultiModeComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -29,6 +24,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowFiniteStateMachineMultiModeComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/DataFlow/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/DataFlow/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/DataFlow/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -29,6 +24,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/FSM/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/FSM/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/FSM/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/FiniteStateMachineComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -29,6 +24,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/FiniteStateMachineComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -31,6 +26,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/include/foo/MyServiceSVC_impl.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/include/foo/MyServiceSVC_impl.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/include/foo/MyServiceSVC_impl.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -34,8 +34,8 @@
    virtual ~MyServiceSVC_impl();
 
    // attributes and operations
-   void setGain(CORBA::Float gain);
-   CORBA::Float getGain();
+   void setGain(::CORBA::Float gain);
+   ::CORBA::Float getGain();
 
 };
 

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/include/foo/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/include/foo/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/include/foo/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -31,6 +26,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/src/MyServiceSVC_impl.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/src/MyServiceSVC_impl.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/src/MyServiceSVC_impl.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -25,19 +25,19 @@
 /*
  * Methods corresponding to IDL attributes and operations
  */
-void MyServiceSVC_impl::setGain(CORBA::Float gain)
+void MyServiceSVC_impl::setGain(::CORBA::Float gain)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <void MyServiceSVC_impl::setGain(CORBA::Float gain)>"
+  #warning "Code missing in function <void MyServiceSVC_impl::setGain(::CORBA::Float gain)>"
 #endif
 }
 
-CORBA::Float MyServiceSVC_impl::getGain()
+::CORBA::Float MyServiceSVC_impl::getGain()
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::Float MyServiceSVC_impl::getGain()>"
+  #warning "Code missing in function <::CORBA::Float MyServiceSVC_impl::getGain()>"
 #endif
   return 0;
 }

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/include/foo/MyServiceChildMultiSVC_impl.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/include/foo/MyServiceChildMultiSVC_impl.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/include/foo/MyServiceChildMultiSVC_impl.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -66,8 +66,8 @@
    virtual ~MyService2SVC_impl();
 
    // attributes and operations
-   void setGain(CORBA::Float gain);
-   CORBA::Float getGain();
+   void setGain(::CORBA::Float gain);
+   ::CORBA::Float getGain();
 
 };
 
@@ -95,12 +95,12 @@
    virtual ~MyServiceChildSVC_impl();
 
    // attributes and operations
-   void setPos(CORBA::Float pos);
+   void setPos(::CORBA::Float pos);
    EchoList1* getPos();
    EchoList1* get_echo_history();
    ValueList1* get_value_history();
-   void setGain(CORBA::Float gain);
-   CORBA::Float getGain();
+   void setGain(::CORBA::Float gain);
+   ::CORBA::Float getGain();
 
 };
 

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/include/foo/MyServiceChildWithTypeSVC_impl.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/include/foo/MyServiceChildWithTypeSVC_impl.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/include/foo/MyServiceChildWithTypeSVC_impl.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -65,7 +65,7 @@
    virtual ~MyServiceWithTypeChildSVC_impl();
 
    // attributes and operations
-   void setPos(CORBA::Float pos);
+   void setPos(::CORBA::Float pos);
    EchoList* getPos();
    EchoList* get_echo_history();
    ValueList* get_value_history();

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/include/foo/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/include/foo/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/include/foo/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -31,6 +26,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/src/MyServiceChildMultiSVC_impl.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/src/MyServiceChildMultiSVC_impl.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/src/MyServiceChildMultiSVC_impl.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -65,19 +65,19 @@
 /*
  * Methods corresponding to IDL attributes and operations
  */
-void MyService2SVC_impl::setGain(CORBA::Float gain)
+void MyService2SVC_impl::setGain(::CORBA::Float gain)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <void MyService2SVC_impl::setGain(CORBA::Float gain)>"
+  #warning "Code missing in function <void MyService2SVC_impl::setGain(::CORBA::Float gain)>"
 #endif
 }
 
-CORBA::Float MyService2SVC_impl::getGain()
+::CORBA::Float MyService2SVC_impl::getGain()
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::Float MyService2SVC_impl::getGain()>"
+  #warning "Code missing in function <::CORBA::Float MyService2SVC_impl::getGain()>"
 #endif
   return 0;
 }
@@ -104,11 +104,11 @@
 /*
  * Methods corresponding to IDL attributes and operations
  */
-void MyServiceChildSVC_impl::setPos(CORBA::Float pos)
+void MyServiceChildSVC_impl::setPos(::CORBA::Float pos)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <void MyServiceChildSVC_impl::setPos(CORBA::Float pos)>"
+  #warning "Code missing in function <void MyServiceChildSVC_impl::setPos(::CORBA::Float pos)>"
 #endif
 }
 
@@ -139,19 +139,19 @@
   return 0;
 }
 
-void MyServiceChildSVC_impl::setGain(CORBA::Float gain)
+void MyServiceChildSVC_impl::setGain(::CORBA::Float gain)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <void MyServiceChildSVC_impl::setGain(CORBA::Float gain)>"
+  #warning "Code missing in function <void MyServiceChildSVC_impl::setGain(::CORBA::Float gain)>"
 #endif
 }
 
-CORBA::Float MyServiceChildSVC_impl::getGain()
+::CORBA::Float MyServiceChildSVC_impl::getGain()
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::Float MyServiceChildSVC_impl::getGain()>"
+  #warning "Code missing in function <::CORBA::Float MyServiceChildSVC_impl::getGain()>"
 #endif
   return 0;
 }

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/src/MyServiceChildWithTypeSVC_impl.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/src/MyServiceChildWithTypeSVC_impl.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/src/MyServiceChildWithTypeSVC_impl.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -65,11 +65,11 @@
 /*
  * Methods corresponding to IDL attributes and operations
  */
-void MyServiceWithTypeChildSVC_impl::setPos(CORBA::Float pos)
+void MyServiceWithTypeChildSVC_impl::setPos(::CORBA::Float pos)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <void MyServiceWithTypeChildSVC_impl::setPos(CORBA::Float pos)>"
+  #warning "Code missing in function <void MyServiceWithTypeChildSVC_impl::setPos(::CORBA::Float pos)>"
 #endif
 }
 

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc1/MyServiceSVC_impl.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc1/MyServiceSVC_impl.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc1/MyServiceSVC_impl.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -25,19 +25,19 @@
 /*
  * Methods corresponding to IDL attributes and operations
  */
-void MyServiceSVC_impl::setGain(CORBA::Float gain)
+void MyServiceSVC_impl::setGain(::CORBA::Float gain)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <void MyServiceSVC_impl::setGain(CORBA::Float gain)>"
+  #warning "Code missing in function <void MyServiceSVC_impl::setGain(::CORBA::Float gain)>"
 #endif
 }
 
-CORBA::Float MyServiceSVC_impl::getGain()
+::CORBA::Float MyServiceSVC_impl::getGain()
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::Float MyServiceSVC_impl::getGain()>"
+  #warning "Code missing in function <::CORBA::Float MyServiceSVC_impl::getGain()>"
 #endif
   return 0;
 }

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc1/MyServiceSVC_impl.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc1/MyServiceSVC_impl.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc1/MyServiceSVC_impl.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -34,8 +34,8 @@
    virtual ~MyServiceSVC_impl();
 
    // attributes and operations
-   void setGain(CORBA::Float gain);
-   CORBA::Float getGain();
+   void setGain(::CORBA::Float gain);
+   ::CORBA::Float getGain();
 
 };
 

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc1/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc1/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc1/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -31,6 +26,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc2/MyServiceChildMultiSVC_impl.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc2/MyServiceChildMultiSVC_impl.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc2/MyServiceChildMultiSVC_impl.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -65,19 +65,19 @@
 /*
  * Methods corresponding to IDL attributes and operations
  */
-void MyService2SVC_impl::setGain(CORBA::Float gain)
+void MyService2SVC_impl::setGain(::CORBA::Float gain)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <void MyService2SVC_impl::setGain(CORBA::Float gain)>"
+  #warning "Code missing in function <void MyService2SVC_impl::setGain(::CORBA::Float gain)>"
 #endif
 }
 
-CORBA::Float MyService2SVC_impl::getGain()
+::CORBA::Float MyService2SVC_impl::getGain()
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::Float MyService2SVC_impl::getGain()>"
+  #warning "Code missing in function <::CORBA::Float MyService2SVC_impl::getGain()>"
 #endif
   return 0;
 }
@@ -104,11 +104,11 @@
 /*
  * Methods corresponding to IDL attributes and operations
  */
-void MyServiceChildSVC_impl::setPos(CORBA::Float pos)
+void MyServiceChildSVC_impl::setPos(::CORBA::Float pos)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <void MyServiceChildSVC_impl::setPos(CORBA::Float pos)>"
+  #warning "Code missing in function <void MyServiceChildSVC_impl::setPos(::CORBA::Float pos)>"
 #endif
 }
 
@@ -139,19 +139,19 @@
   return 0;
 }
 
-void MyServiceChildSVC_impl::setGain(CORBA::Float gain)
+void MyServiceChildSVC_impl::setGain(::CORBA::Float gain)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <void MyServiceChildSVC_impl::setGain(CORBA::Float gain)>"
+  #warning "Code missing in function <void MyServiceChildSVC_impl::setGain(::CORBA::Float gain)>"
 #endif
 }
 
-CORBA::Float MyServiceChildSVC_impl::getGain()
+::CORBA::Float MyServiceChildSVC_impl::getGain()
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::Float MyServiceChildSVC_impl::getGain()>"
+  #warning "Code missing in function <::CORBA::Float MyServiceChildSVC_impl::getGain()>"
 #endif
   return 0;
 }

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc2/MyServiceChildMultiSVC_impl.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc2/MyServiceChildMultiSVC_impl.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc2/MyServiceChildMultiSVC_impl.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -66,8 +66,8 @@
    virtual ~MyService2SVC_impl();
 
    // attributes and operations
-   void setGain(CORBA::Float gain);
-   CORBA::Float getGain();
+   void setGain(::CORBA::Float gain);
+   ::CORBA::Float getGain();
 
 };
 
@@ -95,12 +95,12 @@
    virtual ~MyServiceChildSVC_impl();
 
    // attributes and operations
-   void setPos(CORBA::Float pos);
+   void setPos(::CORBA::Float pos);
    EchoList1* getPos();
    EchoList1* get_echo_history();
    ValueList1* get_value_history();
-   void setGain(CORBA::Float gain);
-   CORBA::Float getGain();
+   void setGain(::CORBA::Float gain);
+   ::CORBA::Float getGain();
 
 };
 

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc2/MyServiceChildWithTypeSVC_impl.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc2/MyServiceChildWithTypeSVC_impl.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc2/MyServiceChildWithTypeSVC_impl.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -65,11 +65,11 @@
 /*
  * Methods corresponding to IDL attributes and operations
  */
-void MyServiceWithTypeChildSVC_impl::setPos(CORBA::Float pos)
+void MyServiceWithTypeChildSVC_impl::setPos(::CORBA::Float pos)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <void MyServiceWithTypeChildSVC_impl::setPos(CORBA::Float pos)>"
+  #warning "Code missing in function <void MyServiceWithTypeChildSVC_impl::setPos(::CORBA::Float pos)>"
 #endif
 }
 

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc2/MyServiceChildWithTypeSVC_impl.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc2/MyServiceChildWithTypeSVC_impl.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc2/MyServiceChildWithTypeSVC_impl.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -65,7 +65,7 @@
    virtual ~MyServiceWithTypeChildSVC_impl();
 
    // attributes and operations
-   void setPos(CORBA::Float pos);
+   void setPos(::CORBA::Float pos);
    EchoList* getPos();
    EchoList* get_echo_history();
    ValueList* get_value_history();

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc2/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc2/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc2/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -31,6 +26,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint1/foo.conf
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint1/foo.conf	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint1/foo.conf	2016-03-07 10:41:53 UTC (rev 572)
@@ -105,6 +105,8 @@
 
 # conf.__constraints__.int_param0, 0<x<1
 
+# conf.__type__.int_param0: int
+
 ##============================================================
 ## Execution context settings
 ##============================================================

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint1/foo.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint1/foo.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint1/foo.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -26,9 +26,13 @@
     "lang_type",         "compile",
     // Configuration variables
     "conf.default.int_param0", "0",
+
     // Widget
     // Constraints
     "conf.__constraints__.int_param0", "0<x<1",
+
+    "conf.__type__.int_param0", "int",
+
     ""
   };
 // </rtc-template>

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint1/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint1/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint1/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -29,6 +24,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint2/foo.conf
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint2/foo.conf	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint2/foo.conf	2016-03-07 10:41:53 UTC (rev 572)
@@ -106,6 +106,9 @@
 # conf.__constraints__.int_param0, 0<x<1
 # conf.__constraints__.str_param0, (up, down, right, left)
 
+# conf.__type__.int_param0: int
+# conf.__type__.str_param0: string
+
 ##============================================================
 ## Execution context settings
 ##============================================================

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint2/foo.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint2/foo.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint2/foo.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -27,10 +27,15 @@
     // Configuration variables
     "conf.default.int_param0", "0",
     "conf.default.str_param0", "up",
+
     // Widget
     // Constraints
     "conf.__constraints__.int_param0", "0<x<1",
     "conf.__constraints__.str_param0", "(up, down, right, left)",
+
+    "conf.__type__.int_param0", "int",
+    "conf.__type__.str_param0", "string",
+
     ""
   };
 // </rtc-template>

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint2/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint2/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint2/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -29,6 +24,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint3/foo.conf
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint3/foo.conf	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint3/foo.conf	2016-03-07 10:41:53 UTC (rev 572)
@@ -107,6 +107,11 @@
 # conf.__constraints__.str_param0, (up, down, right, left)
 # conf.__constraints__.double_param0, 1.5<=x<=3.2
 
+# conf.__type__.int_param0: int
+# conf.__type__.str_param0: string
+# conf.__type__.int_param1: int
+# conf.__type__.double_param0: int
+
 ##============================================================
 ## Execution context settings
 ##============================================================

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint3/foo.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint3/foo.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint3/foo.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -29,11 +29,18 @@
     "conf.default.str_param0", "up",
     "conf.default.int_param1", "0",
     "conf.default.double_param0", "0",
+
     // Widget
     // Constraints
     "conf.__constraints__.int_param0", "0<x<1",
     "conf.__constraints__.str_param0", "(up, down, right, left)",
     "conf.__constraints__.double_param0", "1.5<=x<=3.2",
+
+    "conf.__type__.int_param0", "int",
+    "conf.__type__.str_param0", "string",
+    "conf.__type__.int_param1", "int",
+    "conf.__type__.double_param0", "int",
+
     ""
   };
 // </rtc-template>

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint3/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint3/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint3/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -29,6 +24,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit1/MyServiceChildMultiSVC_impl.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit1/MyServiceChildMultiSVC_impl.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit1/MyServiceChildMultiSVC_impl.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -65,19 +65,19 @@
 /*
  * Methods corresponding to IDL attributes and operations
  */
-void MyService2SVC_impl::setGain(CORBA::Float gain)
+void MyService2SVC_impl::setGain(::CORBA::Float gain)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <void MyService2SVC_impl::setGain(CORBA::Float gain)>"
+  #warning "Code missing in function <void MyService2SVC_impl::setGain(::CORBA::Float gain)>"
 #endif
 }
 
-CORBA::Float MyService2SVC_impl::getGain()
+::CORBA::Float MyService2SVC_impl::getGain()
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::Float MyService2SVC_impl::getGain()>"
+  #warning "Code missing in function <::CORBA::Float MyService2SVC_impl::getGain()>"
 #endif
   return 0;
 }
@@ -104,11 +104,11 @@
 /*
  * Methods corresponding to IDL attributes and operations
  */
-void MyServiceChildSVC_impl::setPos(CORBA::Float pos)
+void MyServiceChildSVC_impl::setPos(::CORBA::Float pos)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <void MyServiceChildSVC_impl::setPos(CORBA::Float pos)>"
+  #warning "Code missing in function <void MyServiceChildSVC_impl::setPos(::CORBA::Float pos)>"
 #endif
 }
 
@@ -139,19 +139,19 @@
   return 0;
 }
 
-void MyServiceChildSVC_impl::setGain(CORBA::Float gain)
+void MyServiceChildSVC_impl::setGain(::CORBA::Float gain)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <void MyServiceChildSVC_impl::setGain(CORBA::Float gain)>"
+  #warning "Code missing in function <void MyServiceChildSVC_impl::setGain(::CORBA::Float gain)>"
 #endif
 }
 
-CORBA::Float MyServiceChildSVC_impl::getGain()
+::CORBA::Float MyServiceChildSVC_impl::getGain()
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::Float MyServiceChildSVC_impl::getGain()>"
+  #warning "Code missing in function <::CORBA::Float MyServiceChildSVC_impl::getGain()>"
 #endif
   return 0;
 }

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit1/MyServiceChildMultiSVC_impl.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit1/MyServiceChildMultiSVC_impl.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit1/MyServiceChildMultiSVC_impl.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -66,8 +66,8 @@
    virtual ~MyService2SVC_impl();
 
    // attributes and operations
-   void setGain(CORBA::Float gain);
-   CORBA::Float getGain();
+   void setGain(::CORBA::Float gain);
+   ::CORBA::Float getGain();
 
 };
 
@@ -95,12 +95,12 @@
    virtual ~MyServiceChildSVC_impl();
 
    // attributes and operations
-   void setPos(CORBA::Float pos);
+   void setPos(::CORBA::Float pos);
    EchoList1* getPos();
    EchoList1* get_echo_history();
    ValueList1* get_value_history();
-   void setGain(CORBA::Float gain);
-   CORBA::Float getGain();
+   void setGain(::CORBA::Float gain);
+   ::CORBA::Float getGain();
 
 };
 

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit1/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit1/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit1/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -30,6 +25,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit2/MyServiceChildMultiSVC_impl.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit2/MyServiceChildMultiSVC_impl.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit2/MyServiceChildMultiSVC_impl.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -65,19 +65,19 @@
 /*
  * Methods corresponding to IDL attributes and operations
  */
-void MyService2SVC_impl::setGain(CORBA::Float gain)
+void MyService2SVC_impl::setGain(::CORBA::Float gain)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <void MyService2SVC_impl::setGain(CORBA::Float gain)>"
+  #warning "Code missing in function <void MyService2SVC_impl::setGain(::CORBA::Float gain)>"
 #endif
 }
 
-CORBA::Float MyService2SVC_impl::getGain()
+::CORBA::Float MyService2SVC_impl::getGain()
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::Float MyService2SVC_impl::getGain()>"
+  #warning "Code missing in function <::CORBA::Float MyService2SVC_impl::getGain()>"
 #endif
   return 0;
 }
@@ -104,11 +104,11 @@
 /*
  * Methods corresponding to IDL attributes and operations
  */
-void MyServiceChildSVC_impl::setPos(CORBA::Float pos)
+void MyServiceChildSVC_impl::setPos(::CORBA::Float pos)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <void MyServiceChildSVC_impl::setPos(CORBA::Float pos)>"
+  #warning "Code missing in function <void MyServiceChildSVC_impl::setPos(::CORBA::Float pos)>"
 #endif
 }
 
@@ -139,19 +139,19 @@
   return 0;
 }
 
-void MyServiceChildSVC_impl::setGain(CORBA::Float gain)
+void MyServiceChildSVC_impl::setGain(::CORBA::Float gain)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <void MyServiceChildSVC_impl::setGain(CORBA::Float gain)>"
+  #warning "Code missing in function <void MyServiceChildSVC_impl::setGain(::CORBA::Float gain)>"
 #endif
 }
 
-CORBA::Float MyServiceChildSVC_impl::getGain()
+::CORBA::Float MyServiceChildSVC_impl::getGain()
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::Float MyServiceChildSVC_impl::getGain()>"
+  #warning "Code missing in function <::CORBA::Float MyServiceChildSVC_impl::getGain()>"
 #endif
   return 0;
 }

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit2/MyServiceChildMultiSVC_impl.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit2/MyServiceChildMultiSVC_impl.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit2/MyServiceChildMultiSVC_impl.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -66,8 +66,8 @@
    virtual ~MyService2SVC_impl();
 
    // attributes and operations
-   void setGain(CORBA::Float gain);
-   CORBA::Float getGain();
+   void setGain(::CORBA::Float gain);
+   ::CORBA::Float getGain();
 
 };
 
@@ -95,12 +95,12 @@
    virtual ~MyServiceChildSVC_impl();
 
    // attributes and operations
-   void setPos(CORBA::Float pos);
+   void setPos(::CORBA::Float pos);
    EchoList1* getPos();
    EchoList1* get_echo_history();
    ValueList1* get_value_history();
-   void setGain(CORBA::Float gain);
-   CORBA::Float getGain();
+   void setGain(::CORBA::Float gain);
+   ::CORBA::Float getGain();
 
 };
 

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit2/MyServiceChildWithTypeSVC_impl.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit2/MyServiceChildWithTypeSVC_impl.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit2/MyServiceChildWithTypeSVC_impl.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -65,11 +65,11 @@
 /*
  * Methods corresponding to IDL attributes and operations
  */
-void MyServiceWithTypeChildSVC_impl::setPos(CORBA::Float pos)
+void MyServiceWithTypeChildSVC_impl::setPos(::CORBA::Float pos)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <void MyServiceWithTypeChildSVC_impl::setPos(CORBA::Float pos)>"
+  #warning "Code missing in function <void MyServiceWithTypeChildSVC_impl::setPos(::CORBA::Float pos)>"
 #endif
 }
 

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit2/MyServiceChildWithTypeSVC_impl.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit2/MyServiceChildWithTypeSVC_impl.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit2/MyServiceChildWithTypeSVC_impl.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -65,7 +65,7 @@
    virtual ~MyServiceWithTypeChildSVC_impl();
 
    // attributes and operations
-   void setPos(CORBA::Float pos);
+   void setPos(::CORBA::Float pos);
    EchoList* getPos();
    EchoList* get_echo_history();
    ValueList* get_value_history();

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit2/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit2/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit2/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -31,6 +26,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceArg/MyServiceModuleTypeDefSVC_impl.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceArg/MyServiceModuleTypeDefSVC_impl.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceArg/MyServiceModuleTypeDefSVC_impl.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,13 +10,13 @@
 /*
  * Example implementational code for IDL interface RTC::RTM::MyService
  */
-MyServiceSVC_impl::MyServiceSVC_impl()
+RTC_RTM_MyServiceSVC_impl::RTC_RTM_MyServiceSVC_impl()
 {
   // Please add extra constructor code here.
 }
 
 
-MyServiceSVC_impl::~MyServiceSVC_impl()
+RTC_RTM_MyServiceSVC_impl::~RTC_RTM_MyServiceSVC_impl()
 {
   // Please add extra destructor code here.
 }
@@ -25,12 +25,12 @@
 /*
  * Methods corresponding to IDL attributes and operations
  */
-RTC::RTM::Time MyServiceSVC_impl::echo(const RTC::RTM::Time& msg, const char* str)
+RTC::RTM::Time RTC_RTM_MyServiceSVC_impl::echo(const RTC::RTM::Time& msg, const char* str)
 {
 	RTC::RTM::Time result;
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <RTC::RTM::Time MyServiceSVC_impl::echo(const RTC::RTM::Time& msg, const char* str)>"
+  #warning "Code missing in function <RTC::RTM::Time RTC_RTM_MyServiceSVC_impl::echo(const RTC::RTM::Time& msg, const char* str)>"
 #endif
   return result;
 }

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceArg/MyServiceModuleTypeDefSVC_impl.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceArg/MyServiceModuleTypeDefSVC_impl.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceArg/MyServiceModuleTypeDefSVC_impl.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -14,7 +14,7 @@
  * @class MyServiceSVC_impl
  * Example class implementing IDL interface RTC::RTM::MyService
  */
-class MyServiceSVC_impl
+class RTC_RTM_MyServiceSVC_impl
  : public virtual POA_RTC::RTM::MyService,
    public virtual PortableServer::RefCountServantBase
 {
@@ -31,7 +31,7 @@
   /*!
    * @brief destructor
    */
-   virtual ~MyServiceSVC_impl();
+   virtual ~RTC_RTM_MyServiceSVC_impl();
 
    // attributes and operations
    RTC::RTM::Time echo(const RTC::RTM::Time& msg, const char* str);

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceArg/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceArg/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceArg/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -30,6 +25,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceArgStruct/MyServiceModuleTypeDefSVC_impl.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceArgStruct/MyServiceModuleTypeDefSVC_impl.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceArgStruct/MyServiceModuleTypeDefSVC_impl.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -25,12 +25,12 @@
 /*
  * Methods corresponding to IDL attributes and operations
  */
-Time MyServiceSVC_impl::echo(Time_out msg, const char* str)
+Time MyServiceSVC_impl::echo(Time& msg, const char* str)
 {
 	Time result;
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <Time MyServiceSVC_impl::echo(Time_out msg, const char* str)>"
+  #warning "Code missing in function <Time MyServiceSVC_impl::echo(Time& msg, const char* str)>"
 #endif
   return result;
 }

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceArgStruct/MyServiceModuleTypeDefSVC_impl.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceArgStruct/MyServiceModuleTypeDefSVC_impl.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceArgStruct/MyServiceModuleTypeDefSVC_impl.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -34,7 +34,7 @@
    virtual ~MyServiceSVC_impl();
 
    // attributes and operations
-   Time echo(Time_out msg, const char* str);
+   Time echo(Time& msg, const char* str);
 
 };
 

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceArgStruct/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceArgStruct/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceArgStruct/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -30,6 +25,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceCon/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceCon/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceCon/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -30,6 +25,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceM/MyServiceSVC_impl.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceM/MyServiceSVC_impl.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceM/MyServiceSVC_impl.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,13 +10,13 @@
 /*
  * Example implementational code for IDL interface SimpleService::MyService
  */
-MyServiceSVC_impl::MyServiceSVC_impl()
+SimpleService_MyServiceSVC_impl::SimpleService_MyServiceSVC_impl()
 {
   // Please add extra constructor code here.
 }
 
 
-MyServiceSVC_impl::~MyServiceSVC_impl()
+SimpleService_MyServiceSVC_impl::~SimpleService_MyServiceSVC_impl()
 {
   // Please add extra destructor code here.
 }
@@ -25,46 +25,46 @@
 /*
  * Methods corresponding to IDL attributes and operations
  */
-char* MyServiceSVC_impl::echo(const char* msg)
+char* SimpleService_MyServiceSVC_impl::echo(const char* msg)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <char* MyServiceSVC_impl::echo(const char* msg)>"
+  #warning "Code missing in function <char* SimpleService_MyServiceSVC_impl::echo(const char* msg)>"
 #endif
   return 0;
 }
 
-SimpleService::EchoList* MyServiceSVC_impl::get_echo_history()
+SimpleService::EchoList* SimpleService_MyServiceSVC_impl::get_echo_history()
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <SimpleService::EchoList* MyServiceSVC_impl::get_echo_history()>"
+  #warning "Code missing in function <SimpleService::EchoList* SimpleService_MyServiceSVC_impl::get_echo_history()>"
 #endif
   return 0;
 }
 
-void MyServiceSVC_impl::set_value(CORBA::Float value)
+void SimpleService_MyServiceSVC_impl::set_value(::CORBA::Float value)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <void MyServiceSVC_impl::set_value(CORBA::Float value)>"
+  #warning "Code missing in function <void SimpleService_MyServiceSVC_impl::set_value(::CORBA::Float value)>"
 #endif
 }
 
-CORBA::Float MyServiceSVC_impl::get_value()
+::CORBA::Float SimpleService_MyServiceSVC_impl::get_value()
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::Float MyServiceSVC_impl::get_value()>"
+  #warning "Code missing in function <::CORBA::Float SimpleService_MyServiceSVC_impl::get_value()>"
 #endif
   return 0;
 }
 
-SimpleService::ValueList* MyServiceSVC_impl::get_value_history()
+SimpleService::ValueList* SimpleService_MyServiceSVC_impl::get_value_history()
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <SimpleService::ValueList* MyServiceSVC_impl::get_value_history()>"
+  #warning "Code missing in function <SimpleService::ValueList* SimpleService_MyServiceSVC_impl::get_value_history()>"
 #endif
   return 0;
 }

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceM/MyServiceSVC_impl.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceM/MyServiceSVC_impl.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceM/MyServiceSVC_impl.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -14,7 +14,7 @@
  * @class MyServiceSVC_impl
  * Example class implementing IDL interface SimpleService::MyService
  */
-class MyServiceSVC_impl
+class SimpleService_MyServiceSVC_impl
  : public virtual POA_SimpleService::MyService,
    public virtual PortableServer::RefCountServantBase
 {
@@ -31,13 +31,13 @@
   /*!
    * @brief destructor
    */
-   virtual ~MyServiceSVC_impl();
+   virtual ~SimpleService_MyServiceSVC_impl();
 
    // attributes and operations
    char* echo(const char* msg);
    SimpleService::EchoList* get_echo_history();
-   void set_value(CORBA::Float value);
-   CORBA::Float get_value();
+   void set_value(::CORBA::Float value);
+   ::CORBA::Float get_value();
    SimpleService::ValueList* get_value_history();
 
 };

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceM/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceM/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceM/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -30,6 +25,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath1/MyServiceSVC_impl.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath1/MyServiceSVC_impl.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath1/MyServiceSVC_impl.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -25,19 +25,19 @@
 /*
  * Methods corresponding to IDL attributes and operations
  */
-void MyServiceSVC_impl::setGain(CORBA::Float gain)
+void MyServiceSVC_impl::setGain(::CORBA::Float gain)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <void MyServiceSVC_impl::setGain(CORBA::Float gain)>"
+  #warning "Code missing in function <void MyServiceSVC_impl::setGain(::CORBA::Float gain)>"
 #endif
 }
 
-CORBA::Float MyServiceSVC_impl::getGain()
+::CORBA::Float MyServiceSVC_impl::getGain()
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::Float MyServiceSVC_impl::getGain()>"
+  #warning "Code missing in function <::CORBA::Float MyServiceSVC_impl::getGain()>"
 #endif
   return 0;
 }

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath1/MyServiceSVC_impl.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath1/MyServiceSVC_impl.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath1/MyServiceSVC_impl.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -34,8 +34,8 @@
    virtual ~MyServiceSVC_impl();
 
    // attributes and operations
-   void setGain(CORBA::Float gain);
-   CORBA::Float getGain();
+   void setGain(::CORBA::Float gain);
+   ::CORBA::Float getGain();
 
 };
 

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath1/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath1/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath1/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -31,6 +26,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath2/MyServiceSVC_impl.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath2/MyServiceSVC_impl.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath2/MyServiceSVC_impl.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -25,19 +25,19 @@
 /*
  * Methods corresponding to IDL attributes and operations
  */
-void MyServiceSVC_impl::setGain(CORBA::Float gain)
+void MyServiceSVC_impl::setGain(::CORBA::Float gain)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <void MyServiceSVC_impl::setGain(CORBA::Float gain)>"
+  #warning "Code missing in function <void MyServiceSVC_impl::setGain(::CORBA::Float gain)>"
 #endif
 }
 
-CORBA::Float MyServiceSVC_impl::getGain()
+::CORBA::Float MyServiceSVC_impl::getGain()
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::Float MyServiceSVC_impl::getGain()>"
+  #warning "Code missing in function <::CORBA::Float MyServiceSVC_impl::getGain()>"
 #endif
   return 0;
 }

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath2/MyServiceSVC_impl.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath2/MyServiceSVC_impl.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath2/MyServiceSVC_impl.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -34,8 +34,8 @@
    virtual ~MyServiceSVC_impl();
 
    // attributes and operations
-   void setGain(CORBA::Float gain);
-   CORBA::Float getGain();
+   void setGain(::CORBA::Float gain);
+   ::CORBA::Float getGain();
 
 };
 

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath2/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath2/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath2/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -31,6 +26,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath3/MyServiceSVC_impl.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath3/MyServiceSVC_impl.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath3/MyServiceSVC_impl.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -25,19 +25,19 @@
 /*
  * Methods corresponding to IDL attributes and operations
  */
-void MyServiceSVC_impl::setGain(CORBA::Float gain)
+void MyServiceSVC_impl::setGain(::CORBA::Float gain)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <void MyServiceSVC_impl::setGain(CORBA::Float gain)>"
+  #warning "Code missing in function <void MyServiceSVC_impl::setGain(::CORBA::Float gain)>"
 #endif
 }
 
-CORBA::Float MyServiceSVC_impl::getGain()
+::CORBA::Float MyServiceSVC_impl::getGain()
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::Float MyServiceSVC_impl::getGain()>"
+  #warning "Code missing in function <::CORBA::Float MyServiceSVC_impl::getGain()>"
 #endif
   return 0;
 }

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath3/MyServiceSVC_impl.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath3/MyServiceSVC_impl.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath3/MyServiceSVC_impl.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -34,8 +34,8 @@
    virtual ~MyServiceSVC_impl();
 
    // attributes and operations
-   void setGain(CORBA::Float gain);
-   CORBA::Float getGain();
+   void setGain(::CORBA::Float gain);
+   ::CORBA::Float getGain();
 
 };
 

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath3/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath3/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath3/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -31,6 +26,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlstruct/TestModule.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlstruct/TestModule.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlstruct/TestModule.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef TESTMODULE_H
 #define TESTMODULE_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -30,6 +25,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlstruct/module_ysuga_netSVC_impl.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlstruct/module_ysuga_netSVC_impl.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlstruct/module_ysuga_netSVC_impl.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,13 +10,13 @@
 /*
  * Example implementational code for IDL interface ysuga_net::Hoge
  */
-HogeSVC_impl::HogeSVC_impl()
+ysuga_net_HogeSVC_impl::ysuga_net_HogeSVC_impl()
 {
   // Please add extra constructor code here.
 }
 
 
-HogeSVC_impl::~HogeSVC_impl()
+ysuga_net_HogeSVC_impl::~ysuga_net_HogeSVC_impl()
 {
   // Please add extra destructor code here.
 }
@@ -25,12 +25,12 @@
 /*
  * Methods corresponding to IDL attributes and operations
  */
-ysuga_net::RETVAL* HogeSVC_impl::foo()
+ysuga_net::RETVAL* ysuga_net_HogeSVC_impl::foo()
 {
 	ysuga_net::RETVAL* result;
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <ysuga_net::RETVAL* HogeSVC_impl::foo()>"
+  #warning "Code missing in function <ysuga_net::RETVAL* ysuga_net_HogeSVC_impl::foo()>"
 #endif
   return result;
 }

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlstruct/module_ysuga_netSVC_impl.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlstruct/module_ysuga_netSVC_impl.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlstruct/module_ysuga_netSVC_impl.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -16,7 +16,7 @@
  * @class HogeSVC_impl
  * Example class implementing IDL interface ysuga_net::Hoge
  */
-class HogeSVC_impl
+class ysuga_net_HogeSVC_impl
  : public virtual POA_ysuga_net::Hoge,
    public virtual PortableServer::RefCountServantBase
 {
@@ -33,7 +33,7 @@
   /*!
    * @brief destructor
    */
-   virtual ~HogeSVC_impl();
+   virtual ~ysuga_net_HogeSVC_impl();
 
    // attributes and operations
    ysuga_net::RETVAL* foo();

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/IDLType1/ModuleName.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/IDLType1/ModuleName.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/IDLType1/ModuleName.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef MODULENAME_H
 #define MODULENAME_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -30,6 +25,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/IDLType1/TestIDLSVC_impl.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/IDLType1/TestIDLSVC_impl.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/IDLType1/TestIDLSVC_impl.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -34,11 +34,11 @@
   return 0;
 }
 
-char* ComFkSVC_impl::set_string(const char* frm, StringList_out frmo, char*& frmio)
+StringList ComFkSVC_impl::set_string(StringList frm, StringList& frmo, StringList& frmio)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <char* ComFkSVC_impl::set_string(const char* frm, StringList_out frmo, char*& frmio)>"
+  #warning "Code missing in function <StringList ComFkSVC_impl::set_string(StringList frm, StringList& frmo, StringList& frmio)>"
 #endif
   return 0;
 }
@@ -63,20 +63,19 @@
 
 color ComFkSVC_impl::set_color(color frm, color& frmo, color& frmio)
 {
-	color result;
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
   #warning "Code missing in function <color ComFkSVC_impl::set_color(color frm, color& frmo, color& frmio)>"
 #endif
-  return result;
+  return 0;
 }
 
-Frame0 ComFkSVC_impl::set_tool0(const Frame0& frm, Frame0_out frmo, Frame0& frmio)
+Frame0 ComFkSVC_impl::set_tool0(const Frame0& frm, Frame0& frmo, Frame0& frmio)
 {
 	Frame0 result;
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <Frame0 ComFkSVC_impl::set_tool0(const Frame0& frm, Frame0_out frmo, Frame0& frmio)>"
+  #warning "Code missing in function <Frame0 ComFkSVC_impl::set_tool0(const Frame0& frm, Frame0& frmo, Frame0& frmio)>"
 #endif
   return result;
 }
@@ -99,12 +98,12 @@
   return 0;
 }
 
-Frame3 ComFkSVC_impl::set_tool3(const Frame3& frm, Frame3_out frmo, Frame3& frmio)
+Frame3 ComFkSVC_impl::set_tool3(const Frame3& frm, Frame3& frmo, Frame3& frmio)
 {
 	Frame3 result;
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <Frame3 ComFkSVC_impl::set_tool3(const Frame3& frm, Frame3_out frmo, Frame3& frmio)>"
+  #warning "Code missing in function <Frame3 ComFkSVC_impl::set_tool3(const Frame3& frm, Frame3& frmo, Frame3& frmio)>"
 #endif
   return result;
 }
@@ -118,13 +117,14 @@
   return 0;
 }
 
-Frame5* ComFkSVC_impl::set_tool5(const Frame5& frm, Frame5_out frmo, Frame5& frmio)
+Frame5 ComFkSVC_impl::set_tool5(const Frame5& frm, Frame5& frmo, Frame5& frmio)
 {
+	Frame5 result;
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <Frame5* ComFkSVC_impl::set_tool5(const Frame5& frm, Frame5_out frmo, Frame5& frmio)>"
+  #warning "Code missing in function <Frame5 ComFkSVC_impl::set_tool5(const Frame5& frm, Frame5& frmo, Frame5& frmio)>"
 #endif
-  return 0;
+  return result;
 }
 
 Frame1List* ComFkSVC_impl::set_toolSeq1(const Frame1List& frm, Frame1List_out frmo, Frame1List& frmio)

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/IDLType1/TestIDLSVC_impl.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/IDLType1/TestIDLSVC_impl.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/IDLType1/TestIDLSVC_impl.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -35,16 +35,16 @@
 
    // attributes and operations
    ValueList* set_value(const ValueList& frm, ValueList_out frmo, ValueList& frmio);
-   char* set_string(const char* frm, StringList_out frmo, char*& frmio);
+   StringList set_string(StringList frm, StringList& frmo, StringList& frmio);
    LongArray_slice* set_longArray(const LongArray frm, LongArray frmo, LongArray frmio);
    ValueListArray_slice* set_longArrayv(const ValueListArray frm, ValueListArray_out frmo, ValueListArray frmio);
    color set_color(color frm, color& frmo, color& frmio);
-   Frame0 set_tool0(const Frame0& frm, Frame0_out frmo, Frame0& frmio);
+   Frame0 set_tool0(const Frame0& frm, Frame0& frmo, Frame0& frmio);
    Frame1* set_tool1(const Frame1& frm, Frame1_out frmo, Frame1& frmio);
    Frame2* set_tool2(const Frame2& frm, Frame2_out frmo, Frame2& frmio);
-   Frame3 set_tool3(const Frame3& frm, Frame3_out frmo, Frame3& frmio);
+   Frame3 set_tool3(const Frame3& frm, Frame3& frmo, Frame3& frmio);
    Frame4* set_tool4(const Frame4& frm, Frame4_out frmo, Frame4& frmio);
-   Frame5* set_tool5(const Frame5& frm, Frame5_out frmo, Frame5& frmio);
+   Frame5 set_tool5(const Frame5& frm, Frame5& frmo, Frame5& frmio);
    Frame1List* set_toolSeq1(const Frame1List& frm, Frame1List_out frmo, Frame1List& frmio);
    Frame2List* set_toolSeq2(const Frame2List& frm, Frame2List_out frmo, Frame2List& frmio);
    Frame1Array_slice* set_toolArray1(const Frame1Array frm, Frame1Array_out frmo, Frame1Array frmio);

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/SeqString/MyServiceSVC_impl.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/SeqString/MyServiceSVC_impl.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/SeqString/MyServiceSVC_impl.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -25,11 +25,11 @@
 /*
  * Methods corresponding to IDL attributes and operations
  */
-char* MyServiceSVC_impl::echo(const CORBA::WChar* msg)
+Str1 MyServiceSVC_impl::echo(WStr1 msg)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <char* MyServiceSVC_impl::echo(const CORBA::WChar* msg)>"
+  #warning "Code missing in function <Str1 MyServiceSVC_impl::echo(WStr1 msg)>"
 #endif
   return 0;
 }

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/SeqString/MyServiceSVC_impl.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/SeqString/MyServiceSVC_impl.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/SeqString/MyServiceSVC_impl.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -34,7 +34,7 @@
    virtual ~MyServiceSVC_impl();
 
    // attributes and operations
-   char* echo(const CORBA::WChar* msg);
+   Str1 echo(WStr1 msg);
 
 };
 

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/SeqString/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/SeqString/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/SeqString/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -30,6 +25,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/Struct/ModuleName.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/Struct/ModuleName.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/Struct/ModuleName.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef MODULENAME_H
 #define MODULENAME_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -30,6 +25,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/Struct2/ModuleName.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/Struct2/ModuleName.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/Struct2/ModuleName.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef MODULENAME_H
 #define MODULENAME_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -30,6 +25,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/type/MyServiceSVC_impl.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/type/MyServiceSVC_impl.cpp	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/type/MyServiceSVC_impl.cpp	2016-03-07 10:41:53 UTC (rev 572)
@@ -25,146 +25,146 @@
 /*
  * Methods corresponding to IDL attributes and operations
  */
-CORBA::Short MyServiceSVC_impl::echo01(CORBA::Short ss, CORBA::Short& ss2, CORBA::Short& ss3)
+::CORBA::Short MyServiceSVC_impl::echo01(::CORBA::Short ss, ::CORBA::Short& ss2, ::CORBA::Short& ss3)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::Short MyServiceSVC_impl::echo01(CORBA::Short ss, CORBA::Short& ss2, CORBA::Short& ss3)>"
+  #warning "Code missing in function <::CORBA::Short MyServiceSVC_impl::echo01(::CORBA::Short ss, ::CORBA::Short& ss2, ::CORBA::Short& ss3)>"
 #endif
   return 0;
 }
 
-CORBA::Long MyServiceSVC_impl::echo02(CORBA::Long ss, CORBA::Long& ss2, CORBA::Long& ss3)
+::CORBA::Long MyServiceSVC_impl::echo02(::CORBA::Long ss, ::CORBA::Long& ss2, ::CORBA::Long& ss3)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::Long MyServiceSVC_impl::echo02(CORBA::Long ss, CORBA::Long& ss2, CORBA::Long& ss3)>"
+  #warning "Code missing in function <::CORBA::Long MyServiceSVC_impl::echo02(::CORBA::Long ss, ::CORBA::Long& ss2, ::CORBA::Long& ss3)>"
 #endif
   return 0;
 }
 
-CORBA::LongLong MyServiceSVC_impl::echo03(CORBA::LongLong ss, CORBA::LongLong& ss2, CORBA::LongLong& ss3)
+::CORBA::LongLong MyServiceSVC_impl::echo03(::CORBA::LongLong ss, ::CORBA::LongLong& ss2, ::CORBA::LongLong& ss3)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::LongLong MyServiceSVC_impl::echo03(CORBA::LongLong ss, CORBA::LongLong& ss2, CORBA::LongLong& ss3)>"
+  #warning "Code missing in function <::CORBA::LongLong MyServiceSVC_impl::echo03(::CORBA::LongLong ss, ::CORBA::LongLong& ss2, ::CORBA::LongLong& ss3)>"
 #endif
   return 0;
 }
 
-CORBA::ULong MyServiceSVC_impl::echo04(CORBA::ULong ss, CORBA::ULong& ss2, CORBA::ULong& ss3)
+::CORBA::ULong MyServiceSVC_impl::echo04(::CORBA::ULong ss, ::CORBA::ULong& ss2, ::CORBA::ULong& ss3)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::ULong MyServiceSVC_impl::echo04(CORBA::ULong ss, CORBA::ULong& ss2, CORBA::ULong& ss3)>"
+  #warning "Code missing in function <::CORBA::ULong MyServiceSVC_impl::echo04(::CORBA::ULong ss, ::CORBA::ULong& ss2, ::CORBA::ULong& ss3)>"
 #endif
   return 0;
 }
 
-CORBA::ULongLong MyServiceSVC_impl::echo05(CORBA::ULongLong ss, CORBA::ULongLong& ss2, CORBA::ULongLong& ss3)
+::CORBA::ULongLong MyServiceSVC_impl::echo05(::CORBA::ULongLong ss, ::CORBA::ULongLong& ss2, ::CORBA::ULongLong& ss3)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::ULongLong MyServiceSVC_impl::echo05(CORBA::ULongLong ss, CORBA::ULongLong& ss2, CORBA::ULongLong& ss3)>"
+  #warning "Code missing in function <::CORBA::ULongLong MyServiceSVC_impl::echo05(::CORBA::ULongLong ss, ::CORBA::ULongLong& ss2, ::CORBA::ULongLong& ss3)>"
 #endif
   return 0;
 }
 
-CORBA::UShort MyServiceSVC_impl::echo06(CORBA::UShort ss, CORBA::UShort& ss2, CORBA::UShort& ss3)
+::CORBA::UShort MyServiceSVC_impl::echo06(::CORBA::UShort ss, ::CORBA::UShort& ss2, ::CORBA::UShort& ss3)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::UShort MyServiceSVC_impl::echo06(CORBA::UShort ss, CORBA::UShort& ss2, CORBA::UShort& ss3)>"
+  #warning "Code missing in function <::CORBA::UShort MyServiceSVC_impl::echo06(::CORBA::UShort ss, ::CORBA::UShort& ss2, ::CORBA::UShort& ss3)>"
 #endif
   return 0;
 }
 
-CORBA::Float MyServiceSVC_impl::echo07(CORBA::Float ss, CORBA::Float& ss2, CORBA::Float& ss3)
+::CORBA::Float MyServiceSVC_impl::echo07(::CORBA::Float ss, ::CORBA::Float& ss2, ::CORBA::Float& ss3)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::Float MyServiceSVC_impl::echo07(CORBA::Float ss, CORBA::Float& ss2, CORBA::Float& ss3)>"
+  #warning "Code missing in function <::CORBA::Float MyServiceSVC_impl::echo07(::CORBA::Float ss, ::CORBA::Float& ss2, ::CORBA::Float& ss3)>"
 #endif
   return 0;
 }
 
-CORBA::Double MyServiceSVC_impl::echo08(CORBA::Double ss, CORBA::Double& ss2, CORBA::Double& ss3)
+::CORBA::Double MyServiceSVC_impl::echo08(::CORBA::Double ss, ::CORBA::Double& ss2, ::CORBA::Double& ss3)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::Double MyServiceSVC_impl::echo08(CORBA::Double ss, CORBA::Double& ss2, CORBA::Double& ss3)>"
+  #warning "Code missing in function <::CORBA::Double MyServiceSVC_impl::echo08(::CORBA::Double ss, ::CORBA::Double& ss2, ::CORBA::Double& ss3)>"
 #endif
   return 0;
 }
 
-CORBA::LongDouble MyServiceSVC_impl::echo09(CORBA::LongDouble ss, CORBA::LongDouble& ss2, CORBA::LongDouble& ss3)
+::CORBA::LongDouble MyServiceSVC_impl::echo09(::CORBA::LongDouble ss, ::CORBA::LongDouble& ss2, ::CORBA::LongDouble& ss3)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::LongDouble MyServiceSVC_impl::echo09(CORBA::LongDouble ss, CORBA::LongDouble& ss2, CORBA::LongDouble& ss3)>"
+  #warning "Code missing in function <::CORBA::LongDouble MyServiceSVC_impl::echo09(::CORBA::LongDouble ss, ::CORBA::LongDouble& ss2, ::CORBA::LongDouble& ss3)>"
 #endif
   return 0;
 }
 
-CORBA::Char MyServiceSVC_impl::echo10(CORBA::Char ss, CORBA::Char& ss2, CORBA::Char& ss3)
+::CORBA::Char MyServiceSVC_impl::echo10(::CORBA::Char ss, ::CORBA::Char& ss2, ::CORBA::Char& ss3)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::Char MyServiceSVC_impl::echo10(CORBA::Char ss, CORBA::Char& ss2, CORBA::Char& ss3)>"
+  #warning "Code missing in function <::CORBA::Char MyServiceSVC_impl::echo10(::CORBA::Char ss, ::CORBA::Char& ss2, ::CORBA::Char& ss3)>"
 #endif
   return 0;
 }
 
-CORBA::WChar MyServiceSVC_impl::echo11(CORBA::WChar ss, CORBA::WChar& ss2, CORBA::WChar& ss3)
+::CORBA::WChar MyServiceSVC_impl::echo11(::CORBA::WChar ss, ::CORBA::WChar& ss2, ::CORBA::WChar& ss3)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::WChar MyServiceSVC_impl::echo11(CORBA::WChar ss, CORBA::WChar& ss2, CORBA::WChar& ss3)>"
+  #warning "Code missing in function <::CORBA::WChar MyServiceSVC_impl::echo11(::CORBA::WChar ss, ::CORBA::WChar& ss2, ::CORBA::WChar& ss3)>"
 #endif
   return 0;
 }
 
-CORBA::Octet MyServiceSVC_impl::echo12(CORBA::Octet ss, CORBA::Octet& ss2, CORBA::Octet& ss3)
+::CORBA::Octet MyServiceSVC_impl::echo12(::CORBA::Octet ss, ::CORBA::Octet& ss2, ::CORBA::Octet& ss3)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::Octet MyServiceSVC_impl::echo12(CORBA::Octet ss, CORBA::Octet& ss2, CORBA::Octet& ss3)>"
+  #warning "Code missing in function <::CORBA::Octet MyServiceSVC_impl::echo12(::CORBA::Octet ss, ::CORBA::Octet& ss2, ::CORBA::Octet& ss3)>"
 #endif
   return 0;
 }
 
-CORBA::Boolean MyServiceSVC_impl::echo13(CORBA::Boolean ss, CORBA::Boolean& ss2, CORBA::Boolean& ss3)
+::CORBA::Boolean MyServiceSVC_impl::echo13(::CORBA::Boolean ss, ::CORBA::Boolean& ss2, ::CORBA::Boolean& ss3)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::Boolean MyServiceSVC_impl::echo13(CORBA::Boolean ss, CORBA::Boolean& ss2, CORBA::Boolean& ss3)>"
+  #warning "Code missing in function <::CORBA::Boolean MyServiceSVC_impl::echo13(::CORBA::Boolean ss, ::CORBA::Boolean& ss2, ::CORBA::Boolean& ss3)>"
 #endif
   return 0;
 }
 
-char* MyServiceSVC_impl::echo14(const char* ss, CORBA::String_out ss2, char*& ss3)
+char* MyServiceSVC_impl::echo14(const char* ss, ::CORBA::String_out ss2, char*& ss3)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <char* MyServiceSVC_impl::echo14(const char* ss, CORBA::String_out ss2, char*& ss3)>"
+  #warning "Code missing in function <char* MyServiceSVC_impl::echo14(const char* ss, ::CORBA::String_out ss2, char*& ss3)>"
 #endif
   return 0;
 }
 
-CORBA::WChar* MyServiceSVC_impl::echo15(const CORBA::WChar* ss, CORBA::WString_out ss2, CORBA::WChar*& ss3)
+::CORBA::WChar* MyServiceSVC_impl::echo15(const ::CORBA::WChar* ss, ::CORBA::WString_out ss2, ::CORBA::WChar*& ss3)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::WChar* MyServiceSVC_impl::echo15(const CORBA::WChar* ss, CORBA::WString_out ss2, CORBA::WChar*& ss3)>"
+  #warning "Code missing in function <::CORBA::WChar* MyServiceSVC_impl::echo15(const ::CORBA::WChar* ss, ::CORBA::WString_out ss2, ::CORBA::WChar*& ss3)>"
 #endif
   return 0;
 }
 
-CORBA::Any* MyServiceSVC_impl::echo16(const CORBA::Any& ss, CORBA::Any_OUT_arg ss2, CORBA::Any& ss3)
+::CORBA::Any* MyServiceSVC_impl::echo16(const ::CORBA::Any& ss, ::CORBA::Any_OUT_arg ss2, ::CORBA::Any& ss3)
 {
   // Please insert your code here and remove the following warning pragma
 #ifndef WIN32
-  #warning "Code missing in function <CORBA::Any* MyServiceSVC_impl::echo16(const CORBA::Any& ss, CORBA::Any_OUT_arg ss2, CORBA::Any& ss3)>"
+  #warning "Code missing in function <::CORBA::Any* MyServiceSVC_impl::echo16(const ::CORBA::Any& ss, ::CORBA::Any_OUT_arg ss2, ::CORBA::Any& ss3)>"
 #endif
   return 0;
 }

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/type/MyServiceSVC_impl.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/type/MyServiceSVC_impl.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/type/MyServiceSVC_impl.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -34,22 +34,22 @@
    virtual ~MyServiceSVC_impl();
 
    // attributes and operations
-   CORBA::Short echo01(CORBA::Short ss, CORBA::Short& ss2, CORBA::Short& ss3);
-   CORBA::Long echo02(CORBA::Long ss, CORBA::Long& ss2, CORBA::Long& ss3);
-   CORBA::LongLong echo03(CORBA::LongLong ss, CORBA::LongLong& ss2, CORBA::LongLong& ss3);
-   CORBA::ULong echo04(CORBA::ULong ss, CORBA::ULong& ss2, CORBA::ULong& ss3);
-   CORBA::ULongLong echo05(CORBA::ULongLong ss, CORBA::ULongLong& ss2, CORBA::ULongLong& ss3);
-   CORBA::UShort echo06(CORBA::UShort ss, CORBA::UShort& ss2, CORBA::UShort& ss3);
-   CORBA::Float echo07(CORBA::Float ss, CORBA::Float& ss2, CORBA::Float& ss3);
-   CORBA::Double echo08(CORBA::Double ss, CORBA::Double& ss2, CORBA::Double& ss3);
-   CORBA::LongDouble echo09(CORBA::LongDouble ss, CORBA::LongDouble& ss2, CORBA::LongDouble& ss3);
-   CORBA::Char echo10(CORBA::Char ss, CORBA::Char& ss2, CORBA::Char& ss3);
-   CORBA::WChar echo11(CORBA::WChar ss, CORBA::WChar& ss2, CORBA::WChar& ss3);
-   CORBA::Octet echo12(CORBA::Octet ss, CORBA::Octet& ss2, CORBA::Octet& ss3);
-   CORBA::Boolean echo13(CORBA::Boolean ss, CORBA::Boolean& ss2, CORBA::Boolean& ss3);
-   char* echo14(const char* ss, CORBA::String_out ss2, char*& ss3);
-   CORBA::WChar* echo15(const CORBA::WChar* ss, CORBA::WString_out ss2, CORBA::WChar*& ss3);
-   CORBA::Any* echo16(const CORBA::Any& ss, CORBA::Any_OUT_arg ss2, CORBA::Any& ss3);
+   ::CORBA::Short echo01(::CORBA::Short ss, ::CORBA::Short& ss2, ::CORBA::Short& ss3);
+   ::CORBA::Long echo02(::CORBA::Long ss, ::CORBA::Long& ss2, ::CORBA::Long& ss3);
+   ::CORBA::LongLong echo03(::CORBA::LongLong ss, ::CORBA::LongLong& ss2, ::CORBA::LongLong& ss3);
+   ::CORBA::ULong echo04(::CORBA::ULong ss, ::CORBA::ULong& ss2, ::CORBA::ULong& ss3);
+   ::CORBA::ULongLong echo05(::CORBA::ULongLong ss, ::CORBA::ULongLong& ss2, ::CORBA::ULongLong& ss3);
+   ::CORBA::UShort echo06(::CORBA::UShort ss, ::CORBA::UShort& ss2, ::CORBA::UShort& ss3);
+   ::CORBA::Float echo07(::CORBA::Float ss, ::CORBA::Float& ss2, ::CORBA::Float& ss3);
+   ::CORBA::Double echo08(::CORBA::Double ss, ::CORBA::Double& ss2, ::CORBA::Double& ss3);
+   ::CORBA::LongDouble echo09(::CORBA::LongDouble ss, ::CORBA::LongDouble& ss2, ::CORBA::LongDouble& ss3);
+   ::CORBA::Char echo10(::CORBA::Char ss, ::CORBA::Char& ss2, ::CORBA::Char& ss3);
+   ::CORBA::WChar echo11(::CORBA::WChar ss, ::CORBA::WChar& ss2, ::CORBA::WChar& ss3);
+   ::CORBA::Octet echo12(::CORBA::Octet ss, ::CORBA::Octet& ss2, ::CORBA::Octet& ss3);
+   ::CORBA::Boolean echo13(::CORBA::Boolean ss, ::CORBA::Boolean& ss2, ::CORBA::Boolean& ss3);
+   char* echo14(const char* ss, ::CORBA::String_out ss2, char*& ss3);
+   ::CORBA::WChar* echo15(const ::CORBA::WChar* ss, ::CORBA::WString_out ss2, ::CORBA::WChar*& ss3);
+   ::CORBA::Any* echo16(const ::CORBA::Any& ss, ::CORBA::Any_OUT_arg ss2, ::CORBA::Any& ss3);
 
 };
 

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/type/test.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/type/test.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/type/test.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef TEST_H
 #define TEST_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -30,6 +25,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/all/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/all/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/all/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -29,6 +24,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/execute/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/execute/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/execute/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -29,6 +24,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/finalize/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/finalize/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/finalize/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -29,6 +24,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/initialize/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/initialize/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/initialize/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -29,6 +24,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/library/library1/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/library/library1/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/library/library1/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -29,6 +24,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/library/library2/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/library/library2/foo.h	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/library/library2/foo.h	2016-03-07 10:41:53 UTC (rev 572)
@@ -10,11 +10,6 @@
 #ifndef FOO_H
 #define FOO_H
 
-#include <rtm/Manager.h>
-#include <rtm/DataFlowComponentBase.h>
-#include <rtm/CorbaPort.h>
-#include <rtm/DataInPort.h>
-#include <rtm/DataOutPort.h>
 #include <rtm/idl/BasicDataTypeSkel.h>
 #include <rtm/idl/ExtendedDataTypesSkel.h>
 #include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -29,6 +24,16 @@
 
 // </rtc-template>
 
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
+// </rtc-template>
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+
 using namespace RTC;
 
 /*!

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/CORBAParseCommentTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/CORBAParseCommentTest.java	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/CORBAParseCommentTest.java	2016-03-07 10:41:53 UTC (rev 572)
@@ -23,7 +23,7 @@
 		List<TypeDefParam> typedefParams = IDLParamConverter
 				.convert_typedef(spec, "");
 		
-		assertEquals(0, typedefParams.size());
+		assertEquals(1, typedefParams.size());
 	}
 	
 	public void testMultiCommentforPref() throws Exception{
@@ -36,6 +36,6 @@
 		List<TypeDefParam> typedefParams = IDLParamConverter
 				.convert_typedef(spec, "");
 		
-		assertEquals(0, typedefParams.size());
+		assertEquals(1, typedefParams.size());
 	}
 }

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/CORBAParseInheritTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/CORBAParseInheritTest.java	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/CORBAParseInheritTest.java	2016-03-07 10:41:53 UTC (rev 572)
@@ -37,8 +37,8 @@
 		assertEquals("getGain", serviceClassParams.get(1).getMethods().get(3).getName());
 		//
 		assertEquals(1, includeFiles.size());
-		assertEquals("C:\\GlobalAssist\\EclipseAISTRep\\jp.go.aist.rtm.rtcbuilder\\resource\\IDL\\MyServiceParent.idl",
-				includeFiles.get(0));
+//		assertEquals("C:\\GlobalAssist\\EclipseAISTRep\\jp.go.aist.rtm.rtcbuilder\\resource\\IDL\\MyServiceParent.idl",
+//				includeFiles.get(0));
 	}
 
 	public void testInheritWithType() throws Exception{

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/CORBAParseMethodTypeTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/CORBAParseMethodTypeTest.java	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/CORBAParseMethodTypeTest.java	2016-03-07 10:41:53 UTC (rev 572)
@@ -20,7 +20,7 @@
 		List<TypeDefParam> typedefParams = IDLParamConverter
 				.convert_typedef(spec, "");
 		
-		assertEquals(2, typedefParams.size());
+		assertEquals(3, typedefParams.size());
 //		assertEquals("string", typedefParams.get(0).getOriginalDef());
 		assertEquals(false, typedefParams.get(0).isSequence());
 //		assertEquals("float", typedefParams.get(1).getOriginalDef());
@@ -36,7 +36,7 @@
 		List<TypeDefParam> typedefParams = IDLParamConverter
 				.convert_typedef(spec, "");
 		
-		assertEquals(2, typedefParams.size());
+		assertEquals(3, typedefParams.size());
 //		assertEquals("string[]", typedefParams.get(0).getOriginalDef());
 		assertEquals("string", typedefParams.get(0).getOriginalDef());
 		assertEquals(true, typedefParams.get(0).isSequence());

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/CORBAParseTypeDefTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/CORBAParseTypeDefTest.java	2016-03-07 09:20:24 UTC (rev 571)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/CORBAParseTypeDefTest.java	2016-03-07 10:41:53 UTC (rev 572)
@@ -21,11 +21,18 @@
 		List<TypeDefParam> typedefParams = IDLParamConverter
 				.convert_typedef(spec, "");
 		
-		assertEquals(2, typedefParams.size());
-		assertEquals("string", typedefParams.get(0).getOriginalDef());
+		assertEquals(3, typedefParams.size());
+		assertEquals("string<1>", typedefParams.get(0).getOriginalDef());
+		assertEquals("Str1", typedefParams.get(0).getTargetDef());
 		assertEquals(false, typedefParams.get(0).isSequence());
-		assertEquals("wstring", typedefParams.get(1).getOriginalDef());
+		
+		assertEquals("wstring<1>", typedefParams.get(1).getOriginalDef());
+		assertEquals("WStr1", typedefParams.get(1).getTargetDef());
 		assertEquals(false, typedefParams.get(1).isSequence());
+		
+		assertEquals("", typedefParams.get(2).getOriginalDef());
+		assertEquals("MyService", typedefParams.get(2).getTargetDef());
+		assertEquals(false, typedefParams.get(2).isSequence());
 	}
 	
 	public void testArrayDef() throws Exception{
@@ -36,9 +43,14 @@
 		List<TypeDefParam> typedefParams = IDLParamConverter
 				.convert_typedef(spec, "");
 		
-		assertEquals(1, typedefParams.size());
-		assertEquals("short", typedefParams.get(0).getOriginalDef());
-		assertEquals(true, typedefParams.get(0).isArray());
+		assertEquals(2, typedefParams.size());
+		
+		assertEquals("", typedefParams.get(0).getOriginalDef());
+		assertEquals("sample", typedefParams.get(0).getTargetDef());
+		assertEquals(false, typedefParams.get(0).isArray());
+		
+		assertEquals("short", typedefParams.get(1).getOriginalDef());
+		assertEquals(true, typedefParams.get(1).isArray());
 	}
 	
 	public void testModule() throws Exception{

