[openrtm-commit:00956] r394 - in branches/RELENG_1_1/rtmtools: . jp.go.aist.rtm.nameserviceview jp.go.aist.rtm.nameserviceview/META-INF jp.go.aist.rtm.nameserviceview/bin jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming jp.go.aist.rtm.nameserviceview/src/jp/go/aist/rtm/nameserviceview/adapterfactory jp.go.aist.rtm.nameserviceview.nl1 jp.go.aist.rtm.nameserviceview.nl1/META-INF jp.go.aist.rtm.repositoryView jp.go.aist.rtm.repositoryView/META-INF jp.go.aist.rtm.repositoryView/bin jp.go.aist.rtm.repositoryView.nl1 jp.go.aist.rtm.repositoryView.nl1/META-INF jp.go.aist.rtm.rtcbuilder jp.go.aist.rtm.rtcbuilder/META-INF jp.go.aist.rtm.rtcbuilder/bin jp.go.aist.rtm.rtcbuilder/resource jp.go.aist.rtm.rtcbuilder/resource/100/CXX jp.go.aist.rtm.rtcbuilder/resource/100/CXX/AIST2 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/ConfigType jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset1 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset2 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset3 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/DataPortIDL jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ExecutionCxt jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ConMulti jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProConMulti jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProMulti jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confprefix jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confsuffix jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtprefix jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtsuffix jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/prefix jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/siprefix jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/sisuffix jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/suffix jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svprefix jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svsuffix jp.go.aist.rtm.rtcbuilder/resource/100/CXX/SystemConfig jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/DataPort jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort1 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort2 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/attribute jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/inport1 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/inport2 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/name jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/operation jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/outport1 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/outport2 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service1 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service2 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/DFFSMMM jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/DataFlow jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/FSM jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/cmake_modules jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/cmake_modules jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc1 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc2 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint1 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint2 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint3 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit1 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit2 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceCon jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceM jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath1 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath2 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath3 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/IDLType1 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/SeqString jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/Struct jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/Struct2 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/type jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/all jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/execute jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/finalize jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/initialize jp.go.aist.rtm.rtcbuilder/resource/100/CXX/library/library1 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/library/library2 jp.go.aist.rtm.rtcbuilder/resource/IDL jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/idl jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/nl jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/common jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/preference jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/wizard jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/util jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100 jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com jp.go.aist.rtm.rtcbuilder.java jp.go.aist.rtm.rtcbuilder.java/META-INF jp.go.aist.rtm.rtcbuilder.java/bin jp.go.aist.rtm.rtcbuilder.java/resource jp.go.aist.rtm.rtcbuilder.java/resource/100/ConfigSet/configset4/src jp.go.aist.rtm.rtcbuilder.java/resource/100/Multi/ConMulti jp.go.aist.rtm.rtcbuilder.java/resource/100/Multi/ProConMulti jp.go.aist.rtm.rtcbuilder.java/resource/100/Multi/ProMulti jp.go.aist.rtm.rtcbuilder.java/resource/100/base/inport1 jp.go.aist.rtm.rtcbuilder.java/resource/100/base/inport2 jp.go.aist.rtm.rtcbuilder.java/resource/100/base/name jp.go.aist.rtm.rtcbuilder.java/resource/100/base/outport1 jp.go.aist.rtm.rtcbuilder.java/resource/100/base/outport2 jp.go.aist.rtm.rtcbuilder.java/resource/100/base/service1 jp.go.aist.rtm.rtcbuilder.java/resource/100/base/service2 jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake1 jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake2 jp.go.aist.rtm.rtcbuilder.java/resource/100/idlinherit/inherit1 jp.go.aist.rtm.rtcbuilder.java/resource/100/idlinherit/inherit2 jp.go.aist.rtm.rtcbuilder.java/resource/100/idltype/type1 jp.go.aist.rtm.rtcbuilder.java/resource/100/idltype/type2 jp.go.aist.rtm.rtcbuilder.java/resource/100/module/serviceCon jp.go.aist.rtm.rtcbuilder.java/resource/100/module/serviceM jp.go.aist.rtm.rtcbuilder.java/resource/100/module/serviceMC jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/manager jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100 jp.go.aist.rtm.rtcbuilder.nl1 jp.go.aist.rtm.rtcbuilder.nl1/META-INF jp.go.aist.rtm.rtcbuilder.nl1/src/jp/go/aist/rtm/rtcbuilder/nl jp.go.aist.rtm.rtcbuilder.python jp.go.aist.rtm.rtcbuilder.python/META-INF jp.go.aist.rtm.rtcbuilder.python/bin jp.go.aist.rtm.rtcbuilder.python/resource jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/author jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/authorLong jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/full jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/refer jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST1 jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST2 jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST3 jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST4 jp.go.aist.rtm.rtcbuilder.python/resource/100/base/inport1 jp.go.aist.rtm.rtcbuilder.python/resource/100/base/inport2 jp.go.aist.rtm.rtcbuilder.python/resource/100/base/name jp.go.aist.rtm.rtcbuilder.python/resource/100/base/name2 jp.go.aist.rtm.rtcbuilder.python/resource/100/base/outport1 jp.go.aist.rtm.rtcbuilder.python/resource/100/base/outport2 jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service1 jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service2 jp.go.aist.rtm.rtcbuilder.python/resource/100/build/cmake1 jp.go.aist.rtm.rtcbuilder.python/resource/100/build/cmake2 jp.go.aist.rtm.rtcbuilder.python/resource/100/idlinherit/inherit1 jp.go.aist.rtm.rtcbuilder.python/resource/100/idlinherit/inherit2 jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type1 jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type2 jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type3 jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM2 jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceMC jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceMC2 jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100 jp.go.aist.rtm.systemeditor jp.go.aist.rtm.systemeditor/META-INF jp.go.aist.rtm.systemeditor/bin jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/_debug jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/_test jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/extension jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/factory jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/manager jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/nl jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/restoration jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/command jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/dnd jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/editpart jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/editpolicy jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/figure jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/preference jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/util jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/views jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/views/configurationview jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/views/configurationview/configurationwrapper jp.go.aist.rtm.systemeditor/test/jp/go/aist/rtm/systemeditor jp.go.aist.rtm.systemeditor/test/jp/go/aist/rtm/systemeditor/ui/views/configurationview/configurationwrapper jp.go.aist.rtm.systemeditor/test/jp/go/aist/rtm/systemeditor/ui/views/configurationview/mock jp.go.aist.rtm.systemeditor.nl1 jp.go.aist.rtm.systemeditor.nl1/META-INF jp.go.aist.rtm.systemeditor.nl1/src/jp/go/aist/rtm/systemeditor/nl jp.go.aist.rtm.toolscommon jp.go.aist.rtm.toolscommon/META-INF jp.go.aist.rtm.toolscommon/bin jp.go.aist.rtm.toolscommon/idl jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/adapterfactory jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/util jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/validation jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/nl jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/synchronizationframework jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/propertysource jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/views/propertysheetview jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/workbenchadapter jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/util jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/validation jp.go.aist.rtm.toolscommon/test/jp/go/aist/rtm/toolscommon/util jp.go.aist.rtm.toolscommon/text jp.go.aist.rtm.toolscommon.nl1 jp.go.aist.rtm.toolscommon.nl1/META-INF jp.go.aist.rtm.toolscommon.nl1/src/jp/go/aist/rtm/toolscommon/nl jp.go.aist.rtm.toolscommon.profiles jp.go.aist.rtm.toolscommon.profiles/META-INF jp.go.aist.rtm.toolscommon.profiles/bin jp.go.aist.rtm.toolscommon.profiles/schema jp.go.aist.rtm.toolscommon.profiles/src/jp/go/aist/rtm/toolscommon/profiles/util jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01 jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02 jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01 jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02 jp.go.aist.rtm.toolscommon.profiles/test/jp/go/aist/rtm/toolscommon/profiles/_test jp.go.aist.rtm.toolscommon.profiles.nl1 jp.go.aist.rtm.toolscommon.profiles.nl1/META-INF

• 前の記事 [openrtm-commit:00955] r60 - trunk
• 次の記事 [openrtm-commit:00957] r395 - trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Author: n-ando
Date: 2013-01-29 19:39:20 +0900 (Tue, 29 Jan 2013)
New Revision: 394

Added:
   branches/RELENG_1_1/rtmtools/build_all
   branches/RELENG_1_1/rtmtools/build_features
   branches/RELENG_1_1/rtmtools/build_plugins
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/Python/
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Content/
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Manip/
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/idl/
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/include/
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/src/
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/include/
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/src/
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceArg/
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceArgStruct/
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlstruct/
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/IDL/Modules.idl
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/COPYING.LESSER.vsl
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/COPYING.vsl
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/doc/
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/idl/
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/include/
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/src/
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_STAND_ALONE.vsl
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/util/ShutdownListener.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXContentTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLStructTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXManipTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/manager/ComponentIconStore.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/ConnectPortActionDelegate.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/DeployActionDelegate.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/DeployLoadActionDelegate.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/DeploySaveActionDelegate.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/DeploySettingActionDelegate.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/StartLoggingActionDelegate.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/ConnectorDialogBase.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/DeploymentSettingDialog.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/DisconnectDialog.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/IconPreferenceDialog.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/preference/IconPreferencePage.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/util/DeployUtil.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/views/logview/
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/test/jp/go/aist/rtm/systemeditor/manager/
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/schema/DeployProfile.xsd
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/deploy/
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/idl/BasicDataType.idl
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/idl/Logger.idl
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/CorbaLogObserver.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaLogObserverImpl.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/util/CorbaObserverStore.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/util/RTCLogStore.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/validation/CorbaLogObserverValidator.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/propertysource/CorbaObserverPropertySource.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/propertysource/PropertyMapPropertySource.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/workbenchadapter/CorbaObserverWorkbenchAdapter.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/workbenchadapter/PropertyMapWorkbenchAdapter.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/util/DeployProfileHandler.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/util/ProfileHandlerBase.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/test/jp/go/aist/rtm/toolscommon/util/ConnectorUtilTest.java
   branches/RELENG_1_1/rtmtools/lib/
   branches/RELENG_1_1/rtmtools/openrtp
   branches/RELENG_1_1/rtmtools/rtmtools/
   branches/RELENG_1_1/rtmtools/sitetool/
   branches/RELENG_1_1/rtmtools/tasktool/
   branches/RELENG_1_1/rtmtools/version
Removed:
   branches/RELENG_1_1/rtmtools/buildall.sh
   branches/RELENG_1_1/rtmtools/buildrtcbuilder.bat
   branches/RELENG_1_1/rtmtools/buildrtcbuilder.sh
   branches/RELENG_1_1/rtmtools/buildsystemeditor.bat
   branches/RELENG_1_1/rtmtools/buildsystemeditor.sh
   branches/RELENG_1_1/rtmtools/clean_rtcb.bat
   branches/RELENG_1_1/rtmtools/clean_rtcb.sh
   branches/RELENG_1_1/rtmtools/clean_rtse.bat
   branches/RELENG_1_1/rtmtools/clean_rtse.sh
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/bin/jp/
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/jar/
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.repositoryView/bin/jp/
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.repositoryView/jar/
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.csharp/
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/bin/jp/
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/jar/
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/Java/
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/AISTTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/AllTestsJava.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/BaseTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/BuildPathTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/ConfigSetTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/DiffTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaDocLongTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaDocTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaExCxtTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaIDLPathTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaImplTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaSystemConfigTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaVariableTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/LuckTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/MLTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/MultiTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/VarTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/bin/jp/
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/jar/
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/Python/
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/AISTTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/AllTestsPy.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/BaseTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/ConfigSetTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/DiffTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/LuckTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/MultiTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/PyDocLongTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/PyDocTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/PyExCxtTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/PyImplTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/PySystemConfigTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/PyVariableTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/VarTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.vbdotnet/
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/bin/jp/
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/jar/
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/CXX/
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_042/
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/bin/_SDOPackage/
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/bin/jp/
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/jar/
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/bin/jp/
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/bin/org/
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/bin/test/
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/jar/
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/bin/RTC/
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/bin/_SDOPackage/
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/bin/jp/
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/jar/
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/util/IPropertyMapUtil.java
Modified:
   branches/RELENG_1_1/rtmtools/
   branches/RELENG_1_1/rtmtools/buildall.bat
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview.nl1/META-INF/MANIFEST.MF
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview.nl1/build.xml
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/META-INF/MANIFEST.MF
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/build.xml
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/BindingTypeHelper.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/NameComponentHelper.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/NameHelper.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/NamingNotifier.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/NamingNotifierHelper.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/NamingNotifierHolder.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/NamingNotifierOperations.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/NamingNotifierPOA.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/NamingObserver.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/NamingObserverHelper.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/NamingObserverHolder.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/NamingObserverOperations.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/NamingObserverPOA.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/ObserverProfile.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/ObserverProfileHelper.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/ObserverProfileHolder.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/TreeBinding.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/TreeBindingHelper.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/TreeBindingHolder.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/TreeBindingListHelper.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/TreeBindingListHolder.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/_NamingNotifierStub.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/_NamingObserverStub.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/jp/go/aist/rtm/nameserviceview/adapterfactory/AdapterFactory.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.repositoryView.nl1/META-INF/MANIFEST.MF
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.repositoryView.nl1/build.xml
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.repositoryView/META-INF/MANIFEST.MF
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.repositoryView/build.xml
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/META-INF/MANIFEST.MF
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/build.xml
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/ConfigSet/configset4/src/foo.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/ConfigSet/configset4/src/fooImpl.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/Multi/ConMulti/build_foo.xml
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/Multi/ProConMulti/build_foo.xml
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/Multi/ProMulti/build_foo.xml
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/inport1/.classpath
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/inport2/.classpath
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/name/.classpath
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/outport1/.classpath
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/outport2/.classpath
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/service1/build_foo.xml
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/service2/DAQService.idl
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/service2/build_foo.xml
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake1/DAQService.idl
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake1/build_foo.xml
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake1/foo.bat
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake1/foo.sh
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake2/build_foo.xml
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake2/foo.bat
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake2/foo.sh
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/idlinherit/inherit1/build_foo.xml
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/idlinherit/inherit2/build_foo.xml
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/idltype/type1/build_test.xml
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/idltype/type2/build_test.xml
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/module/serviceCon/build_foo.xml
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/module/serviceM/build_foo.xml
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/module/serviceMC/build_foo.xml
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/DAQService.idl
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/manager/JavaGenerateManager.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/Java_RTC_Impl.java.vsl
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/build.xml.vsl
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/classpath.vsl
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/run.bat.vsl
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/run.sh.vsl
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/BaseTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/BuildTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/ConfigSetTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/JavaIDLInheritTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/ModuleTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/MultiTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.nl1/META-INF/MANIFEST.MF
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.nl1/build.xml
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.nl1/src/jp/go/aist/rtm/rtcbuilder/nl/messages_ja.properties
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/META-INF/MANIFEST.MF
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/build.xml
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/author/foo.py
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/author/idlcompile.bat
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/author/idlcompile.sh
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/authorLong/MyService_idl_example.py
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/authorLong/foo.py
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/authorLong/idlcompile.bat
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/authorLong/idlcompile.sh
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/full/foo.py
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/full/idlcompile.bat
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/full/idlcompile.sh
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/refer/foo.py
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/refer/idlcompile.bat
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/refer/idlcompile.sh
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST1/idlcompile.bat
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST1/idlcompile.sh
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST1/test.py
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST2/idlcompile.bat
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST2/idlcompile.sh
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST2/test.py
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST3/idlcompile.bat
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST3/idlcompile.sh
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST3/test.py
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST4/idlcompile.bat
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST4/idlcompile.sh
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST4/test.py
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/inport1/foo.py
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/inport2/foo.py
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/name/foo.py
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/name2/Foo.py
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/outport1/foo.py
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/outport2/foo.py
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service1/MyService_idl_example.py
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service1/foo.py
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service1/idlcompile.bat
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service1/idlcompile.sh
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service2/MyService_idl_example.py
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service2/foo.py
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service2/idlcompile.bat
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service2/idlcompile.sh
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/build/cmake1/DAQService.idl
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/build/cmake1/foo.py
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/build/cmake1/idlcompile.bat
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/build/cmake1/idlcompile.sh
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/build/cmake2/foo.py
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/build/cmake2/idlcompile.bat
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/build/cmake2/idlcompile.sh
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idlinherit/inherit1/foo.py
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idlinherit/inherit1/idlcompile.bat
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idlinherit/inherit1/idlcompile.sh
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idlinherit/inherit2/foo.py
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idlinherit/inherit2/idlcompile.bat
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idlinherit/inherit2/idlcompile.sh
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type1/ModuleName.py
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type2/idlcompile.bat
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type2/idlcompile.sh
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type2/test.py
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type3/idlcompile.bat
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type3/idlcompile.sh
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type3/test.py
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM/foo.py
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM/idlcompile.bat
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM/idlcompile.sh
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM2/foo.py
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM2/idlcompile.bat
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM2/idlcompile.sh
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceMC/foo.py
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceMC2/foo.py
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/DAQService.idl
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/PythonGenerateManager.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/TemplateHelperPy.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/Py_RTC.py.vsl
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/Py_SVC_idl_example.py.vsl
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/idlcompile.bat.vsl
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/idlcompile.sh.vsl
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/AISTTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/BaseTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/BuildTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/ConfigSetTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyDocTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyIDLInheritTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyIDLType.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyImplTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyModuleTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/META-INF/MANIFEST.MF
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/build.xml
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/AIST2/ModuleName.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/AIST2/ModuleName.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/ConfigType/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/ConfigType/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset1/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset1/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset2/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset2/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset3/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset3/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/DataPortIDL/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/DataPortIDL/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/MyServiceSVC_impl.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/MyServiceSVC_impl.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/fooComp.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ExecutionCxt/foo.conf
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ExecutionCxt/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ExecutionCxt/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ExecutionCxt/rtc.conf
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ConMulti/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ConMulti/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProConMulti/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProConMulti/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProMulti/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProMulti/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confprefix/DAQService.idl
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confprefix/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confprefix/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confsuffix/DAQService.idl
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confsuffix/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confsuffix/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtprefix/DAQService.idl
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtprefix/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtprefix/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtsuffix/DAQService.idl
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtsuffix/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtsuffix/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/prefix/DAQService.idl
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/prefix/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/prefix/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/siprefix/DAQService.idl
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/siprefix/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/siprefix/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/sisuffix/DAQService.idl
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/sisuffix/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/sisuffix/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/suffix/DAQService.idl
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/suffix/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/suffix/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svprefix/DAQService.idl
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svprefix/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svprefix/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svsuffix/DAQService.idl
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svsuffix/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svsuffix/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/SystemConfig/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/SystemConfig/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/SystemConfig/rtc.conf
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/DataPort/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/DataPort/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort1/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort1/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort2/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort2/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/attribute/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/attribute/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/inport1/test.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/inport1/test.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/inport2/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/inport2/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/name/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/name/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/operation/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/operation/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/outport1/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/outport1/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/outport2/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/outport2/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service1/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service1/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service2/DAQService.idl
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service2/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service2/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/DFFSMMM/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/DFFSMMM/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/DataFlow/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/DataFlow/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/FSM/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/FSM/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/DAQService.idl
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/cmake_modules/FindOpenRTM.cmake
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/cmake_modules/FindOpenRTM.cmake
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc1/DAQService.idl
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc1/Makefile.foo
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc1/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc1/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc2/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc2/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint1/foo.conf
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint1/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint1/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint1/rtc.conf
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint2/foo.conf
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint2/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint2/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint2/rtc.conf
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint3/foo.conf
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint3/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint3/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint3/rtc.conf
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit1/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit1/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit2/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit2/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceCon/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceCon/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceM/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceM/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath1/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath1/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath2/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath2/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath3/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath3/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/IDLType1/ModuleName.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/IDLType1/ModuleName.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/IDLType1/TestIDLSVC_impl.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/IDLType1/TestIDLSVC_impl.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/SeqString/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/SeqString/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/Struct/ModuleName.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/Struct/ModuleName.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/Struct2/ModuleName.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/Struct2/ModuleName.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/type/test.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/type/test.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/all/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/all/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/execute/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/execute/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/finalize/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/finalize/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/initialize/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/initialize/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/library/library1/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/library/library1/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/library/library2/foo.cpp
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/library/library2/foo.h
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/DAQService.idl
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/IDL/Manager.idl
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/Generator.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/IRtcBuilderConstants.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/RTCBLogHandler.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/RtcBuilderPlugin.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/IDLParamConverter.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/PreProcessor.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/ProfileHandler.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/ParamUtil.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/RtcParam.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/idl/IdlFileParam.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/idl/ServiceArgumentParam.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/idl/ServiceMethodParam.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/idl/TypeDefParam.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CMakeGenerateManager.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CXXConverter.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CXXGenerateManager.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CommonGenerateManager.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/GenerateManager.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/nl/messages.properties
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/TemplateHelper.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/TemplateUtil.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/CMakeLists.txt.vsl
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/FindOpenRTM.cmake.vsl
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/common/Component.conf.vsl
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/common/README.vsl
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/common/rtc.conf.vsl
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_RTC.cpp.vsl
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_RTC.h.vsl
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/StringUtil.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/AbstractEditorFormPage.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/ActivityEditorFormPage.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/BasicEditorFormPage.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/ConfigurationEditorFormPage.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/DataPortEditorFormPage.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/IMessageConstants.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/RtcBuilderEditor.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/preference/CodeGeneratePreferencePage.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/preference/ComponentPreferenceManager.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/preference/DataTypePreferenceManager.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/preference/IPreferenceMessageConstants.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/wizard/NewWizard.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/util/FileUtil.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/util/StringUtil.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/TestBase.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/AllTestsCXX.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBaseClass.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBasicTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBuildTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConfigSetTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConstraint.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDataPortIDLTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDocLongTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXExCxtTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLInheritTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLModuleTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLPathTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLType.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXImplTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXLibraryTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXMultiTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXPrefixSuffixTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXSystemConfigTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXTemplateTestAIST2.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXVariableTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/CORBAParseInheritTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/CORBAParseMethodTypeTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/CORBAParseTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/CORBAParseTypeTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/StringUtilTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor.nl1/META-INF/MANIFEST.MF
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor.nl1/build.xml
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor.nl1/plugin_ja.properties
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor.nl1/src/jp/go/aist/rtm/systemeditor/nl/messages_ja.properties
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/META-INF/MANIFEST.MF
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/build.xml
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/plugin.properties
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/plugin.xml
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/RTSELogHandler.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/_debug/AbstractPolygon.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/_debug/Main.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/_test/ServiceConnectorCreaterDialogTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/extension/RTSELoadComponentExtension.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/factory/ComponentCommandCreator.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/factory/CompositeComponentCreator.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/manager/SystemEditorPreferenceManager.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/nl/messages.properties
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/restoration/Restoration.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/ConfigurationDialog.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/DataConnectorCreaterDialog.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/ProfileInformationDialog.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/ServiceConnectorCreaterDialog.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/AbstractSystemDiagramContextMenuProvider.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/AbstractSystemDiagramEditor.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/command/DirectEditNameCommand.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/dnd/ComponentFactory.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/dnd/SystemDiagramDropTargetListener.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/editpart/AbstractEditPart.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/editpart/ComponentEditPart.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/editpart/InPortEditPart.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/editpart/OutPortEditPart.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/editpart/PortEditPart.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/editpart/ServicePortEditPart.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/editpolicy/GraphicalConnectorCreateManager.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/editpolicy/SystemXYLayoutEditPolicy.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/figure/ComponentLayout.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/figure/InPortFigure.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/figure/OutPortFigure.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/figure/PortFigure.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/figure/ServicePortFigure.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/preference/SystemEditorPreferencePage.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/util/RTMixin.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/views/configurationview/ConfigurationView.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/views/configurationview/configurationwrapper/ComponentConfigurationWrapper.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/views/configurationview/configurationwrapper/ConfigurationCondition.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/views/configurationview/configurationwrapper/ConfigurationWidget.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/test/jp/go/aist/rtm/systemeditor/ui/views/configurationview/configurationwrapper/ComponentConfigurationWrapperTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/test/jp/go/aist/rtm/systemeditor/ui/views/configurationview/configurationwrapper/ConfigurationWidgetTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/test/jp/go/aist/rtm/systemeditor/ui/views/configurationview/configurationwrapper/NamedValueConfigurationWrapperTest.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/test/jp/go/aist/rtm/systemeditor/ui/views/configurationview/mock/ComponentMock.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.nl1/META-INF/MANIFEST.MF
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.nl1/build.xml
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.nl1/src/jp/go/aist/rtm/toolscommon/nl/messages_ja.properties
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles.nl1/META-INF/MANIFEST.MF
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles.nl1/build.xml
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/META-INF/MANIFEST.MF
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/build.xml
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/jp/go/aist/rtm/toolscommon/profiles/util/NamespacePrefixMapperImpl.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/jp/go/aist/rtm/toolscommon/profiles/util/XmlHandler.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/ActionStatus.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/ActionStatusDoc.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/Actions.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/BasicInfo.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/BasicInfoDoc.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/BasicInfoExt.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/Configuration.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/ConfigurationDoc.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/ConfigurationExt.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/ConfigurationSet.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/Cxxlang.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/Dataport.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/DataportDoc.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/DataportExt.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/DocAction.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/DocBasic.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/DocConfiguration.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/DocDataport.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/DocServiceinterface.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/DocServiceport.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/Javalang.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/Language.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/ObjectFactory.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/Parameter.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/Position.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/Property.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/RtcProfile.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/Serviceinterface.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/ServiceinterfaceDoc.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/ServiceinterfaceExt.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/Serviceport.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/ServiceportDoc.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/ServiceportExt.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/package-info.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ActionStatus.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ActionStatusDoc.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/Actions.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/And.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/BasicInfo.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/BasicInfoDoc.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/BasicInfoExt.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/Configuration.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ConfigurationDoc.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ConfigurationExt.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ConfigurationSet.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ConstraintHashType.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ConstraintListType.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ConstraintType.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ConstraintUnitType.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/Dataport.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/DataportDoc.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/DataportExt.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/DocAction.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/DocBasic.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/DocConfiguration.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/DocDataport.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/DocServiceinterface.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/DocServiceport.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/Language.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/LanguageExt.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/Library.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/Not.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ObjectFactory.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/Or.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/Parameter.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/Position.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/Property.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/PropertyIsBetween.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/PropertyIsEqualTo.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/PropertyIsGreaterThan.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/PropertyIsGreaterThanOrEqualTo.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/PropertyIsLessThan.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/PropertyIsLessThanOrEqualTo.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/PropertyIsLike.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/PropertyIsNotEqualTo.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/PropertyIsNullType.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/RtcProfile.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/Serviceinterface.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ServiceinterfaceDoc.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ServiceinterfaceExt.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/Serviceport.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ServiceportDoc.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ServiceportExt.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/TargetEnvironment.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/TransmissionMethod.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/package-info.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/Component.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/ComponentExt.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/Condition.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/ConditionExt.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/ConfigurationData.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/ConfigurationSet.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/Dataport.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/DataportConnector.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/DataportConnectorExt.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/ExecutionContext.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/ExecutionContextExt.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/Location.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/ObjectFactory.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/Participant.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/PrecedingComponent.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/Property.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/RtsProfile.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/RtsProfileExt.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/Serviceport.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/ServiceportConnector.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/ServiceportConnectorExt.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/Startup.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/TargetComponent.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/TargetComponentExt.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/TargetPort.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/TargetPortExt.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/package-info.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Activation.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Component.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/ComponentExt.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/ComponentGroup.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Condition.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/ConditionExt.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/ConfigurationData.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/ConfigurationSet.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Dataport.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/DataportConnector.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/DataportConnectorExt.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/DataportExt.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Deactivation.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/ExecutionContext.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/ExecutionContextExt.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Finalize.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Initialize.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Location.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/MessageSending.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/ObjectFactory.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Participants.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Preceding.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Property.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Resetting.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/RtsProfile.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/RtsProfileExt.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Serviceport.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/ServiceportConnector.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/ServiceportConnectorExt.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/ServiceportExt.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Shutdown.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Startup.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/TargetComponent.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/TargetComponentExt.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/TargetExecutioncontext.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/TargetPort.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/TargetPortExt.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Waittime.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/package-info.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/test/jp/go/aist/rtm/toolscommon/profiles/_test/ConstraintParseTest2.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/test/jp/go/aist/rtm/toolscommon/profiles/_test/TestBase.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/META-INF/MANIFEST.MF
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/build.xml
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/idl/ComponentObserver.idl
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/idl/Manager.idl
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/idl/RTC10.idl
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/plugin.xml
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/adapterfactory/WorkbenchAdapterFactory.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component.ecore
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/Component.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/ComponentFactory.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/ComponentPackage.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/CorbaComponent.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/CorbaObserver.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/IPropertyMap.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/PortSynchronizer.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/SystemDiagram.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ComponentFactoryImpl.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ComponentImpl.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ComponentPackageImpl.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ComponentSpecificationImpl.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ConnectorProfileImpl.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaComponentImpl.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaConnectorProfileImpl.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaExecutionContextImpl.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaObserverImpl.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaPortConnectorImpl.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaPortSynchronizerImpl.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaStatusObserverImpl.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ExecutionContextImpl.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/OutPortImpl.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/PortConnectorSpecificationImpl.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/PortImpl.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/PortSynchronizerImpl.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/SystemDiagramImpl.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/util/ComponentAdapterFactory.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/util/ComponentSwitch.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/util/CorbaPropertyMap.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/util/PropertyMap.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/validation/CorbaComponentValidator.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/nl/messages.properties
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/synchronizationframework/SynchronizationSupport.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/propertysource/ComponentPropertySource.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/propertysource/ComponentSpecificationPropertySource.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/propertysource/CorbaStatusObserverPropertySource.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/propertysource/PortConnectorPropertySource.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/propertysource/PortPropertySource.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/propertysource/SystemDiagramPropertySource.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/views/propertysheetview/RtcPropertySheetPage.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/workbenchadapter/ComponentWorkbenchAdapter.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/workbenchadapter/ExecutionContextWorkbenchAdapter.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/workbenchadapter/PortConnectorWorkbenchAdapter.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/workbenchadapter/PortWorkbenchAdapter.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/workbenchadapter/SystemDiagramWorkbenchAdapter.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/util/ConnectorUtil.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/util/RtsProfileHandler.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/validation/AbstractValidator.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/validation/ValidateException.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/validation/Validator.java
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/text/description.txt
Log:
merged r166-r393


Property changes on: branches/RELENG_1_1/rtmtools
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk/rtmtools:166-393

Copied: branches/RELENG_1_1/rtmtools/build_all (from rev 393, trunk/rtmtools/build_all)
===================================================================
--- branches/RELENG_1_1/rtmtools/build_all	                        (rev 0)
+++ branches/RELENG_1_1/rtmtools/build_all	2013-01-29 10:39:20 UTC (rev 394)
@@ -0,0 +1,248 @@
+#!/bin/sh
+#
+# @file buildall.sh
+# @brief rtmtools build script
+# @author Noriaki Ando <n-ando at aist.go.jp>
+#
+# update:
+# cerate:Sep/11/2008
+#
+# * How to build rtmtools
+#
+# ** Required environment
+#
+# The following development environment and tools are required to
+# build rtmtools.
+#
+# - jdk
+# - ant
+# - Eclipse SDK (3.4 or later is required.)
+#
+# ** Before build tools
+#
+# Please edit "version" text to set version number of the tools. This
+# is a kind of bash script.
+#
+# Example:
+# -------
+# VERSION=1.1.0
+# PROJECT_VERSION=${VERSION}.rc7v$(date +%Y%m%d)
+#
+# ** Environment variables
+#
+# To build rtmtools, some environmental variables can be set. In most
+# case, these variables are automatically set.
+#
+# - ECLIPSE_HOME: A directory path to an Eclipse SDK. Under this
+#                 directory, .eclipseproduct, eclipse.ini, plugins and
+#                 eclipse executable should exist. If this
+#                 env.variable is not set, this script tries to search
+#                 eclipse directory under some directories that is set
+#                 in a env.variable ECLIPSE_DIRS written in the head
+#                 of this script.
+#
+# - JAVA_HOME: A directory JDK installed. If this variable is not set,
+#                 this script tries to estimate JDK directory to
+#                 resolve symbolic link of javac executable.
+#
+# - VERSION: A simple version number for the tools like 1.1.1. This is
+#                 used for actual bundles' version number with
+#                 PROJECT_VERSION number.
+#
+# - PROJECT_VERSION: Project version number is full version string
+#                 with simple version and suffix like
+#                 rc120121212. This version string is used actual jar
+#                 file name.
+#
+# - JARDIR: A directory to store jar files. Default directory is "jar".
+#                 This directory is  temporary jar files store place.
+#
+# - DISTDIR: A directory to be archived for distribution package.
+#                 This directory name becomes archive package name.
+#                 Default name is openrtm-x.y.z. x, y, z are version
+#                 number which is defined in version text file.
+#
+
+
+#---------------------------------------------------------------------------
+# Global variables
+#---------------------------------------------------------------------------
+
+# Default build taget
+TARGET="buildAll"
+
+# Default
+JARDIR_DEFAULT="jar"
+
+# target projects
+PROJECTS="jp.go.aist.rtm.toolscommon.profiles
+    jp.go.aist.rtm.toolscommon.profiles.nl1
+    jp.go.aist.rtm.toolscommon
+    jp.go.aist.rtm.toolscommon.nl1
+    jp.go.aist.rtm.rtcbuilder
+    jp.go.aist.rtm.rtcbuilder.nl1
+    jp.go.aist.rtm.rtcbuilder.java
+    jp.go.aist.rtm.rtcbuilder.python
+    jp.go.aist.rtm.repositoryView
+    jp.go.aist.rtm.repositoryView.nl1
+    jp.go.aist.rtm.nameserviceview
+    jp.go.aist.rtm.nameserviceview.nl1
+    jp.go.aist.rtm.systemeditor
+    jp.go.aist.rtm.systemeditor.nl1"
+
+# Eclipse search directories
+ECLIPSE_DIRS="$HOME/eclipse ../ ../../ ../../ $HOME /usr/lib/ /usr/share"
+
+#============================================================
+# functions
+#============================================================
+
+#------------------------------------------------------------
+# getopt
+#
+# This function gets command line options
+# ------------------------------------------------------------
+getopt()
+{
+    if test $# = 1 ; then
+        arg=$1
+        if test "x$arg" = "xclean" ; then
+            TARGET=$1
+            return 0
+        fi
+        if test "x$arg" = "xrevert" ; then
+            echo "Reverting updated MANIFEST.MF..."
+            mf=`svn status | grep '^M' | grep MANIFEST.MF | awk '{print $2;}'`
+            for m in $mf; do
+                rm $m
+                svn update $m
+            done
+            exit 0
+        fi
+    fi
+}
+
+#------------------------------------------------------------
+# get_version
+#
+# This function gets version number and project version string
+# from version text file.
+# ------------------------------------------------------------
+get_version()
+{
+    if test "x$VERSION" = "x" || test "x$PROJECT_VERSION" = "x" ; then
+        echo "Environment variable VERSION/PROJECT_VERSION is not set."
+        echo "Getting from ./version text."
+        . ./version
+    fi
+    export VERSION
+    export PROJECT_VERSION
+
+    if test "x$DISTDIR" = "x" ; then
+        DISTDIR=openrtp-$VERSION
+    fi
+    if test "x$JARDIR" = "x" ; then
+        JARDIR=$JARDIR_DEFAULT
+    fi
+}
+
+#------------------------------------------------------------
+# find_eclipsehome
+#
+# This function checks ECLIPSE_HOME env variable and if it is
+# not set, it searches an eclipse directory under ECLIPSE_DIRS,
+# and set ECLIPSE_HOME env variable.
+# ------------------------------------------------------------
+find_eclipsehome()
+{
+    if test ! "x$ECLIPSE_HOME" = "x" ; then
+        if test -d $ECLIPSE_HOME ; then
+            return 0
+        fi
+        echo "ECLIPSE_HOME $ECLIPSE_HOME does not exist."
+    fi
+    echo "Environment variable ECLIPSE_HOME is not set. Seaching..."
+    for d in $ECLIPSE_DIRS ; do
+        tmp=`find -L $d -name .eclipseproduct`
+        if test "x$tmp" = "x" ; then
+            continue
+        fi
+        for e in $tmp ; do
+            edir=`dirname $e`
+            if test -f $edir/eclipse.ini && test -d $edir/plugins ; then
+                export ECLIPSE_HOME="$edir"
+                return 0
+            fi
+        done
+    done
+    echo "eclipse not found. Please install eclipse and set ECLIPSE_HOME."
+    exit 1
+}
+
+#------------------------------------------------------------
+# find_javahome
+#
+# This function estimate JAVA_HOME from javac, which usually
+# is a symbolic link to $JAVA_HOME/bin/javac.
+#------------------------------------------------------------
+find_javahome()
+{
+    if test ! "x$JAVA_HOME" = "x" ; then
+        if test -d $JAVA_HOME && test -f $JAVA_HOME/bin/javac ; then
+            return 0
+        fi
+        echo "JDK cannot be found under JAVA_HOME: $JAVA_HOME"
+    fi
+    echo "Valid Environment variable JAVA_HOME is not set. Searching..."
+    tmp=`readlink -e $(which javac)`
+    jdk_path=`dirname $tmp | sed 's/\/bin$//'`
+    if test "x$jdk_path" = "x" ; then
+        echo "JDK not found. Please install JDK and set JAVA_HOME."
+        exit 1
+    fi
+    export JAVA_HOME=$jdk_path
+    return 0
+}
+
+#==============================
+# main
+#==============================
+export LC_ALL=C
+cd `dirname $0`
+
+getopt $*
+get_version
+
+find_eclipsehome
+find_javahome
+
+if test "x$TARGET" = "xclean" ; then
+    ./build_plugins clean
+    if test $? -ne 0 ; then
+        echo "[ERROR] cleaning plugins failed. Aborting..."
+        exit 1
+    fi
+    ./build_features clean
+    if test $? -ne 0 ; then
+        echo "[ERROR] cleaning features failed. Aborting..."
+        exit 1
+    fi
+    echo "[OK] cleaning plugins/features successfully done."
+    exit 0
+else
+    ./build_plugins
+    if test $? -ne 0 ; then
+        echo "[ERROR] build plugins failed. Aborting..."
+        exit 1
+    fi
+    ./build_features
+    if test $? -ne 0 ; then
+        echo "[ERROR] build features failed. Aborting..."
+        exit 1
+    fi
+    echo "[OK] building plugins/features successfully done."
+fi
+
+exit 0
+
+# end of script

Copied: branches/RELENG_1_1/rtmtools/build_features (from rev 393, trunk/rtmtools/build_features)
===================================================================
--- branches/RELENG_1_1/rtmtools/build_features	                        (rev 0)
+++ branches/RELENG_1_1/rtmtools/build_features	2013-01-29 10:39:20 UTC (rev 394)
@@ -0,0 +1,337 @@
+#!/bin/sh
+#
+# @file build_features
+# @brief rtmtools feature build script
+# @author Noriaki Ando <n-ando at aist.go.jp>
+#
+# * How to build rtmtools
+#
+# ** Required environment
+#
+# The following development environment and tools are required to
+# build rtmtools.
+#
+# - jdk
+# - ant
+# - Eclipse SDK (3.4 or later is required.)
+#
+# ** Before build tools
+#
+# Please edit "version" text to set version number of the tools. This
+# is a kind of bash script.
+#
+# Example:
+# -------
+# VERSION=1.1.0
+# PROJECT_VERSION=${VERSION}.rc7v$(date +%Y%m%d)
+#
+# ** Environment variables
+#
+# To build rtmtools, some environmental variables can be set. In most
+# case, these variables are automatically set.
+#
+# - ECLIPSE_HOME: A directory path to an Eclipse SDK. Under this
+#                 directory, .eclipseproduct, eclipse.ini, plugins and
+#                 eclipse executable should exist. If this
+#                 env.variable is not set, this script tries to search
+#                 eclipse directory under some directories that is set
+#                 in a env.variable ECLIPSE_DIRS written in the head
+#                 of this script.
+#
+# - JAVA_HOME: A directory JDK installed. If this variable is not set,
+#                 this script tries to estimate JDK directory to
+#                 resolve symbolic link of javac executable.
+#
+# - VERSION: A simple version number for the tools like 1.1.1. This is
+#                 used for actual bundles' version number with
+#                 PROJECT_VERSION number.
+#
+# - PROJECT_VERSION: Project version number is full version string
+#                 with simple version and suffix like
+#                 rc120121212. This version string is used actual jar
+#                 file name.
+#
+# - JARDIR: A directory to store jar files. Default directory is "jar".
+#                 This directory is  temporary jar files store place.
+#
+# - DISTDIR: A directory to be archived for distribution package.
+#                 This directory name becomes archive package name.
+#                 Default name is openrtm-x.y.z. x, y, z are version
+#                 number which is defined in version text file.
+#
+# - PLUGINS_DIR: A directory rtmtools plugins stored. Plugin versions
+#                 should be same as versions which obtained from
+#                 version text file. Usually this variable can be set
+#                 automatically as $JARDIR.
+#
+# - ANT_DiR: Eclipse ant plugin directory. This variable would be set
+#                 automatically as
+#                 ECLIPSE_HOME/org.apache.ant.<something>.
+#
+
+# Eclipse search directories
+ECLIPSE_DIRS="$HOME/eclipse $HOME ../ ../../ ../..//usr/lib/ /usr/share"
+
+# Ant eclipse plugin location
+ANT_HOME_DEFAULT="${ECLIPSE_HOME}/plugins/org.apache.ant_1.7.0.v200803061910/"
+
+# Default
+JARDIR_DEFAULT="jar"
+
+# target projects
+PROJECTS="jp.go.aist.rtm.toolscommon.profiles
+    jp.go.aist.rtm.toolscommon.profiles.nl1
+    jp.go.aist.rtm.toolscommon
+    jp.go.aist.rtm.toolscommon.nl1
+    jp.go.aist.rtm.rtcbuilder
+    jp.go.aist.rtm.rtcbuilder.nl1
+    jp.go.aist.rtm.rtcbuilder.java
+    jp.go.aist.rtm.rtcbuilder.python
+    jp.go.aist.rtm.repositoryView
+    jp.go.aist.rtm.repositoryView.nl1
+    jp.go.aist.rtm.nameserviceview
+    jp.go.aist.rtm.nameserviceview.nl1
+    jp.go.aist.rtm.systemeditor
+    jp.go.aist.rtm.systemeditor.nl1"
+
+#============================================================
+# functions
+#============================================================
+#------------------------------------------------------------
+# getopt
+#
+# This function gets command line options
+# ------------------------------------------------------------
+getopt()
+{
+    if test $# = 1 ; then
+        arg=$1
+        if test "x$arg" = "xclean" ; then
+            TARGET=$1
+            return 0
+        fi
+    fi
+}
+
+#------------------------------------------------------------
+# get_version
+#
+# This function gets version number and project version string
+# from version text file.
+# ------------------------------------------------------------
+get_version()
+{
+    if test "x$VERSION" = "x" || test "x$PROJECT_VERSION" = "x" ; then
+        echo "Environment variable VERSION/PROJECT_VERSION is not set."
+        echo "Getting from ./version text."
+        . ./version
+    fi
+    export VERSION
+    export PROJECT_VERSION
+
+    if test "x$DISTDIR" = "x" ; then
+        DISTDIR=openrtp-$VERSION
+    fi
+    if test "x$JARDIR" = "x" ; then
+        JARDIR=$JARDIR_DEFAULT
+    fi
+}
+
+#------------------------------------------------------------
+# find_eclipsehome
+#
+# This function checks ECLIPSE_HOME env variable and if it is
+# not set, it searches an eclipse directory under ECLIPSE_DIRS,
+# and set ECLIPSE_HOME env variable.
+# ------------------------------------------------------------
+find_eclipsehome()
+{
+    if test ! "x$ECLIPSE_HOME" = "x" ; then
+        if test -d $ECLIPSE_HOME ; then
+            return 0
+        fi
+        echo "ECLIPSE_HOME $ECLIPSE_HOME does not exist."
+    fi
+    echo "Environment variable ECLIPSE_HOME is not set. Seaching..."
+    for d in $ECLIPSE_DIRS ; do
+        tmp=`find -L $d -name .eclipseproduct`
+        if test "x$tmp" = "x" ; then
+            continue
+        fi
+        for e in $tmp ; do
+            edir=`dirname $e`
+            if test -f $edir/eclipse.ini && test -d $edir/plugins ; then
+                export ECLIPSE_HOME="$edir"
+                return 0
+            fi
+        done
+    done
+    echo "eclipse not found. Please install eclipse and set ECLIPSE_HOME."
+    exit 1
+}
+
+#------------------------------------------------------------
+# find_javahome
+#
+# This function estimate JAVA_HOME from javac, which usually
+# is a symbolic link to $JAVA_HOME/bin/javac.
+#------------------------------------------------------------
+find_javahome()
+{
+    if test ! "x$JAVA_HOME" = "x" ; then
+        if test -d $JAVA_HOME && test -f $JAVA_HOME/bin/javac ; then
+            return 0
+        fi
+        echo "JDK cannot be found under JAVA_HOME: $JAVA_HOME"
+    fi
+    echo "Valid Environment variable JAVA_HOME is not set. Searching..."
+    tmp=`readlink -e $(which javac)`
+    jdk_path=`dirname $tmp | sed 's/\/bin$//'`
+    if test "x$jdk_path" = "x" ; then
+        echo "JDK not found. Please install JDK and set JAVA_HOME."
+        exit 1
+    fi
+    export JAVA_HOME=$jdk_path
+    return 0
+}
+
+#------------------------------------------------------------
+# find_antplugin
+#
+# This function find Eclipse's and plugin under ECLIPSE_HOME.
+#------------------------------------------------------------
+find_antplugin()
+{
+    if test ! "x$ANT_HOME" = "x" ; then
+        echo "ANT_HOME: $ANT_HOME is set."
+        if test -d $ANT_HOME ; then
+            echo "ANT_HOME: $ANT_HOME exists. Contents are the following."
+            ls $ANT_HOME
+            return 0
+        fi
+        echo "ANT_HOME directory $ANT_HOME not found. Searching other Ant..."
+    else
+        echo "Environment variable ANT_HOME does not exist. Searching..."
+    fi
+
+    other_ant=`find $ECLIPSE_HOME/plugins -maxdepth 1 -type d -name 'org.apache.ant*'`
+    echo "Found: $other_ant"
+    if test "x$other_ant" = "x" ; then
+        echo "Ant plugin was not found."
+        echo "Please install eclipse with ant plugin such as org.apache.ant.*"
+        echo "Aborting."
+        return 1
+    fi
+    for a in $other_ant ; do
+        ANT_HOME=$other_ant
+        echo "ANT_HOME: $ANT_HOME is set."
+        return 0
+    done
+}
+
+#------------------------------------------------------------
+# check_plugins
+#------------------------------------------------------------
+check_plugins()
+{
+    if test ! "x$PLUGINS_DIR" = "x" ; then
+        JARDIR=$PLUGINS_DIR
+    fi
+    echo "Checking plugin jar files..."
+    for p in $PROJECTS ; do
+        tmp="${p}_${PROJECT_VERSION}.jar"
+        if test ! -f `pwd`/$JARDIR/$tmp ; then
+            echo "[ERROR] $tmp not found"
+            echo "Please build plugins at first."
+            exit 1
+        fi
+        echo "[OK]    $tmp found"
+    done
+    PLUGINS_DIR=`pwd`/$JARDIR
+    echo "PLUGINS_DIR: $JARDIR is set."
+    return 0
+}
+
+#------------------------------------------------------------
+# build_features
+#
+# Building features:
+# - copying plugins
+# - signing plugins
+# - building features
+# - copying features
+#------------------------------------------------------------
+build_features()
+{
+    echo "Getting plugins (get.plugins)"
+    ant -lib lib get.plugins
+    if test $? -ne 0 ; then
+        echo "Error in get.plugins target. Aborting..."
+        exit 1
+    fi
+    
+    echo "Signing features (feature.sign.gen)"
+    ant -lib lib feature.sign.gen
+    if test $? -ne 0 ; then
+        echo "Error in feature.sign.gen target. Aborting..."
+        exit 1
+    fi
+    
+    echo "Building features (build.features)"
+    ant -lib lib build.features
+    if test $? -ne 0 ; then
+        echo "Error in build.features target. Aborting..."
+        exit 1
+    fi
+    
+    echo "Deploying features to site (deploy.site)"
+    ant -lib lib deploy.site
+    if test $? -ne 0 ; then
+        echo "Error in deploy.site target. Aborting..."
+        exit 1
+    fi
+}
+
+clean_features()
+{
+    echo "Cleaning features."
+    ant -lib lib clean
+    if test $? -ne 0 ; then
+        echo "Cleaning features failed. Aborting..."
+        exit 1
+    fi
+    return 0
+}
+#==============================
+# main
+#==============================
+export LC_ALL=C
+cd `dirname $0`
+
+getopt $*
+get_version
+
+# [clean] case
+if test "x$TARGET" = "xclean" ; then
+    echo "Starting to clean features."
+    cd sitetool
+    clean_features
+else
+# [build] case
+    echo "Starting to build features."
+    find_eclipsehome
+    find_antplugin
+    check_plugins
+
+    export ANT_HOME
+    export PLUGINS_DIR
+    export PATH=${PATH}:${ANT_HOME}/bin
+    echo "ANT_HOME=${ANT_HOME}"
+    echo "PLUGINS_DIR=${PLUGINS_DIR}"
+    echo "PATH=${PATH}"
+
+    cd sitetool
+    build_features
+fi
+exit 0
+# EOF

Copied: branches/RELENG_1_1/rtmtools/build_plugins (from rev 393, trunk/rtmtools/build_plugins)
===================================================================
--- branches/RELENG_1_1/rtmtools/build_plugins	                        (rev 0)
+++ branches/RELENG_1_1/rtmtools/build_plugins	2013-01-29 10:39:20 UTC (rev 394)
@@ -0,0 +1,336 @@
+#!/bin/sh
+#
+# @file build_plugins
+# @brief rtmtools plugins build script
+# @author Noriaki Ando <n-ando at aist.go.jp>
+#
+# * How to build rtmtools
+#
+# ** Required environment
+#
+# The following development environment and tools are required to
+# build rtmtools.
+#
+# - jdk
+# - ant
+# - Eclipse SDK (3.4 or later is required.)
+#
+# ** Before build tools
+#
+# Please edit "version" text to set version number of the tools. This
+# is a kind of bash script.
+#
+# Example:
+# -------
+# VERSION=1.1.0
+# PROJECT_VERSION=${VERSION}.rc7v$(date +%Y%m%d)
+#
+# ** Environment variables
+#
+# To build rtmtools, some environmental variables can be set. In most
+# case, these variables are automatically set.
+#
+# - ECLIPSE_HOME: A directory path to an Eclipse SDK. Under this
+#                 directory, .eclipseproduct, eclipse.ini, plugins and
+#                 eclipse executable should exist. If this
+#                 env.variable is not set, this script tries to search
+#                 eclipse directory under some directories that is set
+#                 in a env.variable ECLIPSE_DIRS written in the head
+#                 of this script.
+#
+# - JAVA_HOME: A directory JDK installed. If this variable is not set,
+#                 this script tries to estimate JDK directory to
+#                 resolve symbolic link of javac executable.
+#
+# - VERSION: A simple version number for the tools like 1.1.1. This is
+#                 used for actual bundles' version number with
+#                 PROJECT_VERSION number.
+#
+# - PROJECT_VERSION: Project version number is full version string
+#                 with simple version and suffix like
+#                 rc120121212. This version string is used actual jar
+#                 file name.
+#
+# - JARDIR: A directory to store jar files. Default directory is "jar".
+#                 This directory is  temporary jar files store place.
+#
+# - DISTDIR: A directory to be archived for distribution package.
+#                 This directory name becomes archive package name.
+#                 Default name is openrtm-x.y.z. x, y, z are version
+#                 number which is defined in version text file.
+#
+
+
+#---------------------------------------------------------------------------
+# Global variables
+#---------------------------------------------------------------------------
+
+# Default build taget
+TARGET="buildAll"
+
+# Default
+JARDIR_DEFAULT="jar"
+
+# target projects
+PROJECTS="jp.go.aist.rtm.toolscommon.profiles
+    jp.go.aist.rtm.toolscommon.profiles.nl1
+    jp.go.aist.rtm.toolscommon
+    jp.go.aist.rtm.toolscommon.nl1
+    jp.go.aist.rtm.rtcbuilder
+    jp.go.aist.rtm.rtcbuilder.nl1
+    jp.go.aist.rtm.rtcbuilder.java
+    jp.go.aist.rtm.rtcbuilder.python
+    jp.go.aist.rtm.repositoryView
+    jp.go.aist.rtm.repositoryView.nl1
+    jp.go.aist.rtm.nameserviceview
+    jp.go.aist.rtm.nameserviceview.nl1
+    jp.go.aist.rtm.systemeditor
+    jp.go.aist.rtm.systemeditor.nl1"
+
+# Eclipse search directories
+ECLIPSE_DIRS="$HOME/eclipse ../ ../../ ../../ $HOME /usr/lib/ /usr/share"
+
+#============================================================
+# functions
+#============================================================
+
+#------------------------------------------------------------
+# getopt
+#
+# This function gets command line options
+# ------------------------------------------------------------
+getopt()
+{
+    if test $# = 1 ; then
+        arg=$1
+        if test "x$arg" = "xclean" ; then
+            TARGET=$1
+            return 0
+        fi
+        if test "x$arg" = "xrevert" ; then
+            echo "Reverting updated MANIFEST.MF..."
+            mf=`svn status | grep '^M' | grep MANIFEST.MF | awk '{print $2;}'`
+            for m in $mf; do
+                rm $m
+                svn update $m
+            done
+            exit 0
+        fi
+    fi
+}
+
+#------------------------------------------------------------
+# get_version
+#
+# This function gets version number and project version string
+# from version text file.
+# ------------------------------------------------------------
+get_version()
+{
+    if test "x$VERSION" = "x" || test "x$PROJECT_VERSION" = "x" ; then
+        echo "Environment variable VERSION/PROJECT_VERSION is not set."
+        echo "Getting from ./version text."
+        . ./version
+    fi
+    export VERSION
+    export PROJECT_VERSION
+
+    if test "x$DISTDIR" = "x" ; then
+        DISTDIR=openrtp-$VERSION
+    fi
+    if test "x$JARDIR" = "x" ; then
+        JARDIR=$JARDIR_DEFAULT
+    fi
+}
+
+#------------------------------------------------------------
+# find_eclipsehome
+#
+# This function checks ECLIPSE_HOME env variable and if it is
+# not set, it searches an eclipse directory under ECLIPSE_DIRS,
+# and set ECLIPSE_HOME env variable.
+# ------------------------------------------------------------
+find_eclipsehome()
+{
+    if test ! "x$ECLIPSE_HOME" = "x" ; then
+        if test -d $ECLIPSE_HOME ; then
+            return 0
+        fi
+        echo "ECLIPSE_HOME $ECLIPSE_HOME does not exist."
+    fi
+    echo "Environment variable ECLIPSE_HOME is not set. Seaching..."
+    for d in $ECLIPSE_DIRS ; do
+        tmp=`find -L $d -name .eclipseproduct`
+        if test "x$tmp" = "x" ; then
+            continue
+        fi
+        for e in $tmp ; do
+            edir=`dirname $e`
+            if test -f $edir/eclipse.ini && test -d $edir/plugins ; then
+                export ECLIPSE_HOME="$edir"
+                return 0
+            fi
+        done
+    done
+    echo "eclipse not found. Please install eclipse and set ECLIPSE_HOME."
+    exit 1
+}
+
+#------------------------------------------------------------
+# find_javahome
+#
+# This function estimate JAVA_HOME from javac, which usually
+# is a symbolic link to $JAVA_HOME/bin/javac.
+#------------------------------------------------------------
+find_javahome()
+{
+    if test ! "x$JAVA_HOME" = "x" ; then
+        if test -d $JAVA_HOME && test -f $JAVA_HOME/bin/javac ; then
+            return 0
+        fi
+        echo "JDK cannot be found under JAVA_HOME: $JAVA_HOME"
+    fi
+    echo "Valid Environment variable JAVA_HOME is not set. Searching..."
+    tmp=`readlink -e $(which javac)`
+    jdk_path=`dirname $tmp | sed 's/\/bin$//'`
+    if test "x$jdk_path" = "x" ; then
+        echo "JDK not found. Please install JDK and set JAVA_HOME."
+        exit 1
+    fi
+    export JAVA_HOME=$jdk_path
+    return 0
+}
+
+#------------------------------------------------------------
+# check_plugins
+#------------------------------------------------------------
+check_plugins()
+{
+    if test "x$JARDIR" = "x" ; then
+        echo "Env variable JARDIR is not set. Aborting."
+        exit 1
+    fi
+    echo "Checking plugin jar files..."
+    for p in $PROJECTS ; do
+        tmp="${p}_${PROJECT_VERSION}.jar"
+        if test ! -f $JARDIR/$tmp ; then
+            echo "[ERROR] $tmp not found"
+            return 1
+        fi
+        echo "[OK]    $tmp found"
+    done
+}
+
+#------------------------------------------------------------
+# cleanup_jardir
+#
+# Cleanup jar directory
+#------------------------------------------------------------
+cleanup_jardir()
+{
+    if test -f $DISTDIR.zip ; then
+        rm -f $DISTDIR.zip
+    fi
+    if test -d $DISTDIR; then
+        rm -rf $DISTDIR
+    fi
+    if test -d $JARDIR; then
+        rm -rf $JARDIR
+    fi
+    mkdir $DISTDIR
+    mkdir $JARDIR
+}
+
+#------------------------------------------------------------
+# do_ant <TARGET>
+#
+# Invoke Ant build by buildAll target for each projects.
+#------------------------------------------------------------
+do_ant()
+{
+    target=$TARGET
+    for project in $PROJECTS; do
+        if test -d $project; then
+            echo "- Starting ant build of project: $project"
+            cd $project
+            ant $target $LIBS
+            if test $? -ne 0; then
+                echo "[ERROR] build failed: " $project
+                echo "Aborting..."
+                exit 1
+            fi
+            echo "Copying created jar file into $DISTDIR..."
+            cp jar/*aist*.jar ../$DISTDIR
+            cp jar/*aist*.jar ../$JARDIR
+            cd ..
+        else
+            echo "Project: $project does not exist"
+            echo "Skipping..."
+        fi
+    done
+}
+
+#------------------------------------------------------------
+# create_zip
+#
+# Create ZIP archive of built plugin files.
+#------------------------------------------------------------
+create_zip()
+{
+    echo "Creating ZIP archive of plugins jar files."
+    zipfile=$DISTDIR.zip
+    if test -f $zipfile ; then
+        rm $zipfile
+    fi
+    zip $zipfile -r ./$DISTDIR
+    if test $? -ne 0 ; then
+        echo "Faild to create ZIP file: $zipfile created"
+        exit 1
+    else
+        echo "ZIP file: $zipfile created"
+    fi
+}
+
+#==============================
+# main
+#==============================
+export LC_ALL=C
+cd `dirname $0`
+
+getopt $*
+get_version
+
+find_eclipsehome
+find_javahome
+
+echo "------------------------------------------------------------"
+echo "Environment variables:"
+echo "ECLIPSE_HOME: $ECLIPSE_HOME"
+echo "JAVA_HOME: $JAVA_HOME"
+echo "VERSION: $VERSION"
+echo "PROJECT_VERSION: $PROJECT_VERSION"
+echo "------------------------------------------------------------"
+
+LIBS="-lib ../lib -lib $ECLIPSE_HOME/plugins"
+
+cleanup_jardir
+do_ant $TARGET
+
+# Check and finalize Ant results
+if test "x$TARGET" = "xclean" ; then
+    # cleanup jar directories
+    rm -rf $DISTDIR
+    rm -rf $JARDIR
+    exit 0
+elif test "x$TARGET" = "xbuildAll" ; then
+    check_plugins
+    if test $? -ne 0 ;then
+        echo "Build failed? Some jar files are not found. Aborting..."
+        exit 1
+    fi
+    create_zip
+fi
+
+exit 0
+
+# end of script

Modified: branches/RELENG_1_1/rtmtools/buildall.bat
===================================================================
--- branches/RELENG_1_1/rtmtools/buildall.bat	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/buildall.bat	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,17 +1,12 @@
 @echo off
 rem ---------------------------------------------------------------------------
 rem ---------------------------------------------------------------------------
- at set DUMMY=%ANT_HOME%
- at set ANT_HOME=%ECLIPSE_HOME%\plugins\org.apache.ant_1.6.5\
+ at set JARDIR=openrtp_1.1.0
+ at set LIBS=-lib ..\lib -lib %ECLIPSE_HOME%\plugins
+
 rem ---------------------------------------------------------------------------
 rem
 rem ---------------------------------------------------------------------------
-
- at set ANT4ECLIPSE=%ECLIPSE_HOME%\plugins\net.sf.ant4eclipse.plugin_0.5.0.rc1\lib\
- at set JUNIT=%ECLIPSE_HOME%\plugins\org.junit_3.8.1\
- at set JARDIR=openrtp_1.0.0
-
-
 set TARGETS=^
 	jp.go.aist.rtm.toolscommon.profiles ^
 	jp.go.aist.rtm.toolscommon.profiles.nl1 ^
@@ -21,8 +16,6 @@
 	jp.go.aist.rtm.rtcbuilder.nl1 ^
 	jp.go.aist.rtm.rtcbuilder.java ^
 	jp.go.aist.rtm.rtcbuilder.python ^
-	jp.go.aist.rtm.rtcbuilder.vbdotnet ^
-	jp.go.aist.rtm.rtcbuilder.csharp ^
 	jp.go.aist.rtm.repositoryView ^
 	jp.go.aist.rtm.repositoryView.nl1 ^
 	jp.go.aist.rtm.nameserviceview ^
@@ -39,7 +32,7 @@
     @set target=%%p
     echo %%p
     cd %%p
-    call ant buildAll -lib %ANT4ECLIPSE% -lib %JUNIT%
+    call ant buildAll %LIBS%
     if ERRORLEVEL 1 goto FAIL
     copy jar\*aist*.jar ..\%JARDIR%
     cd ..
@@ -50,7 +43,6 @@
 
 :FAIL
 cd ..
- at set ANT_HOME=%DUMMY%
 echo "Build failed" %TARGET%
 
-:END
+:END
\ No newline at end of file

Deleted: branches/RELENG_1_1/rtmtools/buildall.sh
===================================================================
--- branches/RELENG_1_1/rtmtools/buildall.sh	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/buildall.sh	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,90 +0,0 @@
-#!/bin/sh
-#===========================================================================
-# update:
-# cerate:Sep/11/2008
-# 
-# このシェルスクリプトは RTSystemEditor をビルドします。
-#     （以降、"Update"毎に上記に日付、名前、変更内容を記述する）
-# このシェルスクリプトは RTSystemEditor をビルドします。
-# 環境
-#  以下にビルドに必要な環境とインストール方法を簡単に示します。
-#   Eclipse SDK
-#   ant
-#   ant4eclipse
-#   jdk
-# 
-# 環境変数
-#  ビルドに必要な環境変数を以下に示します。
-#   ECLIPSE_HOME   Eclipse SDK 3.2.x ¤Î¼Â¹Ô¥Õ¥¡¥¤¥ë¤¬¤¢¤ë¥Ç¥£¥ì¥¯¥È¥ê¤ò»ØÄê£
-#   ECLIPSE33_HOME Eclipse SDK 3.3.x ¤Î¼Â¹Ô¥Õ¥¡¥¤¥ë¤¬¤¢¤ë¥Ç¥£¥ì¥¯¥È¥ê¤ò»ØÄê£
-#   ANT_HOME       ant のディレクトリを指定します。
-#   JAVA_HOME      jdkのディレクトリを指定します。
-#
-#===========================================================================
-#
-#
-
-#---------------------------------------------------------------------------
-#---------------------------------------------------------------------------
-
-DUMMY=$ANT_HOME
-export ANT_HOME=$ECLIPSE_HOME/plugins/org.apache.ant_1.6.5/
-
-ECLIPSE_HOME=/usr/users/n-ando/work/rtmtools/eclipse/
-
-ANT4ECLIPSE=$ECLIPSE_HOME/plugins/net.sf.ant4eclipse.plugin_0.5.0.rc1/lib/
-JUNIT=$ECLIPSE_HOME/plugins/org.junit_3.8.1/
-JARDIR=openrtp_1.0.0
-LIBS="-lib $ANT4ECLIPSE -lib $ANT_HOME -lib $JUNIT -lib $ECLIPSE_HOME/plugins"
-projects="jp.go.aist.rtm.toolscommon.profiles
-    jp.go.aist.rtm.toolscommon.profiles.nl1
-    jp.go.aist.rtm.toolscommon
-    jp.go.aist.rtm.toolscommon.nl1
-    jp.go.aist.rtm.rtcbuilder
-    jp.go.aist.rtm.rtcbuilder.nl1
-    jp.go.aist.rtm.rtcbuilder.java
-    jp.go.aist.rtm.rtcbuilder.python
-    jp.go.aist.rtm.rtcbuilder.vbdotnet
-    jp.go.aist.rtm.rtcbuilder.csharp
-    jp.go.aist.rtm.repositoryView
-    jp.go.aist.rtm.repositoryView.nl1
-    jp.go.aist.rtm.nameserviceview
-    jp.go.aist.rtm.nameserviceview.nl1
-    jp.go.aist.rtm.systemeditor
-    jp.go.aist.rtm.systemeditor.nl1"
-
-
-if test -d $JARDIR; then
-    rm -rf $JARDIR
-    mkdir $JARDIR
-else
-    mkdir $JARDIR
-fi
-
-for project in $projects; do
-    if test -d $project; then
-	echo "-" $project
-	cd $project
-
-	ant buildAll $LIBS
-	    
-	if test $? -ne 0; then
-	    echo "build failed: " $project
-	    export ANT_HOME=$DUMMY
-	    exit 1
-	fi
-	mv jar/*aist*.jar ../$JARDIR
-	cd ..
-    else
-	echo $project "does not exist"
-    fi
-done
-
-if test -f $JARDIR.zip ; then
-    rm $JARDIR.zip
-fi
-zip $JARDIR.zip -r ./$JARDIR
-
-export ANT_HOME=$DUMMY
-
-

Deleted: branches/RELENG_1_1/rtmtools/buildrtcbuilder.bat
===================================================================
--- branches/RELENG_1_1/rtmtools/buildrtcbuilder.bat	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/buildrtcbuilder.bat	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,169 +0,0 @@
- at echo off
-rem ---------------------------------------------------------------------------
-rem ---------------------------------------------------------------------------
- at set DUMMY=%ANT_HOME%
- at set ANT_HOME=%ECLIPSE_HOME%\plugins\org.apache.ant_1.6.5\
-rem ---------------------------------------------------------------------------
-rem
-rem ---------------------------------------------------------------------------
- at if exist rtcbuilder_1.0.0 (
-	rd /S /Q rtcbuilder_1.0.0
-)
-mkdir rtcbuilder_1.0.0
-rem ---------------------------------------------------------------------------
-rem
-rem ---------------------------------------------------------------------------
- at if exist jp.go.aist.rtm.toolscommon.profiles (
-    echo -jp.go.aist.rtm.toolscommon.profiles
-    cd jp.go.aist.rtm.toolscommon.profiles
-    call ant buildAll -lib %ECLIPSE_HOME%\plugins\net.sf.ant4eclipse.plugin_0.5.0.rc1\lib\ -lib %ECLIPSE_HOME%\plugins\org.junit_3.8.1\
-    if ERRORLEVEL 1 goto FAIL
-    copy jar\*aist*.jar ..\rtcbuilder_1.0.0
-    cd ..
-) else (
-    echo -jp.go.aist.rtm.toolscommon.profiles doesn't exist.
-)
-
-rem ---------------------------------------------------------------------------
-rem
-rem ---------------------------------------------------------------------------
- at if exist jp.go.aist.rtm.toolscommon.profiles.nl1 (
-    echo -jp.go.aist.rtm.toolscommon.profiles.nl1
-    cd jp.go.aist.rtm.toolscommon.profiles.nl1
-    call ant buildAll -lib %ECLIPSE_HOME%\plugins\net.sf.ant4eclipse.plugin_0.5.0.rc1\lib\ -lib %ECLIPSE_HOME%\plugins\org.junit_3.8.1\
-    if ERRORLEVEL 1 goto FAIL
-    copy jar\*aist*.jar ..\rtcbuilder_1.0.0
-    cd ..
-) else (
-    echo -jp.go.aist.rtm.toolscommon.profilesi.nl1 doesn't exist.
-)
-
-rem ---------------------------------------------------------------------------
-rem
-rem ---------------------------------------------------------------------------
- at if exist jp.go.aist.rtm.toolscommon (
-    echo -jp.go.aist.rtm.toolscommon
-    cd jp.go.aist.rtm.toolscommon
-    call ant buildAll -lib %ECLIPSE_HOME%\plugins\net.sf.ant4eclipse.plugin_0.5.0.rc1\lib\ -lib %ECLIPSE_HOME%\plugins\org.junit_3.8.1\
-    if ERRORLEVEL 1 goto FAIL
-    copy jar\*aist*.jar ..\rtcbuilder_1.0.0
-    cd ..
-) else (
-    echo -jp.go.aist.rtm.toolscommon doesn't exist.
-)
-
-rem ---------------------------------------------------------------------------
-rem
-rem ---------------------------------------------------------------------------
- at if exist jp.go.aist.rtm.toolscommon.nl1 (
-    echo -jp.go.aist.rtm.toolscommon.nl1
-    cd jp.go.aist.rtm.toolscommon.nl1
-    call ant buildAll -lib %ECLIPSE_HOME%\plugins\net.sf.ant4eclipse.plugin_0.5.0.rc1\lib\ -lib %ECLIPSE_HOME%\plugins\org.junit_3.8.1\
-    if ERRORLEVEL 1 goto FAIL
-    copy jar\*aist*.jar ..\rtcbuilder_1.0.0
-    cd ..
-) else (
-    echo -jp.go.aist.rtm.toolscommon.nl1 doesn't exist.
-)
-
-rem ---------------------------------------------------------------------------
-rem
-rem ---------------------------------------------------------------------------
- at if exist jp.go.aist.rtm.rtcbuilder (
-    echo -jp.go.aist.rtm.rtcbuilder
-    cd jp.go.aist.rtm.rtcbuilder
-    call ant buildAll -lib %ECLIPSE_HOME%\plugins\net.sf.ant4eclipse.plugin_0.5.0.rc1\lib\ -lib %ECLIPSE_HOME%\plugins\org.junit_3.8.1\
-    if ERRORLEVEL 1 goto FAIL
-    copy jar\*aist*.jar ..\rtcbuilder_1.0.0
-    cd ..
-) else (
-    echo -jp.go.aist.rtm.rtcbuilder doesn't exist.
-)
-
-rem ---------------------------------------------------------------------------
-rem
-rem ---------------------------------------------------------------------------
- at if exist jp.go.aist.rtm.rtcbuilder.nl1 (
-    echo -jp.go.aist.rtm.rtcbuilder.nl1
-    cd jp.go.aist.rtm.rtcbuilder.nl1
-    call ant buildAll -lib %ECLIPSE_HOME%\plugins\net.sf.ant4eclipse.plugin_0.5.0.rc1\lib\ -lib %ECLIPSE_HOME%\plugins\org.junit_3.8.1\
-    if ERRORLEVEL 1 goto FAIL
-    copy jar\*aist*.jar ..\rtcbuilder_1.0.0
-    cd ..
-) else (
-    echo -jp.go.aist.rtm.rtcbuilder.nl1 doesn't exist.
-)
-
-rem ---------------------------------------------------------------------------
-rem
-rem ---------------------------------------------------------------------------
- at if exist jp.go.aist.rtm.rtcbuilder.java (
-    echo -jp.go.aist.rtm.rtcbuilder.java
-    cd jp.go.aist.rtm.rtcbuilder.java
-    call ant buildAll -lib %ECLIPSE_HOME%\plugins\net.sf.ant4eclipse.plugin_0.5.0.rc1\lib\ -lib %ECLIPSE_HOME%\plugins\org.junit_3.8.1\
-    if ERRORLEVEL 1 goto FAIL
-    copy jar\*aist*.jar ..\rtcbuilder_1.0.0
-    cd ..
-) else (
-    echo -jp.go.aist.rtm.rtcbuilder.java doesn't exist.
-)
-
-rem ---------------------------------------------------------------------------
-rem
-rem ---------------------------------------------------------------------------
- at if exist jp.go.aist.rtm.rtcbuilder.python (
-    echo -jp.go.aist.rtm.rtcbuilder.python
-    cd jp.go.aist.rtm.rtcbuilder.python
-    call ant buildAll -lib %ECLIPSE_HOME%\plugins\net.sf.ant4eclipse.plugin_0.5.0.rc1\lib\ -lib %ECLIPSE_HOME%\plugins\org.junit_3.8.1\
-    if ERRORLEVEL 1 goto FAIL
-    copy jar\*aist*.jar ..\rtcbuilder_1.0.0
-    cd ..
-) else (
-    echo -jp.go.aist.rtm.rtcbuilder.python doesn't exist.
-)
-
-rem ---------------------------------------------------------------------------
-rem
-rem ---------------------------------------------------------------------------
- at if exist jp.go.aist.rtm.rtcbuilder.vbdotnet (
-    echo -jp.go.aist.rtm.rtcbuilder.vbdotnet
-    cd jp.go.aist.rtm.rtcbuilder.vbdotnet
-    call ant buildAll -lib %ECLIPSE_HOME%\plugins\net.sf.ant4eclipse.plugin_0.5.0.rc1\lib\ -lib %ECLIPSE_HOME%\plugins\org.junit_3.8.1\
-    if ERRORLEVEL 1 goto FAIL
-    copy jar\*aist*.jar ..\rtcbuilder_1.0.0
-    cd ..
-) else (
-    echo -jp.go.aist.rtm.rtcbuilder.vbdotnet doesn't exist.
-)
-
-rem ---------------------------------------------------------------------------
-rem
-rem ---------------------------------------------------------------------------
- at if exist jp.go.aist.rtm.rtcbuilder.csharp (
-    echo -jp.go.aist.rtm.rtcbuilder.csharp
-    cd jp.go.aist.rtm.rtcbuilder.csharp
-    call ant buildAll -lib %ECLIPSE_HOME%\plugins\net.sf.ant4eclipse.plugin_0.5.0.rc1\lib\ -lib %ECLIPSE_HOME%\plugins\org.junit_3.8.1\
-    echo --
-    if ERRORLEVEL 1 goto FAIL
-    copy jar\*aist*.jar ..\rtcbuilder_1.0.0
-    cd ..
-) else (
-    echo -jp.go.aist.rtm.rtcbuilder.csharp doesn't exist.
-)
-
-rem ---------------------------------------------------------------------------
-rem
-rem ---------------------------------------------------------------------------
- at if exist zip.vbs (
-	del rtcbuilder_1.0.0.zip
-	CScript.exe .\zip.vbs\MakeZIP.VBS rtcbuilder_1.0.0.zip rtcbuilder_1.0.0
-	rd /S /Q rtcbuilder_1.0.0
-)
- at set ANT_HOME=%DUMMY%
- at goto END
-
-:FAIL
-cd..
- at set ANT_HOME=%DUMMY%
-
-:END

Deleted: branches/RELENG_1_1/rtmtools/buildrtcbuilder.sh
===================================================================
--- branches/RELENG_1_1/rtmtools/buildrtcbuilder.sh	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/buildrtcbuilder.sh	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,94 +0,0 @@
-#!/bin/sh
-#===========================================================================
-# update:
-# cerate:Sep/11/2008
-# 
-# このシェルスクリプトは RTCBuilder をビルドします。
-#     （以降、"Update"毎に上記に日付、名前、変更内容を記述する）
-# このシェルスクリプトは RTCBuilder をビルドします。
-# 環境
-#  以下にビルドに必要な環境とインストール方法を簡単に示します。
-#   Eclipse SDK
-#   ant
-#   ant4eclipse
-#   jdk
-# 
-# 環境変数
-#  ビルドに必要な環境変数を以下に示します。
-#   ECLIPSE_HOME   Eclipse SDK 3.2.x ¤Î¼Â¹Ô¥Õ¥¡¥¤¥ë¤¬¤¢¤ë¥Ç¥£¥ì¥¯¥È¥ê¤ò»ØÄê£
-#   ECLIPSE33_HOME Eclipse SDK 3.3.x ¤Î¼Â¹Ô¥Õ¥¡¥¤¥ë¤¬¤¢¤ë¥Ç¥£¥ì¥¯¥È¥ê¤ò»ØÄê£
-#   ANT_HOME       ant のディレクトリを指定します。
-#   JAVA_HOME      jdkのディレクトリを指定します。
-#
-#===========================================================================
-
-#---------------------------------------------------------------------------
-#---------------------------------------------------------------------------
-set DUMMY=$ANT_HOME
-export ANT_HOME=$ECLIPSE_HOME/plugins/org.apache.ant_1.6.5/
-#---------------------------------------------------------------------------
-#
-#---------------------------------------------------------------------------
-declare -a build_tbl=(	\
-	"jp.go.aist.rtm.toolscommon"	\
-	"jp.go.aist.rtm.toolscommon.nl1"	\
-	"jp.go.aist.rtm.toolscommon.profiles"	\
-	"jp.go.aist.rtm.toolscommon.profiles.nl1"	\
-	"jp.go.aist.rtm.rtcbuilder"	\
-	"jp.go.aist.rtm.rtcbuilder.nl1"	\
-	"jp.go.aist.rtm.rtcbuilder.csharp"	\
-	"jp.go.aist.rtm.rtcbuilder.java"	\
-	"jp.go.aist.rtm.rtcbuilder.python"	\
-	"jp.go.aist.rtm.rtcbuilder.vbdotnet"	\
-)
-
-
-declare	-i num
-declare -i ic
-num=${#build_tbl[@]}
-
-ic=0
-while [ $ic -lt $num ]
-do
-	if [ -d ${build_tbl[ic]} ]
-	then
-		echo "-" ${build_tbl[ic]}
-		cd ${build_tbl[ic]}
-		ant buildAll -lib $ECLIPSE_HOME/plugins/net.sf.ant4eclipse.plugin_0.5.0.rc1/lib/ -lib $ECLIPSE_HOME/plugins/org.apache.ant_1.6.5/lib/ -lib $ECLIPSE_HOME/plugins/org.junit_3.8.1/ -lib $ECLIPSE_HOME/plugins
-		if [ $? -ne 0 ];
-		then 
-			set ANT_HOME=$DUMMY
-			exit 1
-		fi
-		cd ..
-	else
-		echo ${build_tbl[ic]} "doesn't exist."
-	fi
-	ic=ic+1
-done
-
-#---------------------------------------------------------------------------
-# 必要なファイルをzip
-#
-#
-#---------------------------------------------------------------------------
-mkdir ./rtcbuilder_1.0.0
-ic=0
-declare name
-while [ $ic -lt $num ]
-do
-	name=${build_tbl[ic]}"_1.0.0.jar"
-	cp -p ${build_tbl[ic]}/jar/$name ./rtcbuilder_1.0.0 
-	ic=ic+1
-done
-rm rtcbuilder_1.0.0.zip
-zip rtcbuilder_1.0.0.zip -r ./rtcbuilder_1.0.0/
-
-rm -rf ./rtcbuilder_1.0.0
-
-
-#---------------------------------------------------------------------------
-#---------------------------------------------------------------------------
-set ANT_HOME=$DUMMY
-
-

Deleted: branches/RELENG_1_1/rtmtools/buildsystemeditor.bat
===================================================================
--- branches/RELENG_1_1/rtmtools/buildsystemeditor.bat	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/buildsystemeditor.bat	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,171 +0,0 @@
- at echo off
-rem ---------------------------------------------------------------------------
-rem ---------------------------------------------------------------------------
- at set DUMMY=%ANT_HOME%
- at set ANT_HOME=%ECLIPSE_HOME%\plugins\org.apache.ant_1.6.5\
-rem ---------------------------------------------------------------------------
-rem
-rem ---------------------------------------------------------------------------
- at if exist rtsystemeditor_1.0.0 (
-	rd /S /Q rtsystemeditor_1.0.0
-)
-mkdir rtsystemeditor_1.0.0
-rem ---------------------------------------------------------------------------
-rem
-rem ---------------------------------------------------------------------------
- at if exist jp.go.aist.rtm.toolscommon (
-    echo -jp.go.aist.rtm.toolscommon
-    cd jp.go.aist.rtm.toolscommon
-    call ant buildAll -lib %ECLIPSE_HOME%\plugins\net.sf.ant4eclipse.plugin_0.5.0.rc1\lib\ -lib %ECLIPSE_HOME%\plugins\org.junit_3.8.1\
-    if ERRORLEVEL 1 goto FAIL
-    copy jar\*aist*.jar ..\rtsystemeditor_1.0.0
-    cd ..
-) else (
-    echo -jp.go.aist.rtm.toolscommon doesn't exist.
-)
-
-rem ---------------------------------------------------------------------------
-rem
-rem ---------------------------------------------------------------------------
- at if exist jp.go.aist.rtm.toolscommon.nl1 (
-    echo -jp.go.aist.rtm.toolscommon.nl1
-    cd jp.go.aist.rtm.toolscommon.nl1
-    call ant buildAll -lib %ECLIPSE_HOME%\plugins\net.sf.ant4eclipse.plugin_0.5.0.rc1\lib\ -lib %ECLIPSE_HOME%\plugins\org.junit_3.8.1\
-    if ERRORLEVEL 1 goto FAIL
-    copy jar\*aist*.jar ..\rtsystemeditor_1.0.0
-    cd ..
-) else (
-    echo -jp.go.aist.rtm.toolscommon.nl1 doesn't exist.
-)
-
-rem ---------------------------------------------------------------------------
-rem
-rem ---------------------------------------------------------------------------
- at if exist jp.go.aist.rtm.toolscommon.profiles (
-    echo -jp.go.aist.rtm.toolscommon.profiles
-    cd jp.go.aist.rtm.toolscommon.profiles
-    call ant buildAll -lib %ECLIPSE_HOME%\plugins\net.sf.ant4eclipse.plugin_0.5.0.rc1\lib\ -lib %ECLIPSE_HOME%\plugins\org.junit_3.8.1\
-    if ERRORLEVEL 1 goto FAIL
-    copy jar\*aist*.jar ..\rtsystemeditor_1.0.0
-    cd ..
-) else (
-    echo -jp.go.aist.rtm.toolscommon.profiles doesn't exist.
-)
-
-rem ---------------------------------------------------------------------------
-rem
-rem ---------------------------------------------------------------------------
- at if exist jp.go.aist.rtm.toolscommon.profiles.nl1 (
-    echo -jp.go.aist.rtm.toolscommon.profiles.nl1
-    cd jp.go.aist.rtm.toolscommon.profiles.nl1
-    call ant buildAll -lib %ECLIPSE_HOME%\plugins\net.sf.ant4eclipse.plugin_0.5.0.rc1\lib\ -lib %ECLIPSE_HOME%\plugins\org.junit_3.8.1\
-    if ERRORLEVEL 1 goto FAIL
-    copy jar\*aist*.jar ..\rtsystemeditor_1.0.0
-    cd ..
-) else (
-    echo -jp.go.aist.rtm.toolscommon.profiles.nl1 doesn't exist.
-)
-
-rem ---------------------------------------------------------------------------
-rem
-rem ---------------------------------------------------------------------------
- at if exist jp.go.aist.rtm.repositoryView (
-    echo -jp.go.aist.rtm.repositoryView
-    cd jp.go.aist.rtm.repositoryView
-    call ant buildAll -lib %ECLIPSE_HOME%\plugins\net.sf.ant4eclipse.plugin_0.5.0.rc1\lib\ -lib %ECLIPSE_HOME%\plugins\org.junit_3.8.1\
-    if ERRORLEVEL 1 goto FAIL
-    copy jar\*aist*.jar ..\rtsystemeditor_1.0.0
-    cd ..
-) else (
-    echo -jp.go.aist.rtm.repositoryView doesn't exist.
-)
-
-rem ---------------------------------------------------------------------------
-rem
-rem ---------------------------------------------------------------------------
- at if exist jp.go.aist.rtm.repositoryView.nl1 (
-    echo -jp.go.aist.rtm.repositoryView.nl1
-    cd jp.go.aist.rtm.repositoryView.nl1
-    call ant buildAll -lib %ECLIPSE_HOME%\plugins\net.sf.ant4eclipse.plugin_0.5.0.rc1\lib\ -lib %ECLIPSE_HOME%\plugins\org.junit_3.8.1\
-    if ERRORLEVEL 1 goto FAIL
-    copy jar\*aist*.jar ..\rtsystemeditor_1.0.0
-    cd ..
-) else (
-    echo -jp.go.aist.rtm.repositoryView.nl1 doesn't exist.
-)
-
-rem ---------------------------------------------------------------------------
-rem
-rem ---------------------------------------------------------------------------
- at if exist jp.go.aist.rtm.nameserviceview (
-    echo -jp.go.aist.rtm.nameserviceview 
-    cd jp.go.aist.rtm.nameserviceview 
-    call ant buildAll -lib %ECLIPSE_HOME%\plugins\net.sf.ant4eclipse.plugin_0.5.0.rc1\lib\
-    if ERRORLEVEL 1 goto FAIL
-    copy jar\*aist*.jar ..\rtsystemeditor_1.0.0
-    cd ..
-) else (
-    echo -jp.go.aist.rtm.nameserviceview doesn't exist.
-)
-
-rem ---------------------------------------------------------------------------
-rem
-rem ---------------------------------------------------------------------------
- at if exist jp.go.aist.rtm.nameserviceview.nl1 (
-    echo -jp.go.aist.rtm.nameserviceview.nl1 
-    cd jp.go.aist.rtm.nameserviceview.nl1 
-    call ant buildAll -lib %ECLIPSE_HOME%\plugins\net.sf.ant4eclipse.plugin_0.5.0.rc1\lib\
-    if ERRORLEVEL 1 goto FAIL
-    copy jar\*aist*.jar ..\rtsystemeditor_1.0.0
-    cd ..
-) else (
-    echo -jp.go.aist.rtm.nameserviceview.nl1 doesn't exist.
-)
-
-rem ---------------------------------------------------------------------------
-rem
-rem ---------------------------------------------------------------------------
- at if exist jp.go.aist.rtm.systemeditor (
-    echo -jp.go.aist.rtm.systemeditor
-    cd jp.go.aist.rtm.systemeditor
-    call ant buildAll -lib %ECLIPSE_HOME%\plugins\net.sf.ant4eclipse.plugin_0.5.0.rc1\lib\
-    echo --
-    if ERRORLEVEL 1 goto FAIL
-    copy jar\*aist*.jar ..\rtsystemeditor_1.0.0
-    cd ..
-) else (
-    echo -jp.go.aist.rtm.systemeditor doesn't exist.
-)
-
-rem ---------------------------------------------------------------------------
-rem
-rem ---------------------------------------------------------------------------
- at if exist jp.go.aist.rtm.systemeditor.nl1 (
-    echo -jp.go.aist.rtm.systemeditor.nl1
-    cd jp.go.aist.rtm.systemeditor.nl1
-    call ant buildAll -lib %ECLIPSE_HOME%\plugins\net.sf.ant4eclipse.plugin_0.5.0.rc1\lib\
-    echo --
-    if ERRORLEVEL 1 goto FAIL
-    copy jar\*aist*.jar ..\rtsystemeditor_1.0.0
-    cd ..
-) else (
-    echo -jp.go.aist.rtm.systemeditor.nl1 doesn't exist.
-)
-
-rem ---------------------------------------------------------------------------
-rem
-rem ---------------------------------------------------------------------------
- at if exist zip.vbs (
-	del rtsystemeditor_1.0.0.zip
-	CScript.exe .\zip.vbs\MakeZIP.VBS rtsystemeditor_1.0.0.zip rtsystemeditor_1.0.0
-	rd /S /Q rtsystemeditor_1.0.0
-)
- at set ANT_HOME=%DUMMY%
- at goto END
-
-:FAIL
-cd ..
- at set ANT_HOME=%DUMMY%
-
-:END
-

Deleted: branches/RELENG_1_1/rtmtools/buildsystemeditor.sh
===================================================================
--- branches/RELENG_1_1/rtmtools/buildsystemeditor.sh	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/buildsystemeditor.sh	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,98 +0,0 @@
-#!/bin/sh
-#===========================================================================
-# update:
-# cerate:Sep/11/2008
-# 
-# このシェルスクリプトは RTSystemEditor をビルドします。
-#     （以降、"Update"毎に上記に日付、名前、変更内容を記述する）
-# このシェルスクリプトは RTSystemEditor をビルドします。
-# 環境
-#  以下にビルドに必要な環境とインストール方法を簡単に示します。
-#   Eclipse SDK
-#   ant
-#   ant4eclipse
-#   jdk
-# 
-# 環境変数
-#  ビルドに必要な環境変数を以下に示します。
-#   ECLIPSE_HOME   Eclipse SDK 3.2.x ¤Î¼Â¹Ô¥Õ¥¡¥¤¥ë¤¬¤¢¤ë¥Ç¥£¥ì¥¯¥È¥ê¤ò»ØÄê£
-#   ECLIPSE33_HOME Eclipse SDK 3.3.x ¤Î¼Â¹Ô¥Õ¥¡¥¤¥ë¤¬¤¢¤ë¥Ç¥£¥ì¥¯¥È¥ê¤ò»ØÄê£
-#   ANT_HOME       ant のディレクトリを指定します。
-#   JAVA_HOME      jdkのディレクトリを指定します。
-#
-#===========================================================================
-#
-#
-
-#---------------------------------------------------------------------------
-#---------------------------------------------------------------------------
-set DUMMY=$ANT_HOME
-export ANT_HOME=$ECLIPSE_HOME/plugins/org.apache.ant_1.6.5/
-#---------------------------------------------------------------------------
-#
-#---------------------------------------------------------------------------
-declare -a build_tbl=(	\
-	"jp.go.aist.rtm.toolscommon"	\
-	"jp.go.aist.rtm.toolscommon.nl1"	\
-	"jp.go.aist.rtm.toolscommon.profiles"	\
-	"jp.go.aist.rtm.toolscommon.profiles.nl1"	\
-	"jp.go.aist.rtm.repositoryView"	\
-	"jp.go.aist.rtm.repositoryView.nl1"	\
-	"jp.go.aist.rtm.nameserviceview"	\
-	"jp.go.aist.rtm.nameserviceview.nl1"	\
-	"jp.go.aist.rtm.systemeditor"	\
-	"jp.go.aist.rtm.systemeditor.nl1"	\
-)
-
-
-declare	-i num
-declare -i ic
-num=${#build_tbl[@]}
-
-ic=0
-while [ $ic -lt $num ]
-do
-	if [ -d ${build_tbl[ic]} ]
-	then
-		echo "-" ${build_tbl[ic]}
-		cd ${build_tbl[ic]}
-		ant buildAll -lib $ECLIPSE_HOME/plugins/net.sf.ant4eclipse.plugin_0.5.0.rc1/lib/ -lib $ECLIPSE_HOME/plugins/org.apache.ant_1.6.5/lib/ -lib $ECLIPSE_HOME/plugins/org.junit_3.8.1/ -lib $ECLIPSE_HOME/plugins
-		if [ $? -ne 0 ];
-		then 
-			set ANT_HOME=$DUMMY
-			exit 1
-		fi
-		cd ..
-	else
-		echo ${build_tbl[ic]} "doesn't exist."
-	fi
-	ic=ic+1
-done
-
-#---------------------------------------------------------------------------
-# 必要なファイルをzip
-#
-#
-#---------------------------------------------------------------------------
-mkdir ./rtsystemeditor_1.0.0
-#find ./ -name '*aist*.jar' -exec cp -p {} . \;
-ic=0
-declare name
-while [ $ic -lt $num ]
-do
-	name=${build_tbl[ic]}"_1.0.0.jar"
-	cp -p ${build_tbl[ic]}/jar/$name ./rtsystemeditor_1.0.0 
-	ic=ic+1
-done
-rm rtsystemeditor_1.0.0.zip
-zip rtsystemeditor_1.0.0.zip -r ./rtsystemeditor_1.0.0
-
-rm -rf ./rtsystemeditor_1.0.0
-
-
-
-#---------------------------------------------------------------------------
-#---------------------------------------------------------------------------
-set ANT_HOME=$DUMMY
-
-

Deleted: branches/RELENG_1_1/rtmtools/clean_rtcb.bat
===================================================================
--- branches/RELENG_1_1/rtmtools/clean_rtcb.bat	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/clean_rtcb.bat	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,34 +0,0 @@
- at echo off
- at set TEMP_FILE1=temp1.txt
-
-rem
-rem classƒtƒ@ƒCƒ‹‚̍폜ijavac‚̏o—̓tƒ@ƒCƒ‹j
-rem
-for /r ./ %%L in (*.class) do del %%L
-
-rem
-rem javaƒtƒ@ƒCƒ‹‚̍폜iidlj‚̏o—̓tƒ@ƒCƒ‹j 
-rem
- at set KEY_WORD=IDL-to-Java
- at findstr /s /m "%KEY_WORD%" *.java > %TEMP_FILE1%
-for /f "tokens=* delims=" %%L in ( %TEMP_FILE1% ) do del %%L
- at del %TEMP_FILE1%
-
-rem
-rem htmlƒtƒ@ƒCƒ‹‚̍폜ijavadoc‚̏o—̓tƒ@ƒCƒ‹j 
-rem
- at set KEY_WORD='Generated by javadoc'
- at findstr /s /m "%KEY_WORD%" *.html > %TEMP_FILE1%
-for /f "tokens=* delims=" %%L in ( %TEMP_FILE1% ) do del %%L
- at del %TEMP_FILE1%
-
-rem
-rem jarƒtƒ@ƒCƒ‹‚̍폜ijar‚̏o—̓tƒ@ƒCƒ‹j
-rem
-for /r ./ %%L in (*aist*.jar) do del %%L
-
-rem
-rem msiƒtƒ@ƒCƒ‹‚̍폜
-rem
-for /r ./ %%L in (*.msi) do del %%L
-

Deleted: branches/RELENG_1_1/rtmtools/clean_rtcb.sh
===================================================================
--- branches/RELENG_1_1/rtmtools/clean_rtcb.sh	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/clean_rtcb.sh	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,7 +0,0 @@
-#!/bin/sh
-find ./ -name '*.class' -exec rm -f {} \;
-find ./ -name '*.java' -exec grep -nH 'IDL-to-Java' {} \; -exec rm -f {} \;
-find ./ -name '*.html' -exec grep -nH 'Generated by javadoc' {} \; -exec rm -f {} \;
-find ./ -name '*aist*.jar' -exec rm -f {} \;
-find ./ -name '*.msi' -exec rm -f {} \;
-

Deleted: branches/RELENG_1_1/rtmtools/clean_rtse.bat
===================================================================
--- branches/RELENG_1_1/rtmtools/clean_rtse.bat	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/clean_rtse.bat	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,34 +0,0 @@
- at echo off
- at set TEMP_FILE1=temp1.txt
-
-rem
-rem classƒtƒ@ƒCƒ‹‚̍폜ijavac‚̏o—̓tƒ@ƒCƒ‹j
-rem
-for /r ./ %%L in (*.class) do del %%L
-
-rem
-rem javaƒtƒ@ƒCƒ‹‚̍폜iidlj‚̏o—̓tƒ@ƒCƒ‹j 
-rem
- at set KEY_WORD=IDL-to-Java
- at findstr /s /m "%KEY_WORD%" *.java > %TEMP_FILE1%
-for /f "tokens=* delims=" %%L in ( %TEMP_FILE1% ) do del %%L
- at del %TEMP_FILE1%
-
-rem
-rem htmlƒtƒ@ƒCƒ‹‚̍폜ijavadoc‚̏o—̓tƒ@ƒCƒ‹j 
-rem
- at set KEY_WORD='Generated by javadoc'
- at findstr /s /m "%KEY_WORD%" *.html > %TEMP_FILE1%
-for /f "tokens=* delims=" %%L in ( %TEMP_FILE1% ) do del %%L
- at del %TEMP_FILE1%
-
-rem
-rem jarƒtƒ@ƒCƒ‹‚̍폜ijar‚̏o—̓tƒ@ƒCƒ‹j
-rem
-for /r ./ %%L in (*aist*.jar) do del %%L
-
-rem
-rem msiƒtƒ@ƒCƒ‹‚̍폜
-rem
-for /r ./ %%L in (*.msi) do del %%L
-

Deleted: branches/RELENG_1_1/rtmtools/clean_rtse.sh
===================================================================
--- branches/RELENG_1_1/rtmtools/clean_rtse.sh	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/clean_rtse.sh	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,7 +0,0 @@
-#!/bin/sh
-find ./ -name '*.class' -exec rm -f {} \;
-find ./ -name '*.java' -exec grep -nH 'IDL-to-Java' {} \; -exec rm -f {} \;
-find ./ -name '*.html' -exec grep -nH 'Generated by javadoc' {} \; -exec rm -f {} \;
-find ./ -name '*aist*.jar' -exec rm -f {} \;
-find ./ -name '*.msi' -exec rm -f {} \;
-

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/META-INF/MANIFEST.MF
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/META-INF/MANIFEST.MF	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/META-INF/MANIFEST.MF	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,30 +1,29 @@
 Manifest-Version: 1.0
+Ant-Version: Apache Ant 1.7.1
+Created-By: 20.0-b12 (Sun Microsystems Inc.)
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: jp.go.aist.rtm.nameserviceview; singleton:=true
-Bundle-Version: 1.1.0.v20110411
+Bundle-Version: 1.1.0.rc4v20130124
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: jp.go.aist.rtm.nameserviceview,
- jp.go.aist.rtm.nameserviceview.adapterfactory,
- jp.go.aist.rtm.nameserviceview.corba,
- jp.go.aist.rtm.nameserviceview.factory,
- jp.go.aist.rtm.nameserviceview.manager,
- jp.go.aist.rtm.nameserviceview.model.manager,
- jp.go.aist.rtm.nameserviceview.model.manager.impl,
- jp.go.aist.rtm.nameserviceview.model.manager.util,
- jp.go.aist.rtm.nameserviceview.model.nameservice,
- jp.go.aist.rtm.nameserviceview.model.nameservice.impl,
- jp.go.aist.rtm.nameserviceview.model.nameservice.util,
- jp.go.aist.rtm.nameserviceview.ui.action,
- jp.go.aist.rtm.nameserviceview.ui.dialog,
- jp.go.aist.rtm.nameserviceview.ui.preference,
- jp.go.aist.rtm.nameserviceview.ui.views.nameserviceview,
- jp.go.aist.rtm.nameserviceview.ui.workbenchadapter
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
- jp.go.aist.rtm.toolscommon
+Export-Package: jp.go.aist.rtm.nameserviceview,jp.go.aist.rtm.nameserv
+ iceview.adapterfactory,jp.go.aist.rtm.nameserviceview.corba,jp.go.ais
+ t.rtm.nameserviceview.factory,jp.go.aist.rtm.nameserviceview.manager,
+ jp.go.aist.rtm.nameserviceview.model.manager,jp.go.aist.rtm.nameservi
+ ceview.model.manager.impl,jp.go.aist.rtm.nameserviceview.model.manage
+ r.util,jp.go.aist.rtm.nameserviceview.model.nameservice,jp.go.aist.rt
+ m.nameserviceview.model.nameservice.impl,jp.go.aist.rtm.nameservicevi
+ ew.model.nameservice.util,jp.go.aist.rtm.nameserviceview.ui.action,jp
+ .go.aist.rtm.nameserviceview.ui.dialog,jp.go.aist.rtm.nameserviceview
+ .ui.preference,jp.go.aist.rtm.nameserviceview.ui.views.nameservicevie
+ w,jp.go.aist.rtm.nameserviceview.ui.workbenchadapter
+Require-Bundle: org.eclipse.core.runtime,org.eclipse.emf.ecore;visibil
+ ity:=reexport,jp.go.aist.rtm.toolscommon
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: jp.go.aist.rtm.nameserviceview.NameServiceViewPlugin
 Eclipse-BuddyPolicy: registered
+Built-By: n-ando
+Built-Date: 2013/01/25 00:47:24
+

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/build.xml
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/build.xml	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/build.xml	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,6 +1,8 @@
-<project name="jp.go.aist.rtm.nameserviceview_1.0.0" default="jar">
-	<property name="target.name" value="jp.go.aist.rtm.nameserviceview_1.0.0"/>
+<project name="jp.go.aist.rtm.nameserviceview" default="jar">
+	<property name="target.name" value="jp.go.aist.rtm.nameserviceview" />
 
+	<taskdef name="manifesttask" classname="aist.ManifestTask" />
+
 	<property name="source" value="src"/>
 
 	<property name="dist.dir" value="jar" />
@@ -15,6 +17,9 @@
 	<property name="targetPlatformLocation" value="${eclipse.home}" />
 	<property name="workspace" value="${basedir}/.." />
 	<property name="project.name" value="jp.go.aist.rtm.nameserviceview" />
+	<tstamp>
+		<format property="built.date" pattern="yyyy/MM/dd HH:mm:ss" />
+	</tstamp>
 
 	<target name="buildAll">
 		<antcall target="clean" />
@@ -23,16 +28,20 @@
 	</target>
 
 	<target name="clean" description="ビルドで生成されたファイルを削除します">
-		<delete includeEmptyDirs="true">
+		<delete includeEmptyDirs="true" quiet="true">
 			<fileset dir="${build.dir}" includes="**/*.class" />
+			<fileset dir="." includes="**/*.log" />
 		</delete>
+		<delete dir="${build.dir}/OpenRTMNaming" quiet="true"/>
+		<delete dir="${build.dir}/jp" quiet="true"/>
+		<delete dir="${dist.dir}" quiet="true"/>
 	</target>
 
 	<target name="compile" description="ソースをコンパイルします">
 		<getEclipseClasspath pathid="build.classpath" targetplatformlocation="${targetPlatformLocation}"
 					workspace="${workspace}" projectname="${project.name}"/>
 		<javac srcdir="${source}" destdir="${build.dir}"
-			classpathref="build.classpath"  encoding="Shift_JIS" />
+			classpathref="build.classpath"  encoding="UTF-8" />
 	</target>
 
 	<target name="jar" description="jarファイルを作成します">
@@ -44,9 +53,26 @@
 			</fileset>
 		</copy>
 		<mkdir dir="${dist.dir}" />
-		<delete file="${dist.dir}/${target.name}.jar" />
-
-		<jar destfile="${dist.dir}/${target.name}.jar" manifest="META-INF/MANIFEST.MF">
+		<delete>
+			<fileset dir="${dist.dir}" includes="${target.name}_*.jar" />
+		</delete>
+		<!-- Version settings -->
+		<manifesttask file="META-INF/MANIFEST.MF" key="Bundle-Version" property="manifest.project.version" />
+		<condition property="project.version"
+                   value="${env.PROJECT_VERSION}"
+                   else="${manifest.project.version}">
+			<isset property="env.PROJECT_VERSION" />
+		</condition>
+		<property name="jar.version" value="_${project.version}"/>
+		<property name="jar.name" value="${target.name}${jar.version}"/>
+		<!-- Updating MANIFEST.MF -->
+		<manifest file="META-INF/MANIFEST.MF" mode="update">
+			<attribute name="Bundle-Version" value="${project.version}"/>
+			<attribute name="Built-By" value="${user.name}"/>
+			<attribute name="Built-Date" value="${built.date}"/>
+		</manifest>
+		<!-- Creating a jar file -->
+		<jar destfile="${dist.dir}/${jar.name}.jar" manifest="META-INF/MANIFEST.MF">
 			<fileset dir="${build.dir}" />
 			<fileset dir=".">
 				<include name="icons/**.**" />
@@ -56,4 +82,5 @@
 			</fileset>
 		</jar>
 	</target>
+
 </project>

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/BindingTypeHelper.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/BindingTypeHelper.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/BindingTypeHelper.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -3,9 +3,9 @@
 
 /**
 * OpenRTMNaming/BindingTypeHelper.java .
-* IDL-to-Java ƒRƒ“ƒpƒCƒ‰ (ƒ|[ƒ^ƒuƒ‹), ƒo[ƒWƒ‡ƒ“ "3.1" ‚Ő¶¬
-* ¶¬Œ³: ./OpenRTMNaming.idl
-* 2011”N2ŒŽ10“ú 18Žž15•ª14•b JST
+* IDL-to-Java コンパイラ (ポータブル), バージョン "3.1" で生成
+* 生成元: ./OpenRTMNaming.idl
+* 2011年2月10日 18時15分14秒 JST
 */
 
 abstract public class BindingTypeHelper

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/NameComponentHelper.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/NameComponentHelper.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/NameComponentHelper.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -3,9 +3,9 @@
 
 /**
 * OpenRTMNaming/NameComponentHelper.java .
-* IDL-to-Java ƒRƒ“ƒpƒCƒ‰ (ƒ|[ƒ^ƒuƒ‹), ƒo[ƒWƒ‡ƒ“ "3.1" ‚Ő¶¬
-* ¶¬Œ³: ./OpenRTMNaming.idl
-* 2011”N2ŒŽ10“ú 18Žž15•ª14•b JST
+* IDL-to-Java コンパイラ (ポータブル), バージョン "3.1" で生成
+* 生成元: ./OpenRTMNaming.idl
+* 2011年2月10日 18時15分14秒 JST
 */
 
 abstract public class NameComponentHelper

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/NameHelper.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/NameHelper.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/NameHelper.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -3,9 +3,9 @@
 
 /**
 * OpenRTMNaming/NameHelper.java .
-* IDL-to-Java ƒRƒ“ƒpƒCƒ‰ (ƒ|[ƒ^ƒuƒ‹), ƒo[ƒWƒ‡ƒ“ "3.1" ‚Ő¶¬
-* ¶¬Œ³: ./OpenRTMNaming.idl
-* 2011”N2ŒŽ10“ú 18Žž15•ª14•b JST
+* IDL-to-Java コンパイラ (ポータブル), バージョン "3.1" で生成
+* 生成元: ./OpenRTMNaming.idl
+* 2011年2月10日 18時15分14秒 JST
 */
 
 abstract public class NameHelper

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/NamingNotifier.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/NamingNotifier.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/NamingNotifier.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -3,9 +3,9 @@
 
 /**
 * OpenRTMNaming/NamingNotifier.java .
-* IDL-to-Java ƒRƒ“ƒpƒCƒ‰ (ƒ|[ƒ^ƒuƒ‹), ƒo[ƒWƒ‡ƒ“ "3.1" ‚Ő¶¬
-* ¶¬Œ³: ./OpenRTMNaming.idl
-* 2011”N2ŒŽ10“ú 18Žž15•ª14•b JST
+* IDL-to-Java コンパイラ (ポータブル), バージョン "3.1" で生成
+* 生成元: ./OpenRTMNaming.idl
+* 2011年2月10日 18時15分14秒 JST
 */
 
 public interface NamingNotifier extends NamingNotifierOperations, org.omg.CORBA.Object, org.omg.CORBA.portable.IDLEntity 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/NamingNotifierHelper.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/NamingNotifierHelper.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/NamingNotifierHelper.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -3,9 +3,9 @@
 
 /**
 * OpenRTMNaming/NamingNotifierHelper.java .
-* IDL-to-Java ƒRƒ“ƒpƒCƒ‰ (ƒ|[ƒ^ƒuƒ‹), ƒo[ƒWƒ‡ƒ“ "3.1" ‚Ő¶¬
-* ¶¬Œ³: ./OpenRTMNaming.idl
-* 2011”N2ŒŽ10“ú 18Žž15•ª14•b JST
+* IDL-to-Java コンパイラ (ポータブル), バージョン "3.1" で生成
+* 生成元: ./OpenRTMNaming.idl
+* 2011年2月10日 18時15分14秒 JST
 */
 
 abstract public class NamingNotifierHelper

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/NamingNotifierHolder.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/NamingNotifierHolder.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/NamingNotifierHolder.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,9 +2,9 @@
 
 /**
 * OpenRTMNaming/NamingNotifierHolder.java .
-* IDL-to-Java ƒRƒ“ƒpƒCƒ‰ (ƒ|[ƒ^ƒuƒ‹), ƒo[ƒWƒ‡ƒ“ "3.1" ‚Ő¶¬
-* ¶¬Œ³: ./OpenRTMNaming.idl
-* 2011”N2ŒŽ10“ú 18Žž15•ª14•b JST
+* IDL-to-Java コンパイラ (ポータブル), バージョン "3.1" で生成
+* 生成元: ./OpenRTMNaming.idl
+* 2011年2月10日 18時15分14秒 JST
 */
 
 public final class NamingNotifierHolder implements org.omg.CORBA.portable.Streamable

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/NamingNotifierOperations.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/NamingNotifierOperations.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/NamingNotifierOperations.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -3,9 +3,9 @@
 
 /**
 * OpenRTMNaming/NamingNotifierOperations.java .
-* IDL-to-Java ƒRƒ“ƒpƒCƒ‰ (ƒ|[ƒ^ƒuƒ‹), ƒo[ƒWƒ‡ƒ“ "3.1" ‚Ő¶¬
-* ¶¬Œ³: ./OpenRTMNaming.idl
-* 2011”N2ŒŽ10“ú 18Žž15•ª14•b JST
+* IDL-to-Java コンパイラ (ポータブル), バージョン "3.1" で生成
+* 生成元: ./OpenRTMNaming.idl
+* 2011年2月10日 18時15分14秒 JST
 */
 
 public interface NamingNotifierOperations 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/NamingNotifierPOA.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/NamingNotifierPOA.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/NamingNotifierPOA.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -3,9 +3,9 @@
 
 /**
 * OpenRTMNaming/NamingNotifierPOA.java .
-* IDL-to-Java ƒRƒ“ƒpƒCƒ‰ (ƒ|[ƒ^ƒuƒ‹), ƒo[ƒWƒ‡ƒ“ "3.1" ‚Ő¶¬
-* ¶¬Œ³: ./OpenRTMNaming.idl
-* 2011”N2ŒŽ10“ú 18Žž15•ª14•b JST
+* IDL-to-Java コンパイラ (ポータブル), バージョン "3.1" で生成
+* 生成元: ./OpenRTMNaming.idl
+* 2011年2月10日 18時15分14秒 JST
 */
 
 public abstract class NamingNotifierPOA extends org.omg.PortableServer.Servant

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/NamingObserver.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/NamingObserver.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/NamingObserver.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -3,9 +3,9 @@
 
 /**
 * OpenRTMNaming/NamingObserver.java .
-* IDL-to-Java ƒRƒ“ƒpƒCƒ‰ (ƒ|[ƒ^ƒuƒ‹), ƒo[ƒWƒ‡ƒ“ "3.1" ‚Ő¶¬
-* ¶¬Œ³: ./OpenRTMNaming.idl
-* 2011”N2ŒŽ10“ú 18Žž15•ª14•b JST
+* IDL-to-Java コンパイラ (ポータブル), バージョン "3.1" で生成
+* 生成元: ./OpenRTMNaming.idl
+* 2011年2月10日 18時15分14秒 JST
 */
 
 public interface NamingObserver extends NamingObserverOperations, org.omg.CORBA.Object, org.omg.CORBA.portable.IDLEntity 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/NamingObserverHelper.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/NamingObserverHelper.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/NamingObserverHelper.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -3,9 +3,9 @@
 
 /**
 * OpenRTMNaming/NamingObserverHelper.java .
-* IDL-to-Java ƒRƒ“ƒpƒCƒ‰ (ƒ|[ƒ^ƒuƒ‹), ƒo[ƒWƒ‡ƒ“ "3.1" ‚Ő¶¬
-* ¶¬Œ³: ./OpenRTMNaming.idl
-* 2011”N2ŒŽ10“ú 18Žž15•ª14•b JST
+* IDL-to-Java コンパイラ (ポータブル), バージョン "3.1" で生成
+* 生成元: ./OpenRTMNaming.idl
+* 2011年2月10日 18時15分14秒 JST
 */
 
 abstract public class NamingObserverHelper

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/NamingObserverHolder.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/NamingObserverHolder.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/NamingObserverHolder.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,9 +2,9 @@
 
 /**
 * OpenRTMNaming/NamingObserverHolder.java .
-* IDL-to-Java ƒRƒ“ƒpƒCƒ‰ (ƒ|[ƒ^ƒuƒ‹), ƒo[ƒWƒ‡ƒ“ "3.1" ‚Ő¶¬
-* ¶¬Œ³: ./OpenRTMNaming.idl
-* 2011”N2ŒŽ10“ú 18Žž15•ª14•b JST
+* IDL-to-Java コンパイラ (ポータブル), バージョン "3.1" で生成
+* 生成元: ./OpenRTMNaming.idl
+* 2011年2月10日 18時15分14秒 JST
 */
 
 public final class NamingObserverHolder implements org.omg.CORBA.portable.Streamable

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/NamingObserverOperations.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/NamingObserverOperations.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/NamingObserverOperations.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -3,9 +3,9 @@
 
 /**
 * OpenRTMNaming/NamingObserverOperations.java .
-* IDL-to-Java ƒRƒ“ƒpƒCƒ‰ (ƒ|[ƒ^ƒuƒ‹), ƒo[ƒWƒ‡ƒ“ "3.1" ‚Ő¶¬
-* ¶¬Œ³: ./OpenRTMNaming.idl
-* 2011”N2ŒŽ10“ú 18Žž15•ª14•b JST
+* IDL-to-Java コンパイラ (ポータブル), バージョン "3.1" で生成
+* 生成元: ./OpenRTMNaming.idl
+* 2011年2月10日 18時15分14秒 JST
 */
 
 public interface NamingObserverOperations 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/NamingObserverPOA.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/NamingObserverPOA.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/NamingObserverPOA.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -3,9 +3,9 @@
 
 /**
 * OpenRTMNaming/NamingObserverPOA.java .
-* IDL-to-Java ƒRƒ“ƒpƒCƒ‰ (ƒ|[ƒ^ƒuƒ‹), ƒo[ƒWƒ‡ƒ“ "3.1" ‚Ő¶¬
-* ¶¬Œ³: ./OpenRTMNaming.idl
-* 2011”N2ŒŽ10“ú 18Žž15•ª14•b JST
+* IDL-to-Java コンパイラ (ポータブル), バージョン "3.1" で生成
+* 生成元: ./OpenRTMNaming.idl
+* 2011年2月10日 18時15分14秒 JST
 */
 
 public abstract class NamingObserverPOA extends org.omg.PortableServer.Servant

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/ObserverProfile.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/ObserverProfile.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/ObserverProfile.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -3,9 +3,9 @@
 
 /**
 * OpenRTMNaming/ObserverProfile.java .
-* IDL-to-Java ƒRƒ“ƒpƒCƒ‰ (ƒ|[ƒ^ƒuƒ‹), ƒo[ƒWƒ‡ƒ“ "3.1" ‚Ő¶¬
-* ¶¬Œ³: ./OpenRTMNaming.idl
-* 2011”N2ŒŽ10“ú 18Žž15•ª14•b JST
+* IDL-to-Java コンパイラ (ポータブル), バージョン "3.1" で生成
+* 生成元: ./OpenRTMNaming.idl
+* 2011年2月10日 18時15分14秒 JST
 */
 
 public final class ObserverProfile implements org.omg.CORBA.portable.IDLEntity

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/ObserverProfileHelper.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/ObserverProfileHelper.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/ObserverProfileHelper.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -3,9 +3,9 @@
 
 /**
 * OpenRTMNaming/ObserverProfileHelper.java .
-* IDL-to-Java ƒRƒ“ƒpƒCƒ‰ (ƒ|[ƒ^ƒuƒ‹), ƒo[ƒWƒ‡ƒ“ "3.1" ‚Ő¶¬
-* ¶¬Œ³: ./OpenRTMNaming.idl
-* 2011”N2ŒŽ10“ú 18Žž15•ª14•b JST
+* IDL-to-Java コンパイラ (ポータブル), バージョン "3.1" で生成
+* 生成元: ./OpenRTMNaming.idl
+* 2011年2月10日 18時15分14秒 JST
 */
 
 abstract public class ObserverProfileHelper

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/ObserverProfileHolder.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/ObserverProfileHolder.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/ObserverProfileHolder.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,9 +2,9 @@
 
 /**
 * OpenRTMNaming/ObserverProfileHolder.java .
-* IDL-to-Java ƒRƒ“ƒpƒCƒ‰ (ƒ|[ƒ^ƒuƒ‹), ƒo[ƒWƒ‡ƒ“ "3.1" ‚Ő¶¬
-* ¶¬Œ³: ./OpenRTMNaming.idl
-* 2011”N2ŒŽ10“ú 18Žž15•ª14•b JST
+* IDL-to-Java コンパイラ (ポータブル), バージョン "3.1" で生成
+* 生成元: ./OpenRTMNaming.idl
+* 2011年2月10日 18時15分14秒 JST
 */
 
 public final class ObserverProfileHolder implements org.omg.CORBA.portable.Streamable

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/TreeBinding.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/TreeBinding.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/TreeBinding.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -3,9 +3,9 @@
 
 /**
 * OpenRTMNaming/TreeBinding.java .
-* IDL-to-Java ƒRƒ“ƒpƒCƒ‰ (ƒ|[ƒ^ƒuƒ‹), ƒo[ƒWƒ‡ƒ“ "3.1" ‚Ő¶¬
-* ¶¬Œ³: ./OpenRTMNaming.idl
-* 2011”N2ŒŽ10“ú 18Žž15•ª14•b JST
+* IDL-to-Java コンパイラ (ポータブル), バージョン "3.1" で生成
+* 生成元: ./OpenRTMNaming.idl
+* 2011年2月10日 18時15分14秒 JST
 */
 
 public final class TreeBinding implements org.omg.CORBA.portable.IDLEntity

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/TreeBindingHelper.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/TreeBindingHelper.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/TreeBindingHelper.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -3,9 +3,9 @@
 
 /**
 * OpenRTMNaming/TreeBindingHelper.java .
-* IDL-to-Java ƒRƒ“ƒpƒCƒ‰ (ƒ|[ƒ^ƒuƒ‹), ƒo[ƒWƒ‡ƒ“ "3.1" ‚Ő¶¬
-* ¶¬Œ³: ./OpenRTMNaming.idl
-* 2011”N2ŒŽ10“ú 18Žž15•ª14•b JST
+* IDL-to-Java コンパイラ (ポータブル), バージョン "3.1" で生成
+* 生成元: ./OpenRTMNaming.idl
+* 2011年2月10日 18時15分14秒 JST
 */
 
 abstract public class TreeBindingHelper

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/TreeBindingHolder.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/TreeBindingHolder.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/TreeBindingHolder.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,9 +2,9 @@
 
 /**
 * OpenRTMNaming/TreeBindingHolder.java .
-* IDL-to-Java ƒRƒ“ƒpƒCƒ‰ (ƒ|[ƒ^ƒuƒ‹), ƒo[ƒWƒ‡ƒ“ "3.1" ‚Ő¶¬
-* ¶¬Œ³: ./OpenRTMNaming.idl
-* 2011”N2ŒŽ10“ú 18Žž15•ª14•b JST
+* IDL-to-Java コンパイラ (ポータブル), バージョン "3.1" で生成
+* 生成元: ./OpenRTMNaming.idl
+* 2011年2月10日 18時15分14秒 JST
 */
 
 public final class TreeBindingHolder implements org.omg.CORBA.portable.Streamable

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/TreeBindingListHelper.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/TreeBindingListHelper.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/TreeBindingListHelper.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -3,9 +3,9 @@
 
 /**
 * OpenRTMNaming/TreeBindingListHelper.java .
-* IDL-to-Java ƒRƒ“ƒpƒCƒ‰ (ƒ|[ƒ^ƒuƒ‹), ƒo[ƒWƒ‡ƒ“ "3.1" ‚Ő¶¬
-* ¶¬Œ³: ./OpenRTMNaming.idl
-* 2011”N2ŒŽ10“ú 18Žž15•ª14•b JST
+* IDL-to-Java コンパイラ (ポータブル), バージョン "3.1" で生成
+* 生成元: ./OpenRTMNaming.idl
+* 2011年2月10日 18時15分14秒 JST
 */
 
 abstract public class TreeBindingListHelper

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/TreeBindingListHolder.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/TreeBindingListHolder.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/TreeBindingListHolder.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -3,9 +3,9 @@
 
 /**
 * OpenRTMNaming/TreeBindingListHolder.java .
-* IDL-to-Java ƒRƒ“ƒpƒCƒ‰ (ƒ|[ƒ^ƒuƒ‹), ƒo[ƒWƒ‡ƒ“ "3.1" ‚Ő¶¬
-* ¶¬Œ³: ./OpenRTMNaming.idl
-* 2011”N2ŒŽ10“ú 18Žž15•ª14•b JST
+* IDL-to-Java コンパイラ (ポータブル), バージョン "3.1" で生成
+* 生成元: ./OpenRTMNaming.idl
+* 2011年2月10日 18時15分14秒 JST
 */
 
 public final class TreeBindingListHolder implements org.omg.CORBA.portable.Streamable

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/_NamingNotifierStub.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/_NamingNotifierStub.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/_NamingNotifierStub.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -3,9 +3,9 @@
 
 /**
 * OpenRTMNaming/_NamingNotifierStub.java .
-* IDL-to-Java ƒRƒ“ƒpƒCƒ‰ (ƒ|[ƒ^ƒuƒ‹), ƒo[ƒWƒ‡ƒ“ "3.1" ‚Ő¶¬
-* ¶¬Œ³: ./OpenRTMNaming.idl
-* 2011”N2ŒŽ10“ú 18Žž15•ª14•b JST
+* IDL-to-Java コンパイラ (ポータブル), バージョン "3.1" で生成
+* 生成元: ./OpenRTMNaming.idl
+* 2011年2月10日 18時15分14秒 JST
 */
 
 public class _NamingNotifierStub extends org.omg.CORBA.portable.ObjectImpl implements OpenRTMNaming.NamingNotifier

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/_NamingObserverStub.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/_NamingObserverStub.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/OpenRTMNaming/_NamingObserverStub.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -3,9 +3,9 @@
 
 /**
 * OpenRTMNaming/_NamingObserverStub.java .
-* IDL-to-Java ƒRƒ“ƒpƒCƒ‰ (ƒ|[ƒ^ƒuƒ‹), ƒo[ƒWƒ‡ƒ“ "3.1" ‚Ő¶¬
-* ¶¬Œ³: ./OpenRTMNaming.idl
-* 2011”N2ŒŽ10“ú 18Žž15•ª14•b JST
+* IDL-to-Java コンパイラ (ポータブル), バージョン "3.1" で生成
+* 生成元: ./OpenRTMNaming.idl
+* 2011年2月10日 18時15分14秒 JST
 */
 
 public class _NamingObserverStub extends org.omg.CORBA.portable.ObjectImpl implements OpenRTMNaming.NamingObserver

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/jp/go/aist/rtm/nameserviceview/adapterfactory/AdapterFactory.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/jp/go/aist/rtm/nameserviceview/adapterfactory/AdapterFactory.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/jp/go/aist/rtm/nameserviceview/adapterfactory/AdapterFactory.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -8,7 +8,7 @@
 import org.eclipse.core.runtime.IAdapterFactory;
 
 /**
- * RTCLinkのアダプタファクトリ
+ * RTCLinkのアダプタファクトリ 
  * IAdapterFactoryがGenericに対応していないため、@SuppressWarnings("unchecked")を使用している
  * NamingObjectNodeは現在CORBA専用のオブジェクトである
  */

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview.nl1/META-INF/MANIFEST.MF
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview.nl1/META-INF/MANIFEST.MF	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview.nl1/META-INF/MANIFEST.MF	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,6 +1,11 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Nl Fragment
-Bundle-SymbolicName: jp.go.aist.rtm.nameserviceview.nl1
-Bundle-Version: 1.1.0.v20110411
-Fragment-Host: jp.go.aist.rtm.nameserviceview;bundle-version="1.0.0"
+Manifest-Version: 1.0
+Ant-Version: Apache Ant 1.7.1
+Created-By: 20.0-b12 (Sun Microsystems Inc.)
+Bundle-ManifestVersion: 2
+Bundle-Name: Nl Fragment
+Bundle-SymbolicName: jp.go.aist.rtm.nameserviceview.nl1
+Bundle-Version: 1.1.0.rc4v20130124
+Fragment-Host: jp.go.aist.rtm.nameserviceview;bundle-version="1.1.0"
+Built-By: n-ando
+Built-Date: 2013/01/25 00:47:27
+

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview.nl1/build.xml
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview.nl1/build.xml	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview.nl1/build.xml	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,6 +1,8 @@
-<project name="jp.go.aist.rtm.nameserviceview.nl1_1.0.0" default="jar">
-	<property name="target.name" value="jp.go.aist.rtm.nameserviceview.nl1_1.0.0"/>
+<project name="jp.go.aist.rtm.nameserviceview.nl1" default="jar">
+	<property name="target.name" value="jp.go.aist.rtm.nameserviceview.nl1" />
 
+	<taskdef name="manifesttask" classname="aist.ManifestTask" />
+
 	<property name="source" value="src"/>
 
 	<property name="dist.dir" value="jar" />
@@ -14,6 +16,9 @@
 	<property name="targetPlatformLocation" value="${eclipse.home}" />
 	<property name="workspace" value="${basedir}/.." />
 	<property name="project.name" value="jp.go.aist.rtm.toolscommon" />
+	<tstamp>
+		<format property="built.date" pattern="yyyy/MM/dd HH:mm:ss" />
+	</tstamp>
 
 	<target name="buildAll">
 		<!--
@@ -25,27 +30,46 @@
 
 
 	<target name="clean" description="ビルドで生成されたファイルを削除します">
-		<delete includeEmptyDirs="true">
+		<delete includeEmptyDirs="true" quiet="true">
 			<fileset dir="${build.dir}" includes="**/*.class" />
 		</delete>
+		<delete dir="${dist.dir}" quiet="true"/>
 	</target>
 
 	<target name="compile" description="ソースをコンパイルします">
 		<getEclipseClasspath pathid="build.classpath" targetplatformlocation="${targetPlatformLocation}"
 					workspace="${workspace}" projectname="${project.name}"/>
 		<javac srcdir="${source}" destdir="${build.dir}"
-			classpathref="build.classpath" classpath="lib/commons-lang-2.2.jar" encoding="Shift_JIS" />
+			classpathref="build.classpath" classpath="lib/commons-lang-2.2.jar" encoding="UTF-8" />
 	</target>
 
 	<target name="jar" description="jarファイルを作成します">
 		<mkdir dir="${dist.dir}" />
-		<delete file="${dist.dir}/${target.name}.jar" />
-
-		<jar destfile="${dist.dir}/${target.name}.jar" manifest="META-INF/MANIFEST.MF">
+		<delete>
+			<fileset dir="${dist.dir}" includes="${target.name}_*.jar" />
+		</delete>
+		<!-- Version settings -->
+		<manifesttask file="META-INF/MANIFEST.MF" key="Bundle-Version" property="manifest.project.version" />
+		<condition property="project.version"
+                   value="${env.PROJECT_VERSION}"
+                   else="${manifest.project.version}">
+			<isset property="env.PROJECT_VERSION" />
+		</condition>
+		<property name="jar.version" value="_${project.version}"/>
+		<property name="jar.name" value="${target.name}${jar.version}"/>
+		<!-- Updating MANIFEST.MF -->
+		<manifest file="META-INF/MANIFEST.MF" mode="update">
+			<attribute name="Bundle-Version" value="${project.version}"/>
+			<attribute name="Built-By" value="${user.name}"/>
+			<attribute name="Built-Date" value="${built.date}"/>
+		</manifest>
+		<!-- Creating a jar file -->
+		<jar destfile="${dist.dir}/${jar.name}.jar" manifest="META-INF/MANIFEST.MF">
 			<fileset dir="${source}" />
 			<fileset dir=".">
 				<include name="plugin_ja.properties" />
 			</fileset>
 		</jar>
 	</target>
+
 </project>

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.repositoryView/META-INF/MANIFEST.MF
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.repositoryView/META-INF/MANIFEST.MF	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.repositoryView/META-INF/MANIFEST.MF	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,22 +1,22 @@
 Manifest-Version: 1.0
+Ant-Version: Apache Ant 1.7.1
+Created-By: 20.0-b12 (Sun Microsystems Inc.)
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: jp.go.aist.rtm.repositoryView;singleton:=true
-Bundle-Version: 1.1.0.v20110411
+Bundle-Version: 1.1.0.rc4v20130124
 Bundle-Activator: jp.go.aist.rtm.repositoryView.RepositoryViewPlugin
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- jp.go.aist.rtm.toolscommon,
- jp.go.aist.rtm.toolscommon.profiles
+Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,jp.go.aist.rtm
+ .toolscommon,jp.go.aist.rtm.toolscommon.profiles
 Bundle-ActivationPolicy: lazy
-Export-Package: jp.go.aist.rtm.repositoryView,
- jp.go.aist.rtm.repositoryView.adapterfactory,
- jp.go.aist.rtm.repositoryView.model,
- jp.go.aist.rtm.repositoryView.ui,
- jp.go.aist.rtm.repositoryView.ui.action,
- jp.go.aist.rtm.repositoryView.ui.views
-Bundle-ClassPath: lib/rtrepository_local-1.0.jar,
- .
+Export-Package: jp.go.aist.rtm.repositoryView,jp.go.aist.rtm.repositor
+ yView.adapterfactory,jp.go.aist.rtm.repositoryView.model,jp.go.aist.r
+ tm.repositoryView.ui,jp.go.aist.rtm.repositoryView.ui.action,jp.go.ai
+ st.rtm.repositoryView.ui.views
+Bundle-ClassPath: lib/rtrepository_local-1.0.jar,.
 Bundle-Vendor: %providerName
 Eclipse-BuddyPolicy: registered
+Built-By: n-ando
+Built-Date: 2013/01/25 00:47:21
+

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.repositoryView/build.xml
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.repositoryView/build.xml	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.repositoryView/build.xml	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,6 +1,8 @@
-<project name="jp.go.aist.rtm.repositoryVie4_1.0.0" default="jar">
-	<property name="target.name" value="jp.go.aist.rtm.repositoryView_1.0.0"/>
+<project name="jp.go.aist.rtm.repositoryView" default="jar">
+	<property name="target.name" value="jp.go.aist.rtm.repositoryView" />
 
+	<taskdef name="manifesttask" classname="aist.ManifestTask" />
+
 	<property name="source" value="src"/>
 
 	<property name="dist.dir" value="jar" />
@@ -15,6 +17,9 @@
 	<property name="targetPlatformLocation" value="${eclipse.home}" />
 	<property name="workspace" value="${basedir}/.." />
 	<property name="project.name" value="jp.go.aist.rtm.repositoryView" />
+	<tstamp>
+		<format property="built.date" pattern="yyyy/MM/dd HH:mm:ss" />
+	</tstamp>
 
 	<target name="buildAll">
 		<antcall target="clean" />
@@ -23,37 +28,54 @@
 	</target>
 
 	<target name="clean" description="ビルドで生成されたファイルを削除します">
-		<delete includeEmptyDirs="true">
+		<delete includeEmptyDirs="true" quiet="true">
 			<fileset dir="${build.dir}" includes="**/*.class" />
+			<fileset dir="." includes="**/*.log" />
 		</delete>
+		<delete dir="${build.dir}/jp" quiet="true" />
+		<delete dir="${dist.dir}" quiet="true"/>
 	</target>
 
 	<target name="compile" description="ソースをコンパイルします">
 		<getEclipseClasspath pathid="build.classpath" targetplatformlocation="${targetPlatformLocation}"
 					workspace="${workspace}" projectname="${project.name}"/>
 		<javac srcdir="${source}" destdir="${build.dir}"
-			classpathref="build.classpath"  encoding="Shift_JIS" />
+			classpathref="build.classpath"  encoding="UTF-8" />
 	</target>
 
 	<target name="jar" description="jarファイルを作成します">
-		<copy file="${source}/log4j.properties" todir="${build.dir}" />
 		<copy file="${source}/jp/go/aist/rtm/repositoryView/nl/messages.properties" todir="${build.dir}/jp/go/aist/rtm/repositoryView/nl" />
 		<mkdir dir="${dist.dir}" />
-		<delete file="${dist.dir}/${target.name}.jar" />
+		<delete>
+			<fileset dir="${dist.dir}" includes="${target.name}_*.jar" />
+		</delete>
 
-		<jar destfile="${dist.dir}/${target.name}.jar" manifest="META-INF/MANIFEST.MF">
+		<!-- Version settings -->
+		<manifesttask file="META-INF/MANIFEST.MF" key="Bundle-Version" property="manifest.project.version" />
+		<condition property="project.version"
+                   value="${env.PROJECT_VERSION}"
+                   else="${manifest.project.version}">
+			<isset property="env.PROJECT_VERSION" />
+		</condition>
+		<property name="jar.version" value="_${project.version}"/>
+		<property name="jar.name" value="${target.name}${jar.version}"/>
+		<!-- Updating MANIFEST.MF -->
+		<manifest file="META-INF/MANIFEST.MF" mode="update">
+			<attribute name="Bundle-Version" value="${project.version}"/>
+			<attribute name="Built-By" value="${user.name}"/>
+			<attribute name="Built-Date" value="${built.date}"/>
+		</manifest>
+		<!-- Creating a jar file -->
+		<jar destfile="${dist.dir}/${jar.name}.jar" manifest="META-INF/MANIFEST.MF">
 			<fileset dir="${build.dir}" />
 			<fileset dir=".">
-				<include name="bin/log4j.properties" />
 				<include name="icon/**.**" />
 				<include name="lib/**.**" />
 				<include name="plugin.xml" />
 				<include name="plugin.properties" />
 				<include name="repository.properties" />
 			</fileset>
-			<fileset dir="${source}">
-				<include name="log4j.properties" />
-			</fileset>
 		</jar>
 	</target>
+
 </project>

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.repositoryView.nl1/META-INF/MANIFEST.MF
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.repositoryView.nl1/META-INF/MANIFEST.MF	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.repositoryView.nl1/META-INF/MANIFEST.MF	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,7 +1,12 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: RepositoryView Nl1 Fragment
-Bundle-SymbolicName: jp.go.aist.rtm.repositoryView.nl1
-Bundle-Version: 1.1.0.v20110411
-Fragment-Host: jp.go.aist.rtm.repositoryView;bundle-version="1.0.0"
-Bundle-Vendor: AIST
+Manifest-Version: 1.0
+Ant-Version: Apache Ant 1.7.1
+Created-By: 20.0-b12 (Sun Microsystems Inc.)
+Bundle-ManifestVersion: 2
+Bundle-Name: RepositoryView Nl1 Fragment
+Bundle-SymbolicName: jp.go.aist.rtm.repositoryView.nl1
+Bundle-Version: 1.1.0.rc4v20130124
+Fragment-Host: jp.go.aist.rtm.repositoryView;bundle-version="1.1.0"
+Bundle-Vendor: AIST
+Built-By: n-ando
+Built-Date: 2013/01/25 00:47:24
+

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.repositoryView.nl1/build.xml
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.repositoryView.nl1/build.xml	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.repositoryView.nl1/build.xml	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,6 +1,8 @@
-<project name="jp.go.aist.rtm.repositoryView.nl1_1.0.0" default="jar">
-	<property name="target.name" value="jp.go.aist.rtm.repositoryView.nl1_1.0.0"/>
+<project name="jp.go.aist.rtm.repositoryView.nl1" default="jar">
+	<property name="target.name" value="jp.go.aist.rtm.repositoryView.nl1" />
 
+	<taskdef name="manifesttask" classname="aist.ManifestTask" />
+
 	<property name="source" value="src"/>
 
 	<property name="dist.dir" value="jar" />
@@ -14,6 +16,9 @@
 	<property name="targetPlatformLocation" value="${eclipse.home}" />
 	<property name="workspace" value="${basedir}/.." />
 	<property name="project.name" value="jp.go.aist.rtm.toolscommon" />
+	<tstamp>
+		<format property="built.date" pattern="yyyy/MM/dd HH:mm:ss" />
+	</tstamp>
 
 	<target name="buildAll">
 		<!--
@@ -25,27 +30,46 @@
 
 
 	<target name="clean" description="ビルドで生成されたファイルを削除します">
-		<delete includeEmptyDirs="true">
+		<delete includeEmptyDirs="true" quiet="true">
 			<fileset dir="${build.dir}" includes="**/*.class" />
 		</delete>
+		<delete dir="${dist.dir}" quiet="true"/>
 	</target>
 
 	<target name="compile" description="ソースをコンパイルします">
 		<getEclipseClasspath pathid="build.classpath" targetplatformlocation="${targetPlatformLocation}"
 					workspace="${workspace}" projectname="${project.name}"/>
 		<javac srcdir="${source}" destdir="${build.dir}"
-			classpathref="build.classpath" classpath="lib/commons-lang-2.2.jar" encoding="Shift_JIS" />
+			classpathref="build.classpath" classpath="lib/commons-lang-2.2.jar" encoding="UTF-8" />
 	</target>
 
 	<target name="jar" description="jarファイルを作成します">
 		<mkdir dir="${dist.dir}" />
-		<delete file="${dist.dir}/${target.name}.jar" />
-
-		<jar destfile="${dist.dir}/${target.name}.jar" manifest="META-INF/MANIFEST.MF">
+		<delete>
+			<fileset dir="${dist.dir}" includes="${target.name}_*.jar" />
+		</delete>
+		<!-- Version settings -->
+		<manifesttask file="META-INF/MANIFEST.MF" key="Bundle-Version" property="manifest.project.version" />
+		<condition property="project.version"
+                   value="${env.PROJECT_VERSION}"
+                   else="${manifest.project.version}">
+			<isset property="env.PROJECT_VERSION" />
+		</condition>
+		<property name="jar.version" value="_${project.version}"/>
+		<property name="jar.name" value="${target.name}${jar.version}"/>
+		<!-- Updating MANIFEST.MF -->
+		<manifest file="META-INF/MANIFEST.MF" mode="update">
+			<attribute name="Bundle-Version" value="${project.version}"/>
+			<attribute name="Built-By" value="${user.name}"/>
+			<attribute name="Built-Date" value="${built.date}"/>
+		</manifest>
+		<!-- Creating a jar file -->
+		<jar destfile="${dist.dir}/${jar.name}.jar" manifest="META-INF/MANIFEST.MF">
 			<fileset dir="${source}" />
 			<fileset dir=".">
 				<include name="plugin_ja.properties" />
 			</fileset>
 		</jar>
 	</target>
+
 </project>

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/META-INF/MANIFEST.MF
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/META-INF/MANIFEST.MF	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/META-INF/MANIFEST.MF	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,43 +1,34 @@
 Manifest-Version: 1.0
+Ant-Version: Apache Ant 1.7.1
+Created-By: 20.0-b12 (Sun Microsystems Inc.)
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: jp.go.aist.rtm.rtcbuilder; singleton:=true
-Bundle-Version: 1.1.0.v20110411
-Bundle-ClassPath: .,
- lib/velocity-1.6.3-dep.jar
+Bundle-Version: 1.1.0.rc4v20130124
+Bundle-ClassPath: .,lib/velocity-1.6.3-dep.jar
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: jp.go.aist.rtm.rtcbuilder,
- jp.go.aist.rtm.rtcbuilder.corba.idl.parser,
- jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree,
- jp.go.aist.rtm.rtcbuilder.corba.idl.parser.visitor,
- jp.go.aist.rtm.rtcbuilder.extension,
- jp.go.aist.rtm.rtcbuilder.generator,
- jp.go.aist.rtm.rtcbuilder.generator.param,
- jp.go.aist.rtm.rtcbuilder.generator.param.idl,
- jp.go.aist.rtm.rtcbuilder.manager,
- jp.go.aist.rtm.rtcbuilder.model.component,
- jp.go.aist.rtm.rtcbuilder.model.component.impl,
- jp.go.aist.rtm.rtcbuilder.model.component.util,
- jp.go.aist.rtm.rtcbuilder.template,
- jp.go.aist.rtm.rtcbuilder.ui,
- jp.go.aist.rtm.rtcbuilder.ui.Perspective,
- jp.go.aist.rtm.rtcbuilder.ui.editors,
- jp.go.aist.rtm.rtcbuilder.ui.parts,
- jp.go.aist.rtm.rtcbuilder.ui.preference,
- jp.go.aist.rtm.rtcbuilder.ui.wizard,
- jp.go.aist.rtm.rtcbuilder.util
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.compare,
- org.eclipse.jface.text,
- org.eclipse.ui.forms,
- org.eclipse.core.resources,
- org.eclipse.gef,
- org.eclipse.ui.ide,
- org.eclipse.jdt.ui,
- jp.go.aist.rtm.toolscommon.profiles
+Export-Package: jp.go.aist.rtm.rtcbuilder,jp.go.aist.rtm.rtcbuilder.co
+ rba.idl.parser,jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree,
+ jp.go.aist.rtm.rtcbuilder.corba.idl.parser.visitor,jp.go.aist.rtm.rtc
+ builder.extension,jp.go.aist.rtm.rtcbuilder.generator,jp.go.aist.rtm.
+ rtcbuilder.generator.param,jp.go.aist.rtm.rtcbuilder.generator.param.
+ idl,jp.go.aist.rtm.rtcbuilder.generator.parser,jp.go.aist.rtm.rtcbuil
+ der.manager,jp.go.aist.rtm.rtcbuilder.model.component,jp.go.aist.rtm.
+ rtcbuilder.model.component.impl,jp.go.aist.rtm.rtcbuilder.model.compo
+ nent.util,jp.go.aist.rtm.rtcbuilder.template,jp.go.aist.rtm.rtcbuilde
+ r.ui,jp.go.aist.rtm.rtcbuilder.ui.Perspective,jp.go.aist.rtm.rtcbuild
+ er.ui.editors,jp.go.aist.rtm.rtcbuilder.ui.parts,jp.go.aist.rtm.rtcbu
+ ilder.ui.preference,jp.go.aist.rtm.rtcbuilder.ui.wizard,jp.go.aist.rt
+ m.rtcbuilder.util
+Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,org.eclipse.em
+ f.ecore;visibility:=reexport,org.eclipse.compare,org.eclipse.jface.te
+ xt,org.eclipse.ui.forms,org.eclipse.core.resources,org.eclipse.gef,or
+ g.eclipse.ui.ide,org.eclipse.jdt.ui,jp.go.aist.rtm.toolscommon.profil
+ es
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: jp.go.aist.rtm.rtcbuilder.RtcBuilderPlugin
 Eclipse-BuddyPolicy: registered
+Built-By: n-ando
+Built-Date: 2013/01/25 00:47:05
+

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/build.xml
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/build.xml	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/build.xml	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,6 +1,8 @@
-<project name="jp.go.aist.rtm.rtcbuilder_1.0.0" default="jar">
-	<property name="target.name" value="jp.go.aist.rtm.rtcbuilder_1.0.0"/>
+<project name="jp.go.aist.rtm.rtcbuilder" default="jar">
+	<property name="target.name" value="jp.go.aist.rtm.rtcbuilder" />
 
+	<taskdef name="manifesttask" classname="aist.ManifestTask" />
+
 	<property name="source" value="src"/>
 
 	<property name="dist.dir" value="jar" />
@@ -15,6 +17,9 @@
 	<property name="targetPlatformLocation" value="${eclipse.home}" />
 	<property name="workspace" value="${basedir}/.." />
 	<property name="project.name" value="jp.go.aist.rtm.rtcbuilder" />
+	<tstamp>
+		<format property="built.date" pattern="yyyy/MM/dd HH:mm:ss" />
+	</tstamp>
 
 	<target name="buildAll">
 		<antcall target="clean" />
@@ -23,16 +28,19 @@
 	</target>
 
 	<target name="clean" description="ビルドで生成されたファイルを削除します">
-		<delete includeEmptyDirs="true">
+		<delete includeEmptyDirs="true" quiet="true">
 			<fileset dir="${build.dir}" includes="**/*.class" />
+			<fileset dir="." includes="**/*.log" />
 		</delete>
+		<delete dir="${build.dir}/jp" quiet="true"/>
+		<delete dir="${dist.dir}" quiet="true"/>
 	</target>
 
 	<target name="compile" description="ソースをコンパイルします">
 		<getEclipseClasspath pathid="build.classpath" targetplatformlocation="${targetPlatformLocation}"
 					workspace="${workspace}" projectname="${project.name}"/>
 		<javac srcdir="${source}" destdir="${build.dir}"
-			classpathref="build.classpath"  encoding="Shift_JIS" />
+			classpathref="build.classpath"  encoding="UTF-8" />
 	</target>
 
 	<target name="jar" description="jarファイルを作成します">
@@ -50,17 +58,34 @@
 		</copy>
 		<copy todir="${build.dir}/jp/go/aist/rtm/rtcbuilder/template">
 			<fileset dir="${source}/jp/go/aist/rtm/rtcbuilder/template">
-				<include name="_042/**/**.template" />
-				<include name="_100/**/**.template" />
-				<include name="common/**.template" />
-				<include name="cpp/**.template" />
-				<include name="cppwin/**.template" />
+				<include name="cmake/**/**.vsl" />
+				<include name="common/**.vsl" />
+				<include name="common_04/**.vsl" />
+				<include name="cpp/**.vsl" />
+				<include name="cpp_04/**.vsl" />
 			</fileset>
 		</copy>
 		<mkdir dir="${dist.dir}" />
-		<delete file="${dist.dir}/${target.name}.jar" />
-
-		<jar destfile="${dist.dir}/${target.name}.jar" manifest="META-INF/MANIFEST.MF">
+		<delete>
+			<fileset dir="${dist.dir}" includes="${target.name}_*.jar" />
+		</delete>
+		<!-- Version settings -->
+		<manifesttask file="META-INF/MANIFEST.MF" key="Bundle-Version" property="manifest.project.version" />
+		<condition property="project.version"
+                   value="${env.PROJECT_VERSION}"
+                   else="${manifest.project.version}">
+			<isset property="env.PROJECT_VERSION" />
+		</condition>
+		<property name="jar.version" value="_${project.version}"/>
+		<property name="jar.name" value="${target.name}${jar.version}"/>
+		<!-- Updating MANIFEST.MF -->
+		<manifest file="META-INF/MANIFEST.MF" mode="update">
+			<attribute name="Bundle-Version" value="${project.version}"/>
+			<attribute name="Built-By" value="${user.name}"/>
+			<attribute name="Built-Date" value="${built.date}"/>
+		</manifest>
+		<!-- Creating a jar file -->
+		<jar destfile="${dist.dir}/${jar.name}.jar" manifest="META-INF/MANIFEST.MF">
 			<fileset dir="${build.dir}" />
 			<fileset dir=".">
 				<include name="icons/**.**" />
@@ -70,4 +95,5 @@
 			</fileset>
 		</jar>
 	</target>
+
 </project>

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/AIST2/ModuleName.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/AIST2/ModuleName.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/AIST2/ModuleName.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -68,6 +68,9 @@
   
   // </rtc-template>
 
+  // <rtc-template block="bind_config">
+  // </rtc-template>
+  
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/AIST2/ModuleName.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/AIST2/ModuleName.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/AIST2/ModuleName.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -222,6 +222,11 @@
   
   // </rtc-template>
 
+  // Configuration variable declaration
+  // <rtc-template block="config_declare">
+
+  // </rtc-template>
+
   // DataInPort declaration
   // <rtc-template block="inport_declare">
   

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/ConfigType/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/ConfigType/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/ConfigType/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -84,8 +84,8 @@
   bindParameter("double_param", m_double_param, "4.11");
   bindParameter("str_param0", m_str_param0, "hoge");
   bindParameter("str_param1", m_str_param1, "dara");
+  // </rtc-template>
   
-  // </rtc-template>
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/ConfigType/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/ConfigType/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/ConfigType/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -265,6 +265,7 @@
    * - DefaultValue: dara
    */
   std::string m_str_param1;
+
   // </rtc-template>
 
   // DataInPort declaration

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset1/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset1/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset1/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -72,8 +72,8 @@
   // <rtc-template block="bind_config">
   // Bind variables and configuration variable
   bindParameter("int_param0", m_int_param0, "0");
+  // </rtc-template>
   
-  // </rtc-template>
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset1/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset1/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset1/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -229,6 +229,7 @@
    * - DefaultValue: 0
    */
   int m_int_param0;
+
   // </rtc-template>
 
   // DataInPort declaration

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset2/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset2/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset2/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -74,8 +74,8 @@
   // Bind variables and configuration variable
   bindParameter("int_param0", m_int_param0, "0");
   bindParameter("int_param1", m_int_param1, "1");
+  // </rtc-template>
   
-  // </rtc-template>
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset2/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset2/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset2/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -235,6 +235,7 @@
    * - DefaultValue: 1
    */
   int m_int_param1;
+
   // </rtc-template>
 
   // DataInPort declaration

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset3/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset3/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset3/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -80,8 +80,8 @@
   bindParameter("double_param0", m_double_param0, "0.11");
   bindParameter("str_param0", m_str_param0, "hoge");
   bindParameter("str_param1", m_str_param1, "dara");
+  // </rtc-template>
   
-  // </rtc-template>
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset3/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset3/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset3/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -253,6 +253,7 @@
    * - DefaultValue: dara
    */
   std::string m_str_param1;
+
   // </rtc-template>
 
   // DataInPort declaration

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/DataPortIDL/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/DataPortIDL/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/DataPortIDL/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -71,6 +71,9 @@
   
   // </rtc-template>
 
+  // <rtc-template block="bind_config">
+  // </rtc-template>
+  
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/DataPortIDL/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/DataPortIDL/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/DataPortIDL/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -223,26 +223,31 @@
   
   // </rtc-template>
 
+  // Configuration variable declaration
+  // <rtc-template block="config_declare">
+
+  // </rtc-template>
+
   // DataInPort declaration
   // <rtc-template block="inport_declare">
-  Frame1 m_InP1;
+  MyType::Frame1 m_InP1;
   /*!
    */
-  InPort<Frame1> m_InP1In;
-  TimedLong m_InP2;
+  InPort<MyType::Frame1> m_InP1In;
+  RTC::TimedLong m_InP2;
   /*!
    */
-  InPort<TimedLong> m_InP2In;
+  InPort<RTC::TimedLong> m_InP2In;
   
   // </rtc-template>
 
 
   // DataOutPort declaration
   // <rtc-template block="outport_declare">
-  TimedInt m_OutP1;
+  RTC::TimedInt m_OutP1;
   /*!
    */
-  OutPort<TimedInt> m_OutP1Out;
+  OutPort<RTC::TimedInt> m_OutP1Out;
   
   // </rtc-template>
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/MyServiceSVC_impl.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/MyServiceSVC_impl.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/MyServiceSVC_impl.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -3,11 +3,11 @@
  * @file  MyServiceSVC_impl.cpp
  * @brief Service implementation code of MyService.idl
  *
- * @author Noriaki Ando <n-ando at aist.go.jp>3456789412345678951234567896123456789
- * 7123456789812345
+ * @author Noriaki Ando <n-ando at aist.go.jp> one two three four
+ * five six seven eight nine ten
  *
- * Copyright (C) 2006-2008 ライセンス1234567890123456789012345678901234567890123
- * 4567890
+ * Copyright (C) 2006-2008
+ * ライセンス12345678901234567890123456789012345678901234567890
  *
  */
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/MyServiceSVC_impl.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/MyServiceSVC_impl.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/MyServiceSVC_impl.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -3,11 +3,11 @@
  * @file  MyServiceSVC_impl.h
  * @brief Service implementation header of MyService.idl
  *
- * @author Noriaki Ando <n-ando at aist.go.jp>3456789412345678951234567896123456789
- * 7123456789812345
+ * @author Noriaki Ando <n-ando at aist.go.jp> one two three four
+ * five six seven eight nine ten
  *
- * Copyright (C) 2006-2008 ライセンス1234567890123456789012345678901234567890123
- * 4567890
+ * Copyright (C) 2006-2008
+ * ライセンス12345678901234567890123456789012345678901234567890
  *
  */
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -4,11 +4,11 @@
  * @brief MDesc
  * @date $Date$
  *
- * @author Noriaki Ando <n-ando at aist.go.jp>3456789412345678951234567896123456789
- * 7123456789812345
+ * @author Noriaki Ando <n-ando at aist.go.jp> one two three four
+ * five six seven eight nine ten
  *
- * Copyright (C) 2006-2008 ライセンス1234567890123456789012345678901234567890123
- * 4567890
+ * Copyright (C) 2006-2008
+ * ライセンス12345678901234567890123456789012345678901234567890
  *
  * $Id$
  */
@@ -69,8 +69,8 @@
 
 
 /*!
- * on_initialize概要説明12345678901234567890123456789012345678901234567890123456
- * 78901234567890
+ * on_initialize概要説明123456789012345678901234567890123456789012
+ * 3456789012345678901234567890
  */
 RTC::ReturnCode_t foo::onInitialize()
 {
@@ -103,14 +103,14 @@
   bindParameter("double_param0", m_double_param0, "0.11");
   bindParameter("str_param0", m_str_param0, "hoge");
   bindParameter("str_param1", m_str_param1, "dara");
+  // </rtc-template>
   
-  // </rtc-template>
   return RTC::RTC_OK;
 }
 
 /*!
- * on_finalize概要説明1234567890123456789012345678901234567890123456789012345678
- * 901234567890
+ * on_finalize概要説明12345678901234567890123456789012345678901234
+ * 56789012345678901234567890
  */
 /*
 RTC::ReturnCode_t foo::onFinalize()
@@ -120,8 +120,8 @@
 */
 
 /*!
- * on_startup概要説明12345678901234567890123456789012345678901234567890123456789
- * 01234567890
+ * on_startup概要説明123456789012345678901234567890123456789012345
+ * 6789012345678901234567890
  */
 /*
 RTC::ReturnCode_t foo::onStartup(RTC::UniqueId ec_id)
@@ -131,8 +131,8 @@
 */
 
 /*!
- * on_shutdown概要説明1234567890123456789012345678901234567890123456789012345678
- * 901234567890
+ * on_shutdown概要説明12345678901234567890123456789012345678901234
+ * 56789012345678901234567890
  */
 /*
 RTC::ReturnCode_t foo::onShutdown(RTC::UniqueId ec_id)
@@ -142,8 +142,8 @@
 */
 
 /*!
- * on_activated概要説明123456789012345678901234567890123456789012345678901234567
- * 8901234567890
+ * on_activated概要説明1234567890123456789012345678901234567890123
+ * 456789012345678901234567890
  */
 /*
 RTC::ReturnCode_t foo::onActivated(RTC::UniqueId ec_id)
@@ -153,8 +153,8 @@
 */
 
 /*!
- * on_deactivated概要説明1234567890123456789012345678901234567890123456789012345
- * 678901234567890
+ * on_deactivated概要説明12345678901234567890123456789012345678901
+ * 23456789012345678901234567890
  */
 /*
 RTC::ReturnCode_t foo::onDeactivated(RTC::UniqueId ec_id)
@@ -164,8 +164,8 @@
 */
 
 /*!
- * on_execute概要説明12345678901234567890123456789012345678901234567890123456789
- * 01234567890
+ * on_execute概要説明123456789012345678901234567890123456789012345
+ * 6789012345678901234567890
  */
 /*
 RTC::ReturnCode_t foo::onExecute(RTC::UniqueId ec_id)
@@ -175,8 +175,8 @@
 */
 
 /*!
- * on_aborting概要説明1234567890123456789012345678901234567890123456789012345678
- * 901234567890
+ * on_aborting概要説明12345678901234567890123456789012345678901234
+ * 56789012345678901234567890
  */
 /*
 RTC::ReturnCode_t foo::onAborting(RTC::UniqueId ec_id)
@@ -186,8 +186,8 @@
 */
 
 /*!
- * on_error概要説明1234567890123456789012345678901234567890123456789012345678901
- * 234567890
+ * on_error概要説明12345678901234567890123456789012345678901234567
+ * 89012345678901234567890
  */
 /*
 RTC::ReturnCode_t foo::onError(RTC::UniqueId ec_id)
@@ -197,8 +197,8 @@
 */
 
 /*!
- * on_reset概要説明1234567890123456789012345678901234567890123456789012345678901
- * 234567890
+ * on_reset概要説明12345678901234567890123456789012345678901234567
+ * 89012345678901234567890
  */
 /*
 RTC::ReturnCode_t foo::onReset(RTC::UniqueId ec_id)
@@ -208,8 +208,8 @@
 */
 
 /*!
- * on_state_update概要説明123456789012345678901234567890123456789012345678901234
- * 5678901234567890
+ * on_state_update概要説明1234567890123456789012345678901234567890
+ * 123456789012345678901234567890
  */
 /*
 RTC::ReturnCode_t foo::onStateUpdate(RTC::UniqueId ec_id)
@@ -219,8 +219,8 @@
 */
 
 /*!
- * on_rate_changed概要説明123456789012345678901234567890123456789012345678901234
- * 5678901234567890
+ * on_rate_changed概要説明1234567890123456789012345678901234567890
+ * 123456789012345678901234567890
  */
 /*
 RTC::ReturnCode_t foo::onRateChanged(RTC::UniqueId ec_id)

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -4,11 +4,11 @@
  * @brief MDesc
  * @date  $Date$
  *
- * @author Noriaki Ando <n-ando at aist.go.jp>3456789412345678951234567896123456789
- * 7123456789812345
+ * @author Noriaki Ando <n-ando at aist.go.jp> one two three four
+ * five six seven eight nine ten
  *
- * Copyright (C) 2006-2008 ライセンス1234567890123456789012345678901234567890123
- * 4567890
+ * Copyright (C) 2006-2008
+ * ライセンス12345678901234567890123456789012345678901234567890
  *
  * $Id$
  */
@@ -43,17 +43,17 @@
  * @class foo
  * @brief MDesc
  *
- * 本コンポーネントの概要説明123456789012345678901234567890123456789012345678901
- * 2345678901234567890
+ * 本コンポーネントの概要説明1234567890123456789012345678901234567
+ * 890123456789012345678901234567890
  *
- * 本コンポーネントの入出力12345678901234567890123456789012345678901234567890123
- * 45678901234567890
+ * 本コンポーネントの入出力123456789012345678901234567890123456789
+ * 0123456789012345678901234567890
  *
- * 本コンポーネントのアルゴリズムなど1234567890123456789012345678901234567890123
- * 456789012345678901234567890
+ * 本コンポーネントのアルゴリズムなど12345678901234567890123456789
+ * 01234567890123456789012345678901234567890
  *
- * 参考文献の情報123456789012345678901234567890123456789012345678901234567890123
- * 4567890
+ * 参考文献の情報1234567890123456789012345678901234567890123456789
+ * 012345678901234567890
  *
  */
 class foo
@@ -80,42 +80,42 @@
   // </rtc-template>
 
   /***
-   * on_initialize概要説明123456789012345678901234567890123456789012345678901234
-   * 5678901234567890
+   * on_initialize概要説明1234567890123456789012345678901234567890
+   * 123456789012345678901234567890
    *
    * The initialize action (on CREATED->ALIVE transition)
    * formaer rtc_init_entry() 
    *
    * @return RTC::ReturnCode_t
    * 
-   * @pre on_initialize事前条件1234567890123456789012345678901234567890123456789
-   * 012345678901234567890
-   * @post on_initialize事後条件123456789012345678901234567890123456789012345678
-   * 9012345678901234567890
+   * @pre on_initialize事前条件12345678901234567890123456789012345
+   * 67890123456789012345678901234567890
+   * @post on_initialize事後条件1234567890123456789012345678901234
+   * 567890123456789012345678901234567890
    * 
    */
    virtual RTC::ReturnCode_t onInitialize();
 
   /***
-   * on_finalize概要説明12345678901234567890123456789012345678901234567890123456
-   * 78901234567890
+   * on_finalize概要説明123456789012345678901234567890123456789012
+   * 3456789012345678901234567890
    *
    * The finalize action (on ALIVE->END transition)
    * formaer rtc_exiting_entry()
    *
    * @return RTC::ReturnCode_t
    * 
-   * @pre on_finalize事前条件123456789012345678901234567890123456789012345678901
-   * 2345678901234567890
-   * @post on_finalize事後条件12345678901234567890123456789012345678901234567890
-   * 12345678901234567890
+   * @pre on_finalize事前条件1234567890123456789012345678901234567
+   * 890123456789012345678901234567890
+   * @post on_finalize事後条件123456789012345678901234567890123456
+   * 7890123456789012345678901234567890
    * 
    */
   // virtual RTC::ReturnCode_t onFinalize();
 
   /***
-   * on_startup概要説明123456789012345678901234567890123456789012345678901234567
-   * 8901234567890
+   * on_startup概要説明1234567890123456789012345678901234567890123
+   * 456789012345678901234567890
    *
    * The startup action when ExecutionContext startup
    * former rtc_starting_entry()
@@ -124,17 +124,17 @@
    *
    * @return RTC::ReturnCode_t
    * 
-   * @pre on_startup事前条件1234567890123456789012345678901234567890123456789012
-   * 345678901234567890
-   * @post on_startup事後条件123456789012345678901234567890123456789012345678901
-   * 2345678901234567890
+   * @pre on_startup事前条件12345678901234567890123456789012345678
+   * 90123456789012345678901234567890
+   * @post on_startup事後条件1234567890123456789012345678901234567
+   * 890123456789012345678901234567890
    * 
    */
   // virtual RTC::ReturnCode_t onStartup(RTC::UniqueId ec_id);
 
   /***
-   * on_shutdown概要説明12345678901234567890123456789012345678901234567890123456
-   * 78901234567890
+   * on_shutdown概要説明123456789012345678901234567890123456789012
+   * 3456789012345678901234567890
    *
    * The shutdown action when ExecutionContext stop
    * former rtc_stopping_entry()
@@ -143,17 +143,17 @@
    *
    * @return RTC::ReturnCode_t
    * 
-   * @pre on_shutdown事前条件123456789012345678901234567890123456789012345678901
-   * 2345678901234567890
-   * @post on_shutdown事後条件12345678901234567890123456789012345678901234567890
-   * 12345678901234567890
+   * @pre on_shutdown事前条件1234567890123456789012345678901234567
+   * 890123456789012345678901234567890
+   * @post on_shutdown事後条件123456789012345678901234567890123456
+   * 7890123456789012345678901234567890
    * 
    */
   // virtual RTC::ReturnCode_t onShutdown(RTC::UniqueId ec_id);
 
   /***
-   * on_activated概要説明1234567890123456789012345678901234567890123456789012345
-   * 678901234567890
+   * on_activated概要説明12345678901234567890123456789012345678901
+   * 23456789012345678901234567890
    *
    * The activated action (Active state entry action)
    * former rtc_active_entry()
@@ -162,17 +162,17 @@
    *
    * @return RTC::ReturnCode_t
    * 
-   * @pre on_activated事前条件12345678901234567890123456789012345678901234567890
-   * 12345678901234567890
-   * @post on_activated事後条件1234567890123456789012345678901234567890123456789
-   * 012345678901234567890
+   * @pre on_activated事前条件123456789012345678901234567890123456
+   * 7890123456789012345678901234567890
+   * @post on_activated事後条件12345678901234567890123456789012345
+   * 67890123456789012345678901234567890
    * 
    */
   // virtual RTC::ReturnCode_t onActivated(RTC::UniqueId ec_id);
 
   /***
-   * on_deactivated概要説明12345678901234567890123456789012345678901234567890123
-   * 45678901234567890
+   * on_deactivated概要説明123456789012345678901234567890123456789
+   * 0123456789012345678901234567890
    *
    * The deactivated action (Active state exit action)
    * former rtc_active_exit()
@@ -181,17 +181,17 @@
    *
    * @return RTC::ReturnCode_t
    * 
-   * @pre on_deactivated事前条件123456789012345678901234567890123456789012345678
-   * 9012345678901234567890
-   * @post on_deactivated事後条件12345678901234567890123456789012345678901234567
-   * 89012345678901234567890
+   * @pre on_deactivated事前条件1234567890123456789012345678901234
+   * 567890123456789012345678901234567890
+   * @post on_deactivated事後条件123456789012345678901234567890123
+   * 4567890123456789012345678901234567890
    * 
    */
   // virtual RTC::ReturnCode_t onDeactivated(RTC::UniqueId ec_id);
 
   /***
-   * on_execute概要説明123456789012345678901234567890123456789012345678901234567
-   * 8901234567890
+   * on_execute概要説明1234567890123456789012345678901234567890123
+   * 456789012345678901234567890
    *
    * The execution action that is invoked periodically
    * former rtc_active_do()
@@ -200,17 +200,17 @@
    *
    * @return RTC::ReturnCode_t
    * 
-   * @pre on_execute事前条件1234567890123456789012345678901234567890123456789012
-   * 345678901234567890
-   * @post on_execute事後条件123456789012345678901234567890123456789012345678901
-   * 2345678901234567890
+   * @pre on_execute事前条件12345678901234567890123456789012345678
+   * 90123456789012345678901234567890
+   * @post on_execute事後条件1234567890123456789012345678901234567
+   * 890123456789012345678901234567890
    * 
    */
   // virtual RTC::ReturnCode_t onExecute(RTC::UniqueId ec_id);
 
   /***
-   * on_aborting概要説明12345678901234567890123456789012345678901234567890123456
-   * 78901234567890
+   * on_aborting概要説明123456789012345678901234567890123456789012
+   * 3456789012345678901234567890
    *
    * The aborting action when main logic error occurred.
    * former rtc_aborting_entry()
@@ -219,17 +219,17 @@
    *
    * @return RTC::ReturnCode_t
    * 
-   * @pre on_aborting事前条件123456789012345678901234567890123456789012345678901
-   * 2345678901234567890
-   * @post on_aborting事後条件12345678901234567890123456789012345678901234567890
-   * 12345678901234567890
+   * @pre on_aborting事前条件1234567890123456789012345678901234567
+   * 890123456789012345678901234567890
+   * @post on_aborting事後条件123456789012345678901234567890123456
+   * 7890123456789012345678901234567890
    * 
    */
   // virtual RTC::ReturnCode_t onAborting(RTC::UniqueId ec_id);
 
   /***
-   * on_error概要説明12345678901234567890123456789012345678901234567890123456789
-   * 01234567890
+   * on_error概要説明123456789012345678901234567890123456789012345
+   * 6789012345678901234567890
    *
    * The error action in ERROR state
    * former rtc_error_do()
@@ -238,17 +238,17 @@
    *
    * @return RTC::ReturnCode_t
    * 
-   * @pre on_error事前条件123456789012345678901234567890123456789012345678901234
-   * 5678901234567890
-   * @post on_error事後条件12345678901234567890123456789012345678901234567890123
-   * 45678901234567890
+   * @pre on_error事前条件1234567890123456789012345678901234567890
+   * 123456789012345678901234567890
+   * @post on_error事後条件123456789012345678901234567890123456789
+   * 0123456789012345678901234567890
    * 
    */
   // virtual RTC::ReturnCode_t onError(RTC::UniqueId ec_id);
 
   /***
-   * on_reset概要説明12345678901234567890123456789012345678901234567890123456789
-   * 01234567890
+   * on_reset概要説明123456789012345678901234567890123456789012345
+   * 6789012345678901234567890
    *
    * The reset action that is invoked resetting
    * This is same but different the former rtc_init_entry()
@@ -257,17 +257,17 @@
    *
    * @return RTC::ReturnCode_t
    * 
-   * @pre on_reset事前条件123456789012345678901234567890123456789012345678901234
-   * 5678901234567890
-   * @post on_reset事後条件12345678901234567890123456789012345678901234567890123
-   * 45678901234567890
+   * @pre on_reset事前条件1234567890123456789012345678901234567890
+   * 123456789012345678901234567890
+   * @post on_reset事後条件123456789012345678901234567890123456789
+   * 0123456789012345678901234567890
    * 
    */
   // virtual RTC::ReturnCode_t onReset(RTC::UniqueId ec_id);
   
   /***
-   * on_state_update概要説明1234567890123456789012345678901234567890123456789012
-   * 345678901234567890
+   * on_state_update概要説明12345678901234567890123456789012345678
+   * 90123456789012345678901234567890
    *
    * The state update action that is invoked after onExecute() action
    * no corresponding operation exists in OpenRTm-aist-0.2.0
@@ -276,17 +276,17 @@
    *
    * @return RTC::ReturnCode_t
    * 
-   * @pre on_state_update事前条件12345678901234567890123456789012345678901234567
-   * 89012345678901234567890
-   * @post on_state_update事後条件1234567890123456789012345678901234567890123456
-   * 789012345678901234567890
+   * @pre on_state_update事前条件123456789012345678901234567890123
+   * 4567890123456789012345678901234567890
+   * @post on_state_update事後条件12345678901234567890123456789012
+   * 34567890123456789012345678901234567890
    * 
    */
   // virtual RTC::ReturnCode_t onStateUpdate(RTC::UniqueId ec_id);
 
   /***
-   * on_rate_changed概要説明1234567890123456789012345678901234567890123456789012
-   * 345678901234567890
+   * on_rate_changed概要説明12345678901234567890123456789012345678
+   * 90123456789012345678901234567890
    *
    * The action that is invoked when execution context's rate is changed
    * no corresponding operation exists in OpenRTm-aist-0.2.0
@@ -295,10 +295,10 @@
    *
    * @return RTC::ReturnCode_t
    * 
-   * @pre on_rate_changed事前条件12345678901234567890123456789012345678901234567
-   * 89012345678901234567890
-   * @post on_rate_changed事後条件1234567890123456789012345678901234567890123456
-   * 789012345678901234567890
+   * @pre on_rate_changed事前条件123456789012345678901234567890123
+   * 4567890123456789012345678901234567890
+   * @post on_rate_changed事後条件12345678901234567890123456789012
+   * 34567890123456789012345678901234567890
    * 
    */
   // virtual RTC::ReturnCode_t onRateChanged(RTC::UniqueId ec_id);
@@ -316,169 +316,177 @@
   // Configuration variable declaration
   // <rtc-template block="config_declare">
   /*!
-   * Config1の概要12345678901234567890123456789012345678901234567890123456789012
-   * 34567890
+   * ０１２３４５６７８９０１２３４５６７８９０１２３４５６７８９０
+   * １２３４５６７８９
    * - Name: Config1の名前 int_param0
    * - DefaultValue: 0
-   * - Unit: Config1の単位123456789012345678901234567890123456789012345678901234
-   *         5678901234567890
-   * - Range: Config1の範囲12345678901234567890123456789012345678901234567890123
-   *          45678901234567890
-   * - Constraint: Config1の制約条件12345678901234567890123456789012345678901234
-   *               56789012345678901234567890
+   * - Unit: 01234567890123456789０１２３４５01234567890123456789０
+   *         １２３４５01234567890123456789
+   * - Range: 0123456789012345678901234567890123456789 one two
+   *          three four five six
+   * - Constraint: Config1の制約条件123456789012345678901234567890
+   *               one two 1234567890 one two three four five six
    */
   int m_int_param0;
   /*!
-   * Config2の概要12345678901234567890123456789012345678901234567890123456789012
-   * 34567890
+   * Config2の概要123456789012345678901234567890123456789012345678
+   * 9012345678901234567890
    * - Name: Config2の名前 int_param1
    * - DefaultValue: 1
-   * - Unit: Config2の単位123456789012345678901234567890123456789012345678901234
-   *         5678901234567890
-   * - Range: Config2の範囲12345678901234567890123456789012345678901234567890123
-   *          45678901234567890
-   * - Constraint: Config2の制約条件12345678901234567890123456789012345678901234
-   *               56789012345678901234567890
+   * - Unit: Config2の単位
+   *         12345678901234567890123456789012345678901234567890123
+   *         45678901234567890 1234567890
+   * - Range: Config2の範囲123456789012345678901234567890123456789
+   *          0123456789012345678901234567890
+   * - Constraint: Config2の制約条件123456789012345678901234567890
+   *               1234567890123456789012345678901234567890
    */
   int m_int_param1;
   /*!
-   * Config3の概要12345678901234567890123456789012345678901234567890123456789012
-   * 34567890
+   * Config3の概要123456789012345678901234567890123456789012345678
+   * 9012345678901234567890
    * - Name: Config3の名前 double_param0
    * - DefaultValue: 0.11
-   * - Unit: Config3の単位123456789012345678901234567890123456789012345678901234
-   *         5678901234567890
-   * - Range: Config3の範囲12345678901234567890123456789012345678901234567890123
-   *          45678901234567890
-   * - Constraint: Config3の制約条件12345678901234567890123456789012345678901234
-   *               56789012345678901234567890
+   * - Unit: Config3の単位1234567890123456789012345678901234567890
+   *         123456789012345678901234567890
+   * - Range: Config3の範囲123456789012345678901234567890123456789
+   *          0123456789012345678901234567890
+   * - Constraint: Config3の制約条件123456789012345678901234567890
+   *               1234567890123456789012345678901234567890
    */
   double m_double_param0;
   /*!
-   * Config4の概要12345678901234567890123456789012345678901234567890123456789012
-   * 34567890
+   * Config4の概要123456789012345678901234567890123456789012345678
+   * 9012345678901234567890
    * - Name: Config4の名前 str_param0
    * - DefaultValue: hoge
-   * - Unit: Config4の単位123456789012345678901234567890123456789012345678901234
-   *         5678901234567890
-   * - Range: Config4の範囲12345678901234567890123456789012345678901234567890123
-   *          45678901234567890
-   * - Constraint: Config4の制約条件12345678901234567890123456789012345678901234
-   *               56789012345678901234567890
+   * - Unit: Config4の単位1234567890123456789012345678901234567890
+   *         123456789012345678901234567890
+   * - Range: Config4の範囲123456789012345678901234567890123456789
+   *          0123456789012345678901234567890
+   * - Constraint: Config4の制約条件123456789012345678901234567890
+   *               1234567890123456789012345678901234567890
    */
   std::string m_str_param0;
   /*!
-   * Config5の概要12345678901234567890123456789012345678901234567890123456789012
-   * 34567890
+   * Config5の概要123456789012345678901234567890123456789012345678
+   * 9012345678901234567890
    * - Name: Config5の名前 str_param1
    * - DefaultValue: dara
-   * - Unit: Config5の単位123456789012345678901234567890123456789012345678901234
-   *         5678901234567890
-   * - Range: Config5の範囲12345678901234567890123456789012345678901234567890123
-   *          45678901234567890
-   * - Constraint: Config5の制約条件12345678901234567890123456789012345678901234
-   *               56789012345678901234567890
+   * - Unit: Config5の単位1234567890123456789012345678901234567890
+   *         123456789012345678901234567890
+   * - Range: Config5の範囲123456789012345678901234567890123456789
+   *          0123456789012345678901234567890
+   * - Constraint: Config5の制約条件123456789012345678901234567890
+   *               1234567890123456789012345678901234567890
    */
   std::string m_str_param1;
+
   // </rtc-template>
 
   // DataInPort declaration
   // <rtc-template block="inport_declare">
-  TimedShort m_InName1;
+  RTC::TimedShort m_InName1;
   /*!
-   * InPort1の概要12345678901234567890123456789012345678901234567890123456789012
-   * 34567890
-   * - Type: InPort1のデータの型123456789012345678901234567890123456789012345678
-   *         9012345678901234567890
-   * - Number: InPort1のデータの数1234567890123456789012345678901234567890123456
-   *           789012345678901234567890
-   * - Semantics: InPort1のデータの意味12345678901234567890123456789012345678901
-   *              23456789012345678901234567890
-   * - Unit: InPort1のデータの単位1234567890123456789012345678901234567890123456
-   *         789012345678901234567890
-   * - Frequency: InPort1のデータの発生頻度1234567890123456789012345678901234567
-   *              890123456789012345678901234567890
-   * - Operation Cycle: InPort1のデータの処理周期1234567890123456789012345678901
-   *                    234567890123456789012345678901234567890
+   * InPort1の概要123456789012345678901234567890123456789012345678
+   * 9012345678901234567890
+   * - Type: InPort1のデータの型1234567890123456789012345678901234
+   *         567890123456789012345678901234567890
+   * - Number: InPort1のデータの数12345678901234567890123456789012
+   *           34567890123456789012345678901234567890
+   * - Semantics: InPort1のデータの意味123456789012345678901234567
+   *              8901234567890123456789012345678901234567890
+   * - Unit: InPort1のデータの単位12345678901234567890123456789012
+   *         34567890123456789012345678901234567890
+   * - Frequency: InPort1のデータの発生頻度12345678901234567890123
+   *              45678901234567890123456789012345678901234567890
+   * - Operation Cycle: InPort1のデータの処理周期12345678901234567
+   *                    890123456789012345678901234567890123456789
+   *                    01234567890
    */
-  InPort<TimedShort> m_InName1In;
-  TimedLong m_InNm2;
+  InPort<RTC::TimedShort> m_InName1In;
+  RTC::TimedLong m_InNm2;
   /*!
-   * InPort2の概要12345678901234567890123456789012345678901234567890123456789012
-   * 34567890
-   * - Type: InPort2のデータの型123456789012345678901234567890123456789012345678
-   *         9012345678901234567890
-   * - Number: InPort2のデータの数1234567890123456789012345678901234567890123456
-   *           789012345678901234567890
-   * - Semantics: InPort2のデータの意味12345678901234567890123456789012345678901
-   *              23456789012345678901234567890
-   * - Unit: InPort2のデータの単位1234567890123456789012345678901234567890123456
-   *         789012345678901234567890
-   * - Frequency: InPort2のデータの発生頻度1234567890123456789012345678901234567
-   *              890123456789012345678901234567890
-   * - Operation Cycle: InPort2のデータの処理周期1234567890123456789012345678901
-   *                    234567890123456789012345678901234567890
+   * InPort2の概要123456789012345678901234567890123456789012345678
+   * 9012345678901234567890
+   * - Type: InPort2のデータの型1234567890123456789012345678901234
+   *         567890123456789012345678901234567890
+   * - Number: InPort2のデータの数12345678901234567890123456789012
+   *           34567890123456789012345678901234567890
+   * - Semantics: InPort2のデータの意味123456789012345678901234567
+   *              8901234567890123456789012345678901234567890
+   * - Unit: InPort2のデータの単位12345678901234567890123456789012
+   *         34567890123456789012345678901234567890
+   * - Frequency: InPort2のデータの発生頻度12345678901234567890123
+   *              45678901234567890123456789012345678901234567890
+   * - Operation Cycle: InPort2のデータの処理周期12345678901234567
+   *                    890123456789012345678901234567890123456789
+   *                    01234567890
    */
-  InPort<TimedLong> m_InNm2In;
+  InPort<RTC::TimedLong> m_InNm2In;
   
   // </rtc-template>
 
 
   // DataOutPort declaration
   // <rtc-template block="outport_declare">
-  TimedLong m_OutName1;
+  RTC::TimedLong m_OutName1;
   /*!
-   * OutPort1の概要1234567890123456789012345678901234567890123456789012345678901
-   * 234567890
-   * - Type: OutPort1のデータの型12345678901234567890123456789012345678901234567
-   *         89012345678901234567890
-   * - Number: OutPort1のデータの数123456789012345678901234567890123456789012345
-   *           6789012345678901234567890
-   * - Semantics: OutPort1のデータの意味1234567890123456789012345678901234567890
-   *              123456789012345678901234567890
-   * - Unit: OutPort1のデータの単位123456789012345678901234567890123456789012345
-   *         6789012345678901234567890
-   * - Frequency: OutPort1のデータの発生頻度123456789012345678901234567890123456
-   *              7890123456789012345678901234567890
-   * - Operation Cycle: OutPort1のデータの処理周期123456789012345678901234567890
-   *                    1234567890123456789012345678901234567890
+   * OutPort1の概要12345678901234567890123456789012345678901234567
+   * 89012345678901234567890
+   * - Type: OutPort1のデータの型123456789012345678901234567890123
+   *         4567890123456789012345678901234567890
+   * - Number: OutPort1のデータの数1234567890123456789012345678901
+   *           234567890123456789012345678901234567890
+   * - Semantics: OutPort1のデータの意味12345678901234567890123456
+   *              78901234567890123456789012345678901234567890
+   * - Unit: OutPort1のデータの単位1234567890123456789012345678901
+   *         234567890123456789012345678901234567890
+   * - Frequency: OutPort1のデータの発生頻度1234567890123456789012
+   *              345678901234567890123456789012345678901234567890
+   * - Operation Cycle: OutPort1のデータの処理周期1234567890123456
+   *                    789012345678901234567890123456789012345678
+   *                    901234567890
    */
-  OutPort<TimedLong> m_OutName1Out;
-  TimedFloat m_OutNme2;
+  OutPort<RTC::TimedLong> m_OutName1Out;
+  RTC::TimedFloat m_OutNme2;
   /*!
-   * OutPort2の概要1234567890123456789012345678901234567890123456789012345678901
-   * 234567890
-   * - Type: OutPort2のデータの型12345678901234567890123456789012345678901234567
-   *         89012345678901234567890
-   * - Number: OutPort2のデータの数123456789012345678901234567890123456789012345
-   *           6789012345678901234567890
-   * - Semantics: OutPort2のデータの意味1234567890123456789012345678901234567890
-   *              123456789012345678901234567890
-   * - Unit: OutPort2のデータの単位123456789012345678901234567890123456789012345
-   *         6789012345678901234567890
-   * - Frequency: OutPort2のデータの発生頻度123456789012345678901234567890123456
-   *              7890123456789012345678901234567890
-   * - Operation Cycle: OutPort2のデータの処理周期123456789012345678901234567890
-   *                    1234567890123456789012345678901234567890
+   * OutPort2の概要12345678901234567890123456789012345678901234567
+   * 89012345678901234567890
+   * - Type: OutPort2のデータの型123456789012345678901234567890123
+   *         4567890123456789012345678901234567890
+   * - Number: OutPort2のデータの数1234567890123456789012345678901
+   *           234567890123456789012345678901234567890
+   * - Semantics: OutPort2のデータの意味12345678901234567890123456
+   *              78901234567890123456789012345678901234567890
+   * - Unit: OutPort2のデータの単位1234567890123456789012345678901
+   *         234567890123456789012345678901234567890
+   * - Frequency: OutPort2のデータの発生頻度1234567890123456789012
+   *              345678901234567890123456789012345678901234567890
+   * - Operation Cycle: OutPort2のデータの処理周期1234567890123456
+   *                    789012345678901234567890123456789012345678
+   *                    901234567890
    */
-  OutPort<TimedFloat> m_OutNme2Out;
+  OutPort<RTC::TimedFloat> m_OutNme2Out;
   
   // </rtc-template>
 
   // CORBA Port declaration
   // <rtc-template block="corbaport_declare">
   /*!
-   * ServicePort1の概要123456789012345678901234567890123456789012345678901234567
-   * 8901234567890
-   * Interface: ServicePort1のインターフェースの概要1234567890123456789012345678
-   *            901234567890123456789012345678901234567890
+   * ServicePort1の概要1234567890123456789012345678901234567890123
+   * 456789012345678901234567890
+   * Interface: ServicePort1のインターフェースの概要12345678901234
+   *            56789012345678901234567890123456789012345678901234
+   *            567890
    */
   RTC::CorbaPort m_svPortPort;
   /*!
-   * ServicePort2の概要123456789012345678901234567890123456789012345678901234567
-   * 8901234567890
-   * Interface: ServicePort2のインターフェースの概要1234567890123456789012345678
-   *            901234567890123456789012345678901234567890
+   * ServicePort2の概要1234567890123456789012345678901234567890123
+   * 456789012345678901234567890
+   * Interface: ServicePort2のインターフェースの概要12345678901234
+   *            56789012345678901234567890123456789012345678901234
+   *            567890
    */
   RTC::CorbaPort m_cmPortPort;
   
@@ -487,18 +495,20 @@
   // Service declaration
   // <rtc-template block="service_declare">
   /*!
-   * ServiceIF1の概要説明1234567890123456789012345678901234567890123456789012345
-   * 678901234567890
-   * - Argument:      ServiceIF1の引数123456789012345678901234567890123456789012
-   *                  3456789012345678901234567890
-   * - Return Value:  ServiceIF1の返値123456789012345678901234567890123456789012
-   *                  3456789012345678901234567890
-   * - Exception:     ServiceIF1の例外123456789012345678901234567890123456789012
-   *                  3456789012345678901234567890
-   * - PreCondition:  ServiceIF1の事前条件12345678901234567890123456789012345678
-   *                  90123456789012345678901234567890
-   * - PostCondition: ServiceIF1の事後条件12345678901234567890123456789012345678
-   *                  90123456789012345678901234567890
+   * ServiceIF1の概要説明12345678901234567890123456789012345678901
+   * 23456789012345678901234567890
+   * - Argument:      ServiceIF1の引数1234567890123456789012345678
+   *                  901234567890123456789012345678901234567890
+   * - Return Value:  ServiceIF1の返値1234567890123456789012345678
+   *                  901234567890123456789012345678901234567890
+   * - Exception:     ServiceIF1の例外1234567890123456789012345678
+   *                  901234567890123456789012345678901234567890
+   * - PreCondition:  ServiceIF1の事前条件123456789012345678901234
+   *                  56789012345678901234567890123456789012345678
+   *                  90
+   * - PostCondition: ServiceIF1の事後条件123456789012345678901234
+   *                  56789012345678901234567890123456789012345678
+   *                  90
    */
   MyServiceSVC_impl m_acc;
   
@@ -507,18 +517,20 @@
   // Consumer declaration
   // <rtc-template block="consumer_declare">
   /*!
-   * ServiceIF2の概要説明1234567890123456789012345678901234567890123456789012345
-   * 678901234567890
-   * - Argument:      ServiceIF2の引数123456789012345678901234567890123456789012
-   *                  3456789012345678901234567890
-   * - Return Value:  ServiceIF2の返値123456789012345678901234567890123456789012
-   *                  3456789012345678901234567890
-   * - Exception:     ServiceIF2の例外123456789012345678901234567890123456789012
-   *                  3456789012345678901234567890
-   * - PreCondition:  ServiceIF2の事前条件12345678901234567890123456789012345678
-   *                  90123456789012345678901234567890
-   * - PostCondition: ServiceIF2の事後条件12345678901234567890123456789012345678
-   *                  90123456789012345678901234567890
+   * ServiceIF2の概要説明12345678901234567890123456789012345678901
+   * 23456789012345678901234567890
+   * - Argument:      ServiceIF2の引数1234567890123456789012345678
+   *                  901234567890123456789012345678901234567890
+   * - Return Value:  ServiceIF2の返値1234567890123456789012345678
+   *                  901234567890123456789012345678901234567890
+   * - Exception:     ServiceIF2の例外1234567890123456789012345678
+   *                  901234567890123456789012345678901234567890
+   * - PreCondition:  ServiceIF2の事前条件123456789012345678901234
+   *                  56789012345678901234567890123456789012345678
+   *                  90
+   * - PostCondition: ServiceIF2の事後条件123456789012345678901234
+   *                  56789012345678901234567890123456789012345678
+   *                  90
    */
   RTC::CorbaConsumer<DAQService> m_rate;
   

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/fooComp.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/fooComp.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/fooComp.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -4,11 +4,11 @@
  * @brief Standalone component
  * @date $Date$
  *
- * @author Noriaki Ando <n-ando at aist.go.jp>3456789412345678951234567896123456789
- * 7123456789812345
+ * @author Noriaki Ando <n-ando at aist.go.jp> one two three four
+ * five six seven eight nine ten
  *
- * Copyright (C) 2006-2008 ライセンス1234567890123456789012345678901234567890123
- * 4567890
+ * Copyright (C) 2006-2008
+ * ライセンス12345678901234567890123456789012345678901234567890
  *
  * $Id$
  */

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ExecutionCxt/foo.conf
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ExecutionCxt/foo.conf	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ExecutionCxt/foo.conf	2013-01-29 10:39:20 UTC (rev 394)
@@ -0,0 +1,139 @@
+# -*- sh -*-
+#------------------------------------------------------------
+# Configuration file for foo
+#
+# This configuration file name should be specified in rtc.conf (or other
+# configuration file specified by -f option) by "config_file" property.
+#
+# manip2.foo.config_file: foo.conf
+# or
+# manip2.foo0.config_file: foo0.conf
+# manip2.foo1.config_file: foo1.conf
+# manip2.foo2.config_file: foo2.conf
+#
+# ------------------------------------------------------------
+# An example configuration file for foo
+#
+# See details in the following reference manual
+#
+
+# Execution context configuration
+# exec_cxt.periodic.type: PeriodicExecutionContext
+# exec_cxt.periodic.rate: 1000
+#
+#
+# configuration.active_config: mode0
+
+# Additional configuration-set example named "mode0"
+#
+# conf.mode0.int_param0: 0
+# conf.mode0.int_param1: 1
+# conf.mode0.double_param0: 0.99
+# conf.mode0.double_param1: -0.99
+# conf.mode0.str_param0: default
+# conf.mode0.str_param1: default set in conf file
+# conf.mode0.vector_param0: 0.0,0.1,0.2,0.3,0.4,0.5,0.6
+#
+# Other configuration set named "mode1"
+#
+# conf.mode1.int_param0: 0
+# conf.mode1.int_param1: 1
+# conf.mode1.double_param0: 0.99
+# conf.mode1.double_param1: -0.99
+# conf.mode1.str_param0: default
+# conf.mode1.str_param1: default set in conf file
+# conf.mode1.vector_param0: 0.0,0.1,0.2,0.3,0.4,0.5,0.6
+
+
+
+
+
+##============================================================
+## Component configuration reference
+##
+
+##============================================================
+## Active configuration-set
+##============================================================
+##
+## Initial active configuration-set. The following "mode0" is a
+## configuration-set name.  A configuration-set named "mode0" should be
+## appear in this configuration file as follows.
+##
+## configuration.active_config: mode0
+##
+# conf.mode0.param0: hoge
+# conf.mode0.param1: fuga
+# conf.mode0.param2: munya
+
+##============================================================
+## GUI control option for RTSystemEditor
+##============================================================
+## Available GUI control options [__widget__]:
+##
+## - text:          text box [default].
+## - slider.<step>: Horizontal slider. <step> is step for the slider.
+##                  A range constraints option is required. 
+## - spin:          Spin button. A range constraitns option is required.
+## - radio:         Radio button. An enumeration constraints is required.
+## - checkbox:      Checkbox control. An enumeration constraints is
+##                  required. The parameter has to be able to accept a
+##                  comma separated list.
+## - orderd_list:   Orderd list control.  An enumeration constraint is
+##                  required. The parameter has to be able to accept a
+##                  comma separated list. In this control, Enumerated
+##                  elements can appear one or more times in the given list.
+##
+## Available GUI control constraint options [__constraints__]:
+##
+## - none:         blank
+## - direct value: 100 (constant value)
+## - range:        <, >, <=, >= can be used.
+## - enumeration:  (enum0, enum1, ...)
+## - array:        <constraints0>, ,constraints1>, ... for only array value
+## - hash:         {key0: value0, key1:, value0, ...}
+##
+## examples:
+# conf.__widget__.int_param0: slider.10
+# conf.__widget__.int_param1: spin
+# conf.__widget__.double_param0: slider.10
+# conf.__widget__.double_param1: text
+# conf.__widget__.str_param0: radio
+# conf.__widget__.vector_param0: checkbox
+# conf.__widget__.vector_param1: orderd_list
+
+
+# conf.__constraints__.int_param0: 0<=x<=150
+# conf.__constraints__.int_param1: 0<=x<=1000
+# conf.__constraints__.double_param0: 0<=x<=100
+# conf.__constraints__.double_param1:
+# conf.__constraints__.str_param0: (default,mode0,mode1)
+# conf.__constraints__.vector_param0: (dog,monky,pheasant,cat)
+# conf.__constraints__.vector_param1: (pita,gora,switch)
+
+##============================================================
+## Execution context settings
+##============================================================
+##
+## Periodic type ExecutionContext
+##
+## Other availabilities in OpenRTM-aist
+##
+## - ExtTrigExecutionContext: External triggered EC. It is embedded in
+##                            OpenRTM library.
+## - OpenHRPExecutionContext: External triggred paralell execution
+##                            EC. It is embedded in OpenRTM
+##                            library. This is usually used with
+##                            OpenHRP3.
+## - RTPreemptEC:             Real-time execution context for Linux
+##                            RT-preemptive pathed kernel.
+## - ArtExecutionContext:     Real-time execution context for ARTLinux
+##                            (http://sourceforge.net/projects/art-linux/)
+##
+# exec_cxt.periodic.type: PeriodicExecutionContext
+
+##
+## The execution cycle of ExecutionContext
+##
+exec_cxt.periodic.rate:5.0
+

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ExecutionCxt/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ExecutionCxt/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ExecutionCxt/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -80,8 +80,8 @@
   bindParameter("double_param0", m_varname2, "0.11");
   bindParameter("str_param0", m_str_param0, "hoge");
   bindParameter("str_param1", m_varname3, "dara");
+  // </rtc-template>
   
-  // </rtc-template>
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ExecutionCxt/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ExecutionCxt/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ExecutionCxt/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -253,6 +253,7 @@
    * - DefaultValue: dara
    */
   std::string m_varname3;
+
   // </rtc-template>
 
   // DataInPort declaration

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ExecutionCxt/rtc.conf
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ExecutionCxt/rtc.conf	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ExecutionCxt/rtc.conf	2013-01-29 10:39:20 UTC (rev 394)
@@ -1 +1,437 @@
-exec_cxt.periodic.rate:5.0
+#------------------------------------------------------------
+# RT-Component manager configuration
+#
+# See details in the following reference manual or web page.
+# http://www.openrtm.org/openrtm/en/content/configuration
+# http://www.openrtm.org/openrtm/ja/content/rtcconf%E8%A8%AD%E5%AE%9A%E9%A0%85%E7%9B%AE%E4%B8%80%E8%A6%A7
+# http://www.openrtm.org/openrtm/ko/content/rtcconf-%EC%84%A4%EC%A0%95-%ED%95%AD%EB%AA%A9-%EC%9D%BC%EB%9E%8C
+#
+
+#------------------------------------------------------------
+# Typically used configuration parameters
+#
+# corba.name_servers: localhost, 192.168.0.1
+# corba.endpoints: <interface addess>, <interface addess>
+# logger.enable: YES
+# logger.file_name: ./rtc%p.log
+# logger.log_level: NORMAL
+#
+# The following properties should be specified in component specific
+# configuration files.
+# exec_cxt.periodic.type: PeriodicExecutionContext
+# exec_cxt.periodic.rate: 1000
+
+# Component specific configruation files:
+# If you want to load component specific configuration file, please
+# uncomment the following line.
+#
+# manip2.foo.config_file: foo.conf
+# or
+# manip2.foo0.config_file: foo0.conf
+# manip2.foo1.config_file: foo1.conf
+# manip2.foo2.config_file: foo2.conf
+#
+#------------------------------------------------------------
+
+manip2.foo.config_file: foo.conf
+
+#
+# Please delete the following part if you are familiar with OpenRTM's
+# configuration parameters.
+#
+##----------------------------------------------------------------------
+##
+## RT-Component manager configurations
+##
+##----------------------------------------------------------------------
+
+##------------------------------------------------------------
+## Configuration version (optional) 
+##
+# config.version: 1.0
+
+##------------------------------------------------------------
+## OpenRTM-aist version (optional)
+##
+# openrtm.version: 1.0.0
+
+##------------------------------------------------------------
+## The name of manager (default = manager)
+##
+# manager.name: manager
+
+##------------------------------------------------------------
+## Master manager
+## - manager.is_master: YES/NO, This process made a master or not.
+## - manager.corba_servant: YES/NO, create manager's corba service or not
+## - corba.master_manager: <host_name>:<port>, master manager's location
+# manager.is_master: YES
+# manager.corba_servant: YES
+# corba.master_manager: localhost:2810
+
+##------------------------------------------------------------
+## Manager auto shutdown options
+## - manager.shutdown_on_nortcs: YES/NO, 
+##   process will be shutdown in case no rtc exists when rtc is deleted.
+## - manager.shutdown_auto:
+##   process will be shutdown in case no rtc exists on periodic check.
+# manager.shutdown_on_nortcs: YES
+# manager.shutdown_auto: YES
+# manager.auto_shutdown_duration: 10.0
+
+##============================================================
+## CORBA configuration
+##============================================================
+##
+## CORBA ORB's arguments
+##
+## ORB specific command line options given to ORB_init().
+## See your ORB documentation.
+##
+## Example:
+##   corba.args: -ORBInitialHost myhost -ORBInitialPort 8888
+##
+##
+# corba.args:
+
+##
+## ORB endpoint
+##
+## If you have two or more network interfaces, ORB endpoint address and/or
+## port have to be specified. If hostname or port number is abbreviated,
+## default interface or port number is used. At least one colon ':'
+## is needed when you specify this option.
+##
+## Examples:
+##   corba.endpoint: myhost:      (use myhost and default port)
+##   corba.endpoint: :9876        (use default addr and port 9876)
+##   corba.endpoint: myhost:9876  (use myhost and port 9876)
+##
+# corba.endpoint:
+
+##
+## Multiple endpoint options (experimental)
+##
+## Multiple endpoint addresses and ports can be specified using this option.
+##
+## Example:
+##   corba.endpoints: 192.168.1.10:1111, 192.168.10.11:2222
+##   corba.endpoints: 192.168.1.10, 192.168.10.11
+##   corba.endpoints: all
+##
+# corba.endpoints:
+
+
+##
+## CORBA name server setting
+##
+## Multiple name servers can be specified separating by comma.
+## If port number is abbreviated, default port number is used.
+## The default port number is depend on ORB implementation.
+##
+## Examples:
+##   corba.nameservers: openrtm.aist.go.jp:9876
+##   corba.nameservers: rtm0.aist.go.jp, rtm1.aist.go.jp, rtm2.aist.go.jp
+##
+# corba.nameservers: localhost
+
+##
+## IOR host address replacement by guessed endpoint from routing (experimental)
+##
+## This option replaces a host address with an endpoint that is guessed
+## by route information to nameserver's address. This option may be
+## effective for CORBA implementation that does not supports IOR's
+## multiple profile or alternate IIOP address. However, since other
+## object references that are obtained from RT-Components or other are
+## not modified by this rule, other RTCs that are connected to this RTC
+## have to also support IOR multiple profile feature.  When this option
+## is used, corba.endpoints option should also be specified with
+## multiple endpoints.
+##
+# corba.nameservice.replace_endpoint: NO
+
+##
+## IOR alternate IIOP addresses
+##
+## This option adds alternate IIOP addresses into the IOR Profiles.
+## IOR can include additional endpoints for a servant. It is almost
+## same as "corba.endpoints" option, but this option does not create
+## actual endpoint on the ORB. (corba.endpoints try to create actual
+## endpoint, and if it cannot be created, error will be returned.)
+## This option just add alternate IIOP endpoint address information to
+## an IOR.
+##
+## This option can be used when RTCs are located inside of NAT or
+## router.  Generally speaking, RTCs in a private network cannot
+## connect to RTCs in the global network, because global client cannot
+## reach to private servants. However, if route (or NAT) is properly
+## configured for port forwarding, global RTCs can reach to RTCs in
+## private network.
+##
+## A setting example is as follows.
+## 1) Configure your router properly for port-forwarding.
+##    ex. global 2810 port is forwarded to private 2810
+## 2) Set the following options in rtc.conf
+##  corba.nameservers: my.global.nameserver.com <- name server in global network
+##  corba.endpoints: :2810 <- actual port number
+##  corba.additional_ior_addresses: w.x.y.z:2810 <- routers global IP addr/port
+## 3) Launch global RTCs and private RTC, and connect them.
+##
+# corba.alternate_iiop_addresses: addr:port
+
+##============================================================
+## Naming configurations
+##============================================================
+##
+## Enable/Disable naming functions
+##
+# naming.enable: YES
+
+##
+## Naming Types
+##
+## Now only "corba" is supported.
+##
+# naming.type: corba
+
+##
+## Naming format
+##
+## The name format of components that is bound to naming services.
+## The delimiter between names is "/".
+## The delimiter between name and kind is ".".
+##
+## example: (OpenRTM-aist-0.2.0 style)
+##       %h.host_cxt/%M.mgr_cxt/%c.cat_cxt/%m.mod_cxt/%n.rtc
+## This is formatted according to the following replacement rules.
+##
+## %n: The instance name of the component.
+## %t: The type name of the component.
+## %m: The module name of the component.
+## %v: The version of the component.
+## %V: The component vendor.
+## %c: The category of the component.
+## %h: The hostname.
+## %M: The manager name.
+## %p: PID of the manager.
+##
+# naming.formats: %h.host/%n.rtc
+
+##
+## Auto update to Naming Server
+##
+# naming.update.enable: YES
+##
+## Update interval [s] for auto update
+##
+# naming.update.interval: 10.0
+##
+## Rebind references in auto update
+##
+# naming.update.rebind: NO
+
+## End of Naming configuration section
+##------------------------------------------------------------
+
+##============================================================
+## Module management
+##============================================================
+##
+## Loadable module search path list
+##
+## Manager searches loadable modules from the specified search path list.
+## Path list elements should be separated by comma.
+## Path delimiter is '/' on UNIX, and '\\' on Windows
+## Valid path examples:
+##   manager.modules.load_path: C:/Program Files/OpenRTM-aist,  \
+##   			       C:\\Program Files\\OpenRTM-aist
+##   manager.modules.load_path: /usr/lib, /usr/local/lib,       \
+##   			       /usr/local/lib/OpenRTM-aist/libs
+##
+# manager.modules.load_path: ./
+
+##
+## Preload module list
+##
+## Manager can load loadable modules before starting up.
+## Loadable modules, which is specified only as its file name, is searched
+## in each module load path specified in the "manager.modules.load_path".
+## If the "manager.modules.abs_path_allowed" option is YES, loadable file
+## can be specified as full-path name,
+##
+## Valid settings:
+## manager.modules.preload: ConsoleIn.dll, ConsoleOut.dll
+## manager.modules.preload: ConsoleIn.so, ConsoleOut.so
+## manager.modules.abs_path_allowed: YES
+## manager.modules.preload: /usr/lib/OpenRTM-aist/ConsoleIn.so
+##
+# manager.modules.preload:
+
+##
+## Permission flag of absolute module path
+##
+## If this option is "YES", absolute path specification for module is allowed.
+##
+# manager.modules.abs_path_allowed: YES
+
+##
+## The following options are not implemented yet. 
+##
+## manager.modules.config_ext:
+## manager.modules.config_path:
+## manager.modules.detect_loadable:
+## manager.modules.init_func_suffix:
+## manager.modules.init_func_prefix:
+## manager.modules.download_allowed:
+## manager.modules.download_dir:
+## manager.modules.download_cleanup:
+##
+
+##
+## Advance component creation
+##
+## This option specifies components' names (module name) creating in advance
+## before starting the manager's event-loop. The components' factories should
+## be registered by manager.module.preload option or statically linked to the
+##  manager.
+##
+## Example:
+## manager.components.precreate: ConsoleIn, ConsoleOut, SeqIn, SeqOut
+##
+# manager.components.precreate: 
+
+
+##============================================================
+## Logger configurations
+##============================================================
+##
+## Enable/Disable logger [YES/NO]
+# logger.enable: YES
+
+##
+## Log file name (default = ./rtc%p.log)
+##
+## %p: PID
+##
+# logger.file_name: ./rtc%p.log
+
+##
+## Log date format (default = %b %d %H:%M:%S)
+##
+## The following strftime(3) like format expression is available.
+## If no prefix is needed, use "No" or "Disable".
+## 
+## %a abbreviated weekday name 
+## %A full weekday name 
+## %b abbreviated month name 
+## %B full month name 
+## %c the standard date and time string 
+## %d day of the month, as a number (1-31) 
+## %H hour, 24 hour format (0-23) 
+## %I hour, 12 hour format (1-12) 
+## %j day of the year, as a number (1-366) 
+## %m month as a number (1-12).
+##    Note: some versions of Microsoft Visual C++ may use values that range
+##    from 0-11. 
+## %M minute as a number (0-59) 
+## %p locale's equivalent of AM or PM 
+## %Q millisecond as a number (0-999) from ver 1.1
+## %q microsecond as a number (0-999) from ver 1.1
+## %S second as a number (0-59) 
+## %U week of the year, sunday as the first day 
+## %w weekday as a decimal (0-6, sunday=0) 
+## %W week of the year, monday as the first day 
+## %x standard date string 
+## %X standard time string 
+## %y year in decimal, without the century (0-99) 
+## %Y year in decimal, with the century 
+## %Z time zone name 
+## %% a percent sign 
+##  
+##
+## logger.date_format: No
+## logger.date_format: Disable
+## logger.date_format: [%Y-%m-%dT%H.%M.%S%Z]     // W3C standard format
+## logger.date_format: [%b %d %H:%M:%S]          // Syslog format
+## logger.date_format: [%a %b %d %Y %H:%M:%S %Z] // RFC2822 format
+## logger.date_format: [%a %b %d %H:%M:%S %Z %Y] // data command format
+## logger.date_format: [%Y-%m-%d %H.%M.%S]
+##
+# logger.date_format: %b %d %H:%M:%S
+
+##
+## Log level (default = NORMAL)
+##
+## The following LogLevels are allowed.
+## SILENT, ERROR, WARN, NORMAL, INFO, DEBUG, TRACE, VERBOSE, PARANOID
+##
+##
+## SILENT  : completely silent
+## ERROR   : includes (ERROR)
+## WARN    : includes (ERROR, WARN)
+## INFO    : includes (ERROR, WARN, INFO)
+## NORMAL  : includes (ERROR, WARN, INFO, NORMAL)
+## DEBUG   : includes (ERROR, WARN, INFO, NORMAL, DEBUG)
+## TRACE   : includes (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE)
+## VERBOSE : includes (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE, VERBOSE)
+## PARANOID: includes (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE, VERBOSE, PARA)
+##
+## Warning!!!
+## "TRACE", "VERBOSE", "PARANOID" logging level will create a huge log file!!
+## "PARANOID" log level will tangle the log file.
+##
+# logger.log_level: NORMAL
+
+##============================================================
+## Timer configuration
+##============================================================
+##
+## Enable/disable timer function
+##
+# timer.enable: YES
+
+##
+## Timer clock tick setting [s]
+##
+# timer.tick: 0.1
+
+##============================================================
+## Execution context settings
+##============================================================
+##
+## Periodic type ExecutionContext
+##
+## Other availabilities in OpenRTM-aist
+##
+## - ExtTrigExecutionContext: External triggered EC. It is embedded in
+##                            OpenRTM library.
+## - OpenHRPExecutionContext: External triggred paralell execution
+##                            EC. It is embedded in OpenRTM
+##                            library. This is usually used with
+##                            OpenHRP3.
+## - RTPreemptEC:             Real-time execution context for Linux
+##                            RT-preemptive pathed kernel.
+## - ArtExecutionContext:     Real-time execution context for ARTLinux
+##                            (http://sourceforge.net/projects/art-linux/)
+##
+# exec_cxt.periodic.type: PeriodicExecutionContext
+
+##
+## The execution cycle of ExecutionContext
+##
+# exec_cxt.periodic.rate: 1000
+
+##============================================================
+## SDO service settings
+##============================================================
+##
+## SDO service provider settings
+##
+# sdo.service.provider.available_services: [read only]
+# sdo.service.provider.enabled_services: ALL
+# sdo.service.provider.providing_services: [read only]
+##
+## SDO service consumer settings
+##
+# sdo.service.consumer.available_services: [read only]
+# sdo.service.consumer.enabled_services: ALL

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ConMulti/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ConMulti/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ConMulti/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -75,6 +75,9 @@
   
   // </rtc-template>
 
+  // <rtc-template block="bind_config">
+  // </rtc-template>
+  
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ConMulti/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ConMulti/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ConMulti/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -223,6 +223,11 @@
   
   // </rtc-template>
 
+  // Configuration variable declaration
+  // <rtc-template block="config_declare">
+
+  // </rtc-template>
+
   // DataInPort declaration
   // <rtc-template block="inport_declare">
   TimedShort m_in1;

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProConMulti/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProConMulti/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProConMulti/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -81,6 +81,9 @@
   
   // </rtc-template>
 
+  // <rtc-template block="bind_config">
+  // </rtc-template>
+  
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProConMulti/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProConMulti/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProConMulti/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -224,6 +224,11 @@
   
   // </rtc-template>
 
+  // Configuration variable declaration
+  // <rtc-template block="config_declare">
+
+  // </rtc-template>
+
   // DataInPort declaration
   // <rtc-template block="inport_declare">
   TimedShort m_in1;

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProMulti/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProMulti/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProMulti/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -75,6 +75,9 @@
   
   // </rtc-template>
 
+  // <rtc-template block="bind_config">
+  // </rtc-template>
+  
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProMulti/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProMulti/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProMulti/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -223,6 +223,11 @@
   
   // </rtc-template>
 
+  // Configuration variable declaration
+  // <rtc-template block="config_declare">
+
+  // </rtc-template>
+
   // DataInPort declaration
   // <rtc-template block="inport_declare">
   TimedShort m_in1;

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confprefix/DAQService.idl
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confprefix/DAQService.idl	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confprefix/DAQService.idl	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,7 +1,7 @@
 // -*- IDL -*-
 /*!
  * @file RTCService.idl
- * @brief RTComponent ƒT[ƒrƒXƒCƒ“ƒ^[ƒtƒF[ƒX
+ * @brief RTComponent サービスインターフェース
  * @date $Date: 2007/03/14 12:14:35 $
  * @author Noriaki Ando <n-ando at aist.go.jp>
  *
@@ -20,7 +20,7 @@
 /*
  * $Log: DAQService.idl,v $
  * Revision 1.1  2007/03/14 12:14:35  tsakamoto
- * ‘®«¶¬”Å
+ * 属性生成版
  *
  * Revision 1.1  2005/09/07 05:06:13  n-ando
  * RTComponent's service management feature was added.

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confprefix/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confprefix/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confprefix/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -86,8 +86,8 @@
   // <rtc-template block="bind_config">
   // Bind variables and configuration variable
   bindParameter("int_param0", p_cpint_param0_s, "0");
+  // </rtc-template>
   
-  // </rtc-template>
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confprefix/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confprefix/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confprefix/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -231,32 +231,33 @@
    * - DefaultValue: 0
    */
   int p_cpint_param0_s;
+
   // </rtc-template>
 
   // DataInPort declaration
   // <rtc-template block="inport_declare">
-  TimedShort p_dtInP1ds_s;
+  RTC::TimedShort p_dtInP1ds_s;
   /*!
    */
-  InPort<TimedShort> p_dtInP1Inds_s;
-  TimedLong p_dtInP2ds_s;
+  InPort<RTC::TimedShort> p_dtInP1Inds_s;
+  RTC::TimedLong p_dtInP2ds_s;
   /*!
    */
-  InPort<TimedLong> p_dtInP2Inds_s;
+  InPort<RTC::TimedLong> p_dtInP2Inds_s;
   
   // </rtc-template>
 
 
   // DataOutPort declaration
   // <rtc-template block="outport_declare">
-  TimedOctet p_dtOutP1ds_s;
+  RTC::TimedOctet p_dtOutP1ds_s;
   /*!
    */
-  OutPort<TimedOctet> p_dtOutP1Outds_s;
-  TimedFloat p_dtOutP2ds_s;
+  OutPort<RTC::TimedOctet> p_dtOutP1Outds_s;
+  RTC::TimedFloat p_dtOutP2ds_s;
   /*!
    */
-  OutPort<TimedFloat> p_dtOutP2Outds_s;
+  OutPort<RTC::TimedFloat> p_dtOutP2Outds_s;
   
   // </rtc-template>
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confsuffix/DAQService.idl
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confsuffix/DAQService.idl	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confsuffix/DAQService.idl	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,7 +1,7 @@
 // -*- IDL -*-
 /*!
  * @file RTCService.idl
- * @brief RTComponent ƒT[ƒrƒXƒCƒ“ƒ^[ƒtƒF[ƒX
+ * @brief RTComponent サービスインターフェース
  * @date $Date: 2007/03/14 12:14:35 $
  * @author Noriaki Ando <n-ando at aist.go.jp>
  *
@@ -20,7 +20,7 @@
 /*
  * $Log: DAQService.idl,v $
  * Revision 1.1  2007/03/14 12:14:35  tsakamoto
- * ‘®«¶¬”Å
+ * 属性生成版
  *
  * Revision 1.1  2005/09/07 05:06:13  n-ando
  * RTComponent's service management feature was added.

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confsuffix/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confsuffix/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confsuffix/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -86,8 +86,8 @@
   // <rtc-template block="bind_config">
   // Bind variables and configuration variable
   bindParameter("int_param0", p_cpint_param0cs_s, "0");
+  // </rtc-template>
   
-  // </rtc-template>
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confsuffix/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confsuffix/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confsuffix/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -231,32 +231,33 @@
    * - DefaultValue: 0
    */
   int p_cpint_param0cs_s;
+
   // </rtc-template>
 
   // DataInPort declaration
   // <rtc-template block="inport_declare">
-  TimedShort p_dtInP1ds_s;
+  RTC::TimedShort p_dtInP1ds_s;
   /*!
    */
-  InPort<TimedShort> p_dtInP1Inds_s;
-  TimedLong p_dtInP2ds_s;
+  InPort<RTC::TimedShort> p_dtInP1Inds_s;
+  RTC::TimedLong p_dtInP2ds_s;
   /*!
    */
-  InPort<TimedLong> p_dtInP2Inds_s;
+  InPort<RTC::TimedLong> p_dtInP2Inds_s;
   
   // </rtc-template>
 
 
   // DataOutPort declaration
   // <rtc-template block="outport_declare">
-  TimedOctet p_dtOutP1ds_s;
+  RTC::TimedOctet p_dtOutP1ds_s;
   /*!
    */
-  OutPort<TimedOctet> p_dtOutP1Outds_s;
-  TimedFloat p_dtOutP2ds_s;
+  OutPort<RTC::TimedOctet> p_dtOutP1Outds_s;
+  RTC::TimedFloat p_dtOutP2ds_s;
   /*!
    */
-  OutPort<TimedFloat> p_dtOutP2Outds_s;
+  OutPort<RTC::TimedFloat> p_dtOutP2Outds_s;
   
   // </rtc-template>
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtprefix/DAQService.idl
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtprefix/DAQService.idl	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtprefix/DAQService.idl	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,7 +1,7 @@
 // -*- IDL -*-
 /*!
  * @file RTCService.idl
- * @brief RTComponent ƒT[ƒrƒXƒCƒ“ƒ^[ƒtƒF[ƒX
+ * @brief RTComponent サービスインターフェース
  * @date $Date: 2007/03/14 12:14:35 $
  * @author Noriaki Ando <n-ando at aist.go.jp>
  *
@@ -20,7 +20,7 @@
 /*
  * $Log: DAQService.idl,v $
  * Revision 1.1  2007/03/14 12:14:35  tsakamoto
- * ‘®«¶¬”Å
+ * 属性生成版
  *
  * Revision 1.1  2005/09/07 05:06:13  n-ando
  * RTComponent's service management feature was added.

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtprefix/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtprefix/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtprefix/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -86,8 +86,8 @@
   // <rtc-template block="bind_config">
   // Bind variables and configuration variable
   bindParameter("int_param0", p_int_param0_s, "0");
+  // </rtc-template>
   
-  // </rtc-template>
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtprefix/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtprefix/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtprefix/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -231,32 +231,33 @@
    * - DefaultValue: 0
    */
   int p_int_param0_s;
+
   // </rtc-template>
 
   // DataInPort declaration
   // <rtc-template block="inport_declare">
-  TimedShort p_dtInP1_s;
+  RTC::TimedShort p_dtInP1_s;
   /*!
    */
-  InPort<TimedShort> p_dtInP1In_s;
-  TimedLong p_dtInP2_s;
+  InPort<RTC::TimedShort> p_dtInP1In_s;
+  RTC::TimedLong p_dtInP2_s;
   /*!
    */
-  InPort<TimedLong> p_dtInP2In_s;
+  InPort<RTC::TimedLong> p_dtInP2In_s;
   
   // </rtc-template>
 
 
   // DataOutPort declaration
   // <rtc-template block="outport_declare">
-  TimedOctet p_dtOutP1_s;
+  RTC::TimedOctet p_dtOutP1_s;
   /*!
    */
-  OutPort<TimedOctet> p_dtOutP1Out_s;
-  TimedFloat p_dtOutP2_s;
+  OutPort<RTC::TimedOctet> p_dtOutP1Out_s;
+  RTC::TimedFloat p_dtOutP2_s;
   /*!
    */
-  OutPort<TimedFloat> p_dtOutP2Out_s;
+  OutPort<RTC::TimedFloat> p_dtOutP2Out_s;
   
   // </rtc-template>
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtsuffix/DAQService.idl
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtsuffix/DAQService.idl	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtsuffix/DAQService.idl	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,7 +1,7 @@
 // -*- IDL -*-
 /*!
  * @file RTCService.idl
- * @brief RTComponent ƒT[ƒrƒXƒCƒ“ƒ^[ƒtƒF[ƒX
+ * @brief RTComponent サービスインターフェース
  * @date $Date: 2007/03/14 12:14:35 $
  * @author Noriaki Ando <n-ando at aist.go.jp>
  *
@@ -20,7 +20,7 @@
 /*
  * $Log: DAQService.idl,v $
  * Revision 1.1  2007/03/14 12:14:35  tsakamoto
- * ‘®«¶¬”Å
+ * 属性生成版
  *
  * Revision 1.1  2005/09/07 05:06:13  n-ando
  * RTComponent's service management feature was added.

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtsuffix/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtsuffix/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtsuffix/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -86,8 +86,8 @@
   // <rtc-template block="bind_config">
   // Bind variables and configuration variable
   bindParameter("int_param0", p_int_param0_s, "0");
+  // </rtc-template>
   
-  // </rtc-template>
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtsuffix/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtsuffix/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtsuffix/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -231,32 +231,33 @@
    * - DefaultValue: 0
    */
   int p_int_param0_s;
+
   // </rtc-template>
 
   // DataInPort declaration
   // <rtc-template block="inport_declare">
-  TimedShort p_dtInP1ds_s;
+  RTC::TimedShort p_dtInP1ds_s;
   /*!
    */
-  InPort<TimedShort> p_dtInP1Inds_s;
-  TimedLong p_dtInP2ds_s;
+  InPort<RTC::TimedShort> p_dtInP1Inds_s;
+  RTC::TimedLong p_dtInP2ds_s;
   /*!
    */
-  InPort<TimedLong> p_dtInP2Inds_s;
+  InPort<RTC::TimedLong> p_dtInP2Inds_s;
   
   // </rtc-template>
 
 
   // DataOutPort declaration
   // <rtc-template block="outport_declare">
-  TimedOctet p_dtOutP1ds_s;
+  RTC::TimedOctet p_dtOutP1ds_s;
   /*!
    */
-  OutPort<TimedOctet> p_dtOutP1Outds_s;
-  TimedFloat p_dtOutP2ds_s;
+  OutPort<RTC::TimedOctet> p_dtOutP1Outds_s;
+  RTC::TimedFloat p_dtOutP2ds_s;
   /*!
    */
-  OutPort<TimedFloat> p_dtOutP2Outds_s;
+  OutPort<RTC::TimedFloat> p_dtOutP2Outds_s;
   
   // </rtc-template>
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/prefix/DAQService.idl
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/prefix/DAQService.idl	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/prefix/DAQService.idl	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,7 +1,7 @@
 // -*- IDL -*-
 /*!
  * @file RTCService.idl
- * @brief RTComponent ƒT[ƒrƒXƒCƒ“ƒ^[ƒtƒF[ƒX
+ * @brief RTComponent サービスインターフェース
  * @date $Date: 2007/03/14 12:14:35 $
  * @author Noriaki Ando <n-ando at aist.go.jp>
  *
@@ -20,7 +20,7 @@
 /*
  * $Log: DAQService.idl,v $
  * Revision 1.1  2007/03/14 12:14:35  tsakamoto
- * ‘®«¶¬”Å
+ * 属性生成版
  *
  * Revision 1.1  2005/09/07 05:06:13  n-ando
  * RTComponent's service management feature was added.

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/prefix/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/prefix/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/prefix/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -86,8 +86,8 @@
   // <rtc-template block="bind_config">
   // Bind variables and configuration variable
   bindParameter("int_param0", p_int_param0, "0");
+  // </rtc-template>
   
-  // </rtc-template>
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/prefix/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/prefix/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/prefix/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -231,32 +231,33 @@
    * - DefaultValue: 0
    */
   int p_int_param0;
+
   // </rtc-template>
 
   // DataInPort declaration
   // <rtc-template block="inport_declare">
-  TimedShort p_InP1;
+  RTC::TimedShort p_InP1;
   /*!
    */
-  InPort<TimedShort> p_InP1In;
-  TimedLong p_InP2;
+  InPort<RTC::TimedShort> p_InP1In;
+  RTC::TimedLong p_InP2;
   /*!
    */
-  InPort<TimedLong> p_InP2In;
+  InPort<RTC::TimedLong> p_InP2In;
   
   // </rtc-template>
 
 
   // DataOutPort declaration
   // <rtc-template block="outport_declare">
-  TimedOctet p_OutP1;
+  RTC::TimedOctet p_OutP1;
   /*!
    */
-  OutPort<TimedOctet> p_OutP1Out;
-  TimedFloat p_OutP2;
+  OutPort<RTC::TimedOctet> p_OutP1Out;
+  RTC::TimedFloat p_OutP2;
   /*!
    */
-  OutPort<TimedFloat> p_OutP2Out;
+  OutPort<RTC::TimedFloat> p_OutP2Out;
   
   // </rtc-template>
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/siprefix/DAQService.idl
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/siprefix/DAQService.idl	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/siprefix/DAQService.idl	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,7 +1,7 @@
 // -*- IDL -*-
 /*!
  * @file RTCService.idl
- * @brief RTComponent ƒT[ƒrƒXƒCƒ“ƒ^[ƒtƒF[ƒX
+ * @brief RTComponent サービスインターフェース
  * @date $Date: 2007/03/14 12:14:35 $
  * @author Noriaki Ando <n-ando at aist.go.jp>
  *
@@ -20,7 +20,7 @@
 /*
  * $Log: DAQService.idl,v $
  * Revision 1.1  2007/03/14 12:14:35  tsakamoto
- * ‘®«¶¬”Å
+ * 属性生成版
  *
  * Revision 1.1  2005/09/07 05:06:13  n-ando
  * RTComponent's service management feature was added.

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/siprefix/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/siprefix/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/siprefix/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -86,8 +86,8 @@
   // <rtc-template block="bind_config">
   // Bind variables and configuration variable
   bindParameter("int_param0", p_int_param0_s, "0");
+  // </rtc-template>
   
-  // </rtc-template>
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/siprefix/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/siprefix/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/siprefix/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -231,32 +231,33 @@
    * - DefaultValue: 0
    */
   int p_int_param0_s;
+
   // </rtc-template>
 
   // DataInPort declaration
   // <rtc-template block="inport_declare">
-  TimedShort p_dtInP1ds_s;
+  RTC::TimedShort p_dtInP1ds_s;
   /*!
    */
-  InPort<TimedShort> p_dtInP1Inds_s;
-  TimedLong p_dtInP2ds_s;
+  InPort<RTC::TimedShort> p_dtInP1Inds_s;
+  RTC::TimedLong p_dtInP2ds_s;
   /*!
    */
-  InPort<TimedLong> p_dtInP2Inds_s;
+  InPort<RTC::TimedLong> p_dtInP2Inds_s;
   
   // </rtc-template>
 
 
   // DataOutPort declaration
   // <rtc-template block="outport_declare">
-  TimedOctet p_dtOutP1ds_s;
+  RTC::TimedOctet p_dtOutP1ds_s;
   /*!
    */
-  OutPort<TimedOctet> p_dtOutP1Outds_s;
-  TimedFloat p_dtOutP2ds_s;
+  OutPort<RTC::TimedOctet> p_dtOutP1Outds_s;
+  RTC::TimedFloat p_dtOutP2ds_s;
   /*!
    */
-  OutPort<TimedFloat> p_dtOutP2Outds_s;
+  OutPort<RTC::TimedFloat> p_dtOutP2Outds_s;
   
   // </rtc-template>
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/sisuffix/DAQService.idl
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/sisuffix/DAQService.idl	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/sisuffix/DAQService.idl	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,7 +1,7 @@
 // -*- IDL -*-
 /*!
  * @file RTCService.idl
- * @brief RTComponent ƒT[ƒrƒXƒCƒ“ƒ^[ƒtƒF[ƒX
+ * @brief RTComponent サービスインターフェース
  * @date $Date: 2007/03/14 12:14:35 $
  * @author Noriaki Ando <n-ando at aist.go.jp>
  *
@@ -20,7 +20,7 @@
 /*
  * $Log: DAQService.idl,v $
  * Revision 1.1  2007/03/14 12:14:35  tsakamoto
- * ‘®«¶¬”Å
+ * 属性生成版
  *
  * Revision 1.1  2005/09/07 05:06:13  n-ando
  * RTComponent's service management feature was added.

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/sisuffix/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/sisuffix/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/sisuffix/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -86,8 +86,8 @@
   // <rtc-template block="bind_config">
   // Bind variables and configuration variable
   bindParameter("int_param0", p_int_param0_s, "0");
+  // </rtc-template>
   
-  // </rtc-template>
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/sisuffix/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/sisuffix/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/sisuffix/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -231,32 +231,33 @@
    * - DefaultValue: 0
    */
   int p_int_param0_s;
+
   // </rtc-template>
 
   // DataInPort declaration
   // <rtc-template block="inport_declare">
-  TimedShort p_dtInP1ds_s;
+  RTC::TimedShort p_dtInP1ds_s;
   /*!
    */
-  InPort<TimedShort> p_dtInP1Inds_s;
-  TimedLong p_dtInP2ds_s;
+  InPort<RTC::TimedShort> p_dtInP1Inds_s;
+  RTC::TimedLong p_dtInP2ds_s;
   /*!
    */
-  InPort<TimedLong> p_dtInP2Inds_s;
+  InPort<RTC::TimedLong> p_dtInP2Inds_s;
   
   // </rtc-template>
 
 
   // DataOutPort declaration
   // <rtc-template block="outport_declare">
-  TimedOctet p_dtOutP1ds_s;
+  RTC::TimedOctet p_dtOutP1ds_s;
   /*!
    */
-  OutPort<TimedOctet> p_dtOutP1Outds_s;
-  TimedFloat p_dtOutP2ds_s;
+  OutPort<RTC::TimedOctet> p_dtOutP1Outds_s;
+  RTC::TimedFloat p_dtOutP2ds_s;
   /*!
    */
-  OutPort<TimedFloat> p_dtOutP2Outds_s;
+  OutPort<RTC::TimedFloat> p_dtOutP2Outds_s;
   
   // </rtc-template>
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/suffix/DAQService.idl
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/suffix/DAQService.idl	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/suffix/DAQService.idl	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,7 +1,7 @@
 // -*- IDL -*-
 /*!
  * @file RTCService.idl
- * @brief RTComponent ƒT[ƒrƒXƒCƒ“ƒ^[ƒtƒF[ƒX
+ * @brief RTComponent サービスインターフェース
  * @date $Date: 2007/03/14 12:14:35 $
  * @author Noriaki Ando <n-ando at aist.go.jp>
  *
@@ -20,7 +20,7 @@
 /*
  * $Log: DAQService.idl,v $
  * Revision 1.1  2007/03/14 12:14:35  tsakamoto
- * ‘®«¶¬”Å
+ * 属性生成版
  *
  * Revision 1.1  2005/09/07 05:06:13  n-ando
  * RTComponent's service management feature was added.

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/suffix/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/suffix/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/suffix/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -86,8 +86,8 @@
   // <rtc-template block="bind_config">
   // Bind variables and configuration variable
   bindParameter("int_param0", p_int_param0_s, "0");
+  // </rtc-template>
   
-  // </rtc-template>
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/suffix/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/suffix/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/suffix/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -231,32 +231,33 @@
    * - DefaultValue: 0
    */
   int p_int_param0_s;
+
   // </rtc-template>
 
   // DataInPort declaration
   // <rtc-template block="inport_declare">
-  TimedShort p_InP1_s;
+  RTC::TimedShort p_InP1_s;
   /*!
    */
-  InPort<TimedShort> p_InP1In_s;
-  TimedLong p_InP2_s;
+  InPort<RTC::TimedShort> p_InP1In_s;
+  RTC::TimedLong p_InP2_s;
   /*!
    */
-  InPort<TimedLong> p_InP2In_s;
+  InPort<RTC::TimedLong> p_InP2In_s;
   
   // </rtc-template>
 
 
   // DataOutPort declaration
   // <rtc-template block="outport_declare">
-  TimedOctet p_OutP1_s;
+  RTC::TimedOctet p_OutP1_s;
   /*!
    */
-  OutPort<TimedOctet> p_OutP1Out_s;
-  TimedFloat p_OutP2_s;
+  OutPort<RTC::TimedOctet> p_OutP1Out_s;
+  RTC::TimedFloat p_OutP2_s;
   /*!
    */
-  OutPort<TimedFloat> p_OutP2Out_s;
+  OutPort<RTC::TimedFloat> p_OutP2Out_s;
   
   // </rtc-template>
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svprefix/DAQService.idl
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svprefix/DAQService.idl	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svprefix/DAQService.idl	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,7 +1,7 @@
 // -*- IDL -*-
 /*!
  * @file RTCService.idl
- * @brief RTComponent ƒT[ƒrƒXƒCƒ“ƒ^[ƒtƒF[ƒX
+ * @brief RTComponent サービスインターフェース
  * @date $Date: 2007/03/14 12:14:35 $
  * @author Noriaki Ando <n-ando at aist.go.jp>
  *
@@ -20,7 +20,7 @@
 /*
  * $Log: DAQService.idl,v $
  * Revision 1.1  2007/03/14 12:14:35  tsakamoto
- * ‘®«¶¬”Å
+ * 属性生成版
  *
  * Revision 1.1  2005/09/07 05:06:13  n-ando
  * RTComponent's service management feature was added.

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svprefix/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svprefix/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svprefix/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -86,8 +86,8 @@
   // <rtc-template block="bind_config">
   // Bind variables and configuration variable
   bindParameter("int_param0", p_int_param0_s, "0");
+  // </rtc-template>
   
-  // </rtc-template>
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svprefix/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svprefix/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svprefix/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -231,32 +231,33 @@
    * - DefaultValue: 0
    */
   int p_int_param0_s;
+
   // </rtc-template>
 
   // DataInPort declaration
   // <rtc-template block="inport_declare">
-  TimedShort p_dtInP1ds_s;
+  RTC::TimedShort p_dtInP1ds_s;
   /*!
    */
-  InPort<TimedShort> p_dtInP1Inds_s;
-  TimedLong p_dtInP2ds_s;
+  InPort<RTC::TimedShort> p_dtInP1Inds_s;
+  RTC::TimedLong p_dtInP2ds_s;
   /*!
    */
-  InPort<TimedLong> p_dtInP2Inds_s;
+  InPort<RTC::TimedLong> p_dtInP2Inds_s;
   
   // </rtc-template>
 
 
   // DataOutPort declaration
   // <rtc-template block="outport_declare">
-  TimedOctet p_dtOutP1ds_s;
+  RTC::TimedOctet p_dtOutP1ds_s;
   /*!
    */
-  OutPort<TimedOctet> p_dtOutP1Outds_s;
-  TimedFloat p_dtOutP2ds_s;
+  OutPort<RTC::TimedOctet> p_dtOutP1Outds_s;
+  RTC::TimedFloat p_dtOutP2ds_s;
   /*!
    */
-  OutPort<TimedFloat> p_dtOutP2Outds_s;
+  OutPort<RTC::TimedFloat> p_dtOutP2Outds_s;
   
   // </rtc-template>
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svsuffix/DAQService.idl
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svsuffix/DAQService.idl	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svsuffix/DAQService.idl	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,7 +1,7 @@
 // -*- IDL -*-
 /*!
  * @file RTCService.idl
- * @brief RTComponent ƒT[ƒrƒXƒCƒ“ƒ^[ƒtƒF[ƒX
+ * @brief RTComponent サービスインターフェース
  * @date $Date: 2007/03/14 12:14:35 $
  * @author Noriaki Ando <n-ando at aist.go.jp>
  *
@@ -20,7 +20,7 @@
 /*
  * $Log: DAQService.idl,v $
  * Revision 1.1  2007/03/14 12:14:35  tsakamoto
- * ‘®«¶¬”Å
+ * 属性生成版
  *
  * Revision 1.1  2005/09/07 05:06:13  n-ando
  * RTComponent's service management feature was added.

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svsuffix/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svsuffix/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svsuffix/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -86,8 +86,8 @@
   // <rtc-template block="bind_config">
   // Bind variables and configuration variable
   bindParameter("int_param0", p_int_param0_s, "0");
+  // </rtc-template>
   
-  // </rtc-template>
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svsuffix/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svsuffix/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svsuffix/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -231,32 +231,33 @@
    * - DefaultValue: 0
    */
   int p_int_param0_s;
+
   // </rtc-template>
 
   // DataInPort declaration
   // <rtc-template block="inport_declare">
-  TimedShort p_dtInP1ds_s;
+  RTC::TimedShort p_dtInP1ds_s;
   /*!
    */
-  InPort<TimedShort> p_dtInP1Inds_s;
-  TimedLong p_dtInP2ds_s;
+  InPort<RTC::TimedShort> p_dtInP1Inds_s;
+  RTC::TimedLong p_dtInP2ds_s;
   /*!
    */
-  InPort<TimedLong> p_dtInP2Inds_s;
+  InPort<RTC::TimedLong> p_dtInP2Inds_s;
   
   // </rtc-template>
 
 
   // DataOutPort declaration
   // <rtc-template block="outport_declare">
-  TimedOctet p_dtOutP1ds_s;
+  RTC::TimedOctet p_dtOutP1ds_s;
   /*!
    */
-  OutPort<TimedOctet> p_dtOutP1Outds_s;
-  TimedFloat p_dtOutP2ds_s;
+  OutPort<RTC::TimedOctet> p_dtOutP1Outds_s;
+  RTC::TimedFloat p_dtOutP2ds_s;
   /*!
    */
-  OutPort<TimedFloat> p_dtOutP2Outds_s;
+  OutPort<RTC::TimedFloat> p_dtOutP2Outds_s;
   
   // </rtc-template>
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/SystemConfig/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/SystemConfig/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/SystemConfig/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -83,8 +83,8 @@
   bindParameter("double_param0", m_varname2, "0.11");
   bindParameter("str_param0", m_str_param0, "hoge");
   bindParameter("str_param1", m_varname3, "dara");
+  // </rtc-template>
   
-  // </rtc-template>
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/SystemConfig/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/SystemConfig/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/SystemConfig/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -253,6 +253,7 @@
    * - DefaultValue: dara
    */
   std::string m_varname3;
+
   // </rtc-template>
 
   // DataInPort declaration

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/SystemConfig/rtc.conf
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/SystemConfig/rtc.conf	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/SystemConfig/rtc.conf	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,3 +1,437 @@
-exec_cxt.periodic.rate:5.0
-timer.tick:0.1
-naming.update.interval:10.0
+#------------------------------------------------------------
+# RT-Component manager configuration
+#
+# See details in the following reference manual or web page.
+# http://www.openrtm.org/openrtm/en/content/configuration
+# http://www.openrtm.org/openrtm/ja/content/rtcconf%E8%A8%AD%E5%AE%9A%E9%A0%85%E7%9B%AE%E4%B8%80%E8%A6%A7
+# http://www.openrtm.org/openrtm/ko/content/rtcconf-%EC%84%A4%EC%A0%95-%ED%95%AD%EB%AA%A9-%EC%9D%BC%EB%9E%8C
+#
+
+#------------------------------------------------------------
+# Typically used configuration parameters
+#
+# corba.name_servers: localhost, 192.168.0.1
+# corba.endpoints: <interface addess>, <interface addess>
+# logger.enable: YES
+# logger.file_name: ./rtc%p.log
+# logger.log_level: NORMAL
+#
+# The following properties should be specified in component specific
+# configuration files.
+# exec_cxt.periodic.type: PeriodicExecutionContext
+# exec_cxt.periodic.rate: 1000
+
+# Component specific configruation files:
+# If you want to load component specific configuration file, please
+# uncomment the following line.
+#
+# manip2.foo.config_file: foo.conf
+# or
+# manip2.foo0.config_file: foo0.conf
+# manip2.foo1.config_file: foo1.conf
+# manip2.foo2.config_file: foo2.conf
+#
+#------------------------------------------------------------
+
+manip2.foo.config_file: foo.conf
+
+#
+# Please delete the following part if you are familiar with OpenRTM's
+# configuration parameters.
+#
+##----------------------------------------------------------------------
+##
+## RT-Component manager configurations
+##
+##----------------------------------------------------------------------
+
+##------------------------------------------------------------
+## Configuration version (optional) 
+##
+# config.version: 1.0
+
+##------------------------------------------------------------
+## OpenRTM-aist version (optional)
+##
+# openrtm.version: 1.0.0
+
+##------------------------------------------------------------
+## The name of manager (default = manager)
+##
+# manager.name: manager
+
+##------------------------------------------------------------
+## Master manager
+## - manager.is_master: YES/NO, This process made a master or not.
+## - manager.corba_servant: YES/NO, create manager's corba service or not
+## - corba.master_manager: <host_name>:<port>, master manager's location
+# manager.is_master: YES
+# manager.corba_servant: YES
+# corba.master_manager: localhost:2810
+
+##------------------------------------------------------------
+## Manager auto shutdown options
+## - manager.shutdown_on_nortcs: YES/NO, 
+##   process will be shutdown in case no rtc exists when rtc is deleted.
+## - manager.shutdown_auto:
+##   process will be shutdown in case no rtc exists on periodic check.
+# manager.shutdown_on_nortcs: YES
+# manager.shutdown_auto: YES
+# manager.auto_shutdown_duration: 10.0
+
+##============================================================
+## CORBA configuration
+##============================================================
+##
+## CORBA ORB's arguments
+##
+## ORB specific command line options given to ORB_init().
+## See your ORB documentation.
+##
+## Example:
+##   corba.args: -ORBInitialHost myhost -ORBInitialPort 8888
+##
+##
+# corba.args:
+
+##
+## ORB endpoint
+##
+## If you have two or more network interfaces, ORB endpoint address and/or
+## port have to be specified. If hostname or port number is abbreviated,
+## default interface or port number is used. At least one colon ':'
+## is needed when you specify this option.
+##
+## Examples:
+##   corba.endpoint: myhost:      (use myhost and default port)
+##   corba.endpoint: :9876        (use default addr and port 9876)
+##   corba.endpoint: myhost:9876  (use myhost and port 9876)
+##
+# corba.endpoint:
+
+##
+## Multiple endpoint options (experimental)
+##
+## Multiple endpoint addresses and ports can be specified using this option.
+##
+## Example:
+##   corba.endpoints: 192.168.1.10:1111, 192.168.10.11:2222
+##   corba.endpoints: 192.168.1.10, 192.168.10.11
+##   corba.endpoints: all
+##
+# corba.endpoints:
+
+
+##
+## CORBA name server setting
+##
+## Multiple name servers can be specified separating by comma.
+## If port number is abbreviated, default port number is used.
+## The default port number is depend on ORB implementation.
+##
+## Examples:
+##   corba.nameservers: openrtm.aist.go.jp:9876
+##   corba.nameservers: rtm0.aist.go.jp, rtm1.aist.go.jp, rtm2.aist.go.jp
+##
+# corba.nameservers: localhost
+
+##
+## IOR host address replacement by guessed endpoint from routing (experimental)
+##
+## This option replaces a host address with an endpoint that is guessed
+## by route information to nameserver's address. This option may be
+## effective for CORBA implementation that does not supports IOR's
+## multiple profile or alternate IIOP address. However, since other
+## object references that are obtained from RT-Components or other are
+## not modified by this rule, other RTCs that are connected to this RTC
+## have to also support IOR multiple profile feature.  When this option
+## is used, corba.endpoints option should also be specified with
+## multiple endpoints.
+##
+# corba.nameservice.replace_endpoint: NO
+
+##
+## IOR alternate IIOP addresses
+##
+## This option adds alternate IIOP addresses into the IOR Profiles.
+## IOR can include additional endpoints for a servant. It is almost
+## same as "corba.endpoints" option, but this option does not create
+## actual endpoint on the ORB. (corba.endpoints try to create actual
+## endpoint, and if it cannot be created, error will be returned.)
+## This option just add alternate IIOP endpoint address information to
+## an IOR.
+##
+## This option can be used when RTCs are located inside of NAT or
+## router.  Generally speaking, RTCs in a private network cannot
+## connect to RTCs in the global network, because global client cannot
+## reach to private servants. However, if route (or NAT) is properly
+## configured for port forwarding, global RTCs can reach to RTCs in
+## private network.
+##
+## A setting example is as follows.
+## 1) Configure your router properly for port-forwarding.
+##    ex. global 2810 port is forwarded to private 2810
+## 2) Set the following options in rtc.conf
+##  corba.nameservers: my.global.nameserver.com <- name server in global network
+##  corba.endpoints: :2810 <- actual port number
+##  corba.additional_ior_addresses: w.x.y.z:2810 <- routers global IP addr/port
+## 3) Launch global RTCs and private RTC, and connect them.
+##
+# corba.alternate_iiop_addresses: addr:port
+
+##============================================================
+## Naming configurations
+##============================================================
+##
+## Enable/Disable naming functions
+##
+# naming.enable: YES
+
+##
+## Naming Types
+##
+## Now only "corba" is supported.
+##
+# naming.type: corba
+
+##
+## Naming format
+##
+## The name format of components that is bound to naming services.
+## The delimiter between names is "/".
+## The delimiter between name and kind is ".".
+##
+## example: (OpenRTM-aist-0.2.0 style)
+##       %h.host_cxt/%M.mgr_cxt/%c.cat_cxt/%m.mod_cxt/%n.rtc
+## This is formatted according to the following replacement rules.
+##
+## %n: The instance name of the component.
+## %t: The type name of the component.
+## %m: The module name of the component.
+## %v: The version of the component.
+## %V: The component vendor.
+## %c: The category of the component.
+## %h: The hostname.
+## %M: The manager name.
+## %p: PID of the manager.
+##
+# naming.formats: %h.host/%n.rtc
+
+##
+## Auto update to Naming Server
+##
+# naming.update.enable: YES
+##
+## Update interval [s] for auto update
+##
+# naming.update.interval: 10.0
+##
+## Rebind references in auto update
+##
+# naming.update.rebind: NO
+
+## End of Naming configuration section
+##------------------------------------------------------------
+
+##============================================================
+## Module management
+##============================================================
+##
+## Loadable module search path list
+##
+## Manager searches loadable modules from the specified search path list.
+## Path list elements should be separated by comma.
+## Path delimiter is '/' on UNIX, and '\\' on Windows
+## Valid path examples:
+##   manager.modules.load_path: C:/Program Files/OpenRTM-aist,  \
+##   			       C:\\Program Files\\OpenRTM-aist
+##   manager.modules.load_path: /usr/lib, /usr/local/lib,       \
+##   			       /usr/local/lib/OpenRTM-aist/libs
+##
+# manager.modules.load_path: ./
+
+##
+## Preload module list
+##
+## Manager can load loadable modules before starting up.
+## Loadable modules, which is specified only as its file name, is searched
+## in each module load path specified in the "manager.modules.load_path".
+## If the "manager.modules.abs_path_allowed" option is YES, loadable file
+## can be specified as full-path name,
+##
+## Valid settings:
+## manager.modules.preload: ConsoleIn.dll, ConsoleOut.dll
+## manager.modules.preload: ConsoleIn.so, ConsoleOut.so
+## manager.modules.abs_path_allowed: YES
+## manager.modules.preload: /usr/lib/OpenRTM-aist/ConsoleIn.so
+##
+# manager.modules.preload:
+
+##
+## Permission flag of absolute module path
+##
+## If this option is "YES", absolute path specification for module is allowed.
+##
+# manager.modules.abs_path_allowed: YES
+
+##
+## The following options are not implemented yet. 
+##
+## manager.modules.config_ext:
+## manager.modules.config_path:
+## manager.modules.detect_loadable:
+## manager.modules.init_func_suffix:
+## manager.modules.init_func_prefix:
+## manager.modules.download_allowed:
+## manager.modules.download_dir:
+## manager.modules.download_cleanup:
+##
+
+##
+## Advance component creation
+##
+## This option specifies components' names (module name) creating in advance
+## before starting the manager's event-loop. The components' factories should
+## be registered by manager.module.preload option or statically linked to the
+##  manager.
+##
+## Example:
+## manager.components.precreate: ConsoleIn, ConsoleOut, SeqIn, SeqOut
+##
+# manager.components.precreate: 
+
+
+##============================================================
+## Logger configurations
+##============================================================
+##
+## Enable/Disable logger [YES/NO]
+# logger.enable: YES
+
+##
+## Log file name (default = ./rtc%p.log)
+##
+## %p: PID
+##
+# logger.file_name: ./rtc%p.log
+
+##
+## Log date format (default = %b %d %H:%M:%S)
+##
+## The following strftime(3) like format expression is available.
+## If no prefix is needed, use "No" or "Disable".
+## 
+## %a abbreviated weekday name 
+## %A full weekday name 
+## %b abbreviated month name 
+## %B full month name 
+## %c the standard date and time string 
+## %d day of the month, as a number (1-31) 
+## %H hour, 24 hour format (0-23) 
+## %I hour, 12 hour format (1-12) 
+## %j day of the year, as a number (1-366) 
+## %m month as a number (1-12).
+##    Note: some versions of Microsoft Visual C++ may use values that range
+##    from 0-11. 
+## %M minute as a number (0-59) 
+## %p locale's equivalent of AM or PM 
+## %Q millisecond as a number (0-999) from ver 1.1
+## %q microsecond as a number (0-999) from ver 1.1
+## %S second as a number (0-59) 
+## %U week of the year, sunday as the first day 
+## %w weekday as a decimal (0-6, sunday=0) 
+## %W week of the year, monday as the first day 
+## %x standard date string 
+## %X standard time string 
+## %y year in decimal, without the century (0-99) 
+## %Y year in decimal, with the century 
+## %Z time zone name 
+## %% a percent sign 
+##  
+##
+## logger.date_format: No
+## logger.date_format: Disable
+## logger.date_format: [%Y-%m-%dT%H.%M.%S%Z]     // W3C standard format
+## logger.date_format: [%b %d %H:%M:%S]          // Syslog format
+## logger.date_format: [%a %b %d %Y %H:%M:%S %Z] // RFC2822 format
+## logger.date_format: [%a %b %d %H:%M:%S %Z %Y] // data command format
+## logger.date_format: [%Y-%m-%d %H.%M.%S]
+##
+# logger.date_format: %b %d %H:%M:%S
+
+##
+## Log level (default = NORMAL)
+##
+## The following LogLevels are allowed.
+## SILENT, ERROR, WARN, NORMAL, INFO, DEBUG, TRACE, VERBOSE, PARANOID
+##
+##
+## SILENT  : completely silent
+## ERROR   : includes (ERROR)
+## WARN    : includes (ERROR, WARN)
+## INFO    : includes (ERROR, WARN, INFO)
+## NORMAL  : includes (ERROR, WARN, INFO, NORMAL)
+## DEBUG   : includes (ERROR, WARN, INFO, NORMAL, DEBUG)
+## TRACE   : includes (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE)
+## VERBOSE : includes (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE, VERBOSE)
+## PARANOID: includes (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE, VERBOSE, PARA)
+##
+## Warning!!!
+## "TRACE", "VERBOSE", "PARANOID" logging level will create a huge log file!!
+## "PARANOID" log level will tangle the log file.
+##
+# logger.log_level: NORMAL
+
+##============================================================
+## Timer configuration
+##============================================================
+##
+## Enable/disable timer function
+##
+# timer.enable: YES
+
+##
+## Timer clock tick setting [s]
+##
+# timer.tick: 0.1
+
+##============================================================
+## Execution context settings
+##============================================================
+##
+## Periodic type ExecutionContext
+##
+## Other availabilities in OpenRTM-aist
+##
+## - ExtTrigExecutionContext: External triggered EC. It is embedded in
+##                            OpenRTM library.
+## - OpenHRPExecutionContext: External triggred paralell execution
+##                            EC. It is embedded in OpenRTM
+##                            library. This is usually used with
+##                            OpenHRP3.
+## - RTPreemptEC:             Real-time execution context for Linux
+##                            RT-preemptive pathed kernel.
+## - ArtExecutionContext:     Real-time execution context for ARTLinux
+##                            (http://sourceforge.net/projects/art-linux/)
+##
+# exec_cxt.periodic.type: PeriodicExecutionContext
+
+##
+## The execution cycle of ExecutionContext
+##
+# exec_cxt.periodic.rate: 1000
+
+##============================================================
+## SDO service settings
+##============================================================
+##
+## SDO service provider settings
+##
+# sdo.service.provider.available_services: [read only]
+# sdo.service.provider.enabled_services: ALL
+# sdo.service.provider.providing_services: [read only]
+##
+## SDO service consumer settings
+##
+# sdo.service.consumer.available_services: [read only]
+# sdo.service.consumer.enabled_services: ALL

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/DataPort/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/DataPort/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/DataPort/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -73,6 +73,9 @@
   
   // </rtc-template>
 
+  // <rtc-template block="bind_config">
+  // </rtc-template>
+  
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/DataPort/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/DataPort/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/DataPort/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -221,30 +221,35 @@
   
   // </rtc-template>
 
+  // Configuration variable declaration
+  // <rtc-template block="config_declare">
+
+  // </rtc-template>
+
   // DataInPort declaration
   // <rtc-template block="inport_declare">
-  TimedShort m_VarInP1;
+  RTC::TimedShort m_VarInP1;
   /*!
    */
-  InPort<TimedShort> m_VarInP1In;
-  TimedLong m_InP2;
+  InPort<RTC::TimedShort> m_VarInP1In;
+  RTC::TimedLong m_InP2;
   /*!
    */
-  InPort<TimedLong> m_InP2In;
+  InPort<RTC::TimedLong> m_InP2In;
   
   // </rtc-template>
 
 
   // DataOutPort declaration
   // <rtc-template block="outport_declare">
-  TimedLong m_OutP1;
+  RTC::TimedLong m_OutP1;
   /*!
    */
-  OutPort<TimedLong> m_OutP1Out;
-  TimedFloat m_VarOutP2;
+  OutPort<RTC::TimedLong> m_OutP1Out;
+  RTC::TimedFloat m_VarOutP2;
   /*!
    */
-  OutPort<TimedFloat> m_VarOutP2Out;
+  OutPort<RTC::TimedFloat> m_VarOutP2Out;
   
   // </rtc-template>
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort1/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort1/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort1/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -79,6 +79,9 @@
   
   // </rtc-template>
 
+  // <rtc-template block="bind_config">
+  // </rtc-template>
+  
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort1/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort1/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort1/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -223,30 +223,35 @@
   
   // </rtc-template>
 
+  // Configuration variable declaration
+  // <rtc-template block="config_declare">
+
+  // </rtc-template>
+
   // DataInPort declaration
   // <rtc-template block="inport_declare">
-  TimedShort m_InP1;
+  RTC::TimedShort m_InP1;
   /*!
    */
-  InPort<TimedShort> m_InP1In;
-  TimedLong m_InP2;
+  InPort<RTC::TimedShort> m_InP1In;
+  RTC::TimedLong m_InP2;
   /*!
    */
-  InPort<TimedLong> m_InP2In;
+  InPort<RTC::TimedLong> m_InP2In;
   
   // </rtc-template>
 
 
   // DataOutPort declaration
   // <rtc-template block="outport_declare">
-  TimedLong m_OutP1;
+  RTC::TimedLong m_OutP1;
   /*!
    */
-  OutPort<TimedLong> m_OutP1Out;
-  TimedFloat m_OutP2;
+  OutPort<RTC::TimedLong> m_OutP1Out;
+  RTC::TimedFloat m_OutP2;
   /*!
    */
-  OutPort<TimedFloat> m_OutP2Out;
+  OutPort<RTC::TimedFloat> m_OutP2Out;
   
   // </rtc-template>
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort2/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort2/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort2/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -79,6 +79,9 @@
   
   // </rtc-template>
 
+  // <rtc-template block="bind_config">
+  // </rtc-template>
+  
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort2/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort2/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort2/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -223,30 +223,35 @@
   
   // </rtc-template>
 
+  // Configuration variable declaration
+  // <rtc-template block="config_declare">
+
+  // </rtc-template>
+
   // DataInPort declaration
   // <rtc-template block="inport_declare">
-  TimedShort m_InP1;
+  RTC::TimedShort m_InP1;
   /*!
    */
-  InPort<TimedShort> m_InP1In;
-  TimedLong m_InP2;
+  InPort<RTC::TimedShort> m_InP1In;
+  RTC::TimedLong m_InP2;
   /*!
    */
-  InPort<TimedLong> m_InP2In;
+  InPort<RTC::TimedLong> m_InP2In;
   
   // </rtc-template>
 
 
   // DataOutPort declaration
   // <rtc-template block="outport_declare">
-  TimedLong m_OutP1;
+  RTC::TimedLong m_OutP1;
   /*!
    */
-  OutPort<TimedLong> m_OutP1Out;
-  TimedFloat m_OutP2;
+  OutPort<RTC::TimedLong> m_OutP1Out;
+  RTC::TimedFloat m_OutP2;
   /*!
    */
-  OutPort<TimedFloat> m_OutP2Out;
+  OutPort<RTC::TimedFloat> m_OutP2Out;
   
   // </rtc-template>
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/attribute/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/attribute/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/attribute/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -65,6 +65,9 @@
   
   // </rtc-template>
 
+  // <rtc-template block="bind_config">
+  // </rtc-template>
+  
   return RTC::RTC_OK;
 }
 */

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/attribute/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/attribute/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/attribute/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -52,8 +52,8 @@
   ~foo();
 
   // <rtc-template block="public_attribute">
-  boolean pubbol1;
-  double attribute_5;
+  boolean pubbol1
+  double attribute_5
   
   // </rtc-template>
 
@@ -216,8 +216,8 @@
 
  protected:
   // <rtc-template block="protected_attribute">
-  String protectval;
-  static float attribute_4;
+  String protectval
+  static float attribute_4
   
   // </rtc-template>
 
@@ -225,6 +225,11 @@
   
   // </rtc-template>
 
+  // Configuration variable declaration
+  // <rtc-template block="config_declare">
+
+  // </rtc-template>
+
   // DataInPort declaration
   // <rtc-template block="inport_declare">
   
@@ -253,8 +258,8 @@
 
  private:
   // <rtc-template block="private_attribute">
-  int private1;
-  static int attribute_4;
+  int private1
+  static int attribute_4
   
   // </rtc-template>
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/inport1/test.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/inport1/test.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/inport1/test.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -67,6 +67,9 @@
   
   // </rtc-template>
 
+  // <rtc-template block="bind_config">
+  // </rtc-template>
+  
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/inport1/test.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/inport1/test.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/inport1/test.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -221,12 +221,17 @@
   
   // </rtc-template>
 
+  // Configuration variable declaration
+  // <rtc-template block="config_declare">
+
+  // </rtc-template>
+
   // DataInPort declaration
   // <rtc-template block="inport_declare">
-  TimedShort m_InP1;
+  RTC::TimedShort m_InP1;
   /*!
    */
-  InPort<TimedShort> m_InP1In;
+  InPort<RTC::TimedShort> m_InP1In;
   
   // </rtc-template>
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/inport2/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/inport2/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/inport2/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -69,6 +69,9 @@
   
   // </rtc-template>
 
+  // <rtc-template block="bind_config">
+  // </rtc-template>
+  
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/inport2/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/inport2/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/inport2/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -221,16 +221,21 @@
   
   // </rtc-template>
 
+  // Configuration variable declaration
+  // <rtc-template block="config_declare">
+
+  // </rtc-template>
+
   // DataInPort declaration
   // <rtc-template block="inport_declare">
-  TimedShort m_InP1;
+  RTC::TimedShort m_InP1;
   /*!
    */
-  InPort<TimedShort> m_InP1In;
-  TimedLong m_InP2;
+  InPort<RTC::TimedShort> m_InP1In;
+  RTC::TimedLong m_InP2;
   /*!
    */
-  InPort<TimedLong> m_InP2In;
+  InPort<RTC::TimedLong> m_InP2In;
   
   // </rtc-template>
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/name/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/name/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/name/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -65,6 +65,9 @@
   
   // </rtc-template>
 
+  // <rtc-template block="bind_config">
+  // </rtc-template>
+  
   return RTC::RTC_OK;
 }
 */

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/name/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/name/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/name/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -221,6 +221,11 @@
   
   // </rtc-template>
 
+  // Configuration variable declaration
+  // <rtc-template block="config_declare">
+
+  // </rtc-template>
+
   // DataInPort declaration
   // <rtc-template block="inport_declare">
   

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/operation/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/operation/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/operation/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -65,6 +65,9 @@
   
   // </rtc-template>
 
+  // <rtc-template block="bind_config">
+  // </rtc-template>
+  
   return RTC::RTC_OK;
 }
 */

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/operation/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/operation/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/operation/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -52,14 +52,14 @@
   ~foo();
 
   // <rtc-template block="public_attribute">
-  boolean pubbol1;
-  double attribute_5;
+  boolean pubbol1
+  double attribute_5
   
   // </rtc-template>
 
   // <rtc-template block="public_operation">
-  int operation_2(int param_1 = 10);
-  String operation_1(String param_1, int param_2);
+  int operation_2(int param_1 = 10)
+  String operation_1(String param_1, int param_2)
   
   // </rtc-template>
 
@@ -218,8 +218,8 @@
 
  protected:
   // <rtc-template block="protected_attribute">
-  String protectval;
-  static float attribute_4;
+  String protectval
+  static float attribute_4
   
   // </rtc-template>
 
@@ -227,6 +227,11 @@
   
   // </rtc-template>
 
+  // Configuration variable declaration
+  // <rtc-template block="config_declare">
+
+  // </rtc-template>
+
   // DataInPort declaration
   // <rtc-template block="inport_declare">
   
@@ -255,8 +260,8 @@
 
  private:
   // <rtc-template block="private_attribute">
-  int private1;
-  static int attribute_4;
+  int private1
+  static int attribute_4
   
   // </rtc-template>
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/outport1/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/outport1/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/outport1/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -71,6 +71,9 @@
   
   // </rtc-template>
 
+  // <rtc-template block="bind_config">
+  // </rtc-template>
+  
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/outport1/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/outport1/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/outport1/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -221,26 +221,31 @@
   
   // </rtc-template>
 
+  // Configuration variable declaration
+  // <rtc-template block="config_declare">
+
+  // </rtc-template>
+
   // DataInPort declaration
   // <rtc-template block="inport_declare">
-  TimedShort m_InP1;
+  RTC::TimedShort m_InP1;
   /*!
    */
-  InPort<TimedShort> m_InP1In;
-  TimedLong m_InP2;
+  InPort<RTC::TimedShort> m_InP1In;
+  RTC::TimedLong m_InP2;
   /*!
    */
-  InPort<TimedLong> m_InP2In;
+  InPort<RTC::TimedLong> m_InP2In;
   
   // </rtc-template>
 
 
   // DataOutPort declaration
   // <rtc-template block="outport_declare">
-  TimedInt m_OutP1;
+  RTC::TimedInt m_OutP1;
   /*!
    */
-  OutPort<TimedInt> m_OutP1Out;
+  OutPort<RTC::TimedInt> m_OutP1Out;
   
   // </rtc-template>
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/outport2/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/outport2/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/outport2/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -73,6 +73,9 @@
   
   // </rtc-template>
 
+  // <rtc-template block="bind_config">
+  // </rtc-template>
+  
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/outport2/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/outport2/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/outport2/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -221,30 +221,35 @@
   
   // </rtc-template>
 
+  // Configuration variable declaration
+  // <rtc-template block="config_declare">
+
+  // </rtc-template>
+
   // DataInPort declaration
   // <rtc-template block="inport_declare">
-  TimedShort m_InP1;
+  RTC::TimedShort m_InP1;
   /*!
    */
-  InPort<TimedShort> m_InP1In;
-  TimedLong m_InP2;
+  InPort<RTC::TimedShort> m_InP1In;
+  RTC::TimedLong m_InP2;
   /*!
    */
-  InPort<TimedLong> m_InP2In;
+  InPort<RTC::TimedLong> m_InP2In;
   
   // </rtc-template>
 
 
   // DataOutPort declaration
   // <rtc-template block="outport_declare">
-  TimedInt m_OutP1;
+  RTC::TimedInt m_OutP1;
   /*!
    */
-  OutPort<TimedInt> m_OutP1Out;
-  TimedFloat m_OutP2;
+  OutPort<RTC::TimedInt> m_OutP1Out;
+  RTC::TimedFloat m_OutP2;
   /*!
    */
-  OutPort<TimedFloat> m_OutP2Out;
+  OutPort<RTC::TimedFloat> m_OutP2Out;
   
   // </rtc-template>
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service1/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service1/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service1/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -76,6 +76,9 @@
   
   // </rtc-template>
 
+  // <rtc-template block="bind_config">
+  // </rtc-template>
+  
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service1/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service1/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service1/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -222,30 +222,35 @@
   
   // </rtc-template>
 
+  // Configuration variable declaration
+  // <rtc-template block="config_declare">
+
+  // </rtc-template>
+
   // DataInPort declaration
   // <rtc-template block="inport_declare">
-  TimedShort m_InP1;
+  RTC::TimedShort m_InP1;
   /*!
    */
-  InPort<TimedShort> m_InP1In;
-  TimedLong m_InP2;
+  InPort<RTC::TimedShort> m_InP1In;
+  RTC::TimedLong m_InP2;
   /*!
    */
-  InPort<TimedLong> m_InP2In;
+  InPort<RTC::TimedLong> m_InP2In;
   
   // </rtc-template>
 
 
   // DataOutPort declaration
   // <rtc-template block="outport_declare">
-  TimedInt m_OutP1;
+  RTC::TimedInt m_OutP1;
   /*!
    */
-  OutPort<TimedInt> m_OutP1Out;
-  TimedFloat m_OutP2;
+  OutPort<RTC::TimedInt> m_OutP1Out;
+  RTC::TimedFloat m_OutP2;
   /*!
    */
-  OutPort<TimedFloat> m_OutP2Out;
+  OutPort<RTC::TimedFloat> m_OutP2Out;
   
   // </rtc-template>
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service2/DAQService.idl
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service2/DAQService.idl	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service2/DAQService.idl	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,7 +1,7 @@
 // -*- IDL -*-
 /*!
  * @file RTCService.idl
- * @brief RTComponent ƒT[ƒrƒXƒCƒ“ƒ^[ƒtƒF[ƒX
+ * @brief RTComponent サービスインターフェース
  * @date $Date: 2007/03/14 12:14:35 $
  * @author Noriaki Ando <n-ando at aist.go.jp>
  *
@@ -20,7 +20,7 @@
 /*
  * $Log: DAQService.idl,v $
  * Revision 1.1  2007/03/14 12:14:35  tsakamoto
- * ‘®«¶¬”Å
+ * 属性生成版
  *
  * Revision 1.1  2005/09/07 05:06:13  n-ando
  * RTComponent's service management feature was added.

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service2/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service2/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service2/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -79,6 +79,9 @@
   
   // </rtc-template>
 
+  // <rtc-template block="bind_config">
+  // </rtc-template>
+  
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service2/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service2/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service2/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -223,30 +223,35 @@
   
   // </rtc-template>
 
+  // Configuration variable declaration
+  // <rtc-template block="config_declare">
+
+  // </rtc-template>
+
   // DataInPort declaration
   // <rtc-template block="inport_declare">
-  TimedShort m_InP1;
+  RTC::TimedShort m_InP1;
   /*!
    */
-  InPort<TimedShort> m_InP1In;
-  TimedLong m_InP2;
+  InPort<RTC::TimedShort> m_InP1In;
+  RTC::TimedLong m_InP2;
   /*!
    */
-  InPort<TimedLong> m_InP2In;
+  InPort<RTC::TimedLong> m_InP2In;
   
   // </rtc-template>
 
 
   // DataOutPort declaration
   // <rtc-template block="outport_declare">
-  TimedInt m_OutP1;
+  RTC::TimedInt m_OutP1;
   /*!
    */
-  OutPort<TimedInt> m_OutP1Out;
-  TimedFloat m_OutP2;
+  OutPort<RTC::TimedInt> m_OutP1Out;
+  RTC::TimedFloat m_OutP2;
   /*!
    */
-  OutPort<TimedFloat> m_OutP2Out;
+  OutPort<RTC::TimedFloat> m_OutP2Out;
   
   // </rtc-template>
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/DFFSMMM/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/DFFSMMM/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/DFFSMMM/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -65,6 +65,9 @@
   
   // </rtc-template>
 
+  // <rtc-template block="bind_config">
+  // </rtc-template>
+  
   return RTC::RTC_OK;
 }
 */

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/DFFSMMM/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/DFFSMMM/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/DFFSMMM/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -221,6 +221,11 @@
   
   // </rtc-template>
 
+  // Configuration variable declaration
+  // <rtc-template block="config_declare">
+
+  // </rtc-template>
+
   // DataInPort declaration
   // <rtc-template block="inport_declare">
   

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/DataFlow/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/DataFlow/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/DataFlow/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -65,6 +65,9 @@
   
   // </rtc-template>
 
+  // <rtc-template block="bind_config">
+  // </rtc-template>
+  
   return RTC::RTC_OK;
 }
 */

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/DataFlow/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/DataFlow/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/DataFlow/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -221,6 +221,11 @@
   
   // </rtc-template>
 
+  // Configuration variable declaration
+  // <rtc-template block="config_declare">
+
+  // </rtc-template>
+
   // DataInPort declaration
   // <rtc-template block="inport_declare">
   

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/FSM/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/FSM/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/FSM/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -65,6 +65,9 @@
   
   // </rtc-template>
 
+  // <rtc-template block="bind_config">
+  // </rtc-template>
+  
   return RTC::RTC_OK;
 }
 */

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/FSM/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/FSM/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/FSM/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -221,6 +221,11 @@
   
   // </rtc-template>
 
+  // Configuration variable declaration
+  // <rtc-template block="config_declare">
+
+  // </rtc-template>
+
   // DataInPort declaration
   // <rtc-template block="inport_declare">
   

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/DAQService.idl
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/DAQService.idl	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/DAQService.idl	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,7 +1,7 @@
 // -*- IDL -*-
 /*!
  * @file RTCService.idl
- * @brief RTComponent ƒT[ƒrƒXƒCƒ“ƒ^[ƒtƒF[ƒX
+ * @brief RTComponent サービスインターフェース
  * @date $Date: 2007/03/14 12:14:35 $
  * @author Noriaki Ando <n-ando at aist.go.jp>
  *
@@ -20,7 +20,7 @@
 /*
  * $Log: DAQService.idl,v $
  * Revision 1.1  2007/03/14 12:14:35  tsakamoto
- * ‘®«¶¬”Å
+ * 属性生成版
  *
  * Revision 1.1  2005/09/07 05:06:13  n-ando
  * RTComponent's service management feature was added.

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/cmake_modules/FindOpenRTM.cmake
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/cmake_modules/FindOpenRTM.cmake	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/cmake_modules/FindOpenRTM.cmake	2013-01-29 10:39:20 UTC (rev 394)
@@ -64,8 +64,132 @@
 
 endif(UNIX)
 
+set(WIN32_RTM "")
+set(RTM_CONFIG_CMAKE "")
+
+macro(rtm_norm_path _path _result)
+    string(REGEX REPLACE "\"" ""    _var "${_path}")
+    string(REGEX REPLACE "[/]+" "/" _var "${_var}")
+    string(REGEX REPLACE "[/]$" ""  _var "${_var}")
+    set(${_result} "${_var}")
+endmacro(rtm_norm_path)
+
 if(WIN32)
+    set(WIN32_RTM "10")
+    find_file(rtm_conf "rtm_config.cmake" PATHS "$ENV{RTM_ROOT}/etc")
+    if(rtm_conf)
+        set(WIN32_RTM "11")
+        set(RTM_CONFIG_CMAKE "${rtm_conf}")
+    endif()
+endif(WIN32)
+
+if(WIN32_RTM STREQUAL "11")
+    include("${RTM_CONFIG_CMAKE}")
+    message(STATUS "Configuration by ${RTM_CONFIG_CMAKE}.")
+
     # omniORB
+    set(OMNIORB_DIR "${omni_root}")
+    set(OMNIORB_FOUND TRUE)
+    file(TO_CMAKE_PATH "${OMNIORB_DIR}" OMNIORB_DIR)
+
+    foreach(path ${omni_includes})
+        file(TO_CMAKE_PATH "${path}" path)
+        rtm_norm_path("${path}" path)
+        list(APPEND OMNIORB_INCLUDE_DIRS "${path}")
+    endforeach()
+    foreach(path ${omni_libdir})
+        file(TO_CMAKE_PATH "${path}" path)
+        rtm_norm_path("${path}" path)
+        list(APPEND OMNIORB_LIBRARY_DIRS "${path}")
+    endforeach()
+
+    # omniORB version
+    file(GLOB _vers RELATIVE "${OMNIORB_DIR}" "${OMNIORB_DIR}/THIS_IS_OMNIORB*")
+    if("${_vers}" STREQUAL "")
+        message(FATAL_ERROR "omniORB version file not found.")
+    endif()
+
+    set(OMNIORB_VERSION "${_vers}")
+    string(REGEX REPLACE "THIS_IS_OMNIORB_" ""
+           OMNIORB_VERSION "${OMNIORB_VERSION}")
+    string(REGEX REPLACE "[_]" "."
+           OMNIORB_VERSION "${OMNIORB_VERSION}")
+
+    set(OMNIORB_VERSION_NUM "${omni_dllver}")
+    set(OMNIORB_THREAD_NUM "${omnithread_dllver}")
+
+    set(OMNIORB_CFLAGS -D__WIN32__;-D__x86__;-D__NT__;-D__OSVERSION__=4;-D_CRT_SECURE_NO_DEPRECATE)
+    if(${OMNIORB_VERSION_NUM} MATCHES "^40")
+      set(OMNIORB_CFLAGS ${OMNIORB_CFLAGS};-D_WIN32_WINNT=0x0400)
+    else()
+      set(OMNIORB_CFLAGS ${OMNIORB_CFLAGS};-D_WIN32_WINNT=0x0500;-DRTC_CORBA_CXXMAPPING11)
+    endif()
+
+    foreach(library ${omni_lib})
+        list(APPEND OMNIORB_LIBRARIES optimized "${library}")
+    endforeach()
+    foreach(library ${omni_libd})
+        list(APPEND OMNIORB_LIBRARIES debug "${library}")
+    endforeach()
+
+    # OpenRTM-aist
+    set(OPENRTM_DIR "${rtm_root}")
+    set(OPENRTM_FOUND TRUE)
+    file(TO_CMAKE_PATH "${OPENRTM_DIR}" OPENRTM_DIR)
+
+    # OpenRTM-aist version
+    set(OPENRTM_VERSION "${rtm_version}")
+    string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\1"
+           OPENRTM_VERSION_MAJOR "${OPENRTM_VERSION}")
+    string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\2"
+           OPENRTM_VERSION_MINOR "${OPENRTM_VERSION}")
+    string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\3"
+           OPENRTM_VERSION_PATCH "${OPENRTM_VERSION}")
+
+    set(OPENRTM_VERSION_NUM "${rtm_dllver}")
+
+    foreach(path ${rtm_includes})
+        file(TO_CMAKE_PATH "${path}" path)
+        rtm_norm_path("${path}" path)
+        list(APPEND OPENRTM_INCLUDE_DIRS "${path}")
+    endforeach()
+    foreach(path ${rtm_libdir})
+        file(TO_CMAKE_PATH "${path}" path)
+        rtm_norm_path("${path}" path)
+        list(APPEND OPENRTM_LIBRARY_DIRS "${path}")
+    endforeach()
+
+    set(OPENRTM_CFLAGS "-DUSE_stub_in_nt_dll")
+
+    foreach(library ${rtm_lib})
+        list(APPEND OPENRTM_LIBRARIES optimized "${library}")
+    endforeach()
+    foreach(library ${coil_lib})
+        list(APPEND OPENRTM_LIBRARIES optimized "${library}")
+    endforeach()
+
+    foreach(library ${rtm_libd})
+        list(APPEND OPENRTM_LIBRARIES debug "${library}")
+    endforeach()
+    foreach(library ${coil_libd})
+        list(APPEND OPENRTM_LIBRARIES debug "${library}")
+    endforeach()
+
+    # IDL Compiler
+    set(OPENRTM_IDLC "${rtm_idlc}")
+    foreach(flag ${rtm_idlflags})
+        string(REGEX REPLACE "[\\]" "/" flag "${flag}")
+        list(APPEND OPENRTM_IDLFLAGS "${flag}")
+    endforeach()
+
+    # IDL Skelton Wrapper
+    set(OPENRTM_IDL_WRAPPER "rtm-skelwrapper.py")
+    set(OPENRTM_IDL_WRAPPER_FLAGS --include-dir="" --skel-suffix=Skel --stub-suffix=Stub)
+
+endif(WIN32_RTM STREQUAL "11")
+
+if(WIN32_RTM STREQUAL "10")
+    # omniORB
     if(NOT OMNIORB_DIR)
         if(NOT $ENV{OMNI_ROOT} STREQUAL "")
             set(OMNIORB_DIR "$ENV{OMNI_ROOT}")
@@ -134,6 +258,8 @@
     string(REGEX REPLACE "([0-9]+)\\.([0-9]+)" "\\2" OPENRTM_VERSION_MINOR "${OPENRTM_VERSION}")
     set(OPENRTM_VERSION_PATCH "0")
     set(OPENRTM_VERSION "${OPENRTM_VERSION_MAJOR}.${OPENRTM_VERSION_MINOR}.${OPENRTM_VERSION_PATCH}")
+    string(REGEX REPLACE "[.]" ""
+           OPENRTM_VERSION_NUM "${OPENRTM_VERSION}")
 
     set(OPENRTM_INCLUDE_DIRS "${OPENRTM_DIR}")
     set(OPENRTM_LIBRARY_DIRS "${OPENRTM_DIR}/bin")
@@ -141,7 +267,7 @@
 
     set(OPENRTM_CFLAGS "-DUSE_stub_in_nt_dll")
 
-    foreach(library "RTC100" "coil")
+    foreach(library "RTC${OPENRTM_VERSION_NUM}" "coil")
         list(APPEND OPENRTM_LIBRARIES optimized "${library}" debug "${library}d")
     endforeach()
     foreach(library "ws2_32" "mswsock")

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -79,6 +79,9 @@
   
   // </rtc-template>
 
+  // <rtc-template block="bind_config">
+  // </rtc-template>
+  
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -223,30 +223,35 @@
   
   // </rtc-template>
 
+  // Configuration variable declaration
+  // <rtc-template block="config_declare">
+
+  // </rtc-template>
+
   // DataInPort declaration
   // <rtc-template block="inport_declare">
-  TimedShort m_InP1;
+  RTC::TimedShort m_InP1;
   /*!
    */
-  InPort<TimedShort> m_InP1In;
-  TimedLong m_InP2;
+  InPort<RTC::TimedShort> m_InP1In;
+  RTC::TimedLong m_InP2;
   /*!
    */
-  InPort<TimedLong> m_InP2In;
+  InPort<RTC::TimedLong> m_InP2In;
   
   // </rtc-template>
 
 
   // DataOutPort declaration
   // <rtc-template block="outport_declare">
-  TimedInt m_OutP1;
+  RTC::TimedInt m_OutP1;
   /*!
    */
-  OutPort<TimedInt> m_OutP1Out;
-  TimedFloat m_OutP2;
+  OutPort<RTC::TimedInt> m_OutP1Out;
+  RTC::TimedFloat m_OutP2;
   /*!
    */
-  OutPort<TimedFloat> m_OutP2Out;
+  OutPort<RTC::TimedFloat> m_OutP2Out;
   
   // </rtc-template>
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/cmake_modules/FindOpenRTM.cmake
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/cmake_modules/FindOpenRTM.cmake	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/cmake_modules/FindOpenRTM.cmake	2013-01-29 10:39:20 UTC (rev 394)
@@ -64,8 +64,132 @@
 
 endif(UNIX)
 
+set(WIN32_RTM "")
+set(RTM_CONFIG_CMAKE "")
+
+macro(rtm_norm_path _path _result)
+    string(REGEX REPLACE "\"" ""    _var "${_path}")
+    string(REGEX REPLACE "[/]+" "/" _var "${_var}")
+    string(REGEX REPLACE "[/]$" ""  _var "${_var}")
+    set(${_result} "${_var}")
+endmacro(rtm_norm_path)
+
 if(WIN32)
+    set(WIN32_RTM "10")
+    find_file(rtm_conf "rtm_config.cmake" PATHS "$ENV{RTM_ROOT}/etc")
+    if(rtm_conf)
+        set(WIN32_RTM "11")
+        set(RTM_CONFIG_CMAKE "${rtm_conf}")
+    endif()
+endif(WIN32)
+
+if(WIN32_RTM STREQUAL "11")
+    include("${RTM_CONFIG_CMAKE}")
+    message(STATUS "Configuration by ${RTM_CONFIG_CMAKE}.")
+
     # omniORB
+    set(OMNIORB_DIR "${omni_root}")
+    set(OMNIORB_FOUND TRUE)
+    file(TO_CMAKE_PATH "${OMNIORB_DIR}" OMNIORB_DIR)
+
+    foreach(path ${omni_includes})
+        file(TO_CMAKE_PATH "${path}" path)
+        rtm_norm_path("${path}" path)
+        list(APPEND OMNIORB_INCLUDE_DIRS "${path}")
+    endforeach()
+    foreach(path ${omni_libdir})
+        file(TO_CMAKE_PATH "${path}" path)
+        rtm_norm_path("${path}" path)
+        list(APPEND OMNIORB_LIBRARY_DIRS "${path}")
+    endforeach()
+
+    # omniORB version
+    file(GLOB _vers RELATIVE "${OMNIORB_DIR}" "${OMNIORB_DIR}/THIS_IS_OMNIORB*")
+    if("${_vers}" STREQUAL "")
+        message(FATAL_ERROR "omniORB version file not found.")
+    endif()
+
+    set(OMNIORB_VERSION "${_vers}")
+    string(REGEX REPLACE "THIS_IS_OMNIORB_" ""
+           OMNIORB_VERSION "${OMNIORB_VERSION}")
+    string(REGEX REPLACE "[_]" "."
+           OMNIORB_VERSION "${OMNIORB_VERSION}")
+
+    set(OMNIORB_VERSION_NUM "${omni_dllver}")
+    set(OMNIORB_THREAD_NUM "${omnithread_dllver}")
+
+    set(OMNIORB_CFLAGS -D__WIN32__;-D__x86__;-D__NT__;-D__OSVERSION__=4;-D_CRT_SECURE_NO_DEPRECATE)
+    if(${OMNIORB_VERSION_NUM} MATCHES "^40")
+      set(OMNIORB_CFLAGS ${OMNIORB_CFLAGS};-D_WIN32_WINNT=0x0400)
+    else()
+      set(OMNIORB_CFLAGS ${OMNIORB_CFLAGS};-D_WIN32_WINNT=0x0500;-DRTC_CORBA_CXXMAPPING11)
+    endif()
+
+    foreach(library ${omni_lib})
+        list(APPEND OMNIORB_LIBRARIES optimized "${library}")
+    endforeach()
+    foreach(library ${omni_libd})
+        list(APPEND OMNIORB_LIBRARIES debug "${library}")
+    endforeach()
+
+    # OpenRTM-aist
+    set(OPENRTM_DIR "${rtm_root}")
+    set(OPENRTM_FOUND TRUE)
+    file(TO_CMAKE_PATH "${OPENRTM_DIR}" OPENRTM_DIR)
+
+    # OpenRTM-aist version
+    set(OPENRTM_VERSION "${rtm_version}")
+    string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\1"
+           OPENRTM_VERSION_MAJOR "${OPENRTM_VERSION}")
+    string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\2"
+           OPENRTM_VERSION_MINOR "${OPENRTM_VERSION}")
+    string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\3"
+           OPENRTM_VERSION_PATCH "${OPENRTM_VERSION}")
+
+    set(OPENRTM_VERSION_NUM "${rtm_dllver}")
+
+    foreach(path ${rtm_includes})
+        file(TO_CMAKE_PATH "${path}" path)
+        rtm_norm_path("${path}" path)
+        list(APPEND OPENRTM_INCLUDE_DIRS "${path}")
+    endforeach()
+    foreach(path ${rtm_libdir})
+        file(TO_CMAKE_PATH "${path}" path)
+        rtm_norm_path("${path}" path)
+        list(APPEND OPENRTM_LIBRARY_DIRS "${path}")
+    endforeach()
+
+    set(OPENRTM_CFLAGS "-DUSE_stub_in_nt_dll")
+
+    foreach(library ${rtm_lib})
+        list(APPEND OPENRTM_LIBRARIES optimized "${library}")
+    endforeach()
+    foreach(library ${coil_lib})
+        list(APPEND OPENRTM_LIBRARIES optimized "${library}")
+    endforeach()
+
+    foreach(library ${rtm_libd})
+        list(APPEND OPENRTM_LIBRARIES debug "${library}")
+    endforeach()
+    foreach(library ${coil_libd})
+        list(APPEND OPENRTM_LIBRARIES debug "${library}")
+    endforeach()
+
+    # IDL Compiler
+    set(OPENRTM_IDLC "${rtm_idlc}")
+    foreach(flag ${rtm_idlflags})
+        string(REGEX REPLACE "[\\]" "/" flag "${flag}")
+        list(APPEND OPENRTM_IDLFLAGS "${flag}")
+    endforeach()
+
+    # IDL Skelton Wrapper
+    set(OPENRTM_IDL_WRAPPER "rtm-skelwrapper.py")
+    set(OPENRTM_IDL_WRAPPER_FLAGS --include-dir="" --skel-suffix=Skel --stub-suffix=Stub)
+
+endif(WIN32_RTM STREQUAL "11")
+
+if(WIN32_RTM STREQUAL "10")
+    # omniORB
     if(NOT OMNIORB_DIR)
         if(NOT $ENV{OMNI_ROOT} STREQUAL "")
             set(OMNIORB_DIR "$ENV{OMNI_ROOT}")
@@ -134,6 +258,8 @@
     string(REGEX REPLACE "([0-9]+)\\.([0-9]+)" "\\2" OPENRTM_VERSION_MINOR "${OPENRTM_VERSION}")
     set(OPENRTM_VERSION_PATCH "0")
     set(OPENRTM_VERSION "${OPENRTM_VERSION_MAJOR}.${OPENRTM_VERSION_MINOR}.${OPENRTM_VERSION_PATCH}")
+    string(REGEX REPLACE "[.]" ""
+           OPENRTM_VERSION_NUM "${OPENRTM_VERSION}")
 
     set(OPENRTM_INCLUDE_DIRS "${OPENRTM_DIR}")
     set(OPENRTM_LIBRARY_DIRS "${OPENRTM_DIR}/bin")
@@ -141,7 +267,7 @@
 
     set(OPENRTM_CFLAGS "-DUSE_stub_in_nt_dll")
 
-    foreach(library "RTC100" "coil")
+    foreach(library "RTC${OPENRTM_VERSION_NUM}" "coil")
         list(APPEND OPENRTM_LIBRARIES optimized "${library}" debug "${library}d")
     endforeach()
     foreach(library "ws2_32" "mswsock")

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -73,6 +73,9 @@
   
   // </rtc-template>
 
+  // <rtc-template block="bind_config">
+  // </rtc-template>
+  
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc1/DAQService.idl
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc1/DAQService.idl	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc1/DAQService.idl	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,7 +1,7 @@
 // -*- IDL -*-
 /*!
  * @file RTCService.idl
- * @brief RTComponent ƒT[ƒrƒXƒCƒ“ƒ^[ƒtƒF[ƒX
+ * @brief RTComponent サービスインターフェース
  * @date $Date: 2007/03/14 12:14:35 $
  * @author Noriaki Ando <n-ando at aist.go.jp>
  *
@@ -20,7 +20,7 @@
 /*
  * $Log: DAQService.idl,v $
  * Revision 1.1  2007/03/14 12:14:35  tsakamoto
- * ‘®«¶¬”Å
+ * 属性生成版
  *
  * Revision 1.1  2005/09/07 05:06:13  n-ando
  * RTComponent's service management feature was added.

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc1/Makefile.foo
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc1/Makefile.foo	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc1/Makefile.foo	2013-01-29 10:39:20 UTC (rev 394)
@@ -11,8 +11,8 @@
 #   --module-category=sample --module-comp-type=STATIC 
 #   --module-act-type=PERIODIC --module-max-inst=2 
 #   --inport=InP1:RTC::TimedShort --inport=InP2:RTC::TimedLong --outport=OutP1:RTC::TimedInt --outport=OutP2:RTC::TimedFloat 
-#   --service-idl=C:\Project\RTM\git34\jp.go.aist.rtm.rtcbuilder\/resource/MyService.idl 
-#   --consumer-idl=C:\Project\RTM\git34\jp.go.aist.rtm.rtcbuilder\/resource/DAQService.idl 
+#   --service-idl=__ROOT_PATH__resource/MyService.idl 
+#   --consumer-idl=__ROOT_PATH__resource/DAQService.idl 
 #   --service=svPort:acc:MyService 
 #   --consumer=cmPort:rate:DAQService 
 #

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc1/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc1/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc1/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -79,6 +79,9 @@
   
   // </rtc-template>
 
+  // <rtc-template block="bind_config">
+  // </rtc-template>
+  
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc1/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc1/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc1/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -223,30 +223,35 @@
   
   // </rtc-template>
 
+  // Configuration variable declaration
+  // <rtc-template block="config_declare">
+
+  // </rtc-template>
+
   // DataInPort declaration
   // <rtc-template block="inport_declare">
-  TimedShort m_InP1;
+  RTC::TimedShort m_InP1;
   /*!
    */
-  InPort<TimedShort> m_InP1In;
-  TimedLong m_InP2;
+  InPort<RTC::TimedShort> m_InP1In;
+  RTC::TimedLong m_InP2;
   /*!
    */
-  InPort<TimedLong> m_InP2In;
+  InPort<RTC::TimedLong> m_InP2In;
   
   // </rtc-template>
 
 
   // DataOutPort declaration
   // <rtc-template block="outport_declare">
-  TimedInt m_OutP1;
+  RTC::TimedInt m_OutP1;
   /*!
    */
-  OutPort<TimedInt> m_OutP1Out;
-  TimedFloat m_OutP2;
+  OutPort<RTC::TimedInt> m_OutP1Out;
+  RTC::TimedFloat m_OutP2;
   /*!
    */
-  OutPort<TimedFloat> m_OutP2Out;
+  OutPort<RTC::TimedFloat> m_OutP2Out;
   
   // </rtc-template>
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc2/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc2/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc2/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -73,6 +73,9 @@
   
   // </rtc-template>
 
+  // <rtc-template block="bind_config">
+  // </rtc-template>
+  
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc2/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc2/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc2/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -223,6 +223,11 @@
   
   // </rtc-template>
 
+  // Configuration variable declaration
+  // <rtc-template block="config_declare">
+
+  // </rtc-template>
+
   // DataInPort declaration
   // <rtc-template block="inport_declare">
   

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint1/foo.conf
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint1/foo.conf	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint1/foo.conf	2013-01-29 10:39:20 UTC (rev 394)
@@ -0,0 +1,133 @@
+# -*- sh -*-
+#------------------------------------------------------------
+# Configuration file for foo
+#
+# This configuration file name should be specified in rtc.conf (or other
+# configuration file specified by -f option) by "config_file" property.
+#
+# manip2.foo.config_file: foo.conf
+# or
+# manip2.foo0.config_file: foo0.conf
+# manip2.foo1.config_file: foo1.conf
+# manip2.foo2.config_file: foo2.conf
+#
+# ------------------------------------------------------------
+# An example configuration file for foo
+#
+# See details in the following reference manual
+#
+
+# Execution context configuration
+# exec_cxt.periodic.type: PeriodicExecutionContext
+# exec_cxt.periodic.rate: 1000
+#
+#
+# configuration.active_config: mode0
+
+# Additional configuration-set example named "mode0"
+#
+# conf.mode0.int_param0: 0
+# conf.mode0.int_param1: 1
+# conf.mode0.double_param0: 0.99
+# conf.mode0.double_param1: -0.99
+# conf.mode0.str_param0: default
+# conf.mode0.str_param1: default set in conf file
+# conf.mode0.vector_param0: 0.0,0.1,0.2,0.3,0.4,0.5,0.6
+#
+# Other configuration set named "mode1"
+#
+# conf.mode1.int_param0: 0
+# conf.mode1.int_param1: 1
+# conf.mode1.double_param0: 0.99
+# conf.mode1.double_param1: -0.99
+# conf.mode1.str_param0: default
+# conf.mode1.str_param1: default set in conf file
+# conf.mode1.vector_param0: 0.0,0.1,0.2,0.3,0.4,0.5,0.6
+
+
+
+
+
+##============================================================
+## Component configuration reference
+##
+
+##============================================================
+## Active configuration-set
+##============================================================
+##
+## Initial active configuration-set. The following "mode0" is a
+## configuration-set name.  A configuration-set named "mode0" should be
+## appear in this configuration file as follows.
+##
+## configuration.active_config: mode0
+##
+# conf.mode0.param0: hoge
+# conf.mode0.param1: fuga
+# conf.mode0.param2: munya
+
+##============================================================
+## GUI control option for RTSystemEditor
+##============================================================
+## Available GUI control options [__widget__]:
+##
+## - text:          text box [default].
+## - slider.<step>: Horizontal slider. <step> is step for the slider.
+##                  A range constraints option is required. 
+## - spin:          Spin button. A range constraitns option is required.
+## - radio:         Radio button. An enumeration constraints is required.
+## - checkbox:      Checkbox control. An enumeration constraints is
+##                  required. The parameter has to be able to accept a
+##                  comma separated list.
+## - orderd_list:   Orderd list control.  An enumeration constraint is
+##                  required. The parameter has to be able to accept a
+##                  comma separated list. In this control, Enumerated
+##                  elements can appear one or more times in the given list.
+##
+## Available GUI control constraint options [__constraints__]:
+##
+## - none:         blank
+## - direct value: 100 (constant value)
+## - range:        <, >, <=, >= can be used.
+## - enumeration:  (enum0, enum1, ...)
+## - array:        <constraints0>, ,constraints1>, ... for only array value
+## - hash:         {key0: value0, key1:, value0, ...}
+##
+## examples:
+# conf.__widget__.int_param0: slider.10
+# conf.__widget__.int_param1: spin
+# conf.__widget__.double_param0: slider.10
+# conf.__widget__.double_param1: text
+# conf.__widget__.str_param0: radio
+# conf.__widget__.vector_param0: checkbox
+# conf.__widget__.vector_param1: orderd_list
+
+
+# conf.__constraints__.int_param0, 0<x<1
+
+##============================================================
+## Execution context settings
+##============================================================
+##
+## Periodic type ExecutionContext
+##
+## Other availabilities in OpenRTM-aist
+##
+## - ExtTrigExecutionContext: External triggered EC. It is embedded in
+##                            OpenRTM library.
+## - OpenHRPExecutionContext: External triggred paralell execution
+##                            EC. It is embedded in OpenRTM
+##                            library. This is usually used with
+##                            OpenHRP3.
+## - RTPreemptEC:             Real-time execution context for Linux
+##                            RT-preemptive pathed kernel.
+## - ArtExecutionContext:     Real-time execution context for ARTLinux
+##                            (http://sourceforge.net/projects/art-linux/)
+##
+# exec_cxt.periodic.type: PeriodicExecutionContext
+
+##
+## The execution cycle of ExecutionContext
+##
+# exec_cxt.periodic.rate: 1000
+

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint1/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint1/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint1/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -73,8 +73,8 @@
   // <rtc-template block="bind_config">
   // Bind variables and configuration variable
   bindParameter("int_param0", m_int_param0, "0");
+  // </rtc-template>
   
-  // </rtc-template>
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint1/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint1/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint1/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -229,6 +229,7 @@
    * - DefaultValue: 0
    */
   int m_int_param0;
+
   // </rtc-template>
 
   // DataInPort declaration

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint1/rtc.conf
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint1/rtc.conf	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint1/rtc.conf	2013-01-29 10:39:20 UTC (rev 394)
@@ -1 +1,437 @@
+#------------------------------------------------------------
+# RT-Component manager configuration
+#
+# See details in the following reference manual or web page.
+# http://www.openrtm.org/openrtm/en/content/configuration
+# http://www.openrtm.org/openrtm/ja/content/rtcconf%E8%A8%AD%E5%AE%9A%E9%A0%85%E7%9B%AE%E4%B8%80%E8%A6%A7
+# http://www.openrtm.org/openrtm/ko/content/rtcconf-%EC%84%A4%EC%A0%95-%ED%95%AD%EB%AA%A9-%EC%9D%BC%EB%9E%8C
+#
+
+#------------------------------------------------------------
+# Typically used configuration parameters
+#
+# corba.name_servers: localhost, 192.168.0.1
+# corba.endpoints: <interface addess>, <interface addess>
+# logger.enable: YES
+# logger.file_name: ./rtc%p.log
+# logger.log_level: NORMAL
+#
+# The following properties should be specified in component specific
+# configuration files.
+# exec_cxt.periodic.type: PeriodicExecutionContext
+# exec_cxt.periodic.rate: 1000
+
+# Component specific configruation files:
+# If you want to load component specific configuration file, please
+# uncomment the following line.
+#
+# manip2.foo.config_file: foo.conf
+# or
+# manip2.foo0.config_file: foo0.conf
+# manip2.foo1.config_file: foo1.conf
+# manip2.foo2.config_file: foo2.conf
+#
+#------------------------------------------------------------
+
 manip2.foo.config_file: foo.conf
+
+#
+# Please delete the following part if you are familiar with OpenRTM's
+# configuration parameters.
+#
+##----------------------------------------------------------------------
+##
+## RT-Component manager configurations
+##
+##----------------------------------------------------------------------
+
+##------------------------------------------------------------
+## Configuration version (optional) 
+##
+# config.version: 1.0
+
+##------------------------------------------------------------
+## OpenRTM-aist version (optional)
+##
+# openrtm.version: 1.0.0
+
+##------------------------------------------------------------
+## The name of manager (default = manager)
+##
+# manager.name: manager
+
+##------------------------------------------------------------
+## Master manager
+## - manager.is_master: YES/NO, This process made a master or not.
+## - manager.corba_servant: YES/NO, create manager's corba service or not
+## - corba.master_manager: <host_name>:<port>, master manager's location
+# manager.is_master: YES
+# manager.corba_servant: YES
+# corba.master_manager: localhost:2810
+
+##------------------------------------------------------------
+## Manager auto shutdown options
+## - manager.shutdown_on_nortcs: YES/NO, 
+##   process will be shutdown in case no rtc exists when rtc is deleted.
+## - manager.shutdown_auto:
+##   process will be shutdown in case no rtc exists on periodic check.
+# manager.shutdown_on_nortcs: YES
+# manager.shutdown_auto: YES
+# manager.auto_shutdown_duration: 10.0
+
+##============================================================
+## CORBA configuration
+##============================================================
+##
+## CORBA ORB's arguments
+##
+## ORB specific command line options given to ORB_init().
+## See your ORB documentation.
+##
+## Example:
+##   corba.args: -ORBInitialHost myhost -ORBInitialPort 8888
+##
+##
+# corba.args:
+
+##
+## ORB endpoint
+##
+## If you have two or more network interfaces, ORB endpoint address and/or
+## port have to be specified. If hostname or port number is abbreviated,
+## default interface or port number is used. At least one colon ':'
+## is needed when you specify this option.
+##
+## Examples:
+##   corba.endpoint: myhost:      (use myhost and default port)
+##   corba.endpoint: :9876        (use default addr and port 9876)
+##   corba.endpoint: myhost:9876  (use myhost and port 9876)
+##
+# corba.endpoint:
+
+##
+## Multiple endpoint options (experimental)
+##
+## Multiple endpoint addresses and ports can be specified using this option.
+##
+## Example:
+##   corba.endpoints: 192.168.1.10:1111, 192.168.10.11:2222
+##   corba.endpoints: 192.168.1.10, 192.168.10.11
+##   corba.endpoints: all
+##
+# corba.endpoints:
+
+
+##
+## CORBA name server setting
+##
+## Multiple name servers can be specified separating by comma.
+## If port number is abbreviated, default port number is used.
+## The default port number is depend on ORB implementation.
+##
+## Examples:
+##   corba.nameservers: openrtm.aist.go.jp:9876
+##   corba.nameservers: rtm0.aist.go.jp, rtm1.aist.go.jp, rtm2.aist.go.jp
+##
+# corba.nameservers: localhost
+
+##
+## IOR host address replacement by guessed endpoint from routing (experimental)
+##
+## This option replaces a host address with an endpoint that is guessed
+## by route information to nameserver's address. This option may be
+## effective for CORBA implementation that does not supports IOR's
+## multiple profile or alternate IIOP address. However, since other
+## object references that are obtained from RT-Components or other are
+## not modified by this rule, other RTCs that are connected to this RTC
+## have to also support IOR multiple profile feature.  When this option
+## is used, corba.endpoints option should also be specified with
+## multiple endpoints.
+##
+# corba.nameservice.replace_endpoint: NO
+
+##
+## IOR alternate IIOP addresses
+##
+## This option adds alternate IIOP addresses into the IOR Profiles.
+## IOR can include additional endpoints for a servant. It is almost
+## same as "corba.endpoints" option, but this option does not create
+## actual endpoint on the ORB. (corba.endpoints try to create actual
+## endpoint, and if it cannot be created, error will be returned.)
+## This option just add alternate IIOP endpoint address information to
+## an IOR.
+##
+## This option can be used when RTCs are located inside of NAT or
+## router.  Generally speaking, RTCs in a private network cannot
+## connect to RTCs in the global network, because global client cannot
+## reach to private servants. However, if route (or NAT) is properly
+## configured for port forwarding, global RTCs can reach to RTCs in
+## private network.
+##
+## A setting example is as follows.
+## 1) Configure your router properly for port-forwarding.
+##    ex. global 2810 port is forwarded to private 2810
+## 2) Set the following options in rtc.conf
+##  corba.nameservers: my.global.nameserver.com <- name server in global network
+##  corba.endpoints: :2810 <- actual port number
+##  corba.additional_ior_addresses: w.x.y.z:2810 <- routers global IP addr/port
+## 3) Launch global RTCs and private RTC, and connect them.
+##
+# corba.alternate_iiop_addresses: addr:port
+
+##============================================================
+## Naming configurations
+##============================================================
+##
+## Enable/Disable naming functions
+##
+# naming.enable: YES
+
+##
+## Naming Types
+##
+## Now only "corba" is supported.
+##
+# naming.type: corba
+
+##
+## Naming format
+##
+## The name format of components that is bound to naming services.
+## The delimiter between names is "/".
+## The delimiter between name and kind is ".".
+##
+## example: (OpenRTM-aist-0.2.0 style)
+##       %h.host_cxt/%M.mgr_cxt/%c.cat_cxt/%m.mod_cxt/%n.rtc
+## This is formatted according to the following replacement rules.
+##
+## %n: The instance name of the component.
+## %t: The type name of the component.
+## %m: The module name of the component.
+## %v: The version of the component.
+## %V: The component vendor.
+## %c: The category of the component.
+## %h: The hostname.
+## %M: The manager name.
+## %p: PID of the manager.
+##
+# naming.formats: %h.host/%n.rtc
+
+##
+## Auto update to Naming Server
+##
+# naming.update.enable: YES
+##
+## Update interval [s] for auto update
+##
+# naming.update.interval: 10.0
+##
+## Rebind references in auto update
+##
+# naming.update.rebind: NO
+
+## End of Naming configuration section
+##------------------------------------------------------------
+
+##============================================================
+## Module management
+##============================================================
+##
+## Loadable module search path list
+##
+## Manager searches loadable modules from the specified search path list.
+## Path list elements should be separated by comma.
+## Path delimiter is '/' on UNIX, and '\\' on Windows
+## Valid path examples:
+##   manager.modules.load_path: C:/Program Files/OpenRTM-aist,  \
+##   			       C:\\Program Files\\OpenRTM-aist
+##   manager.modules.load_path: /usr/lib, /usr/local/lib,       \
+##   			       /usr/local/lib/OpenRTM-aist/libs
+##
+# manager.modules.load_path: ./
+
+##
+## Preload module list
+##
+## Manager can load loadable modules before starting up.
+## Loadable modules, which is specified only as its file name, is searched
+## in each module load path specified in the "manager.modules.load_path".
+## If the "manager.modules.abs_path_allowed" option is YES, loadable file
+## can be specified as full-path name,
+##
+## Valid settings:
+## manager.modules.preload: ConsoleIn.dll, ConsoleOut.dll
+## manager.modules.preload: ConsoleIn.so, ConsoleOut.so
+## manager.modules.abs_path_allowed: YES
+## manager.modules.preload: /usr/lib/OpenRTM-aist/ConsoleIn.so
+##
+# manager.modules.preload:
+
+##
+## Permission flag of absolute module path
+##
+## If this option is "YES", absolute path specification for module is allowed.
+##
+# manager.modules.abs_path_allowed: YES
+
+##
+## The following options are not implemented yet. 
+##
+## manager.modules.config_ext:
+## manager.modules.config_path:
+## manager.modules.detect_loadable:
+## manager.modules.init_func_suffix:
+## manager.modules.init_func_prefix:
+## manager.modules.download_allowed:
+## manager.modules.download_dir:
+## manager.modules.download_cleanup:
+##
+
+##
+## Advance component creation
+##
+## This option specifies components' names (module name) creating in advance
+## before starting the manager's event-loop. The components' factories should
+## be registered by manager.module.preload option or statically linked to the
+##  manager.
+##
+## Example:
+## manager.components.precreate: ConsoleIn, ConsoleOut, SeqIn, SeqOut
+##
+# manager.components.precreate: 
+
+
+##============================================================
+## Logger configurations
+##============================================================
+##
+## Enable/Disable logger [YES/NO]
+# logger.enable: YES
+
+##
+## Log file name (default = ./rtc%p.log)
+##
+## %p: PID
+##
+# logger.file_name: ./rtc%p.log
+
+##
+## Log date format (default = %b %d %H:%M:%S)
+##
+## The following strftime(3) like format expression is available.
+## If no prefix is needed, use "No" or "Disable".
+## 
+## %a abbreviated weekday name 
+## %A full weekday name 
+## %b abbreviated month name 
+## %B full month name 
+## %c the standard date and time string 
+## %d day of the month, as a number (1-31) 
+## %H hour, 24 hour format (0-23) 
+## %I hour, 12 hour format (1-12) 
+## %j day of the year, as a number (1-366) 
+## %m month as a number (1-12).
+##    Note: some versions of Microsoft Visual C++ may use values that range
+##    from 0-11. 
+## %M minute as a number (0-59) 
+## %p locale's equivalent of AM or PM 
+## %Q millisecond as a number (0-999) from ver 1.1
+## %q microsecond as a number (0-999) from ver 1.1
+## %S second as a number (0-59) 
+## %U week of the year, sunday as the first day 
+## %w weekday as a decimal (0-6, sunday=0) 
+## %W week of the year, monday as the first day 
+## %x standard date string 
+## %X standard time string 
+## %y year in decimal, without the century (0-99) 
+## %Y year in decimal, with the century 
+## %Z time zone name 
+## %% a percent sign 
+##  
+##
+## logger.date_format: No
+## logger.date_format: Disable
+## logger.date_format: [%Y-%m-%dT%H.%M.%S%Z]     // W3C standard format
+## logger.date_format: [%b %d %H:%M:%S]          // Syslog format
+## logger.date_format: [%a %b %d %Y %H:%M:%S %Z] // RFC2822 format
+## logger.date_format: [%a %b %d %H:%M:%S %Z %Y] // data command format
+## logger.date_format: [%Y-%m-%d %H.%M.%S]
+##
+# logger.date_format: %b %d %H:%M:%S
+
+##
+## Log level (default = NORMAL)
+##
+## The following LogLevels are allowed.
+## SILENT, ERROR, WARN, NORMAL, INFO, DEBUG, TRACE, VERBOSE, PARANOID
+##
+##
+## SILENT  : completely silent
+## ERROR   : includes (ERROR)
+## WARN    : includes (ERROR, WARN)
+## INFO    : includes (ERROR, WARN, INFO)
+## NORMAL  : includes (ERROR, WARN, INFO, NORMAL)
+## DEBUG   : includes (ERROR, WARN, INFO, NORMAL, DEBUG)
+## TRACE   : includes (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE)
+## VERBOSE : includes (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE, VERBOSE)
+## PARANOID: includes (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE, VERBOSE, PARA)
+##
+## Warning!!!
+## "TRACE", "VERBOSE", "PARANOID" logging level will create a huge log file!!
+## "PARANOID" log level will tangle the log file.
+##
+# logger.log_level: NORMAL
+
+##============================================================
+## Timer configuration
+##============================================================
+##
+## Enable/disable timer function
+##
+# timer.enable: YES
+
+##
+## Timer clock tick setting [s]
+##
+# timer.tick: 0.1
+
+##============================================================
+## Execution context settings
+##============================================================
+##
+## Periodic type ExecutionContext
+##
+## Other availabilities in OpenRTM-aist
+##
+## - ExtTrigExecutionContext: External triggered EC. It is embedded in
+##                            OpenRTM library.
+## - OpenHRPExecutionContext: External triggred paralell execution
+##                            EC. It is embedded in OpenRTM
+##                            library. This is usually used with
+##                            OpenHRP3.
+## - RTPreemptEC:             Real-time execution context for Linux
+##                            RT-preemptive pathed kernel.
+## - ArtExecutionContext:     Real-time execution context for ARTLinux
+##                            (http://sourceforge.net/projects/art-linux/)
+##
+# exec_cxt.periodic.type: PeriodicExecutionContext
+
+##
+## The execution cycle of ExecutionContext
+##
+# exec_cxt.periodic.rate: 1000
+
+##============================================================
+## SDO service settings
+##============================================================
+##
+## SDO service provider settings
+##
+# sdo.service.provider.available_services: [read only]
+# sdo.service.provider.enabled_services: ALL
+# sdo.service.provider.providing_services: [read only]
+##
+## SDO service consumer settings
+##
+# sdo.service.consumer.available_services: [read only]
+# sdo.service.consumer.enabled_services: ALL

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint2/foo.conf
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint2/foo.conf	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint2/foo.conf	2013-01-29 10:39:20 UTC (rev 394)
@@ -0,0 +1,134 @@
+# -*- sh -*-
+#------------------------------------------------------------
+# Configuration file for foo
+#
+# This configuration file name should be specified in rtc.conf (or other
+# configuration file specified by -f option) by "config_file" property.
+#
+# manip2.foo.config_file: foo.conf
+# or
+# manip2.foo0.config_file: foo0.conf
+# manip2.foo1.config_file: foo1.conf
+# manip2.foo2.config_file: foo2.conf
+#
+# ------------------------------------------------------------
+# An example configuration file for foo
+#
+# See details in the following reference manual
+#
+
+# Execution context configuration
+# exec_cxt.periodic.type: PeriodicExecutionContext
+# exec_cxt.periodic.rate: 1000
+#
+#
+# configuration.active_config: mode0
+
+# Additional configuration-set example named "mode0"
+#
+# conf.mode0.int_param0: 0
+# conf.mode0.int_param1: 1
+# conf.mode0.double_param0: 0.99
+# conf.mode0.double_param1: -0.99
+# conf.mode0.str_param0: default
+# conf.mode0.str_param1: default set in conf file
+# conf.mode0.vector_param0: 0.0,0.1,0.2,0.3,0.4,0.5,0.6
+#
+# Other configuration set named "mode1"
+#
+# conf.mode1.int_param0: 0
+# conf.mode1.int_param1: 1
+# conf.mode1.double_param0: 0.99
+# conf.mode1.double_param1: -0.99
+# conf.mode1.str_param0: default
+# conf.mode1.str_param1: default set in conf file
+# conf.mode1.vector_param0: 0.0,0.1,0.2,0.3,0.4,0.5,0.6
+
+
+
+
+
+##============================================================
+## Component configuration reference
+##
+
+##============================================================
+## Active configuration-set
+##============================================================
+##
+## Initial active configuration-set. The following "mode0" is a
+## configuration-set name.  A configuration-set named "mode0" should be
+## appear in this configuration file as follows.
+##
+## configuration.active_config: mode0
+##
+# conf.mode0.param0: hoge
+# conf.mode0.param1: fuga
+# conf.mode0.param2: munya
+
+##============================================================
+## GUI control option for RTSystemEditor
+##============================================================
+## Available GUI control options [__widget__]:
+##
+## - text:          text box [default].
+## - slider.<step>: Horizontal slider. <step> is step for the slider.
+##                  A range constraints option is required. 
+## - spin:          Spin button. A range constraitns option is required.
+## - radio:         Radio button. An enumeration constraints is required.
+## - checkbox:      Checkbox control. An enumeration constraints is
+##                  required. The parameter has to be able to accept a
+##                  comma separated list.
+## - orderd_list:   Orderd list control.  An enumeration constraint is
+##                  required. The parameter has to be able to accept a
+##                  comma separated list. In this control, Enumerated
+##                  elements can appear one or more times in the given list.
+##
+## Available GUI control constraint options [__constraints__]:
+##
+## - none:         blank
+## - direct value: 100 (constant value)
+## - range:        <, >, <=, >= can be used.
+## - enumeration:  (enum0, enum1, ...)
+## - array:        <constraints0>, ,constraints1>, ... for only array value
+## - hash:         {key0: value0, key1:, value0, ...}
+##
+## examples:
+# conf.__widget__.int_param0: slider.10
+# conf.__widget__.int_param1: spin
+# conf.__widget__.double_param0: slider.10
+# conf.__widget__.double_param1: text
+# conf.__widget__.str_param0: radio
+# conf.__widget__.vector_param0: checkbox
+# conf.__widget__.vector_param1: orderd_list
+
+
+# conf.__constraints__.int_param0, 0<x<1
+# conf.__constraints__.str_param0, (up, down, right, left)
+
+##============================================================
+## Execution context settings
+##============================================================
+##
+## Periodic type ExecutionContext
+##
+## Other availabilities in OpenRTM-aist
+##
+## - ExtTrigExecutionContext: External triggered EC. It is embedded in
+##                            OpenRTM library.
+## - OpenHRPExecutionContext: External triggred paralell execution
+##                            EC. It is embedded in OpenRTM
+##                            library. This is usually used with
+##                            OpenHRP3.
+## - RTPreemptEC:             Real-time execution context for Linux
+##                            RT-preemptive pathed kernel.
+## - ArtExecutionContext:     Real-time execution context for ARTLinux
+##                            (http://sourceforge.net/projects/art-linux/)
+##
+# exec_cxt.periodic.type: PeriodicExecutionContext
+
+##
+## The execution cycle of ExecutionContext
+##
+# exec_cxt.periodic.rate: 1000
+

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint2/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint2/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint2/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -76,8 +76,8 @@
   // Bind variables and configuration variable
   bindParameter("int_param0", m_int_param0, "0");
   bindParameter("str_param0", m_str_param0, "up");
+  // </rtc-template>
   
-  // </rtc-template>
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint2/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint2/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint2/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -235,6 +235,7 @@
    * - DefaultValue: up
    */
   std::string m_str_param0;
+
   // </rtc-template>
 
   // DataInPort declaration

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint2/rtc.conf
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint2/rtc.conf	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint2/rtc.conf	2013-01-29 10:39:20 UTC (rev 394)
@@ -1 +1,437 @@
+#------------------------------------------------------------
+# RT-Component manager configuration
+#
+# See details in the following reference manual or web page.
+# http://www.openrtm.org/openrtm/en/content/configuration
+# http://www.openrtm.org/openrtm/ja/content/rtcconf%E8%A8%AD%E5%AE%9A%E9%A0%85%E7%9B%AE%E4%B8%80%E8%A6%A7
+# http://www.openrtm.org/openrtm/ko/content/rtcconf-%EC%84%A4%EC%A0%95-%ED%95%AD%EB%AA%A9-%EC%9D%BC%EB%9E%8C
+#
+
+#------------------------------------------------------------
+# Typically used configuration parameters
+#
+# corba.name_servers: localhost, 192.168.0.1
+# corba.endpoints: <interface addess>, <interface addess>
+# logger.enable: YES
+# logger.file_name: ./rtc%p.log
+# logger.log_level: NORMAL
+#
+# The following properties should be specified in component specific
+# configuration files.
+# exec_cxt.periodic.type: PeriodicExecutionContext
+# exec_cxt.periodic.rate: 1000
+
+# Component specific configruation files:
+# If you want to load component specific configuration file, please
+# uncomment the following line.
+#
+# manip2.foo.config_file: foo.conf
+# or
+# manip2.foo0.config_file: foo0.conf
+# manip2.foo1.config_file: foo1.conf
+# manip2.foo2.config_file: foo2.conf
+#
+#------------------------------------------------------------
+
 manip2.foo.config_file: foo.conf
+
+#
+# Please delete the following part if you are familiar with OpenRTM's
+# configuration parameters.
+#
+##----------------------------------------------------------------------
+##
+## RT-Component manager configurations
+##
+##----------------------------------------------------------------------
+
+##------------------------------------------------------------
+## Configuration version (optional) 
+##
+# config.version: 1.0
+
+##------------------------------------------------------------
+## OpenRTM-aist version (optional)
+##
+# openrtm.version: 1.0.0
+
+##------------------------------------------------------------
+## The name of manager (default = manager)
+##
+# manager.name: manager
+
+##------------------------------------------------------------
+## Master manager
+## - manager.is_master: YES/NO, This process made a master or not.
+## - manager.corba_servant: YES/NO, create manager's corba service or not
+## - corba.master_manager: <host_name>:<port>, master manager's location
+# manager.is_master: YES
+# manager.corba_servant: YES
+# corba.master_manager: localhost:2810
+
+##------------------------------------------------------------
+## Manager auto shutdown options
+## - manager.shutdown_on_nortcs: YES/NO, 
+##   process will be shutdown in case no rtc exists when rtc is deleted.
+## - manager.shutdown_auto:
+##   process will be shutdown in case no rtc exists on periodic check.
+# manager.shutdown_on_nortcs: YES
+# manager.shutdown_auto: YES
+# manager.auto_shutdown_duration: 10.0
+
+##============================================================
+## CORBA configuration
+##============================================================
+##
+## CORBA ORB's arguments
+##
+## ORB specific command line options given to ORB_init().
+## See your ORB documentation.
+##
+## Example:
+##   corba.args: -ORBInitialHost myhost -ORBInitialPort 8888
+##
+##
+# corba.args:
+
+##
+## ORB endpoint
+##
+## If you have two or more network interfaces, ORB endpoint address and/or
+## port have to be specified. If hostname or port number is abbreviated,
+## default interface or port number is used. At least one colon ':'
+## is needed when you specify this option.
+##
+## Examples:
+##   corba.endpoint: myhost:      (use myhost and default port)
+##   corba.endpoint: :9876        (use default addr and port 9876)
+##   corba.endpoint: myhost:9876  (use myhost and port 9876)
+##
+# corba.endpoint:
+
+##
+## Multiple endpoint options (experimental)
+##
+## Multiple endpoint addresses and ports can be specified using this option.
+##
+## Example:
+##   corba.endpoints: 192.168.1.10:1111, 192.168.10.11:2222
+##   corba.endpoints: 192.168.1.10, 192.168.10.11
+##   corba.endpoints: all
+##
+# corba.endpoints:
+
+
+##
+## CORBA name server setting
+##
+## Multiple name servers can be specified separating by comma.
+## If port number is abbreviated, default port number is used.
+## The default port number is depend on ORB implementation.
+##
+## Examples:
+##   corba.nameservers: openrtm.aist.go.jp:9876
+##   corba.nameservers: rtm0.aist.go.jp, rtm1.aist.go.jp, rtm2.aist.go.jp
+##
+# corba.nameservers: localhost
+
+##
+## IOR host address replacement by guessed endpoint from routing (experimental)
+##
+## This option replaces a host address with an endpoint that is guessed
+## by route information to nameserver's address. This option may be
+## effective for CORBA implementation that does not supports IOR's
+## multiple profile or alternate IIOP address. However, since other
+## object references that are obtained from RT-Components or other are
+## not modified by this rule, other RTCs that are connected to this RTC
+## have to also support IOR multiple profile feature.  When this option
+## is used, corba.endpoints option should also be specified with
+## multiple endpoints.
+##
+# corba.nameservice.replace_endpoint: NO
+
+##
+## IOR alternate IIOP addresses
+##
+## This option adds alternate IIOP addresses into the IOR Profiles.
+## IOR can include additional endpoints for a servant. It is almost
+## same as "corba.endpoints" option, but this option does not create
+## actual endpoint on the ORB. (corba.endpoints try to create actual
+## endpoint, and if it cannot be created, error will be returned.)
+## This option just add alternate IIOP endpoint address information to
+## an IOR.
+##
+## This option can be used when RTCs are located inside of NAT or
+## router.  Generally speaking, RTCs in a private network cannot
+## connect to RTCs in the global network, because global client cannot
+## reach to private servants. However, if route (or NAT) is properly
+## configured for port forwarding, global RTCs can reach to RTCs in
+## private network.
+##
+## A setting example is as follows.
+## 1) Configure your router properly for port-forwarding.
+##    ex. global 2810 port is forwarded to private 2810
+## 2) Set the following options in rtc.conf
+##  corba.nameservers: my.global.nameserver.com <- name server in global network
+##  corba.endpoints: :2810 <- actual port number
+##  corba.additional_ior_addresses: w.x.y.z:2810 <- routers global IP addr/port
+## 3) Launch global RTCs and private RTC, and connect them.
+##
+# corba.alternate_iiop_addresses: addr:port
+
+##============================================================
+## Naming configurations
+##============================================================
+##
+## Enable/Disable naming functions
+##
+# naming.enable: YES
+
+##
+## Naming Types
+##
+## Now only "corba" is supported.
+##
+# naming.type: corba
+
+##
+## Naming format
+##
+## The name format of components that is bound to naming services.
+## The delimiter between names is "/".
+## The delimiter between name and kind is ".".
+##
+## example: (OpenRTM-aist-0.2.0 style)
+##       %h.host_cxt/%M.mgr_cxt/%c.cat_cxt/%m.mod_cxt/%n.rtc
+## This is formatted according to the following replacement rules.
+##
+## %n: The instance name of the component.
+## %t: The type name of the component.
+## %m: The module name of the component.
+## %v: The version of the component.
+## %V: The component vendor.
+## %c: The category of the component.
+## %h: The hostname.
+## %M: The manager name.
+## %p: PID of the manager.
+##
+# naming.formats: %h.host/%n.rtc
+
+##
+## Auto update to Naming Server
+##
+# naming.update.enable: YES
+##
+## Update interval [s] for auto update
+##
+# naming.update.interval: 10.0
+##
+## Rebind references in auto update
+##
+# naming.update.rebind: NO
+
+## End of Naming configuration section
+##------------------------------------------------------------
+
+##============================================================
+## Module management
+##============================================================
+##
+## Loadable module search path list
+##
+## Manager searches loadable modules from the specified search path list.
+## Path list elements should be separated by comma.
+## Path delimiter is '/' on UNIX, and '\\' on Windows
+## Valid path examples:
+##   manager.modules.load_path: C:/Program Files/OpenRTM-aist,  \
+##   			       C:\\Program Files\\OpenRTM-aist
+##   manager.modules.load_path: /usr/lib, /usr/local/lib,       \
+##   			       /usr/local/lib/OpenRTM-aist/libs
+##
+# manager.modules.load_path: ./
+
+##
+## Preload module list
+##
+## Manager can load loadable modules before starting up.
+## Loadable modules, which is specified only as its file name, is searched
+## in each module load path specified in the "manager.modules.load_path".
+## If the "manager.modules.abs_path_allowed" option is YES, loadable file
+## can be specified as full-path name,
+##
+## Valid settings:
+## manager.modules.preload: ConsoleIn.dll, ConsoleOut.dll
+## manager.modules.preload: ConsoleIn.so, ConsoleOut.so
+## manager.modules.abs_path_allowed: YES
+## manager.modules.preload: /usr/lib/OpenRTM-aist/ConsoleIn.so
+##
+# manager.modules.preload:
+
+##
+## Permission flag of absolute module path
+##
+## If this option is "YES", absolute path specification for module is allowed.
+##
+# manager.modules.abs_path_allowed: YES
+
+##
+## The following options are not implemented yet. 
+##
+## manager.modules.config_ext:
+## manager.modules.config_path:
+## manager.modules.detect_loadable:
+## manager.modules.init_func_suffix:
+## manager.modules.init_func_prefix:
+## manager.modules.download_allowed:
+## manager.modules.download_dir:
+## manager.modules.download_cleanup:
+##
+
+##
+## Advance component creation
+##
+## This option specifies components' names (module name) creating in advance
+## before starting the manager's event-loop. The components' factories should
+## be registered by manager.module.preload option or statically linked to the
+##  manager.
+##
+## Example:
+## manager.components.precreate: ConsoleIn, ConsoleOut, SeqIn, SeqOut
+##
+# manager.components.precreate: 
+
+
+##============================================================
+## Logger configurations
+##============================================================
+##
+## Enable/Disable logger [YES/NO]
+# logger.enable: YES
+
+##
+## Log file name (default = ./rtc%p.log)
+##
+## %p: PID
+##
+# logger.file_name: ./rtc%p.log
+
+##
+## Log date format (default = %b %d %H:%M:%S)
+##
+## The following strftime(3) like format expression is available.
+## If no prefix is needed, use "No" or "Disable".
+## 
+## %a abbreviated weekday name 
+## %A full weekday name 
+## %b abbreviated month name 
+## %B full month name 
+## %c the standard date and time string 
+## %d day of the month, as a number (1-31) 
+## %H hour, 24 hour format (0-23) 
+## %I hour, 12 hour format (1-12) 
+## %j day of the year, as a number (1-366) 
+## %m month as a number (1-12).
+##    Note: some versions of Microsoft Visual C++ may use values that range
+##    from 0-11. 
+## %M minute as a number (0-59) 
+## %p locale's equivalent of AM or PM 
+## %Q millisecond as a number (0-999) from ver 1.1
+## %q microsecond as a number (0-999) from ver 1.1
+## %S second as a number (0-59) 
+## %U week of the year, sunday as the first day 
+## %w weekday as a decimal (0-6, sunday=0) 
+## %W week of the year, monday as the first day 
+## %x standard date string 
+## %X standard time string 
+## %y year in decimal, without the century (0-99) 
+## %Y year in decimal, with the century 
+## %Z time zone name 
+## %% a percent sign 
+##  
+##
+## logger.date_format: No
+## logger.date_format: Disable
+## logger.date_format: [%Y-%m-%dT%H.%M.%S%Z]     // W3C standard format
+## logger.date_format: [%b %d %H:%M:%S]          // Syslog format
+## logger.date_format: [%a %b %d %Y %H:%M:%S %Z] // RFC2822 format
+## logger.date_format: [%a %b %d %H:%M:%S %Z %Y] // data command format
+## logger.date_format: [%Y-%m-%d %H.%M.%S]
+##
+# logger.date_format: %b %d %H:%M:%S
+
+##
+## Log level (default = NORMAL)
+##
+## The following LogLevels are allowed.
+## SILENT, ERROR, WARN, NORMAL, INFO, DEBUG, TRACE, VERBOSE, PARANOID
+##
+##
+## SILENT  : completely silent
+## ERROR   : includes (ERROR)
+## WARN    : includes (ERROR, WARN)
+## INFO    : includes (ERROR, WARN, INFO)
+## NORMAL  : includes (ERROR, WARN, INFO, NORMAL)
+## DEBUG   : includes (ERROR, WARN, INFO, NORMAL, DEBUG)
+## TRACE   : includes (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE)
+## VERBOSE : includes (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE, VERBOSE)
+## PARANOID: includes (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE, VERBOSE, PARA)
+##
+## Warning!!!
+## "TRACE", "VERBOSE", "PARANOID" logging level will create a huge log file!!
+## "PARANOID" log level will tangle the log file.
+##
+# logger.log_level: NORMAL
+
+##============================================================
+## Timer configuration
+##============================================================
+##
+## Enable/disable timer function
+##
+# timer.enable: YES
+
+##
+## Timer clock tick setting [s]
+##
+# timer.tick: 0.1
+
+##============================================================
+## Execution context settings
+##============================================================
+##
+## Periodic type ExecutionContext
+##
+## Other availabilities in OpenRTM-aist
+##
+## - ExtTrigExecutionContext: External triggered EC. It is embedded in
+##                            OpenRTM library.
+## - OpenHRPExecutionContext: External triggred paralell execution
+##                            EC. It is embedded in OpenRTM
+##                            library. This is usually used with
+##                            OpenHRP3.
+## - RTPreemptEC:             Real-time execution context for Linux
+##                            RT-preemptive pathed kernel.
+## - ArtExecutionContext:     Real-time execution context for ARTLinux
+##                            (http://sourceforge.net/projects/art-linux/)
+##
+# exec_cxt.periodic.type: PeriodicExecutionContext
+
+##
+## The execution cycle of ExecutionContext
+##
+# exec_cxt.periodic.rate: 1000
+
+##============================================================
+## SDO service settings
+##============================================================
+##
+## SDO service provider settings
+##
+# sdo.service.provider.available_services: [read only]
+# sdo.service.provider.enabled_services: ALL
+# sdo.service.provider.providing_services: [read only]
+##
+## SDO service consumer settings
+##
+# sdo.service.consumer.available_services: [read only]
+# sdo.service.consumer.enabled_services: ALL

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint3/foo.conf
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint3/foo.conf	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint3/foo.conf	2013-01-29 10:39:20 UTC (rev 394)
@@ -0,0 +1,135 @@
+# -*- sh -*-
+#------------------------------------------------------------
+# Configuration file for foo
+#
+# This configuration file name should be specified in rtc.conf (or other
+# configuration file specified by -f option) by "config_file" property.
+#
+# manip2.foo.config_file: foo.conf
+# or
+# manip2.foo0.config_file: foo0.conf
+# manip2.foo1.config_file: foo1.conf
+# manip2.foo2.config_file: foo2.conf
+#
+# ------------------------------------------------------------
+# An example configuration file for foo
+#
+# See details in the following reference manual
+#
+
+# Execution context configuration
+# exec_cxt.periodic.type: PeriodicExecutionContext
+# exec_cxt.periodic.rate: 1000
+#
+#
+# configuration.active_config: mode0
+
+# Additional configuration-set example named "mode0"
+#
+# conf.mode0.int_param0: 0
+# conf.mode0.int_param1: 1
+# conf.mode0.double_param0: 0.99
+# conf.mode0.double_param1: -0.99
+# conf.mode0.str_param0: default
+# conf.mode0.str_param1: default set in conf file
+# conf.mode0.vector_param0: 0.0,0.1,0.2,0.3,0.4,0.5,0.6
+#
+# Other configuration set named "mode1"
+#
+# conf.mode1.int_param0: 0
+# conf.mode1.int_param1: 1
+# conf.mode1.double_param0: 0.99
+# conf.mode1.double_param1: -0.99
+# conf.mode1.str_param0: default
+# conf.mode1.str_param1: default set in conf file
+# conf.mode1.vector_param0: 0.0,0.1,0.2,0.3,0.4,0.5,0.6
+
+
+
+
+
+##============================================================
+## Component configuration reference
+##
+
+##============================================================
+## Active configuration-set
+##============================================================
+##
+## Initial active configuration-set. The following "mode0" is a
+## configuration-set name.  A configuration-set named "mode0" should be
+## appear in this configuration file as follows.
+##
+## configuration.active_config: mode0
+##
+# conf.mode0.param0: hoge
+# conf.mode0.param1: fuga
+# conf.mode0.param2: munya
+
+##============================================================
+## GUI control option for RTSystemEditor
+##============================================================
+## Available GUI control options [__widget__]:
+##
+## - text:          text box [default].
+## - slider.<step>: Horizontal slider. <step> is step for the slider.
+##                  A range constraints option is required. 
+## - spin:          Spin button. A range constraitns option is required.
+## - radio:         Radio button. An enumeration constraints is required.
+## - checkbox:      Checkbox control. An enumeration constraints is
+##                  required. The parameter has to be able to accept a
+##                  comma separated list.
+## - orderd_list:   Orderd list control.  An enumeration constraint is
+##                  required. The parameter has to be able to accept a
+##                  comma separated list. In this control, Enumerated
+##                  elements can appear one or more times in the given list.
+##
+## Available GUI control constraint options [__constraints__]:
+##
+## - none:         blank
+## - direct value: 100 (constant value)
+## - range:        <, >, <=, >= can be used.
+## - enumeration:  (enum0, enum1, ...)
+## - array:        <constraints0>, ,constraints1>, ... for only array value
+## - hash:         {key0: value0, key1:, value0, ...}
+##
+## examples:
+# conf.__widget__.int_param0: slider.10
+# conf.__widget__.int_param1: spin
+# conf.__widget__.double_param0: slider.10
+# conf.__widget__.double_param1: text
+# conf.__widget__.str_param0: radio
+# conf.__widget__.vector_param0: checkbox
+# conf.__widget__.vector_param1: orderd_list
+
+
+# conf.__constraints__.int_param0, 0<x<1
+# conf.__constraints__.str_param0, (up, down, right, left)
+# conf.__constraints__.double_param0, 1.5<=x<=3.2
+
+##============================================================
+## Execution context settings
+##============================================================
+##
+## Periodic type ExecutionContext
+##
+## Other availabilities in OpenRTM-aist
+##
+## - ExtTrigExecutionContext: External triggered EC. It is embedded in
+##                            OpenRTM library.
+## - OpenHRPExecutionContext: External triggred paralell execution
+##                            EC. It is embedded in OpenRTM
+##                            library. This is usually used with
+##                            OpenHRP3.
+## - RTPreemptEC:             Real-time execution context for Linux
+##                            RT-preemptive pathed kernel.
+## - ArtExecutionContext:     Real-time execution context for ARTLinux
+##                            (http://sourceforge.net/projects/art-linux/)
+##
+# exec_cxt.periodic.type: PeriodicExecutionContext
+
+##
+## The execution cycle of ExecutionContext
+##
+# exec_cxt.periodic.rate: 1000
+

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint3/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint3/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint3/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -81,8 +81,8 @@
   bindParameter("str_param0", m_str_param0, "up");
   bindParameter("int_param1", m_int_param1, "0");
   bindParameter("double_param0", m_double_param0, "0");
+  // </rtc-template>
   
-  // </rtc-template>
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint3/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint3/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint3/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -247,6 +247,7 @@
    * - DefaultValue: 0
    */
   int m_double_param0;
+
   // </rtc-template>
 
   // DataInPort declaration

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint3/rtc.conf
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint3/rtc.conf	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint3/rtc.conf	2013-01-29 10:39:20 UTC (rev 394)
@@ -1 +1,437 @@
+#------------------------------------------------------------
+# RT-Component manager configuration
+#
+# See details in the following reference manual or web page.
+# http://www.openrtm.org/openrtm/en/content/configuration
+# http://www.openrtm.org/openrtm/ja/content/rtcconf%E8%A8%AD%E5%AE%9A%E9%A0%85%E7%9B%AE%E4%B8%80%E8%A6%A7
+# http://www.openrtm.org/openrtm/ko/content/rtcconf-%EC%84%A4%EC%A0%95-%ED%95%AD%EB%AA%A9-%EC%9D%BC%EB%9E%8C
+#
+
+#------------------------------------------------------------
+# Typically used configuration parameters
+#
+# corba.name_servers: localhost, 192.168.0.1
+# corba.endpoints: <interface addess>, <interface addess>
+# logger.enable: YES
+# logger.file_name: ./rtc%p.log
+# logger.log_level: NORMAL
+#
+# The following properties should be specified in component specific
+# configuration files.
+# exec_cxt.periodic.type: PeriodicExecutionContext
+# exec_cxt.periodic.rate: 1000
+
+# Component specific configruation files:
+# If you want to load component specific configuration file, please
+# uncomment the following line.
+#
+# manip2.foo.config_file: foo.conf
+# or
+# manip2.foo0.config_file: foo0.conf
+# manip2.foo1.config_file: foo1.conf
+# manip2.foo2.config_file: foo2.conf
+#
+#------------------------------------------------------------
+
 manip2.foo.config_file: foo.conf
+
+#
+# Please delete the following part if you are familiar with OpenRTM's
+# configuration parameters.
+#
+##----------------------------------------------------------------------
+##
+## RT-Component manager configurations
+##
+##----------------------------------------------------------------------
+
+##------------------------------------------------------------
+## Configuration version (optional) 
+##
+# config.version: 1.0
+
+##------------------------------------------------------------
+## OpenRTM-aist version (optional)
+##
+# openrtm.version: 1.0.0
+
+##------------------------------------------------------------
+## The name of manager (default = manager)
+##
+# manager.name: manager
+
+##------------------------------------------------------------
+## Master manager
+## - manager.is_master: YES/NO, This process made a master or not.
+## - manager.corba_servant: YES/NO, create manager's corba service or not
+## - corba.master_manager: <host_name>:<port>, master manager's location
+# manager.is_master: YES
+# manager.corba_servant: YES
+# corba.master_manager: localhost:2810
+
+##------------------------------------------------------------
+## Manager auto shutdown options
+## - manager.shutdown_on_nortcs: YES/NO, 
+##   process will be shutdown in case no rtc exists when rtc is deleted.
+## - manager.shutdown_auto:
+##   process will be shutdown in case no rtc exists on periodic check.
+# manager.shutdown_on_nortcs: YES
+# manager.shutdown_auto: YES
+# manager.auto_shutdown_duration: 10.0
+
+##============================================================
+## CORBA configuration
+##============================================================
+##
+## CORBA ORB's arguments
+##
+## ORB specific command line options given to ORB_init().
+## See your ORB documentation.
+##
+## Example:
+##   corba.args: -ORBInitialHost myhost -ORBInitialPort 8888
+##
+##
+# corba.args:
+
+##
+## ORB endpoint
+##
+## If you have two or more network interfaces, ORB endpoint address and/or
+## port have to be specified. If hostname or port number is abbreviated,
+## default interface or port number is used. At least one colon ':'
+## is needed when you specify this option.
+##
+## Examples:
+##   corba.endpoint: myhost:      (use myhost and default port)
+##   corba.endpoint: :9876        (use default addr and port 9876)
+##   corba.endpoint: myhost:9876  (use myhost and port 9876)
+##
+# corba.endpoint:
+
+##
+## Multiple endpoint options (experimental)
+##
+## Multiple endpoint addresses and ports can be specified using this option.
+##
+## Example:
+##   corba.endpoints: 192.168.1.10:1111, 192.168.10.11:2222
+##   corba.endpoints: 192.168.1.10, 192.168.10.11
+##   corba.endpoints: all
+##
+# corba.endpoints:
+
+
+##
+## CORBA name server setting
+##
+## Multiple name servers can be specified separating by comma.
+## If port number is abbreviated, default port number is used.
+## The default port number is depend on ORB implementation.
+##
+## Examples:
+##   corba.nameservers: openrtm.aist.go.jp:9876
+##   corba.nameservers: rtm0.aist.go.jp, rtm1.aist.go.jp, rtm2.aist.go.jp
+##
+# corba.nameservers: localhost
+
+##
+## IOR host address replacement by guessed endpoint from routing (experimental)
+##
+## This option replaces a host address with an endpoint that is guessed
+## by route information to nameserver's address. This option may be
+## effective for CORBA implementation that does not supports IOR's
+## multiple profile or alternate IIOP address. However, since other
+## object references that are obtained from RT-Components or other are
+## not modified by this rule, other RTCs that are connected to this RTC
+## have to also support IOR multiple profile feature.  When this option
+## is used, corba.endpoints option should also be specified with
+## multiple endpoints.
+##
+# corba.nameservice.replace_endpoint: NO
+
+##
+## IOR alternate IIOP addresses
+##
+## This option adds alternate IIOP addresses into the IOR Profiles.
+## IOR can include additional endpoints for a servant. It is almost
+## same as "corba.endpoints" option, but this option does not create
+## actual endpoint on the ORB. (corba.endpoints try to create actual
+## endpoint, and if it cannot be created, error will be returned.)
+## This option just add alternate IIOP endpoint address information to
+## an IOR.
+##
+## This option can be used when RTCs are located inside of NAT or
+## router.  Generally speaking, RTCs in a private network cannot
+## connect to RTCs in the global network, because global client cannot
+## reach to private servants. However, if route (or NAT) is properly
+## configured for port forwarding, global RTCs can reach to RTCs in
+## private network.
+##
+## A setting example is as follows.
+## 1) Configure your router properly for port-forwarding.
+##    ex. global 2810 port is forwarded to private 2810
+## 2) Set the following options in rtc.conf
+##  corba.nameservers: my.global.nameserver.com <- name server in global network
+##  corba.endpoints: :2810 <- actual port number
+##  corba.additional_ior_addresses: w.x.y.z:2810 <- routers global IP addr/port
+## 3) Launch global RTCs and private RTC, and connect them.
+##
+# corba.alternate_iiop_addresses: addr:port
+
+##============================================================
+## Naming configurations
+##============================================================
+##
+## Enable/Disable naming functions
+##
+# naming.enable: YES
+
+##
+## Naming Types
+##
+## Now only "corba" is supported.
+##
+# naming.type: corba
+
+##
+## Naming format
+##
+## The name format of components that is bound to naming services.
+## The delimiter between names is "/".
+## The delimiter between name and kind is ".".
+##
+## example: (OpenRTM-aist-0.2.0 style)
+##       %h.host_cxt/%M.mgr_cxt/%c.cat_cxt/%m.mod_cxt/%n.rtc
+## This is formatted according to the following replacement rules.
+##
+## %n: The instance name of the component.
+## %t: The type name of the component.
+## %m: The module name of the component.
+## %v: The version of the component.
+## %V: The component vendor.
+## %c: The category of the component.
+## %h: The hostname.
+## %M: The manager name.
+## %p: PID of the manager.
+##
+# naming.formats: %h.host/%n.rtc
+
+##
+## Auto update to Naming Server
+##
+# naming.update.enable: YES
+##
+## Update interval [s] for auto update
+##
+# naming.update.interval: 10.0
+##
+## Rebind references in auto update
+##
+# naming.update.rebind: NO
+
+## End of Naming configuration section
+##------------------------------------------------------------
+
+##============================================================
+## Module management
+##============================================================
+##
+## Loadable module search path list
+##
+## Manager searches loadable modules from the specified search path list.
+## Path list elements should be separated by comma.
+## Path delimiter is '/' on UNIX, and '\\' on Windows
+## Valid path examples:
+##   manager.modules.load_path: C:/Program Files/OpenRTM-aist,  \
+##   			       C:\\Program Files\\OpenRTM-aist
+##   manager.modules.load_path: /usr/lib, /usr/local/lib,       \
+##   			       /usr/local/lib/OpenRTM-aist/libs
+##
+# manager.modules.load_path: ./
+
+##
+## Preload module list
+##
+## Manager can load loadable modules before starting up.
+## Loadable modules, which is specified only as its file name, is searched
+## in each module load path specified in the "manager.modules.load_path".
+## If the "manager.modules.abs_path_allowed" option is YES, loadable file
+## can be specified as full-path name,
+##
+## Valid settings:
+## manager.modules.preload: ConsoleIn.dll, ConsoleOut.dll
+## manager.modules.preload: ConsoleIn.so, ConsoleOut.so
+## manager.modules.abs_path_allowed: YES
+## manager.modules.preload: /usr/lib/OpenRTM-aist/ConsoleIn.so
+##
+# manager.modules.preload:
+
+##
+## Permission flag of absolute module path
+##
+## If this option is "YES", absolute path specification for module is allowed.
+##
+# manager.modules.abs_path_allowed: YES
+
+##
+## The following options are not implemented yet. 
+##
+## manager.modules.config_ext:
+## manager.modules.config_path:
+## manager.modules.detect_loadable:
+## manager.modules.init_func_suffix:
+## manager.modules.init_func_prefix:
+## manager.modules.download_allowed:
+## manager.modules.download_dir:
+## manager.modules.download_cleanup:
+##
+
+##
+## Advance component creation
+##
+## This option specifies components' names (module name) creating in advance
+## before starting the manager's event-loop. The components' factories should
+## be registered by manager.module.preload option or statically linked to the
+##  manager.
+##
+## Example:
+## manager.components.precreate: ConsoleIn, ConsoleOut, SeqIn, SeqOut
+##
+# manager.components.precreate: 
+
+
+##============================================================
+## Logger configurations
+##============================================================
+##
+## Enable/Disable logger [YES/NO]
+# logger.enable: YES
+
+##
+## Log file name (default = ./rtc%p.log)
+##
+## %p: PID
+##
+# logger.file_name: ./rtc%p.log
+
+##
+## Log date format (default = %b %d %H:%M:%S)
+##
+## The following strftime(3) like format expression is available.
+## If no prefix is needed, use "No" or "Disable".
+## 
+## %a abbreviated weekday name 
+## %A full weekday name 
+## %b abbreviated month name 
+## %B full month name 
+## %c the standard date and time string 
+## %d day of the month, as a number (1-31) 
+## %H hour, 24 hour format (0-23) 
+## %I hour, 12 hour format (1-12) 
+## %j day of the year, as a number (1-366) 
+## %m month as a number (1-12).
+##    Note: some versions of Microsoft Visual C++ may use values that range
+##    from 0-11. 
+## %M minute as a number (0-59) 
+## %p locale's equivalent of AM or PM 
+## %Q millisecond as a number (0-999) from ver 1.1
+## %q microsecond as a number (0-999) from ver 1.1
+## %S second as a number (0-59) 
+## %U week of the year, sunday as the first day 
+## %w weekday as a decimal (0-6, sunday=0) 
+## %W week of the year, monday as the first day 
+## %x standard date string 
+## %X standard time string 
+## %y year in decimal, without the century (0-99) 
+## %Y year in decimal, with the century 
+## %Z time zone name 
+## %% a percent sign 
+##  
+##
+## logger.date_format: No
+## logger.date_format: Disable
+## logger.date_format: [%Y-%m-%dT%H.%M.%S%Z]     // W3C standard format
+## logger.date_format: [%b %d %H:%M:%S]          // Syslog format
+## logger.date_format: [%a %b %d %Y %H:%M:%S %Z] // RFC2822 format
+## logger.date_format: [%a %b %d %H:%M:%S %Z %Y] // data command format
+## logger.date_format: [%Y-%m-%d %H.%M.%S]
+##
+# logger.date_format: %b %d %H:%M:%S
+
+##
+## Log level (default = NORMAL)
+##
+## The following LogLevels are allowed.
+## SILENT, ERROR, WARN, NORMAL, INFO, DEBUG, TRACE, VERBOSE, PARANOID
+##
+##
+## SILENT  : completely silent
+## ERROR   : includes (ERROR)
+## WARN    : includes (ERROR, WARN)
+## INFO    : includes (ERROR, WARN, INFO)
+## NORMAL  : includes (ERROR, WARN, INFO, NORMAL)
+## DEBUG   : includes (ERROR, WARN, INFO, NORMAL, DEBUG)
+## TRACE   : includes (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE)
+## VERBOSE : includes (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE, VERBOSE)
+## PARANOID: includes (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE, VERBOSE, PARA)
+##
+## Warning!!!
+## "TRACE", "VERBOSE", "PARANOID" logging level will create a huge log file!!
+## "PARANOID" log level will tangle the log file.
+##
+# logger.log_level: NORMAL
+
+##============================================================
+## Timer configuration
+##============================================================
+##
+## Enable/disable timer function
+##
+# timer.enable: YES
+
+##
+## Timer clock tick setting [s]
+##
+# timer.tick: 0.1
+
+##============================================================
+## Execution context settings
+##============================================================
+##
+## Periodic type ExecutionContext
+##
+## Other availabilities in OpenRTM-aist
+##
+## - ExtTrigExecutionContext: External triggered EC. It is embedded in
+##                            OpenRTM library.
+## - OpenHRPExecutionContext: External triggred paralell execution
+##                            EC. It is embedded in OpenRTM
+##                            library. This is usually used with
+##                            OpenHRP3.
+## - RTPreemptEC:             Real-time execution context for Linux
+##                            RT-preemptive pathed kernel.
+## - ArtExecutionContext:     Real-time execution context for ARTLinux
+##                            (http://sourceforge.net/projects/art-linux/)
+##
+# exec_cxt.periodic.type: PeriodicExecutionContext
+
+##
+## The execution cycle of ExecutionContext
+##
+# exec_cxt.periodic.rate: 1000
+
+##============================================================
+## SDO service settings
+##============================================================
+##
+## SDO service provider settings
+##
+# sdo.service.provider.available_services: [read only]
+# sdo.service.provider.enabled_services: ALL
+# sdo.service.provider.providing_services: [read only]
+##
+## SDO service consumer settings
+##
+# sdo.service.consumer.available_services: [read only]
+# sdo.service.consumer.enabled_services: ALL

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit1/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit1/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit1/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -71,6 +71,9 @@
   
   // </rtc-template>
 
+  // <rtc-template block="bind_config">
+  // </rtc-template>
+  
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit1/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit1/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit1/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -222,6 +222,11 @@
   
   // </rtc-template>
 
+  // Configuration variable declaration
+  // <rtc-template block="config_declare">
+
+  // </rtc-template>
+
   // DataInPort declaration
   // <rtc-template block="inport_declare">
   

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit2/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit2/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit2/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -73,6 +73,9 @@
   
   // </rtc-template>
 
+  // <rtc-template block="bind_config">
+  // </rtc-template>
+  
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit2/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit2/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit2/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -223,6 +223,11 @@
   
   // </rtc-template>
 
+  // Configuration variable declaration
+  // <rtc-template block="config_declare">
+
+  // </rtc-template>
+
   // DataInPort declaration
   // <rtc-template block="inport_declare">
   

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceCon/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceCon/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceCon/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -68,6 +68,9 @@
   
   // </rtc-template>
 
+  // <rtc-template block="bind_config">
+  // </rtc-template>
+  
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceCon/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceCon/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceCon/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -222,6 +222,11 @@
   
   // </rtc-template>
 
+  // Configuration variable declaration
+  // <rtc-template block="config_declare">
+
+  // </rtc-template>
+
   // DataInPort declaration
   // <rtc-template block="inport_declare">
   

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceM/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceM/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceM/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -68,6 +68,9 @@
   
   // </rtc-template>
 
+  // <rtc-template block="bind_config">
+  // </rtc-template>
+  
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceM/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceM/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceM/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -222,6 +222,11 @@
   
   // </rtc-template>
 
+  // Configuration variable declaration
+  // <rtc-template block="config_declare">
+
+  // </rtc-template>
+
   // DataInPort declaration
   // <rtc-template block="inport_declare">
   

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath1/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath1/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath1/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -79,6 +79,9 @@
   
   // </rtc-template>
 
+  // <rtc-template block="bind_config">
+  // </rtc-template>
+  
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath1/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath1/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath1/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -223,30 +223,35 @@
   
   // </rtc-template>
 
+  // Configuration variable declaration
+  // <rtc-template block="config_declare">
+
+  // </rtc-template>
+
   // DataInPort declaration
   // <rtc-template block="inport_declare">
-  TimedShort m_InP1;
+  RTC::TimedShort m_InP1;
   /*!
    */
-  InPort<TimedShort> m_InP1In;
-  TimedLong m_InP2;
+  InPort<RTC::TimedShort> m_InP1In;
+  RTC::TimedLong m_InP2;
   /*!
    */
-  InPort<TimedLong> m_InP2In;
+  InPort<RTC::TimedLong> m_InP2In;
   
   // </rtc-template>
 
 
   // DataOutPort declaration
   // <rtc-template block="outport_declare">
-  TimedLong m_OutP1;
+  RTC::TimedLong m_OutP1;
   /*!
    */
-  OutPort<TimedLong> m_OutP1Out;
-  TimedFloat m_OutP2;
+  OutPort<RTC::TimedLong> m_OutP1Out;
+  RTC::TimedFloat m_OutP2;
   /*!
    */
-  OutPort<TimedFloat> m_OutP2Out;
+  OutPort<RTC::TimedFloat> m_OutP2Out;
   
   // </rtc-template>
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath2/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath2/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath2/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -79,6 +79,9 @@
   
   // </rtc-template>
 
+  // <rtc-template block="bind_config">
+  // </rtc-template>
+  
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath2/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath2/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath2/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -223,30 +223,35 @@
   
   // </rtc-template>
 
+  // Configuration variable declaration
+  // <rtc-template block="config_declare">
+
+  // </rtc-template>
+
   // DataInPort declaration
   // <rtc-template block="inport_declare">
-  TimedShort m_InP1;
+  RTC::TimedShort m_InP1;
   /*!
    */
-  InPort<TimedShort> m_InP1In;
-  TimedLong m_InP2;
+  InPort<RTC::TimedShort> m_InP1In;
+  RTC::TimedLong m_InP2;
   /*!
    */
-  InPort<TimedLong> m_InP2In;
+  InPort<RTC::TimedLong> m_InP2In;
   
   // </rtc-template>
 
 
   // DataOutPort declaration
   // <rtc-template block="outport_declare">
-  TimedLong m_OutP1;
+  RTC::TimedLong m_OutP1;
   /*!
    */
-  OutPort<TimedLong> m_OutP1Out;
-  TimedFloat m_OutP2;
+  OutPort<RTC::TimedLong> m_OutP1Out;
+  RTC::TimedFloat m_OutP2;
   /*!
    */
-  OutPort<TimedFloat> m_OutP2Out;
+  OutPort<RTC::TimedFloat> m_OutP2Out;
   
   // </rtc-template>
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath3/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath3/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath3/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -79,6 +79,9 @@
   
   // </rtc-template>
 
+  // <rtc-template block="bind_config">
+  // </rtc-template>
+  
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath3/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath3/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath3/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -223,30 +223,35 @@
   
   // </rtc-template>
 
+  // Configuration variable declaration
+  // <rtc-template block="config_declare">
+
+  // </rtc-template>
+
   // DataInPort declaration
   // <rtc-template block="inport_declare">
-  TimedShort m_InP1;
+  RTC::TimedShort m_InP1;
   /*!
    */
-  InPort<TimedShort> m_InP1In;
-  TimedLong m_InP2;
+  InPort<RTC::TimedShort> m_InP1In;
+  RTC::TimedLong m_InP2;
   /*!
    */
-  InPort<TimedLong> m_InP2In;
+  InPort<RTC::TimedLong> m_InP2In;
   
   // </rtc-template>
 
 
   // DataOutPort declaration
   // <rtc-template block="outport_declare">
-  TimedLong m_OutP1;
+  RTC::TimedLong m_OutP1;
   /*!
    */
-  OutPort<TimedLong> m_OutP1Out;
-  TimedFloat m_OutP2;
+  OutPort<RTC::TimedLong> m_OutP1Out;
+  RTC::TimedFloat m_OutP2;
   /*!
    */
-  OutPort<TimedFloat> m_OutP2Out;
+  OutPort<RTC::TimedFloat> m_OutP2Out;
   
   // </rtc-template>
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/IDLType1/ModuleName.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/IDLType1/ModuleName.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/IDLType1/ModuleName.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -68,6 +68,9 @@
   
   // </rtc-template>
 
+  // <rtc-template block="bind_config">
+  // </rtc-template>
+  
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/IDLType1/ModuleName.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/IDLType1/ModuleName.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/IDLType1/ModuleName.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -222,6 +222,11 @@
   
   // </rtc-template>
 
+  // Configuration variable declaration
+  // <rtc-template block="config_declare">
+
+  // </rtc-template>
+
   // DataInPort declaration
   // <rtc-template block="inport_declare">
   

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/IDLType1/TestIDLSVC_impl.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/IDLType1/TestIDLSVC_impl.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/IDLType1/TestIDLSVC_impl.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -71,12 +71,12 @@
   return result;
 }
 
-Frame0 ComFkSVC_impl::set_tool0(const Frame0& frm, Frame0& frmo, Frame0& frmio)
+Frame0 ComFkSVC_impl::set_tool0(const Frame0& frm, Frame0_out 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& frmo, Frame0& frmio)>"
+  #warning "Code missing in function <Frame0 ComFkSVC_impl::set_tool0(const Frame0& frm, Frame0_out frmo, Frame0& frmio)>"
 #endif
   return result;
 }
@@ -99,12 +99,12 @@
   return 0;
 }
 
-Frame3 ComFkSVC_impl::set_tool3(const Frame3& frm, Frame3& frmo, Frame3& frmio)
+Frame3 ComFkSVC_impl::set_tool3(const Frame3& frm, Frame3_out 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& frmo, Frame3& frmio)>"
+  #warning "Code missing in function <Frame3 ComFkSVC_impl::set_tool3(const Frame3& frm, Frame3_out frmo, Frame3& frmio)>"
 #endif
   return result;
 }

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/IDLType1/TestIDLSVC_impl.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/IDLType1/TestIDLSVC_impl.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/IDLType1/TestIDLSVC_impl.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -39,10 +39,10 @@
    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& frmo, Frame0& frmio);
+   Frame0 set_tool0(const Frame0& frm, Frame0_out 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& frmo, Frame3& frmio);
+   Frame3 set_tool3(const Frame3& frm, Frame3_out 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);
    Frame1List* set_toolSeq1(const Frame1List& frm, Frame1List_out frmo, Frame1List& frmio);

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/SeqString/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/SeqString/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/SeqString/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -68,6 +68,9 @@
   
   // </rtc-template>
 
+  // <rtc-template block="bind_config">
+  // </rtc-template>
+  
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/SeqString/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/SeqString/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/SeqString/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -222,6 +222,11 @@
   
   // </rtc-template>
 
+  // Configuration variable declaration
+  // <rtc-template block="config_declare">
+
+  // </rtc-template>
+
   // DataInPort declaration
   // <rtc-template block="inport_declare">
   

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/Struct/ModuleName.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/Struct/ModuleName.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/Struct/ModuleName.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -68,6 +68,9 @@
   
   // </rtc-template>
 
+  // <rtc-template block="bind_config">
+  // </rtc-template>
+  
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/Struct/ModuleName.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/Struct/ModuleName.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/Struct/ModuleName.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -222,6 +222,11 @@
   
   // </rtc-template>
 
+  // Configuration variable declaration
+  // <rtc-template block="config_declare">
+
+  // </rtc-template>
+
   // DataInPort declaration
   // <rtc-template block="inport_declare">
   

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/Struct2/ModuleName.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/Struct2/ModuleName.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/Struct2/ModuleName.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -68,6 +68,9 @@
   
   // </rtc-template>
 
+  // <rtc-template block="bind_config">
+  // </rtc-template>
+  
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/Struct2/ModuleName.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/Struct2/ModuleName.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/Struct2/ModuleName.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -222,6 +222,11 @@
   
   // </rtc-template>
 
+  // Configuration variable declaration
+  // <rtc-template block="config_declare">
+
+  // </rtc-template>
+
   // DataInPort declaration
   // <rtc-template block="inport_declare">
   

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/type/test.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/type/test.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/type/test.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -68,6 +68,9 @@
   
   // </rtc-template>
 
+  // <rtc-template block="bind_config">
+  // </rtc-template>
+  
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/type/test.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/type/test.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/type/test.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -222,6 +222,11 @@
   
   // </rtc-template>
 
+  // Configuration variable declaration
+  // <rtc-template block="config_declare">
+
+  // </rtc-template>
+
   // DataInPort declaration
   // <rtc-template block="inport_declare">
   

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/all/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/all/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/all/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -65,6 +65,9 @@
   
   // </rtc-template>
 
+  // <rtc-template block="bind_config">
+  // </rtc-template>
+  
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/all/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/all/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/all/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -221,6 +221,11 @@
   
   // </rtc-template>
 
+  // Configuration variable declaration
+  // <rtc-template block="config_declare">
+
+  // </rtc-template>
+
   // DataInPort declaration
   // <rtc-template block="inport_declare">
   

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/execute/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/execute/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/execute/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -65,6 +65,9 @@
   
   // </rtc-template>
 
+  // <rtc-template block="bind_config">
+  // </rtc-template>
+  
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/execute/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/execute/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/execute/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -221,6 +221,11 @@
   
   // </rtc-template>
 
+  // Configuration variable declaration
+  // <rtc-template block="config_declare">
+
+  // </rtc-template>
+
   // DataInPort declaration
   // <rtc-template block="inport_declare">
   

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/finalize/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/finalize/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/finalize/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -65,6 +65,9 @@
   
   // </rtc-template>
 
+  // <rtc-template block="bind_config">
+  // </rtc-template>
+  
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/finalize/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/finalize/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/finalize/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -221,6 +221,11 @@
   
   // </rtc-template>
 
+  // Configuration variable declaration
+  // <rtc-template block="config_declare">
+
+  // </rtc-template>
+
   // DataInPort declaration
   // <rtc-template block="inport_declare">
   

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/initialize/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/initialize/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/initialize/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -65,6 +65,9 @@
   
   // </rtc-template>
 
+  // <rtc-template block="bind_config">
+  // </rtc-template>
+  
   return RTC::RTC_OK;
 }
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/initialize/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/initialize/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/initialize/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -221,6 +221,11 @@
   
   // </rtc-template>
 
+  // Configuration variable declaration
+  // <rtc-template block="config_declare">
+
+  // </rtc-template>
+
   // DataInPort declaration
   // <rtc-template block="inport_declare">
   

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/library/library1/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/library/library1/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/library/library1/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -65,6 +65,9 @@
   
   // </rtc-template>
 
+  // <rtc-template block="bind_config">
+  // </rtc-template>
+  
   return RTC::RTC_OK;
 }
 */

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/library/library1/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/library/library1/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/library/library1/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -221,6 +221,11 @@
   
   // </rtc-template>
 
+  // Configuration variable declaration
+  // <rtc-template block="config_declare">
+
+  // </rtc-template>
+
   // DataInPort declaration
   // <rtc-template block="inport_declare">
   

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/library/library2/foo.cpp
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/library/library2/foo.cpp	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/library/library2/foo.cpp	2013-01-29 10:39:20 UTC (rev 394)
@@ -65,6 +65,9 @@
   
   // </rtc-template>
 
+  // <rtc-template block="bind_config">
+  // </rtc-template>
+  
   return RTC::RTC_OK;
 }
 */

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/library/library2/foo.h
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/library/library2/foo.h	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/library/library2/foo.h	2013-01-29 10:39:20 UTC (rev 394)
@@ -221,6 +221,11 @@
   
   // </rtc-template>
 
+  // Configuration variable declaration
+  // <rtc-template block="config_declare">
+
+  // </rtc-template>
+
   // DataInPort declaration
   // <rtc-template block="inport_declare">
   

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/DAQService.idl
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/DAQService.idl	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/DAQService.idl	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,7 +1,7 @@
 // -*- IDL -*-
 /*!
  * @file RTCService.idl
- * @brief RTComponent ƒT[ƒrƒXƒCƒ“ƒ^[ƒtƒF[ƒX
+ * @brief RTComponent サービスインターフェース
  * @date $Date: 2007/12/25 05:43:04 $
  * @author Noriaki Ando <n-ando at aist.go.jp>
  *
@@ -23,7 +23,7 @@
  * *** empty log message ***
  *
  * Revision 1.1  2007/03/14 12:14:35  tsakamoto
- * ‘®«¶¬”Å
+ * 属性生成版
  *
  * Revision 1.1  2005/09/07 05:06:13  n-ando
  * RTComponent's service management feature was added.

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/IDL/Manager.idl
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/IDL/Manager.idl	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/IDL/Manager.idl	2013-01-29 10:39:20 UTC (rev 394)
@@ -44,20 +44,20 @@
 
   interface Manager
   {
-    // module ŠÖ˜A
+    // module 関連
     RTC::ReturnCode_t load_module(in string pathname, in string initfunc);
     RTC::ReturnCode_t unload_module(in string pathname);
     ModuleProfileList get_loadable_modules();
     ModuleProfileList get_loaded_modules();
     
-    // component ŠÖ˜A
+    // component 関連
     ModuleProfileList get_factory_profiles();
     RTC::RTObject create_component(in string module_name);
     RTC::ReturnCode_t delete_component(in string instance_name);
     RTC::RTCList get_components();
     RTC::ComponentProfileList get_component_profiles();
 
-    // manager Šî–{
+    // manager 基本
     ManagerProfile get_profile();
     NVList get_configuration();
     RTC::ReturnCode_t set_configuration(in string name, in string value);

Copied: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/IDL/Modules.idl (from rev 393, trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/IDL/Modules.idl)
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/IDL/Modules.idl	                        (rev 0)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/IDL/Modules.idl	2013-01-29 10:39:20 UTC (rev 394)
@@ -0,0 +1,13 @@
+module AAA {
+	module BBB
+	{
+		module CCC
+		{
+			struct TimeBBB
+			{
+				unsigned long secaaa;    // sec
+				unsigned long nsecaaa;   // nano sec
+			};
+		};
+	};
+};

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/Generator.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/Generator.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/Generator.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -35,6 +35,7 @@
 import jp.go.aist.rtm.rtcbuilder.manager.CommonGenerateManager;
 import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
 import jp.go.aist.rtm.rtcbuilder.ui.editors.IMessageConstants;
+import jp.go.aist.rtm.rtcbuilder.ui.preference.DataTypePreferenceManager;
 import jp.go.aist.rtm.rtcbuilder.util.FileUtil;
 import jp.go.aist.rtm.rtcbuilder.util.StringUtil;
 import jp.go.aist.rtm.rtcbuilder.util.ValidationUtil;
@@ -82,7 +83,7 @@
 
 	public List<GeneratedResult> generateTemplateCode(
 			GeneratorParam generatorParam) throws Exception {
-		return generateTemplateCode(generatorParam, true);
+		return generateTemplateCode(generatorParam, null, true);
 	}
 
 	/**
@@ -95,7 +96,7 @@
 	 *             IDLのパースに失敗した場合など
 	 */
 	public List<GeneratedResult> generateTemplateCode(
-			GeneratorParam generatorParam, boolean validateFlag)
+			GeneratorParam generatorParam, List<String> idlDir, boolean validateFlag)
 			throws Exception {
 
 		if( validateFlag ) {
@@ -111,15 +112,32 @@
 		List<ServiceClassParam> IDLPathParams = new ArrayList<ServiceClassParam>();
 		List<GeneratedResult> result = new ArrayList<GeneratedResult>();
 		for( RtcParam rtcParam : generatorParam.getRtcParams() ) {
+			//onImplementedフラグの修正
+			for(int index=IRtcBuilderConstants.ACTIVITY_INITIALIZE;index<IRtcBuilderConstants.ACTIVITY_DUMMY;index++) {
+				if(rtcParam.getDetailContent(index)!=null && 0<rtcParam.getDetailContent(index).length()) {
+					rtcParam.setActionImplemented(index, true);
+				}
+			}
 			rtcParam.checkAndSetParameter();
+			rtcParam.getIdlPathes().clear();
 			for( ServicePortParam serviceport : rtcParam.getServicePorts() ) {
 				for( ServicePortInterfaceParam serviceInterfaces : serviceport.getServicePortInterfaces() ) {
-					if( !IDLPathes.contains(serviceInterfaces.getIdlFullPath()) )
+					if( !IDLPathes.contains(serviceInterfaces.getIdlFullPath()) ) {
 						IDLPathes.add(serviceInterfaces.getIdlFullPath());
 						IDLPathParams.add(new ServiceClassParam(serviceInterfaces.getIdlFullPath(),
 																 serviceInterfaces.getIdlSearchPath()));
+					}
+					if( 0<serviceInterfaces.getIdlSearchPath().length() &&
+							rtcParam.getIdlPathes().contains(serviceInterfaces.getIdlSearchPath())==false) {
+						rtcParam.getIdlPathes().add(serviceInterfaces.getIdlSearchPath());
+					}
 				}
 			}
+			rtcParam.getIdlPathes().addAll(DataTypePreferenceManager.getInstance().getIdlFileDirectories());
+			if(idlDir!=null) {
+				rtcParam.getIdlPathes().addAll(idlDir);
+			}
+			
 			rtcServiceClasses.addAll(getRtcServiceClass(rtcParam, IDLPathParams));
 			checkReferencedServiceParam(rtcServiceClasses, rtcParam);
 			List<ServiceClassParam> serviceClassParamList = new ArrayList<ServiceClassParam>();
@@ -270,7 +288,29 @@
 			List<String> incs = new ArrayList<String>();
 			String idl = null;
 			try {
-				String idlContent = FileUtil.readFile(sv.getName());
+				String fileName = sv.getName();
+				File file = new File(fileName);
+				if(file.exists()==false) {
+					for(String path : rtcParam.getIdlPathes()) {
+						String fullName = path + File.separator + fileName; 
+						file = new File(fullName);
+						if(file.exists()) {
+							for( IdlFileParam idlFile : rtcParam.getProviderIdlPathes() ) {
+								if( idlFile.getIdlFile().equals(fileName) ) {
+									idlFile.setIdlPath(fullName);
+								}
+							}
+							for( IdlFileParam idlFile : rtcParam.getConsumerIdlPathes() ) {
+								if( idlFile.getIdlFile().equals(fileName) ) {
+									idlFile.setIdlPath(fullName);
+								}
+							}
+							fileName = fullName;
+							break;
+						}
+					}
+				}
+				String idlContent = FileUtil.readFile(fileName);
 				if (idlContent == null) continue;
 				idl = PreProcessor.parse(idlContent, getIncludeIDLDic(sv.getIdlPath()), incs);
 			} catch (IOException e) {
@@ -280,10 +320,8 @@
 
 			specification spec = parser.specification();
 
-			List<ServiceClassParam> serviceClassParams = IDLParamConverter
-					.convert(spec, sv.getName());
-			List<TypeDefParam> typedefParams = IDLParamConverter
-					.convert_typedef(spec, sv.getName());
+			List<ServiceClassParam> serviceClassParams = IDLParamConverter.convert(spec, sv.getName());
+			List<TypeDefParam> typedefParams = IDLParamConverter.convert_typedef(spec, sv.getName());
 			if (typedefParams.size() > 0) {
 				serviceClassParams = convertType(serviceClassParams, typedefParams);
 			}
@@ -358,10 +396,20 @@
 		}
 	}
 	private void checkMethodType(ServiceMethodParam target, List<TypeDefParam> types) {
+		String targetFull = target.getModule() + target.getType();
+		//
 		for(TypeDefParam tdparam : types) {
-			if(target.getType().equals(tdparam.getTargetDef())) {
+			String defFull = "";
+			if( 0<tdparam.getModuleName().length() ) {
+				defFull = tdparam.getModuleName() + "::" + tdparam.getTargetDef();
+			} else {
+				defFull = tdparam.getTargetDef();
+			}
+//			if(target.getType().equals(tdparam.getTargetDef())) {
+			if(targetFull.equals(defFull)) {
 				target.setSequence(tdparam.isSequence());
 				target.setString(tdparam.isString());
+				target.setChildString(tdparam.isChildString());
 				target.setArray(tdparam.isArray());
 				target.setStruct(tdparam.isStruct() || tdparam.isEnum());
 				break;
@@ -370,13 +418,22 @@
 		target.setType(checkType(target.getType(), types));
 	}
 	private void checkArgumentType(ServiceArgumentParam target, List<TypeDefParam> types) {
+		String targetFull = target.getModule() + target.getType();
 		for(TypeDefParam tdparam : types) {
-			if(target.getType().equals(tdparam.getTargetDef())) {
+			String defFull = "";
+			if( 0<tdparam.getModuleName().length() ) {
+				defFull = tdparam.getModuleName() + "::" + tdparam.getTargetDef();
+			} else {
+				defFull = tdparam.getTargetDef();
+			}
+			if(targetFull.equals(defFull)) {
 				target.setOriginalType(target.getType());
 				target.setUnbounded(tdparam.isSequence() || tdparam.isString());
 				target.setArray(tdparam.isArray());
+				target.setInnerArray(tdparam.isInnerArray());
 				target.setStruct(tdparam.isStruct());
 				target.setEnum(tdparam.isEnum());
+				target.setChildDouble(tdparam.isChildDouble());
 				target.setType(checkType(target.getType(), types));
 				return;
 			}
@@ -426,14 +483,24 @@
 			}
 		}
 		for( IdlFileParam idlFile : rtcParam.getProviderIdlPathes() ) {
-			IFile idlTarget = project.getFile(idlFile.getIdlFile());
+			IFile idlTarget;
+			if(rtcParam.getRtmVersion().equals(IRtcBuilderConstants.RTM_VERSION_100) && rtcParam.enableOldBuildEnv()==false) {
+				idlTarget = project.getFile("idl" + File.separator + idlFile.getIdlFile());
+			} else {
+				idlTarget = project.getFile(idlFile.getIdlFile());
+			}
 			if( !idlTarget.getLocation().toOSString().equals(idlFile.getIdlPath()) )  {
 				idlTarget.delete(true, null);
 				idlTarget.create(new FileInputStream(idlFile.getIdlPath()), true, null);
 			}
 		}
 		for( IdlFileParam idlFile : rtcParam.getConsumerIdlPathes() ) {
-			IFile idlTarget = project.getFile(idlFile.getIdlFile());
+			IFile idlTarget;
+			if(rtcParam.getRtmVersion().equals(IRtcBuilderConstants.RTM_VERSION_100) && rtcParam.enableOldBuildEnv()==false) {
+				idlTarget = project.getFile("idl" + File.separator + idlFile.getIdlFile());
+			} else {
+				idlTarget = project.getFile(idlFile.getIdlFile());
+			}
 			if( !idlTarget.getLocation().toOSString().equals(idlFile.getIdlPath()) )  {
 				idlTarget.delete(true, null);
 				idlTarget.create(new FileInputStream(idlFile.getIdlPath()), true, null);
@@ -442,7 +509,12 @@
 		//
 		for( String includedIdlFile : rtcParam.getIncludedIdls() ) {
 			File target = new File(includedIdlFile);
-			IFile idlTarget = project.getFile(target.getName());
+			IFile idlTarget;
+			if(rtcParam.getRtmVersion().equals(IRtcBuilderConstants.RTM_VERSION_100) && rtcParam.enableOldBuildEnv()==false) {
+				idlTarget = project.getFile("idl" + File.separator + target.getName());
+			} else {
+				idlTarget = project.getFile(target.getName());
+			}
 			if( !idlTarget.getLocation().toOSString().equals(includedIdlFile) )  {
 				idlTarget.delete(true, null);
 				idlTarget.create(new FileInputStream(includedIdlFile), true, null);
@@ -474,9 +546,13 @@
 						}
 	
 						isOutput = true;
+					} catch (NullPointerException e) {
+						e.printStackTrace();
 					} catch (CoreException e) {
 						e.printStackTrace();
 					}
+					//バックアップファイルの整理
+					FileUtil.removeBackupFiles(outputProject, generatedResult.getName());
 				}
 			}
 		} else {
@@ -485,20 +561,22 @@
 
 		if (isOutput) {
 			IFile outputFile = outputProject.getFile(generatedResult.getName());
-			//TODO 階層が深いパスへの対応は未
 			IPath relPath = outputFile.getProjectRelativePath();
 			if( relPath.segmentCount() > 1 ) {
-				IPath outPath = relPath.removeLastSegments(1);
-				IFolder folder = outputProject.getFolder(outPath);
-				if(!folder.exists()) {
-					try {
-						folder.create(false, true, null);
-					} catch (CoreException e) {
-						e.printStackTrace();
+				String[] segs = relPath.segments();
+				StringBuilder builder = new StringBuilder();
+				for(int index=0;index<relPath.segmentCount()-1;index++) {
+					builder.append(segs[index] + File.separator);
+					IFolder folder = outputProject.getFolder(builder.toString());
+					if(!folder.exists()) {
+						try {
+							folder.create(false, true, null);
+						} catch (CoreException e) {
+							e.printStackTrace();
+						}
 					}
 				}
 			}
-			//TODO
 			try {
 				outputFile.create(new ByteArrayInputStream(generatedResult.getCode().getBytes("UTF-8")), false, null);
 			} catch (CoreException e) {

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/IRtcBuilderConstants.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/IRtcBuilderConstants.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/IRtcBuilderConstants.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -8,7 +8,6 @@
      */
     public static final String NEWEDITOR_ACTION_ID = RtcBuilderPlugin.PLUGIN_ID + ".ui.actionSet";
 
-	public static final String RTM_VERSION_042 = "0.4.2";
 	public static final String RTM_VERSION_100 = "1.0.0";
 	public static final String DEFAULT_RTM_VERSION = RTM_VERSION_100;
 
@@ -123,7 +122,7 @@
 	public static final String DOC_README_PORT_DETAIL_PREFIX = "\t\t" + SPACE17; 
 	public static final String DOC_README_INTERFACE_PREFIX = "\t\t" + SPACE15; 
 	//
-	public static final int DOC_DEFAULT_WIDTH = 80; 
+	public static final int DOC_DEFAULT_WIDTH = 66; 
 	public static final int DOC_AUTHOR_OFFSET = 11; 
 	public static final int DOC_DEFAULT_OFFSET = 3; 
 	public static final int DOC_DESC_OFFSET = 5;
@@ -163,4 +162,5 @@
 	public static final int PORT_SPACE_HEIGHT = 60;
 	public static final int PORT_SPACE_WIDTH = 150;
 
+	public static final int SINGLE_COLUMN_WIDTH = 200;
 }

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/RTCBLogHandler.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/RTCBLogHandler.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/RTCBLogHandler.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -62,7 +62,7 @@
 	}
 
 	public void stop() {
-		for (Logger logger : loggers) {
+		for (Logger logger : new ArrayList<Logger>(loggers)) {
 			removeLogger(logger);
 		}
 		loggers.clear();

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/RtcBuilderPlugin.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/RtcBuilderPlugin.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/RtcBuilderPlugin.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -7,6 +7,9 @@
 import java.util.logging.LogManager;
 import java.util.logging.Logger;
 
+import jp.go.aist.rtm.rtcbuilder.util.ShutdownListener;
+
+import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
 
@@ -30,6 +33,9 @@
 	private ImportExtensionLoader importExtensionLoader;
 	private ExportExtensionLoader exportExtensionLoader;
 	
+	//終了時フラグ
+	private boolean canExit;
+	
 	/**
 	 * The constructor
 	 */
@@ -42,6 +48,7 @@
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
+		canExit = true;
 	}
 
 	/*
@@ -50,6 +57,7 @@
 	 */
 	public void start(BundleContext context) throws Exception {
 		logHandler.start();
+		PlatformUI.getWorkbench().addWorkbenchListener(new ShutdownListener());
 		//
 		super.start(context);
 		loader = new ExtensionLoader();
@@ -141,4 +149,10 @@
 		}
 	}
 
+	public boolean isCanExit() {
+		return canExit;
+	}
+	public void setCanExit(boolean canExit) {
+		this.canExit = canExit;
+	}
 }

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/IDLParamConverter.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/IDLParamConverter.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/IDLParamConverter.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -11,14 +11,18 @@
 import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.NodeToken;
 import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.array_declarator;
 import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.base_type_spec;
+import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.definition;
 import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.enum_type;
+import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.fixed_array_size;
 import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.identifier;
 import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.interface_dcl;
 import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.interface_header;
 import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.module;
 import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.op_dcl;
 import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.param_dcl;
+import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.primary_expr;
 import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.scoped_name;
+import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.sequence_type;
 import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.simple_type_spec;
 import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.specification;
 import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.string_type;
@@ -38,6 +42,8 @@
  * <p>
  */
 public class IDLParamConverter {
+	
+	static private List<String> moduleName;
 
 	/**
 	 * IDLの構文解析木から、ジェネレータのインプットとなるServiceParamに変換する
@@ -78,8 +84,7 @@
 					@Override
 					public void visit(op_dcl n, Object argu) {
 						final ServiceMethodParam serviceMethodParam = new ServiceMethodParam();
-						serviceMethodParam
-								.setName(n.identifier.nodeToken.tokenImage);
+						serviceMethodParam.setName(n.identifier.nodeToken.tokenImage);
 						serviceMethodParam.setType(node2String(n.op_type_spec));
 						serviceMethodParam.setModule(service.getModule());
 
@@ -92,6 +97,7 @@
 								serviceArgumentParam
 										.setType(node2String(n.param_type_spec));
 								serviceArgumentParam.setDirection(node2String(n.param_attribute));
+								serviceArgumentParam.setModule(service.getModule());
 
 								serviceMethodParam.getArguments().add(
 										serviceArgumentParam);
@@ -136,15 +142,32 @@
 	public static List<TypeDefParam> convert_typedef(specification spec,
 			final String idlPath) {
 		final List<TypeDefParam> result = new ArrayList<TypeDefParam>();
-
+		moduleName = new ArrayList<String>();
+		
 		spec.accept(new GJVoidDepthFirst<String>() {
+			
 			@Override
+			public void visit(module n, String argu) {
+				moduleName.add(node2String(n.identifier.nodeToken));
+				super.visit(n, argu);
+			}
+			
+			@Override
+			public void visit(NodeToken n, String argu) {
+				if( node2String(n).equals("}")) {
+					moduleName.remove(moduleName.size()-1);
+				}
+				super.visit(n, argu);
+			}
+
+			@Override
 			public void visit(interface_dcl n, String argu) {
 				final String ifname = n.interface_header.identifier.nodeToken.tokenImage;
 				n.interface_body.accept(new GJVoidDepthFirst<String>() {
 					@Override
 					public void visit(type_declarator n, String argu) {
 						final TypeDefParam tdparam = new TypeDefParam();
+						tdparam.setModuleName(getModuleNames());
 						n.declarators.accept(new DepthFirstVisitor(){
 							@Override
 							public void visit(identifier n) {
@@ -180,6 +203,7 @@
 			@Override
 			public void visit(struct_type n, String argu) {
 				final TypeDefParam tdparam = new TypeDefParam();
+				tdparam.setModuleName(getModuleNames());
 				tdparam.setStruct(true);
 				n.identifier.accept(new DepthFirstVisitor(){
 					@Override
@@ -191,13 +215,23 @@
 					@Override
 					public void visit(simple_type_spec n) {
 						tdparam.getChildType().add(node2String(n));
+						if(node2String(n).toLowerCase().equals("string") ) {
+							tdparam.setChildString(true);
+						} else if(node2String(n).toLowerCase().equals("double") ) {
+							tdparam.setChildDouble(true);
+						}
 					}
+					@Override
+					public void visit(array_declarator n) {
+						tdparam.setInnerArray(true);
+					}
 				});
 				result.add(tdparam);
 			}
 			@Override
 			public void visit(enum_type n, String argu) {
 				final TypeDefParam tdparam = new TypeDefParam();
+				tdparam.setModuleName(getModuleNames());
 				tdparam.setEnum(true);
 				n.identifier.accept(new DepthFirstVisitor(){
 					@Override
@@ -210,6 +244,7 @@
 			@Override
 			public void visit(type_declarator n, String argu) {
 				final TypeDefParam tdparam = new TypeDefParam();
+				tdparam.setModuleName(getModuleNames());
 				n.declarators.accept(new DepthFirstVisitor(){
 					@Override
 					public void visit(identifier n) {
@@ -268,9 +303,17 @@
 		return result;
 	}
 	
-	public static List<String> extractTypeDef(List<DataTypeParam> sources) {
-		List<String> result = new ArrayList<String>();
-		
+	private static String getModuleNames() {
+		StringBuilder builder = new StringBuilder();
+		for(int index=0;index<moduleName.size();index++) {
+			builder.append(moduleName.get(index));
+			if(index!=moduleName.size()-1) builder.append("::");
+		}
+		return builder.toString();
+	}
+	
+	public static boolean extractTypeDef(List<DataTypeParam> sources, List<String> result) {
+		boolean ret = true;
 		for( Iterator<DataTypeParam> iter = sources.iterator(); iter.hasNext(); ) {
 			DataTypeParam targetParam = iter.next();
 			String targetContent = targetParam.getContent();
@@ -280,6 +323,7 @@
 			try {
 				spec = parser.specification();
 			} catch (ParseException e) {
+				ret = false;
 				continue;
 			}
 			List<String> types = parseForTypeDef(spec);
@@ -292,7 +336,7 @@
 				targetParam.getDefinedTypes().add(resultType);
 			}
 		}
-		return result;
+		return ret;
 	}
 	
 	private static List<String> parseForTypeDef(specification spec) {
@@ -302,18 +346,10 @@
 			@SuppressWarnings("unchecked")
 			@Override
 			public void visit(module n, String argu) {
-				final String moduleName = node2String(n.identifier);
-				n.accept(new GJVoidDepthFirst() {
-					@Override
-					public void visit(struct_type n, Object argu) {
-						String typeName = node2String(n.identifier);
-						if( moduleName!=null && moduleName.length()>0 ) {
-							typeName = moduleName + "::" + typeName;
-						}
-						results.add(typeName);
-					}
-					
-				},null);
+				moduleName = new ArrayList<String>();
+				final String moduleNames = node2String(n.identifier);
+				moduleName.add(moduleNames);
+				n.accept(new ExtractModule(results),null);
 			}
 			//
 			@Override
@@ -325,6 +361,31 @@
 
 		return results;
 	}
+	private static final class ExtractModule extends GJVoidDepthFirst {
+		private List<String> results;
+		
+		public ExtractModule(List<String> results) {
+			this.results = results;
+		}
+		
+		@Override
+		public void visit(definition n, Object argu) {
+			n.accept(new GJVoidDepthFirst() {
+				@Override
+				public void visit(struct_type n, Object argu) {
+					String typeName = node2String(n.identifier);
+					results.add(getModuleNames() + "::" + typeName);
+				}
+				@Override
+				public void visit(module n, Object argu) {
+					String typeName = node2String(n.identifier);
+					moduleName.add(typeName);
+					n.accept(new ExtractModule(results),null);
+				}
+			},null);
+		}
+	}
+
 	/**
 	 * インタフェースのモジュール名を取得する
 	 * 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/PreProcessor.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/PreProcessor.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/PreProcessor.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -117,6 +117,10 @@
 				throw new RuntimeException(IRTCBMessageConstants.ERROR_PREPROCESSOR + filePath);
 			}
 			String includeFilePath = new File(includeBaseDir, filePath).getAbsolutePath();
+			File target = new File(includeFilePath);
+			if(target.exists()==false) {
+				throw new RuntimeException("Include of IDL '" + filePath + "' cannot be solved");
+			}
 			result = FileUtil.readFile(includeFilePath);
 			if(includeFiles!=null) {
 				if( !includeFiles.contains(includeFilePath) ) {

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/ProfileHandler.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/ProfileHandler.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/ProfileHandler.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -9,6 +9,7 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
+import java.util.ArrayList;
 import java.util.List;
 
 import jp.go.aist.rtm.rtcbuilder.IRTCBMessageConstants;
@@ -24,12 +25,25 @@
 
 public class ProfileHandler {
 	private List<GenerateManager> managerList = null;
+	private boolean isDirect = false;
 	
 	public ProfileHandler() {
 		super();
 		managerList = RtcBuilderPlugin.getDefault().getLoader().getManagerList();
 	}
 
+	public ProfileHandler(boolean source) {
+		super();
+		isDirect = source;
+	}
+	
+	public void addManager(GenerateManager target) {
+		if( managerList==null ) {
+			managerList = new ArrayList<GenerateManager>();
+		}
+		managerList.add(target);
+	}
+	
 	public boolean validateXml(String targetString) throws Exception {
 		XmlHandler handler = new XmlHandler();
 		handler.validateXmlRtcBySchema(targetString);
@@ -42,6 +56,9 @@
 	}
 
 	public GeneratorParam restorefromXMLFile(String filePath) throws Exception {
+		return restorefromXMLFile(filePath, false);
+	}
+	public GeneratorParam restorefromXMLFile(String filePath, boolean isDirect) throws Exception {
 		GeneratorParam generatorParam = null;
 		try {
 			BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(filePath), "UTF-8"));
@@ -57,7 +74,7 @@
 
 			generatorParam = new GeneratorParam();
 			ParamUtil putil = new ParamUtil();
-			RtcParam rtcParam = putil.convertFromModule(profile, generatorParam, managerList);
+			RtcParam rtcParam = putil.convertFromModule(profile, generatorParam, managerList, isDirect);
 		    rtcParam.setRtcXml(tmp_sb.toString());
 			generatorParam.getRtcParams().add(rtcParam);
 		} catch (FileNotFoundException e) {
@@ -77,6 +94,21 @@
 		return xmlFile;
 	}
 
+	public String convert2XML(RtcParam target) throws Exception {
+	    String xmlFile = "";
+	    ParamUtil putil = new ParamUtil();
+		RtcProfile profile = putil.convertToModule(target, managerList);
+		XmlHandler handler = new XmlHandler();
+		xmlFile = handler.convertToXmlRtc(profile);
+		return xmlFile;
+	}
+
+	public RtcProfile convert2XMLProfile(RtcParam target) throws Exception {
+	    ParamUtil putil = new ParamUtil();
+		RtcProfile profile = putil.convertToModule(target, managerList);
+		return profile;
+	}
+	
 	public 	String createInitialRtcXml(String creationDate) {
 		String result = "";
 		RtcProfile profile = ParamUtil.initialXml(creationDate);

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/ParamUtil.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/ParamUtil.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/ParamUtil.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -5,7 +5,9 @@
 import java.util.Iterator;
 import java.util.List;
 
+import javax.xml.datatype.DatatypeConstants;
 import javax.xml.datatype.DatatypeFactory;
+import javax.xml.datatype.XMLGregorianCalendar;
 
 import jp.go.aist.rtm.rtcbuilder.IRtcBuilderConstants;
 import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
@@ -188,9 +190,15 @@
 	}
 
 	public RtcParam convertFromModule(RtcProfile profile, GeneratorParam generatorParam,
-										List<GenerateManager> managerList) throws Exception {
-		RtcParam rtcParam = new RtcParam(generatorParam);
+			List<GenerateManager> managerList) throws Exception {
+		return convertFromModule(profile, generatorParam, managerList, false);
 		
+	}
+	
+	public RtcParam convertFromModule(RtcProfile profile, GeneratorParam generatorParam,
+										List<GenerateManager> managerList, boolean isDirect) throws Exception {
+		RtcParam rtcParam = new RtcParam(generatorParam, isDirect);
+		
 		rtcParam.setSchemaVersion(profile.getVersion());
 
 		convertFromModuleBasic(profile, rtcParam);
@@ -313,7 +321,7 @@
 
 	private void convertFromModuleBasic(RtcProfile profile, RtcParam rtcParam) {
 		BasicInfoExt basic = (BasicInfoExt)profile.getBasicInfo();
-		//Šî–{
+		//鐃緒申{
 		rtcParam.setName(basic.getName());
 		rtcParam.setComponentType(basic.getComponentType());
 		rtcParam.setActivityType(basic.getActivityType());
@@ -330,8 +338,13 @@
 			rtcParam.setExecutionRate(basic.getExecutionRate().doubleValue());
 		rtcParam.setAbstract(basic.getAbstract());
 		rtcParam.setRtcType(basic.getRtcType());
-		rtcParam.setCreationDate(basic.getCreationDate().toString());
-		rtcParam.setUpdateDate(basic.getUpdateDate().toString());
+		XMLGregorianCalendar crDate = basic.getCreationDate();
+		crDate.setMillisecond(DatatypeConstants.FIELD_UNDEFINED);
+		rtcParam.setCreationDate(crDate.toString());
+		XMLGregorianCalendar updateDate = basic.getUpdateDate();
+		updateDate.setMillisecond(DatatypeConstants.FIELD_UNDEFINED);
+		rtcParam.setUpdateDate(updateDate.toString());
+		
 		rtcParam.getVersionUpLog().clear();
 		rtcParam.getVersionUpLog().addAll(basic.getVersionUpLogs());
 		// rtcParam.setVersionUpLog(basic.getVersionUpLogs());
@@ -515,32 +528,35 @@
 	public RtcProfile convertToModule(GeneratorParam generatorParam,
 										List<GenerateManager> managerList) throws Exception {
 		RtcParam rtcParam = generatorParam.getRtcParams().get(0);
-		
+		return convertToModule(rtcParam, managerList);
+	}
+
+	public RtcProfile convertToModule(RtcParam target, List<GenerateManager> managerList) throws Exception {
 		ObjectFactory factory = new ObjectFactory();
 		RtcProfile profile = factory.createRtcProfile();
 		String moduleId = IRtcBuilderConstants.SPEC_SUFFIX + IRtcBuilderConstants.SPEC_MAJOR_SEPARATOR +
-							rtcParam.getVender() + IRtcBuilderConstants.SPEC_MAJOR_SEPARATOR +
-							rtcParam.getCategory() + IRtcBuilderConstants.SPEC_MAJOR_SEPARATOR +
-							rtcParam.getName() + IRtcBuilderConstants.SPEC_MAJOR_SEPARATOR +
-							rtcParam.getVersion();
+		target.getVender() + IRtcBuilderConstants.SPEC_MAJOR_SEPARATOR +
+		target.getCategory() + IRtcBuilderConstants.SPEC_MAJOR_SEPARATOR +
+		target.getName() + IRtcBuilderConstants.SPEC_MAJOR_SEPARATOR +
+		target.getVersion();
 		profile.setId(moduleId);
-		profile.setVersion(rtcParam.getSchemaVersion());
-		convertToModuleBasic(rtcParam, factory, profile);
-		convertToModuleActions(rtcParam, factory, profile);
-		
-		for( DataPortParam dataportp : rtcParam.getInports() ) {
+		profile.setVersion(target.getSchemaVersion());
+		convertToModuleBasic(target, factory, profile);
+		convertToModuleActions(target, factory, profile);
+
+		for( DataPortParam dataportp : target.getInports() ) {
 			profile.getDataPorts().add(createDataPort(dataportp, IRtcBuilderConstants.SPEC_DATA_INPORT_KIND));
 		}
-		for( DataPortParam dataportp : rtcParam.getOutports() ) {
+		for( DataPortParam dataportp : target.getOutports() ) {
 			profile.getDataPorts().add(createDataPort(dataportp, IRtcBuilderConstants.SPEC_DATA_OUTPORT_KIND));
 		}
-		for( ServicePortParam serviceportp : rtcParam.getServicePorts() ) {
+		for( ServicePortParam serviceportp : target.getServicePorts() ) {
 			ServiceportExt serviceport = createServicePort(serviceportp);
 			profile.getServicePorts().add(serviceport);
 		}
-		convertToModuleConfiguration(rtcParam, factory, profile);
-		convertToModuleParameter(rtcParam, factory, profile);
-		convertToModuleLanguage(managerList, rtcParam, factory, profile);
+		convertToModuleConfiguration(target, factory, profile);
+		convertToModuleParameter(target, factory, profile);
+		convertToModuleLanguage(managerList, target, factory, profile);
 		
 		deleteInapplicableItem(profile, managerList);
 		

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/RtcParam.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/RtcParam.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/RtcParam.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -91,6 +91,7 @@
 	private List<String> originalConsumerIdls = new ArrayList<String>();
 	
 	private List<String> includedIdls = new ArrayList<String>();
+	private List<String> idlPathes = new ArrayList<String>();
 
 	private RecordedList<String> privateAttributes = new RecordedList<String>();
 	private RecordedList<String> protectedAttributes = new RecordedList<String>();
@@ -99,6 +100,10 @@
 	private RecordedList<String> protectedOperations = new RecordedList<String>();
 	private RecordedList<String> publicOperations = new RecordedList<String>();
 	//
+	private String[] detailContent = new String[IRtcBuilderConstants.ACTIVITY_DUMMY];
+	private String privateOpeSource;
+	private String protectedOpeSource;
+	private String publicOpeSource;
 	//Prefix,Suffix
 	private String commonPrefix;
 	private String commonSuffix;
@@ -113,6 +118,7 @@
 	
 	//
 	private String rtm_version = IRtcBuilderConstants.DEFAULT_RTM_VERSION;
+	private String rtm_java_version = IRtcBuilderConstants.DEFAULT_RTM_VERSION;
 	private boolean test_version = false;
 
 	public RtcParam(GeneratorParam parent) {
@@ -572,6 +578,9 @@
 		}
 		return result;
 	}
+	public List<String> getIdlPathes() {
+		return idlPathes;
+	}
 	//
 	public String getCommonPrefix() {
 		if(commonPrefix==null) commonPrefix = "m_"; 
@@ -744,9 +753,25 @@
 					if( targetIDL!=null) {
 						idlPathes.add(targetIDL.trim());
 						consumerIdlStrings.add(targetIDL);
-						consumerIdlParams.add(new IdlFileParam(targetIDL,this));
 					}
 				}
+				boolean isHit = false;
+				for(IdlFileParam file : consumerIdlParams) {
+					if( file.getIdlPath().equals(targetIDL) ) {
+						if(file.getTargetType().contains(targetType)==false) {
+							file.getTargetType().add(targetType);
+							isHit = true;
+							break;
+						}
+					}
+				}
+				if(isHit==false) {
+					IdlFileParam target = new IdlFileParam(targetIDL,this);
+					target.setDataPort(true);
+					target.getTargetType().add(targetType);
+					consumerIdlParams.add(target);
+				}
+				
 				break;
 			}
 		}
@@ -767,21 +792,54 @@
 		this.rtm_version = version;
 	}
 
+	public String getRtmJavaVersion() {
+		return rtm_java_version;
+	}
+	public void setRtmJavaVersion(String rtm_java_version) {
+		this.rtm_java_version = rtm_java_version;
+	}
+
 	public boolean getIsTest() {
 		return this.test_version;
 	}
 	public void setIsTest(boolean isTest) {
 		this.test_version = isTest;
 	}
-	public boolean checkConstraint() {
-		for( ConfigSetParam config : configParams ) {
-			if( config.getConstraint()!=null && config.getConstraint().length()>0) {
-				return true;
-			}
+	public boolean checkConfig() {
+		if( 0<configParams.size() || 0<configParameterParams.size() || 0.0<executionRate ) {
+			return true;
 		}
 		return false;
 	}
+	
+	public void setDetailContent(int index, String target) {
+		detailContent[index] = target;
+	}
+	public String getDetailContent(int index) {
+		return detailContent[index];
+	}
 
+	public String getPrivateOpeSource() {
+		return privateOpeSource;
+	}
+	public void setPrivateOpeSource(String privateOpeSource) {
+		this.privateOpeSource = privateOpeSource;
+	}
+
+	public String getProtectedOpeSource() {
+		return protectedOpeSource;
+	}
+	public void setProtectedOpeSource(String protectedOpeSource) {
+		this.protectedOpeSource = protectedOpeSource;
+	}
+
+	public String getPublicOpeSource() {
+		return publicOpeSource;
+	}
+	public void setPublicOpeSource(String publicOpeSource) {
+		this.publicOpeSource = publicOpeSource;
+	}
+
 	@Override
 	public boolean isUpdated() {
 		if (super.isUpdated()) {

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/idl/IdlFileParam.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/idl/IdlFileParam.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/idl/IdlFileParam.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -5,6 +5,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import jp.go.aist.rtm.rtcbuilder.IRtcBuilderConstants;
 import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
 
 /**
@@ -18,6 +19,8 @@
 	private RtcParam parent;
 	private List<String> idlSearchPathes = new ArrayList<String>();
 	private List<String> includeIdlPathes = new ArrayList<String>();
+	private boolean isDataPort = false;
+	private List<String> targetTypes = new ArrayList<String>();
 
 	public IdlFileParam() {
 	}
@@ -48,7 +51,7 @@
 	}
 
 	public String getIdlFile() {
-		File file = new File(idlPath);
+		File file = new File( idlPath);
 		return file.getName();
 	}
 
@@ -92,4 +95,14 @@
 		return result;
 	}
 
+	public boolean isDataPort() {
+		return isDataPort;
+	}
+	public void setDataPort(boolean isDataPort) {
+		this.isDataPort = isDataPort;
+	}
+
+	public List<String> getTargetType() {
+		return targetTypes;
+	}
 }

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/idl/ServiceArgumentParam.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/idl/ServiceArgumentParam.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/idl/ServiceArgumentParam.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -11,11 +11,14 @@
 	private String type;
 	private String originalType;
 	private String name;
+	private String module;
 	private String direction;
 	private boolean isUnbounded;
 	private boolean isArray;
+	private boolean isInnerArray;
 	private boolean isStruct;
 	private boolean isEnum;
+	private boolean isChildDouble;
 
 	public String getName() {
 		return name;
@@ -30,6 +33,13 @@
 	public void setType(String argType) {
 		this.type = argType;
 	}
+	
+	public String getModule() {
+		return module;
+	}
+	public void setModule(String module) {
+		this.module = module;
+	}
 
 	public String getOriginalType() {
 		return originalType;
@@ -59,6 +69,20 @@
 		this.isArray = isArray;
 	}
 	
+	public boolean isInnerArray() {
+		return isInnerArray;
+	}
+	public void setInnerArray(boolean isInnerArray) {
+		this.isInnerArray = isInnerArray;
+	}
+	
+	public boolean isChildDouble() {
+		return isChildDouble;
+	}
+	public void setChildDouble(boolean isChildDouble) {
+		this.isChildDouble = isChildDouble;
+	}
+	
 	public boolean isStruct() {
 		return isStruct;
 	}

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/idl/ServiceMethodParam.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/idl/ServiceMethodParam.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/idl/ServiceMethodParam.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -17,6 +17,7 @@
 	private boolean isArray;
 	private boolean isStruct;
 	private boolean isString;
+	private boolean isChildString;
 
 	private List<ServiceArgumentParam> arguments = new ArrayList<ServiceArgumentParam>();
 
@@ -83,4 +84,11 @@
 	public void setString(boolean isString) {
 		this.isString = isString;
 	}
+	
+	public boolean isChildString() {
+		return isChildString;
+	}
+	public void setChildString(boolean isChildString) {
+		this.isChildString = isChildString;
+	}
 }

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/idl/TypeDefParam.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/idl/TypeDefParam.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/idl/TypeDefParam.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -11,24 +11,32 @@
 	private static final long serialVersionUID = -5166319784409856148L;
 	
 	private String originalDef;
+	private String moduleName;
 	private String targetDef;
 	private String scopedName;
 	private boolean isSequence;
 	private boolean isString;
 	private boolean isArray;
+	private boolean isInnerArray;
 	private boolean isStruct;
 	private boolean isEnum;
+	private boolean isChildString;
+	private boolean isChildDouble;
 	private List<String> childType;
 
 	public TypeDefParam() {
 		originalDef = "";
+		moduleName = "";
 		targetDef = "";
 		scopedName = "";
 		isSequence = false;
 		isString = false;
 		isArray = false;
+		isInnerArray = false;
 		isStruct = false;
 		isEnum = false;
+		isChildString = false;
+		isChildDouble = false;
 		childType = new ArrayList<String>();
 	}
 
@@ -39,6 +47,13 @@
 		this.originalDef = originalDef;
 	}
 
+	public String getModuleName() {
+		return moduleName;
+	}
+	public void setModuleName(String moduleName) {
+		this.moduleName = moduleName;
+	}
+
 	public String getTargetDef() {
 		return this.targetDef;
 	}
@@ -74,6 +89,13 @@
 		this.isArray = isArray;
 	}
 
+	public boolean isInnerArray() {
+		return isInnerArray;
+	}
+	public void setInnerArray(boolean isInnerArray) {
+		this.isInnerArray = isInnerArray;
+	}
+	
 	public boolean isStruct() {
 		return isStruct;
 	}
@@ -88,6 +110,20 @@
 		this.isEnum = isEnum;
 	}
 
+	public boolean isChildString() {
+		return isChildString;
+	}
+	public void setChildString(boolean isChildString) {
+		this.isChildString = isChildString;
+	}
+
+	public boolean isChildDouble() {
+		return isChildDouble;
+	}
+	public void setChildDouble(boolean isChildDouble) {
+		this.isChildDouble = isChildDouble;
+	}
+
 	public List<String> getChildType() {
 		return childType;
 	}

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CMakeGenerateManager.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CMakeGenerateManager.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CMakeGenerateManager.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -47,6 +47,8 @@
 	@Override
 	public List<GeneratedResult> generateTemplateCode(RtcParam rtcParam) {
 		List<GeneratedResult> result = new ArrayList<GeneratedResult>();
+		if (rtcParam.enableOldBuildEnv()) return result;
+		
 		if (!validateRtcParam(rtcParam)) {
 			return result;
 		}
@@ -54,6 +56,7 @@
 		resetWIXUUID(rtcParam);
 
 		Map<String, Object> contextMap = createContextMap(rtcParam);
+		contextMap.put("tmpltHelper", new TemplateHelper());
 
 		resetIDLServiceClass(rtcParam);
 
@@ -67,9 +70,6 @@
 		if (rtcParam.getName() == null) {
 			return false;
 		}
-		if (rtcParam.getRtmVersion().equals(RTM_VERSION_042)) {
-			return false;
-		}
 		return true;
 	}
 
@@ -113,96 +113,224 @@
 		List<GeneratedResult> result = new ArrayList<GeneratedResult>();
 
 		GeneratedResult gr;
+		//Root
+		gr = generateCOPYING(contextMap);
+		result.add(gr);
+		gr = generateCOPYING_LESSER(contextMap);
+		result.add(gr);
 		gr = generateCMakeLists(contextMap);
 		result.add(gr);
-		gr = generateDoxyfile(contextMap);
+		
+		//cmake
+		gr = generateCmakeCMakeLists(contextMap);
 		result.add(gr);
-
+		gr = generateCmakeCPackOption(contextMap);
+		result.add(gr);
+		gr = generateResourceLicenseRTF(contextMap);
+		result.add(gr);
+		gr = generateCmakeConfigVersion(contextMap);
+		result.add(gr);
+		gr = generateCmakeConfig(contextMap);
+		result.add(gr);
+		gr = generateCmakePcIn(contextMap);
+		result.add(gr);
 		gr = generateModulesUninstall(contextMap);
 		result.add(gr);
-		gr = generateModulesCPackWIX(contextMap);
+		gr = generateUtilIn(contextMap);
 		result.add(gr);
+		gr = generateResourceWixXSL(contextMap);
+		result.add(gr);
+		//TODO アイコン、ビットマップのコピー
+
+		//cmake/Modules
 		gr = generateModulesFindOpenRTM(contextMap);
 		result.add(gr);
 
-		gr = generateResourceDescriptionTXT(contextMap);
+		//doc
+		gr = generateDocCMakeLists(contextMap);
 		result.add(gr);
-		gr = generateResourceLicenseTXT(contextMap);
+		gr = generateDocConfPy(contextMap);
 		result.add(gr);
-		gr = generateResourceLicenseRTF(contextMap);
+		gr = generateDoxyfile(contextMap);
 		result.add(gr);
-		gr = generateResourceWixXSL(contextMap);
+		
+		//doc/content
+		gr = generateDocIndex(contextMap);
 		result.add(gr);
-
+		gr = generateDocIndexJ(contextMap);
+		result.add(gr);
+		
+		//idl
+		gr = generateIdlCMakeLists(contextMap);
+		result.add(gr);
+		
+		//include
+		gr = generateIncludeCMakeLists(contextMap);
+		result.add(gr);
+		
+		//include/Module
+		gr = generateIncModuleCMakeLists(contextMap);
+		result.add(gr);
+		
+		//src
+		gr = generateSrcCMakeLists(contextMap);
+		result.add(gr);
+		
 		return result;
 	}
 
 	// 1.0ç³» (CMake)
+	public GeneratedResult generateCOPYING(Map<String, Object> contextMap) {
+		String outfile = "COPYING";
+		String infile = "cmake/COPYING.vsl";
+		return generate(infile, outfile, contextMap);
+	}
 
+	public GeneratedResult generateCOPYING_LESSER(Map<String, Object> contextMap) {
+		String outfile = "COPYING.LESSER";
+		String infile = "cmake/COPYING.LESSER.vsl";
+		return generate(infile, outfile, contextMap);
+	}
+	
 	public GeneratedResult generateCMakeLists(Map<String, Object> contextMap) {
 		String outfile = "CMakeLists.txt";
 		String infile = "cmake/CMakeLists.txt.vsl";
 		return generate(infile, outfile, contextMap);
 	}
 
-	public GeneratedResult generateDoxyfile(Map<String, Object> contextMap) {
-		String outfile = "Doxyfile.in";
-		String infile = "cmake/Doxyfile.in.vsl";
+	// 1.0ç³» (CMake/cmake)
+	public GeneratedResult generateCmakeCMakeLists(Map<String, Object> contextMap) {
+		String outfile = "cmake/CMakeLists.txt";
+		String infile = "cmake/cmake/CMakeCMakeLists.txt.vsl";
 		return generate(infile, outfile, contextMap);
 	}
+	
+	public GeneratedResult generateCmakeCPackOption(Map<String, Object> contextMap) {
+		String outfile = "cmake/cpack_options.cmake.in";
+		String infile = "cmake/cmake/cpack_options_cmake.in.vsl";
+		return generate(infile, outfile, contextMap);
+	}
+	
+	public GeneratedResult generateResourceLicenseRTF(
+			Map<String, Object> contextMap) {
+		String outfile = "cmake/License.rtf";
+		String infile = "cmake/cmake/License.rtf.vsl";
+		return generate(infile, outfile, contextMap);
+	}
 
-	// 1.0ç³» (CMake/cmake_modules)
+	public GeneratedResult generateCmakeConfigVersion(Map<String, Object> contextMap) {
+		RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
+		//TODO 暫定処理
+		String outfile = "cmake/" + rtcParam.getName().toLowerCase() + "-config-version.cmake.in";
+		String infile = "cmake/cmake/config_version.cmake.in.vsl";
+		return generate(infile, outfile, contextMap);
+	}
+	
+	public GeneratedResult generateCmakeConfig(Map<String, Object> contextMap) {
+		RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
+		//TODO 暫定処理
+		String outfile = "cmake/" + rtcParam.getName().toLowerCase() + "-config.cmake.in";
+		String infile = "cmake/cmake/config.cmake.in.vsl";
+		return generate(infile, outfile, contextMap);
+	}
 
+	public GeneratedResult generateCmakePcIn(Map<String, Object> contextMap) {
+		RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
+		//TODO 暫定処理
+		String outfile = "cmake/" + rtcParam.getName().toLowerCase() + ".pc.in";
+		String infile = "cmake/cmake/pc.in.vsl";
+		return generate(infile, outfile, contextMap);
+	}
+
 	public GeneratedResult generateModulesUninstall(
 			Map<String, Object> contextMap) {
-		String outfile = "cmake_modules/cmake_uninstall.cmake.in";
-		String infile = "cmake/cmake_uninstall.cmake.in.vsl";
+		String outfile = "cmake/uninstall_target.cmake.in";
+		String infile = "cmake/cmake/cmake_uninstall.cmake.in.vsl";
 		return generate(infile, outfile, contextMap);
 	}
 
-	public GeneratedResult generateModulesCPackWIX(
+	public GeneratedResult generateUtilIn(
 			Map<String, Object> contextMap) {
-		String outfile = "cmake_modules/CPackWIX.cmake";
-		String infile = "cmake/CPackWIX.cmake.vsl";
+		String outfile = "cmake/utils.cmake";
+		String infile = "cmake/cmake/utils.in.vsl";
 		return generate(infile, outfile, contextMap);
 	}
+	
+	public GeneratedResult generateResourceWixXSL(Map<String, Object> contextMap) {
+		String outfile = "cmake/wix.xsl.in";
+		String infile = "cmake/cmake/wix.xsl.in.vsl";
+		return generate(infile, outfile, contextMap);
+	}
 
+	// 1.0ç³» (CMake/cmake/Modules)
 	public GeneratedResult generateModulesFindOpenRTM(
 			Map<String, Object> contextMap) {
-		String outfile = "cmake_modules/FindOpenRTM.cmake";
-		String infile = "cmake/FindOpenRTM.cmake.vsl";
+		String outfile = "cmake/Modules/FindOpenRTM.cmake";
+		String infile = "cmake/cmake/FindOpenRTM.cmake.vsl";
 		return generate(infile, outfile, contextMap);
 	}
 
-	// 1.0ç³» (CMake/cpack_resources)
-
-	public GeneratedResult generateResourceDescriptionTXT(
-			Map<String, Object> contextMap) {
-		String outfile = "cpack_resources/Description.txt";
-		String infile = "cmake/Description.txt.vsl";
+	// 1.0ç³» (CMake/doc)
+	public GeneratedResult generateDocCMakeLists(Map<String, Object> contextMap) {
+		String outfile = "doc/CMakeLists.txt";
+		String infile = "cmake/doc/DocCMakeLists.txt.vsl";
 		return generate(infile, outfile, contextMap);
 	}
 
-	public GeneratedResult generateResourceLicenseTXT(
-			Map<String, Object> contextMap) {
-		String outfile = "cpack_resources/License.txt";
-		String infile = "cmake/License.txt.vsl";
+	public GeneratedResult generateDocConfPy(Map<String, Object> contextMap) {
+		String outfile = "doc/conf.py.in";
+		String infile = "cmake/doc/conf.py.in.vsl";
 		return generate(infile, outfile, contextMap);
 	}
-
-	public GeneratedResult generateResourceLicenseRTF(
-			Map<String, Object> contextMap) {
-		String outfile = "cpack_resources/License.rtf";
-		String infile = "cmake/License.rtf.vsl";
+	
+	public GeneratedResult generateDoxyfile(Map<String, Object> contextMap) {
+		String outfile = "doc/doxyfile.in";
+		String infile = "cmake/doc/Doxyfile.in.vsl";
 		return generate(infile, outfile, contextMap);
 	}
+	
+	// 1.0ç³» (CMake/doc/content)
+	public GeneratedResult generateDocIndex(Map<String, Object> contextMap) {
+		String outfile = "doc/content/index.txt";
+		String infile = "cmake/doc/index.txt.vsl";
+		return generate(infile, outfile, contextMap);
+	}
 
-	public GeneratedResult generateResourceWixXSL(Map<String, Object> contextMap) {
-		String outfile = "cpack_resources/wix.xsl.in";
-		String infile = "cmake/wix.xsl.in.vsl";
+	public GeneratedResult generateDocIndexJ(Map<String, Object> contextMap) {
+		String outfile = "doc/content/index_j.txt";
+		String infile = "cmake/doc/index_j.txt.vsl";
 		return generate(infile, outfile, contextMap);
 	}
-
+	
+	// 1.0ç³» (CMake/idl)
+	public GeneratedResult generateIdlCMakeLists(Map<String, Object> contextMap) {
+		String outfile = "idl/CMakeLists.txt";
+		String infile = "cmake/idl/IdlCMakeLists.txt.vsl";
+		return generate(infile, outfile, contextMap);
+	}
+	
+	// 1.0ç³» (CMake/include)
+	public GeneratedResult generateIncludeCMakeLists(Map<String, Object> contextMap) {
+		String outfile = "include/CMakeLists.txt";
+		String infile = "cmake/include/IncludeCMakeLists.txt.vsl";
+		return generate(infile, outfile, contextMap);
+	}
+	
+	// 1.0ç³» (CMake/include/module)
+	public GeneratedResult generateIncModuleCMakeLists(Map<String, Object> contextMap) {
+		RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
+		String outfile = "include/" + rtcParam.getName() + "/CMakeLists.txt";
+		String infile = "cmake/include/IncModuleCMakeLists.txt.vsl";
+		return generate(infile, outfile, contextMap);
+	}
+	
+	// 1.0ç³» (CMake/src)
+	public GeneratedResult generateSrcCMakeLists(Map<String, Object> contextMap) {
+		String outfile = "src/CMakeLists.txt";
+		String infile = "cmake/src/SrcCMakeLists.txt.vsl";
+		return generate(infile, outfile, contextMap);
+	}
+	
 	public GeneratedResult generate(String infile, String outfile,
 			Map<String, Object> contextMap) {
 		try {

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CXXConverter.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CXXConverter.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CXXConverter.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -6,6 +6,7 @@
 import java.util.Map;
 
 import jp.go.aist.rtm.rtcbuilder.IRtcBuilderConstants;
+import jp.go.aist.rtm.rtcbuilder.generator.param.ConfigParameterParam;
 import jp.go.aist.rtm.rtcbuilder.generator.param.DataPortParam;
 import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
 import jp.go.aist.rtm.rtcbuilder.generator.param.idl.ServiceArgumentParam;
@@ -147,11 +148,16 @@
 		if( result == null ) {
 			result = typeDef.getType();
 			if( !typeDef.getType().contains("::") ) {
+//				if(typeDef.isArray() && !typeDef.isStruct()) {
 				if(typeDef.isArray()) {
 					result = result + "_slice*";
-				} else if(typeDef.isSequence() || typeDef.isString()) {
+				} else if(typeDef.isSequence() || typeDef.isString() || typeDef.isChildString()) {
 					result = result + "*";
 				}
+			} else {
+				if(typeDef.isStruct()) {
+					result = result + "*";
+				}
 			}
 			if(typeDef.getModule()!=null && typeDef.getModule().length()>0) {
 				result = typeDef.getModule() + result;
@@ -234,11 +240,24 @@
 			
 		} else {
 			if(typeDef.isStruct()) {
+				if(typeDef.getModule()!=null && typeDef.getModule().length()>0) {
+					result = typeDef.getModule() + result;
+				}
 				if(typeDef.getDirection().equals("in"))
 					result = "const " + result + "&";
+				else if(typeDef.getDirection().equals("out")) {
+					if(typeDef.isInnerArray()==false && typeDef.isChildDouble()) {
+						result = result + "&";
+					} else {
+						result = result + "_out";
+					}
+				}
+				else if(typeDef.getDirection().equals("inout"))
+					result = result + "&";
+			} else {
+				if(typeDef.getDirection().equals("out") || typeDef.getDirection().equals("inout"))
+					result = result + "&";
 			}
-			if(typeDef.getDirection().equals("out") || typeDef.getDirection().equals("inout"))
-				result = result + "&";
 		}
 
 		return result;
@@ -325,5 +344,4 @@
 		String dataTypeNames[] = rtcType.split("::", 0);
 		return dataTypeNames[1];
 	}
-
 }

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CXXGenerateManager.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CXXGenerateManager.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CXXGenerateManager.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -60,9 +60,6 @@
 
 		resetIDLServiceClass(rtcParam);
 
-		if (rtcParam.getRtmVersion().equals(RTM_VERSION_042)) {
-			return generateTemplateCode04(contextMap);
-		}
 		return generateTemplateCode10(contextMap);
 	}
 
@@ -114,129 +111,75 @@
 		return result;
 	}
 
-	// RTM 0.4ç³»
-	public List<GeneratedResult> generateTemplateCode04(
-			Map<String, Object> contextMap) {
-		List<GeneratedResult> result = new ArrayList<GeneratedResult>();
-		RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
-
-		GeneratedResult gr;
-		gr = generateCompSource_04(contextMap);
-		result.add(gr);
-		gr = generateRTCHeader_04(contextMap);
-		result.add(gr);
-		gr = generateRTCSource_04(contextMap);
-		result.add(gr);
-
-		gr = generateMakefile(contextMap);
-		result.add(gr);
-
-		gr = generateVC9Sln(contextMap);
-		result.add(gr);
-		gr = generateVC8Sln(contextMap);
-		result.add(gr);
-		gr = generateVC9CompProj_04(contextMap);
-		result.add(gr);
-		gr = generateVC8CompProj_04(contextMap);
-		result.add(gr);
-		gr = generateVC9RTCProj_04(contextMap);
-		result.add(gr);
-		gr = generateVC8RTCProj_04(contextMap);
-		result.add(gr);
-		gr = generateVCCopyProps(contextMap);
-		result.add(gr);
-		gr = generateVCUserConfig(contextMap);
-		result.add(gr);
-
-		for (IdlFileParam idl : rtcParam.getProviderIdlPathes()) {
-			contextMap.put("idlFileParam", idl);
-			gr = generateSVCHeader_04(contextMap);
-			result.add(gr);
-			gr = generateSVCSource_04(contextMap);
-			result.add(gr);
-		}
-
-		return result;
-	}
-
 	// 1.0ç³» (C++)
 
 	public GeneratedResult generateCompSource(Map<String, Object> contextMap) {
 		RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
-		String outfile = rtcParam.getName() + "Comp.cpp";
+		String outfile = null;
+		if( rtcParam.enableOldBuildEnv() ) {
+			outfile = rtcParam.getName() + "Comp.cpp";
+		} else {
+			outfile = "src/" + rtcParam.getName() + "Comp.cpp";
+		}
 		String infile = "cpp/CXX_Comp.cpp.vsl";
 		return generate(infile, outfile, contextMap);
 	}
 
 	public GeneratedResult generateRTCHeader(Map<String, Object> contextMap) {
 		RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
-		String outfile = rtcParam.getName() + ".h";
+		String outfile = null;
+		if( rtcParam.enableOldBuildEnv() ) {
+			outfile = rtcParam.getName() + ".h";
+		} else {
+			outfile = "include/" + rtcParam.getName() + "/" + rtcParam.getName() + ".h";
+		}
 		String infile = "cpp/CXX_RTC.h.vsl";
 		return generate(infile, outfile, contextMap);
 	}
 
 	public GeneratedResult generateRTCSource(Map<String, Object> contextMap) {
 		RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
-		String outfile = rtcParam.getName() + ".cpp";
+		String outfile = null;
+		if( rtcParam.enableOldBuildEnv() ) {
+			outfile = rtcParam.getName() + ".cpp";
+		} else {
+			outfile = "src/" + rtcParam.getName() + ".cpp";
+		}
 		String infile = "cpp/CXX_RTC.cpp.vsl";
 		return generate(infile, outfile, contextMap);
 	}
 
 	public GeneratedResult generateSVCHeader(Map<String, Object> contextMap) {
+		RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
 		IdlFileParam idlParam = (IdlFileParam) contextMap.get("idlFileParam");
-		String outfile = TemplateHelper.getBasename(idlParam.getIdlFileNoExt())
-				+ TemplateHelper.getServiceImplSuffix() + ".h";
+		String outfile = null;
+		if( rtcParam.enableOldBuildEnv() ) {
+			outfile = TemplateHelper.getBasename(idlParam.getIdlFileNoExt())
+						+ TemplateHelper.getServiceImplSuffix() + ".h";
+		} else {
+			outfile = "include/" + rtcParam.getName() + "/" 
+					+ TemplateHelper.getBasename(idlParam.getIdlFileNoExt())
+					+ TemplateHelper.getServiceImplSuffix() + ".h";
+		}
 		String infile = "cpp/CXX_SVC.h.vsl";
 		return generate(infile, outfile, contextMap);
 	}
-
+	
 	public GeneratedResult generateSVCSource(Map<String, Object> contextMap) {
 		IdlFileParam idlParam = (IdlFileParam) contextMap.get("idlFileParam");
-		String outfile = TemplateHelper.getBasename(idlParam.getIdlFileNoExt())
-				+ TemplateHelper.getServiceImplSuffix() + ".cpp";
+		RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
+		String outfile = null;
+		if( rtcParam.enableOldBuildEnv() ) {
+			outfile = TemplateHelper.getBasename(idlParam.getIdlFileNoExt())
+						+ TemplateHelper.getServiceImplSuffix() + ".cpp";
+		} else {
+			outfile = "src/" + TemplateHelper.getBasename(idlParam.getIdlFileNoExt())
+						+ TemplateHelper.getServiceImplSuffix() + ".cpp";
+		}
 		String infile = "cpp/CXX_SVC.cpp.vsl";
 		return generate(infile, outfile, contextMap);
 	}
-
-	// 0.4ç³» (C++)
-
-	public GeneratedResult generateCompSource_04(Map<String, Object> contextMap) {
-		RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
-		String outfile = rtcParam.getName() + "Comp.cpp";
-		String infile = "cpp_04/CXX_Comp.cpp.vsl";
-		return generate(infile, outfile, contextMap);
-	}
-
-	public GeneratedResult generateRTCHeader_04(Map<String, Object> contextMap) {
-		RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
-		String outfile = rtcParam.getName() + ".h";
-		String infile = "cpp_04/CXX_RTC.h.vsl";
-		return generate(infile, outfile, contextMap);
-	}
-
-	public GeneratedResult generateRTCSource_04(Map<String, Object> contextMap) {
-		RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
-		String outfile = rtcParam.getName() + ".cpp";
-		String infile = "cpp_04/CXX_RTC.cpp.vsl";
-		return generate(infile, outfile, contextMap);
-	}
-
-	public GeneratedResult generateSVCHeader_04(Map<String, Object> contextMap) {
-		IdlFileParam idlParam = (IdlFileParam) contextMap.get("idlFileParam");
-		String outfile = TemplateHelper.getBasename(idlParam.getIdlFileNoExt())
-				+ TemplateHelper.getServiceImplSuffix() + ".h";
-		String infile = "cpp_04/CXX_SVC.h.vsl";
-		return generate(infile, outfile, contextMap);
-	}
-
-	public GeneratedResult generateSVCSource_04(Map<String, Object> contextMap) {
-		IdlFileParam idlParam = (IdlFileParam) contextMap.get("idlFileParam");
-		String outfile = TemplateHelper.getBasename(idlParam.getIdlFileNoExt())
-				+ TemplateHelper.getServiceImplSuffix() + ".cpp";
-		String infile = "cpp_04/CXX_SVC.cpp.vsl";
-		return generate(infile, outfile, contextMap);
-	}
-
+	
 	// 1.0系 (ビルド環境)
 
 	public GeneratedResult generateMakefile(Map<String, Object> contextMap) {
@@ -300,36 +243,6 @@
 		return generate(infile, outfile, contextMap);
 	}
 
-	// 0.4系 (ビルド環境)
-
-	public GeneratedResult generateVC8CompProj_04(Map<String, Object> contextMap) {
-		RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
-		String outfile = rtcParam.getName() + "Comp_vc8.vcproj";
-		String infile = "cpp_04/CXX_Comp_vc8.vcproj.vsl";
-		return generate(infile, outfile, contextMap);
-	}
-
-	public GeneratedResult generateVC9CompProj_04(Map<String, Object> contextMap) {
-		RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
-		String outfile = rtcParam.getName() + "Comp_vc9.vcproj";
-		String infile = "cpp_04/CXX_Comp_vc9.vcproj.vsl";
-		return generate(infile, outfile, contextMap);
-	}
-
-	public GeneratedResult generateVC8RTCProj_04(Map<String, Object> contextMap) {
-		RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
-		String outfile = rtcParam.getName() + "_vc8.vcproj";
-		String infile = "cpp_04/CXX_vc8.vcproj.vsl";
-		return generate(infile, outfile, contextMap);
-	}
-
-	public GeneratedResult generateVC9RTCProj_04(Map<String, Object> contextMap) {
-		RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
-		String outfile = rtcParam.getName() + "_vc9.vcproj";
-		String infile = "cpp_04/CXX_vc9.vcproj.vsl";
-		return generate(infile, outfile, contextMap);
-	}
-
 	public GeneratedResult generate(String infile, String outfile,
 			Map<String, Object> contextMap) {
 		try {

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CommonGenerateManager.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CommonGenerateManager.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CommonGenerateManager.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,5 +1,7 @@
 package jp.go.aist.rtm.rtcbuilder.manager;
 
+import static jp.go.aist.rtm.rtcbuilder.util.RTCUtil.form;
+
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -11,9 +13,6 @@
 import jp.go.aist.rtm.rtcbuilder.template.TemplateHelper;
 import jp.go.aist.rtm.rtcbuilder.template.TemplateUtil;
 
-import static jp.go.aist.rtm.rtcbuilder.IRtcBuilderConstants.*;
-import static jp.go.aist.rtm.rtcbuilder.util.RTCUtil.*;
-
 /**
  * 一般ファイルの出力を制御するマネージャ
  */
@@ -45,9 +44,6 @@
 		contextMap.put("rtcParam", rtcParam);
 		contextMap.put("tmpltHelper", new TemplateHelper());
 
-		if (rtcParam.getRtmVersion().equals(RTM_VERSION_042)) {
-			return generateTemplateCode04(contextMap);
-		}
 		return generateTemplateCode10(contextMap);
 	}
 
@@ -59,34 +55,15 @@
 
 		GeneratedResult gr;
 
-		if (rtcParam.getExecutionRate() > 0.0 || rtcParam.checkConstraint()
-				|| rtcParam.getConfigParameterParams().size() > 0) {
-			gr = generateRTCConf(contextMap);
-			result.add(gr);
-		}
+		gr = generateREADME(contextMap);
+		result.add(gr);
 
-		gr = generateComponentConf(contextMap);
+		gr = generateRTCConf10(contextMap);
 		result.add(gr);
 
-		return result;
-	}
-
-	// RTM 0.4ç³»
-	public List<GeneratedResult> generateTemplateCode04(
-			Map<String, Object> contextMap) {
-		List<GeneratedResult> result = new ArrayList<GeneratedResult>();
-		RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
-
-		GeneratedResult gr;
-		gr = generateREADME_04(contextMap);
+		gr = generateComponentConf(contextMap);
 		result.add(gr);
 
-		if (rtcParam.getExecutionRate() > 0.0 || rtcParam.checkConstraint()
-				|| rtcParam.getConfigParameterParams().size() > 0) {
-			gr = generateRTCConf(contextMap);
-			result.add(gr);
-		}
-
 		return result;
 	}
 
@@ -105,6 +82,12 @@
 		return generate(infile, outfile, contextMap);
 	}
 
+	public GeneratedResult generateRTCConf10(Map<String, Object> contextMap) {
+		String outfile = "rtc.conf";
+		String infile = "common/rtc.conf.vsl";
+		return generate(infile, outfile, contextMap);
+	}
+
 	public GeneratedResult generateComponentConf(Map<String, Object> contextMap) {
 		RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
 		String outfile = rtcParam.getName() + ".conf";
@@ -112,22 +95,12 @@
 		return generate(infile, outfile, contextMap);
 	}
 
-	// RTM 0.4
-
-	public GeneratedResult generateREADME_04(Map<String, Object> contextMap) {
-		RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
-
-		String outfile = "README." + rtcParam.getName();
-		String infile = "common_04/README.vsl";
-		return generate(infile, outfile, contextMap);
-	}
-
 	public GeneratedResult generate(String infile, String outfile,
 			Map<String, Object> contextMap) {
 		try {
 			String template = TEMPLATE_PATH + "/" + infile;
-			InputStream ins = getClass().getClassLoader().getResourceAsStream(
-					template);
+			ClassLoader cl = Thread.currentThread().getContextClassLoader();
+			InputStream ins = cl.getResourceAsStream(template);
 			GeneratedResult gr = TemplateUtil.createGeneratedResult(ins,
 					contextMap, outfile);
 			if (ins != null) {

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/GenerateManager.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/GenerateManager.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/GenerateManager.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -29,7 +29,7 @@
 
 	// 生成対象言語名称(引数用)
 	public String getTargetVersion() {
-		return IRtcBuilderConstants.RTM_VERSION_042;
+		return IRtcBuilderConstants.RTM_VERSION_100;
 	}
 
 	// 特定のタグを適用対象外とするか否か

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/nl/messages.properties
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/nl/messages.properties	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/nl/messages.properties	2013-01-29 10:39:20 UTC (rev 394)
@@ -261,7 +261,8 @@
 IMessageConstants.CONFIGURATION_HINT_UNIT_TITLE=Unit :
 IMessageConstants.CONFIGURATION_HINT_UNIT_DESC=Specifies the unit of the configuration parameter.
 IMessageConstants.CONFIGURATION_HINT_WIDGET_TITLE=Widget :
-IMessageConstants.CONFIGURATION_HINT_WIDGET_DESC=Specifies a widget to use for defining configuration parameter.
+IMessageConstants.CONFIGURATION_HINT_WIDGET_DESC_P1=Specifies a widget to use for defining configuration parameter.
+IMessageConstants.CONFIGURATION_HINT_WIDGET_DESC_P2=(When you choose "radio" as Widget, you should specify Enumeration type at Constraint.)
 IMessageConstants.CONFIGURATION_HINT_STEP_TITLE=Step :
 IMessageConstants.CONFIGURATION_HINT_STEP_DESC_P1=Specifies a minimum step
 IMessageConstants.CONFIGURATION_HINT_STEP_DESC_P2=when "slider" is selected as widget for the configuration.
@@ -407,15 +408,13 @@
 
 IMessageConstants.CREATE_FILE_ERROR=Failed to create file.
 
-
 IMessageConstants.FILETYPE_YAML=YAML format
 
-
 IMessageConstants.COMPARE_TITLE=Result Comparison :
 
-
 IMessageConstants.COMMON_LABEL_UPDATE=Update
 
+IMessageConstants.BACKUP_FILE_NUM=Backup File Max Number :
 
 IMessageConstants.TITLE_FONT=MS Gothic
 
@@ -423,6 +422,9 @@
 
 IMessageConstants.SELECT_DIRECTORY=Select Output directory
 
+IMessageConstants.SAVE_MESSAGE=Current project has been modified. Save changes?
+IMessageConstants.IDL_PARSE_EROOR=IDL file parse ERROR!
+
 IRTCBMessageConstants.VALIDATE_ERROR_OUTPUTPROJECT=No OutputProject is specified.
 IRTCBMessageConstants.VALIDATE_ERROR_COMPONENTNAME=No Component Name is specified.
 IRTCBMessageConstants.VALIDATE_ERROR_PORTSAMENAME=The same Port name already exists.
@@ -467,6 +469,8 @@
 IPreferenceMessageConstants.CODE_GEN_TITLE_CONFIG=Configuration
 IPreferenceMessageConstants.CODE_GEN_TITLE_PRESUFFIX=Prefix,Suffix
 
+IPreferenceMessageConstants.CODE_GEN_TITLE_BACKUP=Backup
+
 IPreferenceMessageConstants.CONFIG_CLMN_CONFIGURATION=Configuration
 IPreferenceMessageConstants.CONFIG_CLMN_DEFAUT_VALUE=Default Value
 IPreferenceMessageConstants.CONFIG_BTN_ADD=Add

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/TemplateHelper.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/TemplateHelper.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/TemplateHelper.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,6 +2,11 @@
 
 import java.io.File;
 
+import jp.go.aist.rtm.rtcbuilder.generator.param.ConfigParameterParam;
+import jp.go.aist.rtm.rtcbuilder.generator.param.ConfigSetParam;
+import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
+import jp.go.aist.rtm.rtcbuilder.generator.param.idl.IdlFileParam;
+
 import static jp.go.aist.rtm.rtcbuilder.IRtcBuilderConstants.*;
 import static jp.go.aist.rtm.rtcbuilder.util.StringUtil.*;
 
@@ -51,6 +56,27 @@
 		return "";
 	}
 
+	public static String getIDLFilesforIDLCMake(RtcParam source) {
+		StringBuilder builder = new StringBuilder();
+		
+		for(IdlFileParam target : source.getProviderIdlPathes() ) {
+			builder.append("${CMAKE_CURRENT_SOURCE_DIR}/");
+			builder.append(getFilenameNoExt(target.getIdlFile()));
+			builder.append(".idl ");
+		}
+		for(IdlFileParam target : source.getConsumerIdlPathes() ) {
+			builder.append("${CMAKE_CURRENT_SOURCE_DIR}/");
+			builder.append(getFilenameNoExt(target.getIdlFile()));
+			builder.append(".idl ");
+		}
+		for(IdlFileParam target : source.getIncludedIdlPathes() ) {
+			builder.append("${CMAKE_CURRENT_SOURCE_DIR}/");
+			builder.append(getFilenameNoExt(target.getIdlFile()));
+			builder.append(".idl ");
+		}
+		return builder.toString();
+	}
+	
 	public static String toSvcImpl(String fullPath) {
 		String name = getFilenameNoExt(fullPath);
 		if (name.isEmpty()) {
@@ -237,5 +263,70 @@
 		String[] vers = ver.split("\\.");
 		return (vers.length > 2) ? vers[2] : "0";
 	}
-
+	
+	public static String convFormatted(String source, int len) {
+		int clen = source.length();
+		StringBuilder builder = new StringBuilder();
+		builder.append(source);
+		for(int index=0;index<(len-clen);index++) {
+			builder.append(" ");
+		}
+		return builder.toString();
+	}
+	
+	//ConfigParameterのチェック
+	public boolean checkPeriodicType(RtcParam param) {
+		for( ConfigParameterParam target : param.getConfigParameterParams() ) {
+			if( target.getConfigName().trim().equals("exec_cxt.periodic.type") ) {
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	public boolean checkNotPeriodicTypeParam(ConfigParameterParam param) {
+		if( param.getConfigName().trim().equals("exec_cxt.periodic.type") ) {
+			return false;
+		}
+		return true;
+	}
+	
+	public String getPeriodicTypeValue(RtcParam param) {
+		for( ConfigParameterParam target : param.getConfigParameterParams() ) {
+			if( target.getConfigName().trim().equals("exec_cxt.periodic.type") ) {
+				return target.getDefaultVal();
+			}
+		}
+		return "";
+	}
+	
+	public boolean checkNotWidget(RtcParam param) {
+		for(ConfigSetParam target : param.getConfigParams()) {
+			if( target.getWidget()!=null && 0<target.getWidget().length() ) {
+				return false;
+			}
+		}
+		return true;
+	}
+	
+	public boolean checkNotConstraint(RtcParam param) {
+		for(ConfigSetParam target : param.getConfigParams()) {
+			if( target.getConstraint()!=null && 0<target.getConstraint().length() ) {
+				return false;
+			}
+		}
+		return true;
+	}
+	
+	public boolean checkDetailContent(int index, RtcParam param) {
+		if(param.getDetailContent(index)==null || param.getDetailContent(index).length()==0)
+			return false;
+		return true;
+	}
+	
+	public boolean checkContents(String target) {
+		if( target==null || target.length()==0 )
+			return false;
+		return true;
+	}
 }

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/TemplateUtil.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/TemplateUtil.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/TemplateUtil.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -150,7 +150,7 @@
 
 		StringWriter result = new StringWriter();
 		try {
-			ve.evaluate(vc, result, "", new InputStreamReader(in));
+			ve.evaluate(vc, result, "", new InputStreamReader(in, "UTF-8"));
 			result.close();
 		} catch (Exception e) {
 			throw new RuntimeException(e); // system error

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/CMakeLists.txt.vsl
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/CMakeLists.txt.vsl	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/CMakeLists.txt.vsl	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,282 +1,101 @@
 cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
 
 project(${rtcParam.name})
+string(TOLOWER ${dol}{PROJECT_NAME} PROJECT_NAME_LOWER)
+include("${dol}{PROJECT_SOURCE_DIR}/cmake/utils.cmake")
+set(PROJECT_VERSION ${rtcParam.version} CACHE STRING "${rtcParam.name} version")
+DISSECT_VERSION()
+set(PROJECT_DESCRIPTION "${rtcParam.description}")
+set(PROJECT_VENDOR "${rtcParam.vender}")
+set(PROJECT_AUTHOR "${rtcParam.vender}")
+set(PROJECT_AUTHOR_SHORT "${rtcParam.vender}")
 
-set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
-set(CMAKE_MODULE_PATH "${dol}{PROJECT_SOURCE_DIR}/cmake_modules")
+${sharp} Add an "uninstall" target
+CONFIGURE_FILE ("${dol}{PROJECT_SOURCE_DIR}/cmake/uninstall_target.cmake.in"
+    "${dol}{PROJECT_BINARY_DIR}/uninstall_target.cmake" IMMEDIATE @ONLY)
+ADD_CUSTOM_TARGET (uninstall "${dol}{CMAKE_COMMAND}" -P
+    "${dol}{PROJECT_BINARY_DIR}/uninstall_target.cmake")
 
-set(LINUX_PACKAGE_GENERATOR "DEB")
-${sharp}set(LINUX_PACKAGE_GENERATOR "RPM")
+${sharp}option(BUILD_EXAMPLES "Build and install examples" OFF)
+option(BUILD_DOCUMENTATION "Build the documentation" ON)
+${sharp}option(BUILD_TESTS "Build the tests" OFF)
+${sharp}option(BUILD_TOOLS "Build the tools" OFF)
+option(BUILD_IDL "Build and install idl" ON)
+option(BUILD_SOURCES "Build and install sources" OFF)
 
+option(STATIC_LIBS "Build static libraries" OFF)
+if(STATIC_LIBS)
+    set(LIB_TYPE STATIC)
+else(STATIC_LIBS)
+    set(LIB_TYPE SHARED)
+endif(STATIC_LIBS)
 
-${sharp} component settings
-set(RTC_NAME "${dol}{PROJECT_NAME}")
-set(RTC_VERSION "${rtcParam.version}")
-set(RTC_VERSION_MAJOR "${helper.getVerMajor(${rtcParam.version})}")
-set(RTC_VERSION_MINOR "${helper.getVerMinor(${rtcParam.version})}")
-set(RTC_VERSION_PATCH "${helper.getVerPatch(${rtcParam.version})}")
-set(RTC_LANG "${helper.toLower(${rtcParam.language})}")
-set(RTC_DESCRIPTION "${rtcParam.description}")
-set(RTC_VENDOR "${rtcParam.vender}")
-set(RTC_MAINTAINER "author at example.com")
+if (${dol}{CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+   ${sharp} Mac OS X specific code
+   SET(CMAKE_CXX_COMPILER "g++")
+endif (${dol}{CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 
-string(TOLOWER ${dol}{RTC_NAME} PACKAGE_NAME)
-set(PACKAGE_VERSION "${dol}{RTC_VERSION_MAJOR}.${dol}{RTC_VERSION_MINOR}.${dol}{RTC_VERSION_PATCH}")
 
-set(IDL_FILES ""
-#foreach($p in ${rtcParam.providerIdlPathes})
-              ${p.idlFile}
-#end
-#foreach($p in ${rtcParam.consumerIdlPathes})
-              ${p.idlFile}
-#end)
+${sharp} Set up installation directories
+set(BIN_INSTALL_DIR "components/bin")
+set(LIB_INSTALL_DIR "components/lib")
+set(INC_INSTALL_DIR
+    "components/include/${dol}{PROJECT_NAME_LOWER}-${dol}{PROJECT_VERSION_MAJOR}")
+set(SHARE_INSTALL_DIR
+    "components/share/${dol}{PROJECT_NAME_LOWER}-${dol}{PROJECT_VERSION_MAJOR}")
 
-set(SKEL_SRCS ""
-#foreach($p in ${rtcParam.providerIdlPathes})
-              ${helper.toSvcSkel(${p.idlFile})}.cpp
-#end)
-
-set(STUB_SRCS ""
-#foreach($p in ${rtcParam.consumerIdlPathes})
-              ${helper.toSvcStub(${p.idlFile})}.cpp
-#end)
-
-set(IMPL_SRCS ""
-#foreach($p in ${rtcParam.providerIdlPathes})
-              ${helper.toSvcImpl(${p.idlFile})}.cpp
-#end)
-
-set(IMPL_INCS ""
-#foreach($p in ${rtcParam.providerIdlPathes})
-              ${helper.toSvcImpl(${p.idlFile})}.h
-#end)
-
-set(LIBS_SRCS ${rtcParam.name}.cpp)
-
-set(LIBS_INCS ${rtcParam.name}.h)
-
-set(EXEC_SRCS ${rtcParam.name}Comp.cpp)
-
-set(OTHER_SRCS CMakeLists.txt Doxyfile.in
-               RTC.xml ${rtcParam.name}.conf rtc.conf)
-
-
-${sharp} check OpenRTM installed
+${sharp} Get necessary dependency information
+if(NOT WIN32)
+    list(APPEND CMAKE_MODULE_PATH ${dol}{PROJECT_SOURCE_DIR}/cmake/Modules)
+endif(NOT WIN32)
 find_package(OpenRTM REQUIRED)
 
-list(APPEND CFLAGS ${dol}{OMNIORB_CFLAGS} ${dol}{OPENRTM_CFLAGS})
-list(APPEND INCLUDE_DIRS ${dol}{OMNIORB_INCLUDE_DIRS} ${dol}{OPENRTM_INCLUDE_DIRS})
-list(APPEND LDFLAGS ${dol}{OMNIORB_LDFLAGS} ${dol}{OPENRTM_LDFLAGS})
-list(APPEND LIBRARY_DIRS ${dol}{OMNIORB_LIBRARY_DIRS} ${dol}{OPENRTM_LIBRARY_DIRS})
-list(APPEND LIBRARIES ${dol}{OMNIORB_LIBRARIES} ${dol}{OPENRTM_LIBRARIES})
+${sharp} Universal settings
+${sharp}enable_testing()
 
-${sharp} check doxygen installed
-find_package(Doxygen)
-if(DOXYGEN_FOUND STREQUAL "NO")
-    message(FATAL_ERROR "Doxygen not found.")
-endif()
+${sharp} Subdirectories
+add_subdirectory(cmake)
+if(BUILD_DOCUMENTATION)
+    add_subdirectory(doc)
+endif(BUILD_DOCUMENTATION)
 
+${sharp}if(BUILD_EXAMPLES)
+${sharp}    add_subdirectory(examples)
+${sharp}endif(BUILD_EXAMPLES)
 
-if(WIN32)
-    ${sharp} add command path
-    set(${dol}ENV{PATH} ${dol}ENV{PATH} "${dol}{OPENRTM_DIR}/bin")
-    set(${dol}ENV{PATH} ${dol}ENV{PATH} "${dol}{OMNIORB_DIR}/bin/x86_win32")
-    ${sharp} set install path prefix
-    set(CMAKE_INSTALL_PREFIX "${dol}{OPENRTM_DIR}")
-    set(INSTALL_PREFIX "components/${dol}{RTC_LANG}/${dol}{PACKAGE_NAME}${dol}{PACKAGE_VERSION}")
-else()
-    ${sharp} add command path
-    set(${dol}ENV{PATH} ${dol}ENV{PATH} "${dol}{OPENRTM_DIR}/bin")
-    set(${dol}ENV{PATH} ${dol}ENV{PATH} "${dol}{OMNIORB_DIR}/bin")
-    ${sharp} set install path prefix
-    set(CMAKE_INSTALL_PREFIX "${dol}{OPENRTM_DIR}")
-    set(OPENRTM_SHARE_PREFIX "share/openrtm-${dol}{OPENRTM_VERSION_MAJOR}.${dol}{OPENRTM_VERSION_MINOR}")
-    set(INSTALL_PREFIX "${dol}{OPENRTM_SHARE_PREFIX}/components/${dol}{RTC_LANG}/${dol}{PACKAGE_NAME}${dol}{PACKAGE_VERSION}")
-endif()
+if(BUILD_IDL)
+    add_subdirectory(idl)
+endif(BUILD_IDL)
 
+add_subdirectory(include)
+MAP_ADD_STR(headers  "include/" comp_hdrs)
+add_subdirectory(src)
 
-${sharp} add uninstall target
-configure_file(
-    "${dol}{CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/cmake_uninstall.cmake.in"
-    "${dol}{CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
-    IMMEDIATE @ONLY)
-add_custom_target(uninstall COMMAND 
-    ${dol}{CMAKE_COMMAND} -P ${dol}{CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
+${sharp}if(BUILD_TESTS)
+${sharp}    add_subdirectory(test)
+${sharp}endif(BUILD_TESTS)
 
+${sharp}if(BUILD_TOOLS)
+${sharp}    add_subdirectory(tools)
+${sharp}endif(BUILD_TOOLS)
 
-${sharp} target settings for library/executable
-include_directories(${dol}{INCLUDE_DIRS})
+if(BUILD_SOURCES)
+    add_subdirectory(include)
+    add_subdirectory(src)
+endif(BUILD_SOURCES)
 
-link_directories(${dol}{LIBRARY_DIRS})
+${sharp} Package creation
+include(InstallRequiredSystemLibraries)
+set(PROJECT_EXECUTABLES ${dol}{PROJECT_NAME_LOWER}Comp
+    "${dol}{PROJECT_NAME_LOWER}Comp")
 
-add_definitions(${dol}{CFLAGS})
-add_definitions(-I${dol}{CMAKE_CURRENT_BINARY_DIR})
+set(cpack_options "${dol}{PROJECT_BINARY_DIR}/cpack_options.cmake")
 
-foreach(idl ${dol}{IDL_FILES})
-    string(REGEX REPLACE "([^\\/]*)\\.idl" "\\1" idl_base ${dol}{idl})
-    add_custom_command(OUTPUT ${dol}{idl_base}Stub.cpp ${dol}{idl_base}Skel.cpp
-                       COMMAND ${dol}{OPENRTM_IDL_WRAPPER} ${dol}{OPENRTM_IDL_WRAPPER_FLAGS} --idl-file=${dol}{idl}
-                       COMMAND ${dol}{OPENRTM_IDLC} ${dol}{OPENRTM_IDLFLAGS} ${dol}{PROJECT_SOURCE_DIR}/${dol}{idl}
-                       DEPENDS ${dol}{idl})
-endforeach()
+configure_file("${dol}{PROJECT_SOURCE_DIR}/cmake/cpack_options.cmake.in"
+    ${dol}{cpack_options} @ONLY)
 
-if(CMAKE_COMPILER_IS_GNUCC)
-    string(REPLACE ";" " " LDFLAGS "${LDFLAGS}")
-endif()
+set(CPACK_PROJECT_CONFIG_FILE ${dol}{cpack_options})
+include(${dol}{CPACK_PROJECT_CONFIG_FILE})
+include(CPack)
 
-add_library(${dol}{RTC_NAME} SHARED
-            ${dol}{LIBS_SRCS} ${dol}{IMPL_SRCS} ${dol}{SKEL_SRCS} ${dol}{STUB_SRCS})
-target_link_libraries(${dol}{RTC_NAME} ${dol}{LIBRARIES})
-set_target_properties(${dol}{RTC_NAME} PROPERTIES PREFIX "")
-set_target_properties(${dol}{RTC_NAME} PROPERTIES LINK_FLAGS "${dol}{LDFLAGS}")
 
-if(UNIX)
-    add_library(${dol}{RTC_NAME}-static STATIC
-                ${dol}{LIBS_SRCS} ${dol}{IMPL_SRCS} ${dol}{SKEL_SRCS} ${dol}{STUB_SRCS})
-    target_link_libraries(${dol}{RTC_NAME}-static ${dol}{LIBRARIES})
-    set_target_properties(${dol}{RTC_NAME}-static PROPERTIES PREFIX "")
-    set_target_properties(${dol}{RTC_NAME}-static PROPERTIES LINK_FLAGS "${dol}{LDFLAGS}")
-endif()
-
-if(UNIX)
-    add_executable(${dol}{RTC_NAME}Comp ${dol}{EXEC_SRCS})
-    add_dependencies(${dol}{RTC_NAME}Comp ${dol}{RTC_NAME}-static)
-    target_link_libraries(${dol}{RTC_NAME}Comp ${dol}{RTC_NAME}-static ${dol}{LIBRARIES})
-
-    add_executable(${dol}{RTC_NAME}Comp-dynamic ${dol}{EXEC_SRCS})
-    add_dependencies(${dol}{RTC_NAME}Comp-dynamic ${dol}{RTC_NAME})
-    target_link_libraries(${dol}{RTC_NAME}Comp-dynamic ${dol}{RTC_NAME} ${dol}{LIBRARIES})
-    set_target_properties(${dol}{RTC_NAME}Comp-dynamic PROPERTIES LINK_FLAGS "${dol}{LDFLAGS}")
-
-else()
-    add_executable(${dol}{RTC_NAME}Comp ${dol}{EXEC_SRCS})
-    add_dependencies(${dol}{RTC_NAME}Comp ${dol}{RTC_NAME})
-    target_link_libraries(${dol}{RTC_NAME}Comp ${dol}{RTC_NAME} ${dol}{LIBRARIES})
-    set_target_properties(${dol}{RTC_NAME}Comp PROPERTIES LINK_FLAGS "${dol}{LDFLAGS}")
-endif()
-
-install(TARGETS ${dol}{RTC_NAME} LIBRARY DESTINATION "${dol}{INSTALL_PREFIX}"
-                            ARCHIVE DESTINATION "${dol}{INSTALL_PREFIX}"
-                            RUNTIME DESTINATION "${dol}{INSTALL_PREFIX}"
-        COMPONENT "applications")
-install(TARGETS ${dol}{RTC_NAME}Comp RUNTIME DESTINATION "${dol}{INSTALL_PREFIX}"
-        COMPONENT "applications")
-install(FILES RTC.xml DESTINATION "${dol}{INSTALL_PREFIX}"
-        COMPONENT "applications")
-
-
-${sharp} target settings for document
-configure_file("${dol}{CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in"
-               "${dol}{CMAKE_CURRENT_BINARY_DIR}/Doxyfile")
-
-add_custom_target(doxygen COMMAND
-                  ${dol}{DOXYGEN_EXECUTABLE} ${dol}{CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
-
-set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
-
-get_target_property(DOC_TARGET doc TYPE)
-if(NOT DOC_TARGET)
-    add_custom_target(doc)
-endif()
-add_dependencies(doc doxygen)
-
-install(DIRECTORY ${dol}{CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${dol}{INSTALL_PREFIX}"
-        COMPONENT "documents")
-
-
-${sharp} install source files
-install(FILES ${dol}{IDL_FILES} ${dol}{IMPL_SRCS} ${dol}{IMPL_INCS}
-        DESTINATION "${dol}{INSTALL_PREFIX}/src"
-        COMPONENT "sources")
-
-install(FILES ${dol}{LIBS_SRCS} ${dol}{LIBS_INCS} ${dol}{EXEC_SRCS}
-        DESTINATION "${dol}{INSTALL_PREFIX}/src"
-        COMPONENT "sources")
-
-install(FILES ${dol}{OTHER_SRCS}
-        DESTINATION "${dol}{INSTALL_PREFIX}/src"
-        COMPONENT "sources")
-
-install(DIRECTORY cmake_modules cpack_resources
-        DESTINATION "${dol}{INSTALL_PREFIX}/src"
-        COMPONENT "sources")
-
-
-${sharp} package settings
-set(CPACK_PACKAGE_NAME "${dol}{RTC_NAME}")
-set(CPACK_PACKAGE_VERSION_MAJOR "${dol}{RTC_VERSION_MAJOR}")
-set(CPACK_PACKAGE_VERSION_MINOR "${dol}{RTC_VERSION_MINOR}")
-set(CPACK_PACKAGE_VERSION_PATCH "${dol}{RTC_VERSION_PATCH}")
-set(CPACK_PACKAGE_VERSION "${dol}{CPACK_PACKAGE_VERSION_MAJOR}.${dol}{CPACK_PACKAGE_VERSION_MINOR}.${dol}{CPACK_PACKAGE_VERSION_PATCH}")
-set(CPACK_PACKAGE_VENDOR "${dol}{RTC_VENDOR}")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${dol}{RTC_DESCRIPTION}")
-set(CPACK_PACKAGE_CONTACT "${dol}{RTC_MAINTAINER}")
-
-set(CPACK_RESOURCE_FILE_LICENSE
-    "${dol}{CMAKE_CURRENT_SOURCE_DIR}/cpack_resources/License.txt")
-set(CPACK_PACKAGE_DESCRIPTION_FILE
-    "${dol}{CMAKE_CURRENT_SOURCE_DIR}/cpack_resources/Description.txt")
-
-set(CPACK_COMPONENTS_ALL applications documents sources)
-set(CPACK_COMPONENT_APPLICATIONS_DISPLAY_NAME "Applications")
-set(CPACK_COMPONENT_APPLICATIONS_DESCRIPTION "RT-Component applications")
-set(CPACK_COMPONENT_APPLICATIONS_DISABLED FALSE)
-
-set(CPACK_COMPONENT_DOCUMENTS_DISPLAY_NAME "Documents")
-set(CPACK_COMPONENT_DOCUMENTS_DESCRIPTION "RT-Component documents")
-set(CPACK_COMPONENT_DOCUMENTS_DISABLED TRUE)
-
-set(CPACK_COMPONENT_SOURCES_DISPLAY_NAME "Source files")
-set(CPACK_COMPONENT_SOURCES_DESCRIPTION "RT-Component source files")
-set(CPACK_COMPONENT_SOURCES_DISABLED TRUE)
-
-if(WIN32)
-    set(CPACK_GENERATOR "WIX")
-
-    ${sharp} Windows WiX package settings
-
-    set(CPACK_WIX_XSL "@CMAKE_CURRENT_BINARY_DIR@/wix.xsl")
-    set(CPACK_WIX_LANG "ja-jp")
-    set(CPACK_RESOURCE_FILE_LICENSE
-        "@CMAKE_CURRENT_SOURCE_DIR@/cpack_resources/License.rtf")
-    configure_file(
-        "${dol}{CMAKE_CURRENT_SOURCE_DIR}/cpack_resources/wix.xsl.in"
-        "${dol}{CMAKE_CURRENT_BINARY_DIR}/wix.xsl" @ONLY)
-
-    set(CPACK_PACKAGE_FILE_NAME
-        "rtc${dol}{OPENRTM_VERSION}-${dol}{PACKAGE_NAME}${dol}{PACKAGE_VERSION}")
-
-else()
-    set(CPACK_GENERATOR "${dol}{LINUX_PACKAGE_GENERATOR}")
-
-    if(CPACK_GENERATOR STREQUAL "DEB")
-        ${sharp} Linux Debian package settings
-
-        set(CPACK_DEBIAN_PACKAGE_VERSION "${dol}{CPACK_PACKAGE_VERSION}-1")
-        set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "i386")
-        set(CPACK_DEBIAN_PACKAGE_SECTION "main")
-        set(CPACK_DEBIAN_PACKAGE_PRIORITY  "extra")
-        set(CPACK_DEBIAN_PACKAGE_DEPENDS "openrtm-aist (>= ${rtcParam.rtmVersion})")
-
-        set(CPACK_PACKAGE_FILE_NAME
-            "rtc${dol}{OPENRTM_VERSION}-${dol}{PACKAGE_NAME}_${dol}{CPACK_DEBIAN_PACKAGE_VERSION}_${dol}{CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
-
-    elseif(CPACK_GENERATOR STREQUAL "RPM")
-        ${sharp} Linux RPM package settings
-
-        set(CPACK_RPM_PACKAGE_RELEASE "1.fc10")
-        set(CPACK_RPM_PACKAGE_ARCHITECTURE "i386")
-        set(CPACK_RPM_PACKAGE_GROUP "Development/Libraries")
-        set(CPACK_RPM_PACKAGE_LICENSE "LGPL")
-        set(CPACK_RPM_PACKAGE_REQUIRES "OpenRTM-aist >= ${rtcParam.rtmVersion}")
-
-        set(CPACK_PACKAGE_FILE_NAME
-            "rtc${dol}{OPENRTM_VERSION}-${dol}{PACKAGE_NAME}-${dol}{PACKAGE_VERSION}-${dol}{CPACK_RPM_PACKAGE_RELEASE}.${dol}{CPACK_RPM_PACKAGE_ARCHITECTURE}")
-
-    endif()
-endif()
-
-message(STATUS "Package type: ${dol}{CPACK_GENERATOR}")
-message(STATUS "Package name: ${dol}{CPACK_PACKAGE_FILE_NAME}")
-
-include(CPack)

Copied: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/COPYING.LESSER.vsl (from rev 393, trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/COPYING.LESSER.vsl)
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/COPYING.LESSER.vsl	                        (rev 0)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/COPYING.LESSER.vsl	2013-01-29 10:39:20 UTC (rev 394)
@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

Copied: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/COPYING.vsl (from rev 393, trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/COPYING.vsl)
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/COPYING.vsl	                        (rev 0)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/COPYING.vsl	2013-01-29 10:39:20 UTC (rev 394)
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/FindOpenRTM.cmake.vsl
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/FindOpenRTM.cmake.vsl	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/FindOpenRTM.cmake.vsl	2013-01-29 10:39:20 UTC (rev 394)
@@ -64,8 +64,132 @@
 
 endif(UNIX)
 
+set(WIN32_RTM "")
+set(RTM_CONFIG_CMAKE "")
+
+macro(rtm_norm_path _path _result)
+    string(REGEX REPLACE "\"" ""    _var "${dol}{_path}")
+    string(REGEX REPLACE "[/]+" "/" _var "${dol}{_var}")
+    string(REGEX REPLACE "[/]${dol}" ""  _var "${dol}{_var}")
+    set(${dol}{_result} "${dol}{_var}")
+endmacro(rtm_norm_path)
+
 if(WIN32)
+    set(WIN32_RTM "10")
+    find_file(rtm_conf "rtm_config.cmake" PATHS "${dol}ENV{RTM_ROOT}/etc")
+    if(rtm_conf)
+        set(WIN32_RTM "11")
+        set(RTM_CONFIG_CMAKE "${dol}{rtm_conf}")
+    endif()
+endif(WIN32)
+
+if(WIN32_RTM STREQUAL "11")
+    include("${dol}{RTM_CONFIG_CMAKE}")
+    message(STATUS "Configuration by ${dol}{RTM_CONFIG_CMAKE}.")
+
     ${sharp} omniORB
+    set(OMNIORB_DIR "${dol}{omni_root}")
+    set(OMNIORB_FOUND TRUE)
+    file(TO_CMAKE_PATH "${dol}{OMNIORB_DIR}" OMNIORB_DIR)
+
+    foreach(path ${dol}{omni_includes})
+        file(TO_CMAKE_PATH "${dol}{path}" path)
+        rtm_norm_path("${dol}{path}" path)
+        list(APPEND OMNIORB_INCLUDE_DIRS "${dol}{path}")
+    endforeach()
+    foreach(path ${dol}{omni_libdir})
+        file(TO_CMAKE_PATH "${dol}{path}" path)
+        rtm_norm_path("${dol}{path}" path)
+        list(APPEND OMNIORB_LIBRARY_DIRS "${dol}{path}")
+    endforeach()
+
+    ${sharp} omniORB version
+    file(GLOB _vers RELATIVE "${dol}{OMNIORB_DIR}" "${dol}{OMNIORB_DIR}/THIS_IS_OMNIORB*")
+    if("${dol}{_vers}" STREQUAL "")
+        message(FATAL_ERROR "omniORB version file not found.")
+    endif()
+
+    set(OMNIORB_VERSION "${dol}{_vers}")
+    string(REGEX REPLACE "THIS_IS_OMNIORB_" ""
+           OMNIORB_VERSION "${dol}{OMNIORB_VERSION}")
+    string(REGEX REPLACE "[_]" "."
+           OMNIORB_VERSION "${dol}{OMNIORB_VERSION}")
+
+    set(OMNIORB_VERSION_NUM "${dol}{omni_dllver}")
+    set(OMNIORB_THREAD_NUM "${dol}{omnithread_dllver}")
+
+    set(OMNIORB_CFLAGS -D__WIN32__;-D__x86__;-D__NT__;-D__OSVERSION__=4;-D_CRT_SECURE_NO_DEPRECATE)
+    if(${dol}{OMNIORB_VERSION_NUM} MATCHES "^40")
+      set(OMNIORB_CFLAGS ${dol}{OMNIORB_CFLAGS};-D_WIN32_WINNT=0x0400)
+    else()
+      set(OMNIORB_CFLAGS ${dol}{OMNIORB_CFLAGS};-D_WIN32_WINNT=0x0500;-DRTC_CORBA_CXXMAPPING11)
+    endif()
+
+    foreach(library ${dol}{omni_lib})
+        list(APPEND OMNIORB_LIBRARIES optimized "${dol}{library}")
+    endforeach()
+    foreach(library ${dol}{omni_libd})
+        list(APPEND OMNIORB_LIBRARIES debug "${dol}{library}")
+    endforeach()
+
+    ${sharp} OpenRTM-aist
+    set(OPENRTM_DIR "${dol}{rtm_root}")
+    set(OPENRTM_FOUND TRUE)
+    file(TO_CMAKE_PATH "${dol}{OPENRTM_DIR}" OPENRTM_DIR)
+
+    ${sharp} OpenRTM-aist version
+    set(OPENRTM_VERSION "${dol}{rtm_version}")
+    string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\1"
+           OPENRTM_VERSION_MAJOR "${dol}{OPENRTM_VERSION}")
+    string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\2"
+           OPENRTM_VERSION_MINOR "${dol}{OPENRTM_VERSION}")
+    string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\3"
+           OPENRTM_VERSION_PATCH "${dol}{OPENRTM_VERSION}")
+
+    set(OPENRTM_VERSION_NUM "${dol}{rtm_dllver}")
+
+    foreach(path ${dol}{rtm_includes})
+        file(TO_CMAKE_PATH "${dol}{path}" path)
+        rtm_norm_path("${dol}{path}" path)
+        list(APPEND OPENRTM_INCLUDE_DIRS "${dol}{path}")
+    endforeach()
+    foreach(path ${dol}{rtm_libdir})
+        file(TO_CMAKE_PATH "${dol}{path}" path)
+        rtm_norm_path("${dol}{path}" path)
+        list(APPEND OPENRTM_LIBRARY_DIRS "${dol}{path}")
+    endforeach()
+
+    set(OPENRTM_CFLAGS "-DUSE_stub_in_nt_dll")
+
+    foreach(library ${dol}{rtm_lib})
+        list(APPEND OPENRTM_LIBRARIES optimized "${dol}{library}")
+    endforeach()
+    foreach(library ${dol}{coil_lib})
+        list(APPEND OPENRTM_LIBRARIES optimized "${dol}{library}")
+    endforeach()
+
+    foreach(library ${dol}{rtm_libd})
+        list(APPEND OPENRTM_LIBRARIES debug "${dol}{library}")
+    endforeach()
+    foreach(library ${dol}{coil_libd})
+        list(APPEND OPENRTM_LIBRARIES debug "${dol}{library}")
+    endforeach()
+
+    ${sharp} IDL Compiler
+    set(OPENRTM_IDLC "${dol}{rtm_idlc}")
+    foreach(flag ${dol}{rtm_idlflags})
+        string(REGEX REPLACE "[\\]" "/" flag "${flag}")
+        list(APPEND OPENRTM_IDLFLAGS "${dol}{flag}")
+    endforeach()
+
+    ${sharp} IDL Skelton Wrapper
+    set(OPENRTM_IDL_WRAPPER "rtm-skelwrapper.py")
+    set(OPENRTM_IDL_WRAPPER_FLAGS --include-dir="" --skel-suffix=Skel --stub-suffix=Stub)
+
+endif(WIN32_RTM STREQUAL "11")
+
+if(WIN32_RTM STREQUAL "10")
+    ${sharp} omniORB
     if(NOT OMNIORB_DIR)
         if(NOT ${dol}ENV{OMNI_ROOT} STREQUAL "")
             set(OMNIORB_DIR "${dol}ENV{OMNI_ROOT}")
@@ -134,6 +258,8 @@
     string(REGEX REPLACE "([0-9]+)\\.([0-9]+)" "\\2" OPENRTM_VERSION_MINOR "${dol}{OPENRTM_VERSION}")
     set(OPENRTM_VERSION_PATCH "0")
     set(OPENRTM_VERSION "${dol}{OPENRTM_VERSION_MAJOR}.${dol}{OPENRTM_VERSION_MINOR}.${dol}{OPENRTM_VERSION_PATCH}")
+    string(REGEX REPLACE "[.]" ""
+           OPENRTM_VERSION_NUM "${dol}{OPENRTM_VERSION}")
 
     set(OPENRTM_INCLUDE_DIRS "${dol}{OPENRTM_DIR}")
     set(OPENRTM_LIBRARY_DIRS "${dol}{OPENRTM_DIR}/bin")
@@ -141,7 +267,7 @@
 
     set(OPENRTM_CFLAGS "-DUSE_stub_in_nt_dll")
 
-    foreach(library "RTC100" "coil")
+    foreach(library "RTC${dol}{OPENRTM_VERSION_NUM}" "coil")
         list(APPEND OPENRTM_LIBRARIES optimized "${dol}{library}" debug "${dol}{library}d")
     endforeach()
     foreach(library "ws2_32" "mswsock")
@@ -156,7 +282,7 @@
     set(OPENRTM_IDL_WRAPPER "rtm-skelwrapper.py")
     set(OPENRTM_IDL_WRAPPER_FLAGS --include-dir="" --skel-suffix=Skel --stub-suffix=Stub)
 
-endif(WIN32)
+endif(WIN32_RTM STREQUAL "10")
 
 message(STATUS "FindOpenRTM setup done.")
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/common/Component.conf.vsl
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/common/Component.conf.vsl	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/common/Component.conf.vsl	2013-01-29 10:39:20 UTC (rev 394)
@@ -0,0 +1,170 @@
+${sharp} -*- sh -*-
+${sharp}------------------------------------------------------------
+${sharp} Configuration file for ${rtcParam.name}
+${sharp}
+${sharp} This configuration file name should be specified in rtc.conf (or other
+${sharp} configuration file specified by -f option) by "config_file" property.
+${sharp}
+${sharp} ${rtcParam.category}.${rtcParam.name}.config_file: ${rtcParam.name}.conf
+${sharp} or
+${sharp} ${rtcParam.category}.${rtcParam.name}0.config_file: ${rtcParam.name}0.conf
+${sharp} ${rtcParam.category}.${rtcParam.name}1.config_file: ${rtcParam.name}1.conf
+${sharp} ${rtcParam.category}.${rtcParam.name}2.config_file: ${rtcParam.name}2.conf
+${sharp}
+${sharp} ------------------------------------------------------------
+${sharp} An example configuration file for ${rtcParam.name}
+${sharp}
+${sharp} See details in the following reference manual
+${sharp}
+
+${sharp} Execution context configuration
+${sharp} exec_cxt.periodic.type: PeriodicExecutionContext
+${sharp} exec_cxt.periodic.rate: 1000
+${sharp}
+${sharp}
+${sharp} configuration.active_config: mode0
+
+${sharp} Additional configuration-set example named "mode0"
+${sharp}
+${sharp} conf.mode0.int_param0: 0
+${sharp} conf.mode0.int_param1: 1
+${sharp} conf.mode0.double_param0: 0.99
+${sharp} conf.mode0.double_param1: -0.99
+${sharp} conf.mode0.str_param0: default
+${sharp} conf.mode0.str_param1: default set in conf file
+${sharp} conf.mode0.vector_param0: 0.0,0.1,0.2,0.3,0.4,0.5,0.6
+${sharp}
+${sharp} Other configuration set named "mode1"
+${sharp}
+${sharp} conf.mode1.int_param0: 0
+${sharp} conf.mode1.int_param1: 1
+${sharp} conf.mode1.double_param0: 0.99
+${sharp} conf.mode1.double_param1: -0.99
+${sharp} conf.mode1.str_param0: default
+${sharp} conf.mode1.str_param1: default set in conf file
+${sharp} conf.mode1.vector_param0: 0.0,0.1,0.2,0.3,0.4,0.5,0.6
+
+
+
+
+
+${sharp}${sharp}============================================================
+${sharp}${sharp} Component configuration reference
+${sharp}${sharp}
+
+${sharp}${sharp}============================================================
+${sharp}${sharp} Active configuration-set
+${sharp}${sharp}============================================================
+${sharp}${sharp}
+${sharp}${sharp} Initial active configuration-set. The following "mode0" is a
+${sharp}${sharp} configuration-set name.  A configuration-set named "mode0" should be
+${sharp}${sharp} appear in this configuration file as follows.
+${sharp}${sharp}
+${sharp}${sharp} configuration.active_config: mode0
+${sharp}${sharp}
+${sharp} conf.mode0.param0: hoge
+${sharp} conf.mode0.param1: fuga
+${sharp} conf.mode0.param2: munya
+
+${sharp}${sharp}============================================================
+${sharp}${sharp} GUI control option for RTSystemEditor
+${sharp}${sharp}============================================================
+${sharp}${sharp} Available GUI control options [__widget__]:
+${sharp}${sharp}
+${sharp}${sharp} - text:          text box [default].
+${sharp}${sharp} - slider.<step>: Horizontal slider. <step> is step for the slider.
+${sharp}${sharp}                  A range constraints option is required. 
+${sharp}${sharp} - spin:          Spin button. A range constraitns option is required.
+${sharp}${sharp} - radio:         Radio button. An enumeration constraints is required.
+${sharp}${sharp} - checkbox:      Checkbox control. An enumeration constraints is
+${sharp}${sharp}                  required. The parameter has to be able to accept a
+${sharp}${sharp}                  comma separated list.
+${sharp}${sharp} - orderd_list:   Orderd list control.  An enumeration constraint is
+${sharp}${sharp}                  required. The parameter has to be able to accept a
+${sharp}${sharp}                  comma separated list. In this control, Enumerated
+${sharp}${sharp}                  elements can appear one or more times in the given list.
+${sharp}${sharp}
+${sharp}${sharp} Available GUI control constraint options [__constraints__]:
+${sharp}${sharp}
+${sharp}${sharp} - none:         blank
+${sharp}${sharp} - direct value: 100 (constant value)
+${sharp}${sharp} - range:        <, >, <=, >= can be used.
+${sharp}${sharp} - enumeration:  (enum0, enum1, ...)
+${sharp}${sharp} - array:        <constraints0>, ,constraints1>, ... for only array value
+${sharp}${sharp} - hash:         {key0: value0, key1:, value0, ...}
+${sharp}${sharp}
+#if(${tmpltHelper.checkNotWidget(${rtcParam})})
+${sharp}${sharp} examples:
+${sharp} conf.__widget__.int_param0: slider.10
+${sharp} conf.__widget__.int_param1: spin
+${sharp} conf.__widget__.double_param0: slider.10
+${sharp} conf.__widget__.double_param1: text
+${sharp} conf.__widget__.str_param0: radio
+${sharp} conf.__widget__.vector_param0: checkbox
+${sharp} conf.__widget__.vector_param1: orderd_list
+#else
+#foreach($configParam in ${rtcParam.configParams})
+#if( ${configParam.widget.length()} > 0 )
+${sharp} conf.__widget__.${configParam.name}, ${configParam.widget}#if( ${configParam.step.length()} > 0 ).${configParam.step}#end
+
+#end
+#end
+#end
+
+
+#if(${tmpltHelper.checkNotConstraint(${rtcParam})})
+${sharp} conf.__constraints__.int_param0: 0<=x<=150
+${sharp} conf.__constraints__.int_param1: 0<=x<=1000
+${sharp} conf.__constraints__.double_param0: 0<=x<=100
+${sharp} conf.__constraints__.double_param1:
+${sharp} conf.__constraints__.str_param0: (default,mode0,mode1)
+${sharp} conf.__constraints__.vector_param0: (dog,monky,pheasant,cat)
+${sharp} conf.__constraints__.vector_param1: (pita,gora,switch)
+#else
+#foreach($configParam in ${rtcParam.configParams})
+#if( ${configParam.constraint.length()} > 0 )
+${sharp} conf.__constraints__.${configParam.name}, ${configParam.constraint}
+#end
+#end
+#end
+
+${sharp}${sharp}============================================================
+${sharp}${sharp} Execution context settings
+${sharp}${sharp}============================================================
+${sharp}${sharp}
+${sharp}${sharp} Periodic type ExecutionContext
+${sharp}${sharp}
+${sharp}${sharp} Other availabilities in OpenRTM-aist
+${sharp}${sharp}
+${sharp}${sharp} - ExtTrigExecutionContext: External triggered EC. It is embedded in
+${sharp}${sharp}                            OpenRTM library.
+${sharp}${sharp} - OpenHRPExecutionContext: External triggred paralell execution
+${sharp}${sharp}                            EC. It is embedded in OpenRTM
+${sharp}${sharp}                            library. This is usually used with
+${sharp}${sharp}                            OpenHRP3.
+${sharp}${sharp} - RTPreemptEC:             Real-time execution context for Linux
+${sharp}${sharp}                            RT-preemptive pathed kernel.
+${sharp}${sharp} - ArtExecutionContext:     Real-time execution context for ARTLinux
+${sharp}${sharp}                            (http://sourceforge.net/projects/art-linux/)
+${sharp}${sharp}
+#if(${tmpltHelper.checkPeriodicType(${rtcParam})})
+exec_cxt.periodic.type:${tmpltHelper.getPeriodicTypeValue(${rtcParam})}
+#else
+${sharp} exec_cxt.periodic.type: PeriodicExecutionContext
+#end
+
+${sharp}${sharp}
+${sharp}${sharp} The execution cycle of ExecutionContext
+${sharp}${sharp}
+#if(${rtcParam.executionRate}>0)exec_cxt.periodic.rate:${rtcParam.executionRate}
+#else
+${sharp} exec_cxt.periodic.rate: 1000
+#end
+
+#if( ${rtcParam.configParameterParams.size()} > 0 )
+#foreach($parameterParam in ${rtcParam.configParameterParams})  
+#if(${tmpltHelper.checkNotPeriodicTypeParam(${parameterParam})})
+${parameterParam.configName}:${parameterParam.defaultVal}
+#end
+#end
+#end
\ No newline at end of file

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/common/README.vsl
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/common/README.vsl	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/common/README.vsl	2013-01-29 10:39:20 UTC (rev 394)
@@ -259,5 +259,11 @@
 #end
 #end
 # </rtc-template> 
+
+This software is developed at the National Institute of Advanced
+Industrial Science and Technology. Approval number H23PRO-????. This
+software is licensed under the Lesser General Public License. See
+COPYING.LESSER.
+
 This area is reserved for future OpenRTM.
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/common/rtc.conf.vsl
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/common/rtc.conf.vsl	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/common/rtc.conf.vsl	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,9 +1,438 @@
-#if(${rtcParam.executionRate}>0)exec_cxt.periodic.rate:${rtcParam.executionRate}
+${sharp}------------------------------------------------------------
+${sharp} RT-Component manager configuration
+${sharp}
+${sharp} See details in the following reference manual or web page.
+${sharp} http://www.openrtm.org/openrtm/en/content/configuration
+${sharp} http://www.openrtm.org/openrtm/ja/content/rtcconf%E8%A8%AD%E5%AE%9A%E9%A0%85%E7%9B%AE%E4%B8%80%E8%A6%A7
+${sharp} http://www.openrtm.org/openrtm/ko/content/rtcconf-%EC%84%A4%EC%A0%95-%ED%95%AD%EB%AA%A9-%EC%9D%BC%EB%9E%8C
+${sharp}
+
+${sharp}------------------------------------------------------------
+${sharp} Typically used configuration parameters
+${sharp}
+${sharp} corba.name_servers: localhost, 192.168.0.1
+${sharp} corba.endpoints: <interface addess>, <interface addess>
+${sharp} logger.enable: YES
+${sharp} logger.file_name: ./rtc%p.log
+${sharp} logger.log_level: NORMAL
+${sharp}
+${sharp} The following properties should be specified in component specific
+${sharp} configuration files.
+${sharp} exec_cxt.periodic.type: PeriodicExecutionContext
+${sharp} exec_cxt.periodic.rate: 1000
+
+${sharp} Component specific configruation files:
+${sharp} If you want to load component specific configuration file, please
+${sharp} uncomment the following line.
+${sharp}
+${sharp} ${rtcParam.category}.${rtcParam.name}.config_file: ${rtcParam.name}.conf
+${sharp} or
+${sharp} ${rtcParam.category}.${rtcParam.name}0.config_file: ${rtcParam.name}0.conf
+${sharp} ${rtcParam.category}.${rtcParam.name}1.config_file: ${rtcParam.name}1.conf
+${sharp} ${rtcParam.category}.${rtcParam.name}2.config_file: ${rtcParam.name}2.conf
+${sharp}
+${sharp}------------------------------------------------------------
+
+#if(${rtcParam.checkConfig()})${rtcParam.category}.${rtcParam.name}.config_file: ${rtcParam.name}.conf
 #end
-#if( ${rtcParam.configParameterParams.size()} > 0 )
-#foreach($parameterParam in ${rtcParam.configParameterParams})  
-${parameterParam.configName}:${parameterParam.defaultVal}
-#end
-#end
-#if(${rtcParam.checkConstraint()})${rtcParam.category}.${rtcParam.name}.config_file: ${rtcParam.name}.conf
-#end
\ No newline at end of file
+
+${sharp}
+${sharp} Please delete the following part if you are familiar with OpenRTM's
+${sharp} configuration parameters.
+${sharp}
+${sharp}${sharp}----------------------------------------------------------------------
+${sharp}${sharp}
+${sharp}${sharp} RT-Component manager configurations
+${sharp}${sharp}
+${sharp}${sharp}----------------------------------------------------------------------
+
+${sharp}${sharp}------------------------------------------------------------
+${sharp}${sharp} Configuration version (optional) 
+${sharp}${sharp}
+${sharp} config.version: 1.0
+
+${sharp}${sharp}------------------------------------------------------------
+${sharp}${sharp} OpenRTM-aist version (optional)
+${sharp}${sharp}
+${sharp} openrtm.version: 1.0.0
+
+${sharp}${sharp}------------------------------------------------------------
+${sharp}${sharp} The name of manager (default = manager)
+${sharp}${sharp}
+${sharp} manager.name: manager
+
+${sharp}${sharp}------------------------------------------------------------
+${sharp}${sharp} Master manager
+${sharp}${sharp} - manager.is_master: YES/NO, This process made a master or not.
+${sharp}${sharp} - manager.corba_servant: YES/NO, create manager's corba service or not
+${sharp}${sharp} - corba.master_manager: <host_name>:<port>, master manager's location
+${sharp} manager.is_master: YES
+${sharp} manager.corba_servant: YES
+${sharp} corba.master_manager: localhost:2810
+
+${sharp}${sharp}------------------------------------------------------------
+${sharp}${sharp} Manager auto shutdown options
+${sharp}${sharp} - manager.shutdown_on_nortcs: YES/NO, 
+${sharp}${sharp}   process will be shutdown in case no rtc exists when rtc is deleted.
+${sharp}${sharp} - manager.shutdown_auto:
+${sharp}${sharp}   process will be shutdown in case no rtc exists on periodic check.
+${sharp} manager.shutdown_on_nortcs: YES
+${sharp} manager.shutdown_auto: YES
+${sharp} manager.auto_shutdown_duration: 10.0
+
+${sharp}${sharp}============================================================
+${sharp}${sharp} CORBA configuration
+${sharp}${sharp}============================================================
+${sharp}${sharp}
+${sharp}${sharp} CORBA ORB's arguments
+${sharp}${sharp}
+${sharp}${sharp} ORB specific command line options given to ORB_init().
+${sharp}${sharp} See your ORB documentation.
+${sharp}${sharp}
+${sharp}${sharp} Example:
+${sharp}${sharp}   corba.args: -ORBInitialHost myhost -ORBInitialPort 8888
+${sharp}${sharp}
+${sharp}${sharp}
+${sharp} corba.args:
+
+${sharp}${sharp}
+${sharp}${sharp} ORB endpoint
+${sharp}${sharp}
+${sharp}${sharp} If you have two or more network interfaces, ORB endpoint address and/or
+${sharp}${sharp} port have to be specified. If hostname or port number is abbreviated,
+${sharp}${sharp} default interface or port number is used. At least one colon ':'
+${sharp}${sharp} is needed when you specify this option.
+${sharp}${sharp}
+${sharp}${sharp} Examples:
+${sharp}${sharp}   corba.endpoint: myhost:      (use myhost and default port)
+${sharp}${sharp}   corba.endpoint: :9876        (use default addr and port 9876)
+${sharp}${sharp}   corba.endpoint: myhost:9876  (use myhost and port 9876)
+${sharp}${sharp}
+${sharp} corba.endpoint:
+
+${sharp}${sharp}
+${sharp}${sharp} Multiple endpoint options (experimental)
+${sharp}${sharp}
+${sharp}${sharp} Multiple endpoint addresses and ports can be specified using this option.
+${sharp}${sharp}
+${sharp}${sharp} Example:
+${sharp}${sharp}   corba.endpoints: 192.168.1.10:1111, 192.168.10.11:2222
+${sharp}${sharp}   corba.endpoints: 192.168.1.10, 192.168.10.11
+${sharp}${sharp}   corba.endpoints: all
+${sharp}${sharp}
+${sharp} corba.endpoints:
+
+
+${sharp}${sharp}
+${sharp}${sharp} CORBA name server setting
+${sharp}${sharp}
+${sharp}${sharp} Multiple name servers can be specified separating by comma.
+${sharp}${sharp} If port number is abbreviated, default port number is used.
+${sharp}${sharp} The default port number is depend on ORB implementation.
+${sharp}${sharp}
+${sharp}${sharp} Examples:
+${sharp}${sharp}   corba.nameservers: openrtm.aist.go.jp:9876
+${sharp}${sharp}   corba.nameservers: rtm0.aist.go.jp, rtm1.aist.go.jp, rtm2.aist.go.jp
+${sharp}${sharp}
+${sharp} corba.nameservers: localhost
+
+${sharp}${sharp}
+${sharp}${sharp} IOR host address replacement by guessed endpoint from routing (experimental)
+${sharp}${sharp}
+${sharp}${sharp} This option replaces a host address with an endpoint that is guessed
+${sharp}${sharp} by route information to nameserver's address. This option may be
+${sharp}${sharp} effective for CORBA implementation that does not supports IOR's
+${sharp}${sharp} multiple profile or alternate IIOP address. However, since other
+${sharp}${sharp} object references that are obtained from RT-Components or other are
+${sharp}${sharp} not modified by this rule, other RTCs that are connected to this RTC
+${sharp}${sharp} have to also support IOR multiple profile feature.  When this option
+${sharp}${sharp} is used, corba.endpoints option should also be specified with
+${sharp}${sharp} multiple endpoints.
+${sharp}${sharp}
+${sharp} corba.nameservice.replace_endpoint: NO
+
+${sharp}${sharp}
+${sharp}${sharp} IOR alternate IIOP addresses
+${sharp}${sharp}
+${sharp}${sharp} This option adds alternate IIOP addresses into the IOR Profiles.
+${sharp}${sharp} IOR can include additional endpoints for a servant. It is almost
+${sharp}${sharp} same as "corba.endpoints" option, but this option does not create
+${sharp}${sharp} actual endpoint on the ORB. (corba.endpoints try to create actual
+${sharp}${sharp} endpoint, and if it cannot be created, error will be returned.)
+${sharp}${sharp} This option just add alternate IIOP endpoint address information to
+${sharp}${sharp} an IOR.
+${sharp}${sharp}
+${sharp}${sharp} This option can be used when RTCs are located inside of NAT or
+${sharp}${sharp} router.  Generally speaking, RTCs in a private network cannot
+${sharp}${sharp} connect to RTCs in the global network, because global client cannot
+${sharp}${sharp} reach to private servants. However, if route (or NAT) is properly
+${sharp}${sharp} configured for port forwarding, global RTCs can reach to RTCs in
+${sharp}${sharp} private network.
+${sharp}${sharp}
+${sharp}${sharp} A setting example is as follows.
+${sharp}${sharp} 1) Configure your router properly for port-forwarding.
+${sharp}${sharp}    ex. global 2810 port is forwarded to private 2810
+${sharp}${sharp} 2) Set the following options in rtc.conf
+${sharp}${sharp}  corba.nameservers: my.global.nameserver.com <- name server in global network
+${sharp}${sharp}  corba.endpoints: :2810 <- actual port number
+${sharp}${sharp}  corba.additional_ior_addresses: w.x.y.z:2810 <- routers global IP addr/port
+${sharp}${sharp} 3) Launch global RTCs and private RTC, and connect them.
+${sharp}${sharp}
+${sharp} corba.alternate_iiop_addresses: addr:port
+
+${sharp}${sharp}============================================================
+${sharp}${sharp} Naming configurations
+${sharp}${sharp}============================================================
+${sharp}${sharp}
+${sharp}${sharp} Enable/Disable naming functions
+${sharp}${sharp}
+${sharp} naming.enable: YES
+
+${sharp}${sharp}
+${sharp}${sharp} Naming Types
+${sharp}${sharp}
+${sharp}${sharp} Now only "corba" is supported.
+${sharp}${sharp}
+${sharp} naming.type: corba
+
+${sharp}${sharp}
+${sharp}${sharp} Naming format
+${sharp}${sharp}
+${sharp}${sharp} The name format of components that is bound to naming services.
+${sharp}${sharp} The delimiter between names is "/".
+${sharp}${sharp} The delimiter between name and kind is ".".
+${sharp}${sharp}
+${sharp}${sharp} example: (OpenRTM-aist-0.2.0 style)
+${sharp}${sharp}       %h.host_cxt/%M.mgr_cxt/%c.cat_cxt/%m.mod_cxt/%n.rtc
+${sharp}${sharp} This is formatted according to the following replacement rules.
+${sharp}${sharp}
+${sharp}${sharp} %n: The instance name of the component.
+${sharp}${sharp} %t: The type name of the component.
+${sharp}${sharp} %m: The module name of the component.
+${sharp}${sharp} %v: The version of the component.
+${sharp}${sharp} %V: The component vendor.
+${sharp}${sharp} %c: The category of the component.
+${sharp}${sharp} %h: The hostname.
+${sharp}${sharp} %M: The manager name.
+${sharp}${sharp} %p: PID of the manager.
+${sharp}${sharp}
+${sharp} naming.formats: %h.host/%n.rtc
+
+${sharp}${sharp}
+${sharp}${sharp} Auto update to Naming Server
+${sharp}${sharp}
+${sharp} naming.update.enable: YES
+${sharp}${sharp}
+${sharp}${sharp} Update interval [s] for auto update
+${sharp}${sharp}
+${sharp} naming.update.interval: 10.0
+${sharp}${sharp}
+${sharp}${sharp} Rebind references in auto update
+${sharp}${sharp}
+${sharp} naming.update.rebind: NO
+
+${sharp}${sharp} End of Naming configuration section
+${sharp}${sharp}------------------------------------------------------------
+
+${sharp}${sharp}============================================================
+${sharp}${sharp} Module management
+${sharp}${sharp}============================================================
+${sharp}${sharp}
+${sharp}${sharp} Loadable module search path list
+${sharp}${sharp}
+${sharp}${sharp} Manager searches loadable modules from the specified search path list.
+${sharp}${sharp} Path list elements should be separated by comma.
+${sharp}${sharp} Path delimiter is '/' on UNIX, and '\\' on Windows
+${sharp}${sharp} Valid path examples:
+${sharp}${sharp}   manager.modules.load_path: C:/Program Files/OpenRTM-aist,  \
+${sharp}${sharp}   			       C:\\Program Files\\OpenRTM-aist
+${sharp}${sharp}   manager.modules.load_path: /usr/lib, /usr/local/lib,       \
+${sharp}${sharp}   			       /usr/local/lib/OpenRTM-aist/libs
+${sharp}${sharp}
+${sharp} manager.modules.load_path: ./
+
+${sharp}${sharp}
+${sharp}${sharp} Preload module list
+${sharp}${sharp}
+${sharp}${sharp} Manager can load loadable modules before starting up.
+${sharp}${sharp} Loadable modules, which is specified only as its file name, is searched
+${sharp}${sharp} in each module load path specified in the "manager.modules.load_path".
+${sharp}${sharp} If the "manager.modules.abs_path_allowed" option is YES, loadable file
+${sharp}${sharp} can be specified as full-path name,
+${sharp}${sharp}
+${sharp}${sharp} Valid settings:
+${sharp}${sharp} manager.modules.preload: ConsoleIn.dll, ConsoleOut.dll
+${sharp}${sharp} manager.modules.preload: ConsoleIn.so, ConsoleOut.so
+${sharp}${sharp} manager.modules.abs_path_allowed: YES
+${sharp}${sharp} manager.modules.preload: /usr/lib/OpenRTM-aist/ConsoleIn.so
+${sharp}${sharp}
+${sharp} manager.modules.preload:
+
+${sharp}${sharp}
+${sharp}${sharp} Permission flag of absolute module path
+${sharp}${sharp}
+${sharp}${sharp} If this option is "YES", absolute path specification for module is allowed.
+${sharp}${sharp}
+${sharp} manager.modules.abs_path_allowed: YES
+
+${sharp}${sharp}
+${sharp}${sharp} The following options are not implemented yet. 
+${sharp}${sharp}
+${sharp}${sharp} manager.modules.config_ext:
+${sharp}${sharp} manager.modules.config_path:
+${sharp}${sharp} manager.modules.detect_loadable:
+${sharp}${sharp} manager.modules.init_func_suffix:
+${sharp}${sharp} manager.modules.init_func_prefix:
+${sharp}${sharp} manager.modules.download_allowed:
+${sharp}${sharp} manager.modules.download_dir:
+${sharp}${sharp} manager.modules.download_cleanup:
+${sharp}${sharp}
+
+${sharp}${sharp}
+${sharp}${sharp} Advance component creation
+${sharp}${sharp}
+${sharp}${sharp} This option specifies components' names (module name) creating in advance
+${sharp}${sharp} before starting the manager's event-loop. The components' factories should
+${sharp}${sharp} be registered by manager.module.preload option or statically linked to the
+${sharp}${sharp}  manager.
+${sharp}${sharp}
+${sharp}${sharp} Example:
+${sharp}${sharp} manager.components.precreate: ConsoleIn, ConsoleOut, SeqIn, SeqOut
+${sharp}${sharp}
+${sharp} manager.components.precreate: 
+
+
+${sharp}${sharp}============================================================
+${sharp}${sharp} Logger configurations
+${sharp}${sharp}============================================================
+${sharp}${sharp}
+${sharp}${sharp} Enable/Disable logger [YES/NO]
+${sharp} logger.enable: YES
+
+${sharp}${sharp}
+${sharp}${sharp} Log file name (default = ./rtc%p.log)
+${sharp}${sharp}
+${sharp}${sharp} %p: PID
+${sharp}${sharp}
+${sharp} logger.file_name: ./rtc%p.log
+
+${sharp}${sharp}
+${sharp}${sharp} Log date format (default = %b %d %H:%M:%S)
+${sharp}${sharp}
+${sharp}${sharp} The following strftime(3) like format expression is available.
+${sharp}${sharp} If no prefix is needed, use "No" or "Disable".
+${sharp}${sharp} 
+${sharp}${sharp} %a abbreviated weekday name 
+${sharp}${sharp} %A full weekday name 
+${sharp}${sharp} %b abbreviated month name 
+${sharp}${sharp} %B full month name 
+${sharp}${sharp} %c the standard date and time string 
+${sharp}${sharp} %d day of the month, as a number (1-31) 
+${sharp}${sharp} %H hour, 24 hour format (0-23) 
+${sharp}${sharp} %I hour, 12 hour format (1-12) 
+${sharp}${sharp} %j day of the year, as a number (1-366) 
+${sharp}${sharp} %m month as a number (1-12).
+${sharp}${sharp}    Note: some versions of Microsoft Visual C++ may use values that range
+${sharp}${sharp}    from 0-11. 
+${sharp}${sharp} %M minute as a number (0-59) 
+${sharp}${sharp} %p locale's equivalent of AM or PM 
+${sharp}${sharp} %Q millisecond as a number (0-999) from ver 1.1
+${sharp}${sharp} %q microsecond as a number (0-999) from ver 1.1
+${sharp}${sharp} %S second as a number (0-59) 
+${sharp}${sharp} %U week of the year, sunday as the first day 
+${sharp}${sharp} %w weekday as a decimal (0-6, sunday=0) 
+${sharp}${sharp} %W week of the year, monday as the first day 
+${sharp}${sharp} %x standard date string 
+${sharp}${sharp} %X standard time string 
+${sharp}${sharp} %y year in decimal, without the century (0-99) 
+${sharp}${sharp} %Y year in decimal, with the century 
+${sharp}${sharp} %Z time zone name 
+${sharp}${sharp} %% a percent sign 
+${sharp}${sharp}  
+${sharp}${sharp}
+${sharp}${sharp} logger.date_format: No
+${sharp}${sharp} logger.date_format: Disable
+${sharp}${sharp} logger.date_format: [%Y-%m-%dT%H.%M.%S%Z]     // W3C standard format
+${sharp}${sharp} logger.date_format: [%b %d %H:%M:%S]          // Syslog format
+${sharp}${sharp} logger.date_format: [%a %b %d %Y %H:%M:%S %Z] // RFC2822 format
+${sharp}${sharp} logger.date_format: [%a %b %d %H:%M:%S %Z %Y] // data command format
+${sharp}${sharp} logger.date_format: [%Y-%m-%d %H.%M.%S]
+${sharp}${sharp}
+${sharp} logger.date_format: %b %d %H:%M:%S
+
+${sharp}${sharp}
+${sharp}${sharp} Log level (default = NORMAL)
+${sharp}${sharp}
+${sharp}${sharp} The following LogLevels are allowed.
+${sharp}${sharp} SILENT, ERROR, WARN, NORMAL, INFO, DEBUG, TRACE, VERBOSE, PARANOID
+${sharp}${sharp}
+${sharp}${sharp}
+${sharp}${sharp} SILENT  : completely silent
+${sharp}${sharp} ERROR   : includes (ERROR)
+${sharp}${sharp} WARN    : includes (ERROR, WARN)
+${sharp}${sharp} INFO    : includes (ERROR, WARN, INFO)
+${sharp}${sharp} NORMAL  : includes (ERROR, WARN, INFO, NORMAL)
+${sharp}${sharp} DEBUG   : includes (ERROR, WARN, INFO, NORMAL, DEBUG)
+${sharp}${sharp} TRACE   : includes (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE)
+${sharp}${sharp} VERBOSE : includes (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE, VERBOSE)
+${sharp}${sharp} PARANOID: includes (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE, VERBOSE, PARA)
+${sharp}${sharp}
+${sharp}${sharp} Warning!!!
+${sharp}${sharp} "TRACE", "VERBOSE", "PARANOID" logging level will create a huge log file!!
+${sharp}${sharp} "PARANOID" log level will tangle the log file.
+${sharp}${sharp}
+${sharp} logger.log_level: NORMAL
+
+${sharp}${sharp}============================================================
+${sharp}${sharp} Timer configuration
+${sharp}${sharp}============================================================
+${sharp}${sharp}
+${sharp}${sharp} Enable/disable timer function
+${sharp}${sharp}
+${sharp} timer.enable: YES
+
+${sharp}${sharp}
+${sharp}${sharp} Timer clock tick setting [s]
+${sharp}${sharp}
+${sharp} timer.tick: 0.1
+
+${sharp}${sharp}============================================================
+${sharp}${sharp} Execution context settings
+${sharp}${sharp}============================================================
+${sharp}${sharp}
+${sharp}${sharp} Periodic type ExecutionContext
+${sharp}${sharp}
+${sharp}${sharp} Other availabilities in OpenRTM-aist
+${sharp}${sharp}
+${sharp}${sharp} - ExtTrigExecutionContext: External triggered EC. It is embedded in
+${sharp}${sharp}                            OpenRTM library.
+${sharp}${sharp} - OpenHRPExecutionContext: External triggred paralell execution
+${sharp}${sharp}                            EC. It is embedded in OpenRTM
+${sharp}${sharp}                            library. This is usually used with
+${sharp}${sharp}                            OpenHRP3.
+${sharp}${sharp} - RTPreemptEC:             Real-time execution context for Linux
+${sharp}${sharp}                            RT-preemptive pathed kernel.
+${sharp}${sharp} - ArtExecutionContext:     Real-time execution context for ARTLinux
+${sharp}${sharp}                            (http://sourceforge.net/projects/art-linux/)
+${sharp}${sharp}
+${sharp} exec_cxt.periodic.type: PeriodicExecutionContext
+
+${sharp}${sharp}
+${sharp}${sharp} The execution cycle of ExecutionContext
+${sharp}${sharp}
+${sharp} exec_cxt.periodic.rate: 1000
+
+${sharp}${sharp}============================================================
+${sharp}${sharp} SDO service settings
+${sharp}${sharp}============================================================
+${sharp}${sharp}
+${sharp}${sharp} SDO service provider settings
+${sharp}${sharp}
+${sharp} sdo.service.provider.available_services: [read only]
+${sharp} sdo.service.provider.enabled_services: ALL
+${sharp} sdo.service.provider.providing_services: [read only]
+${sharp}${sharp}
+${sharp}${sharp} SDO service consumer settings
+${sharp}${sharp}
+${sharp} sdo.service.consumer.available_services: [read only]
+${sharp} sdo.service.consumer.enabled_services: ALL

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_RTC.cpp.vsl
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_RTC.cpp.vsl	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_RTC.cpp.vsl	2013-01-29 10:39:20 UTC (rev 394)
@@ -132,15 +132,17 @@
   
   // </rtc-template>
 
+  // <rtc-template block="bind_config">
 #if(${rtcParam.configParams.size()}>0)
-  // <rtc-template block="bind_config">
   // Bind variables and configuration variable
 #foreach($configParam in ${rtcParam.configParams})  
   bindParameter("${configParam.name}", ${rtcParam.commonPrefix}${rtcParam.configurationPrefix}${configParam.tmplVarName}${rtcParam.configurationSuffix}${rtcParam.commonSuffix}, "${configParam.defaultVal}");
 #end
-  
+#end
   // </rtc-template>
+#if(${tmpltHelper.checkDetailContent(0,${rtcParam})})${rtcParam.getDetailContent(0)}
 #end
+  
   return RTC::RTC_OK;
 }
 #if(${rtcParam.configParams.size()}==0 && ${rtcParam.IsNotImplemented(0)} && ${rtcParam.inports.size()}==0 && ${rtcParam.outports.size()}==0 && ${rtcParam.servicePorts.size()}==0)*/
@@ -154,6 +156,8 @@
 
 RTC::ReturnCode_t ${rtcParam.name}::onFinalize()
 {
+#if(${tmpltHelper.checkDetailContent(1,${rtcParam})})${rtcParam.getDetailContent(1)}
+#end
   return RTC::RTC_OK;
 }
 #if(${rtcParam.IsNotImplemented(1)})*/
@@ -167,6 +171,8 @@
 
 RTC::ReturnCode_t ${rtcParam.name}::onStartup(RTC::UniqueId ec_id)
 {
+#if(${tmpltHelper.checkDetailContent(2,${rtcParam})})${rtcParam.getDetailContent(2)}
+#end
   return RTC::RTC_OK;
 }
 #if(${rtcParam.IsNotImplemented(2)})*/
@@ -180,6 +186,8 @@
 
 RTC::ReturnCode_t ${rtcParam.name}::onShutdown(RTC::UniqueId ec_id)
 {
+#if(${tmpltHelper.checkDetailContent(3,${rtcParam})})${rtcParam.getDetailContent(3)}
+#end
   return RTC::RTC_OK;
 }
 #if(${rtcParam.IsNotImplemented(3)})*/
@@ -193,6 +201,8 @@
 
 RTC::ReturnCode_t ${rtcParam.name}::onActivated(RTC::UniqueId ec_id)
 {
+#if(${tmpltHelper.checkDetailContent(4,${rtcParam})})${rtcParam.getDetailContent(4)}
+#end
   return RTC::RTC_OK;
 }
 #if(${rtcParam.IsNotImplemented(4)})*/
@@ -206,6 +216,8 @@
 
 RTC::ReturnCode_t ${rtcParam.name}::onDeactivated(RTC::UniqueId ec_id)
 {
+#if(${tmpltHelper.checkDetailContent(5,${rtcParam})})${rtcParam.getDetailContent(5)}
+#end
   return RTC::RTC_OK;
 }
 #if(${rtcParam.IsNotImplemented(5)})*/
@@ -219,6 +231,8 @@
 
 RTC::ReturnCode_t ${rtcParam.name}::onExecute(RTC::UniqueId ec_id)
 {
+#if(${tmpltHelper.checkDetailContent(9,${rtcParam})})${rtcParam.getDetailContent(9)}
+#end
   return RTC::RTC_OK;
 }
 #if(${rtcParam.IsNotImplemented(9)})*/
@@ -232,6 +246,8 @@
 
 RTC::ReturnCode_t ${rtcParam.name}::onAborting(RTC::UniqueId ec_id)
 {
+#if(${tmpltHelper.checkDetailContent(6,${rtcParam})})${rtcParam.getDetailContent(6)}
+#end
   return RTC::RTC_OK;
 }
 #if(${rtcParam.IsNotImplemented(6)})*/
@@ -245,6 +261,8 @@
 
 RTC::ReturnCode_t ${rtcParam.name}::onError(RTC::UniqueId ec_id)
 {
+#if(${tmpltHelper.checkDetailContent(7,${rtcParam})})${rtcParam.getDetailContent(7)}
+#end
   return RTC::RTC_OK;
 }
 #if(${rtcParam.IsNotImplemented(7)})*/
@@ -258,6 +276,8 @@
 
 RTC::ReturnCode_t ${rtcParam.name}::onReset(RTC::UniqueId ec_id)
 {
+#if(${tmpltHelper.checkDetailContent(8,${rtcParam})})${rtcParam.getDetailContent(8)}
+#end
   return RTC::RTC_OK;
 }
 #if(${rtcParam.IsNotImplemented(8)})*/
@@ -271,6 +291,8 @@
 
 RTC::ReturnCode_t ${rtcParam.name}::onStateUpdate(RTC::UniqueId ec_id)
 {
+#if(${tmpltHelper.checkDetailContent(10,${rtcParam})})${rtcParam.getDetailContent(10)}
+#end
   return RTC::RTC_OK;
 }
 #if(${rtcParam.IsNotImplemented(10)})*/
@@ -284,11 +306,19 @@
 
 RTC::ReturnCode_t ${rtcParam.name}::onRateChanged(RTC::UniqueId ec_id)
 {
+#if(${tmpltHelper.checkDetailContent(11,${rtcParam})})${rtcParam.getDetailContent(11)}
+#end
   return RTC::RTC_OK;
 }
 #if(${rtcParam.IsNotImplemented(11)})*/
 #end
 
+#if(${tmpltHelper.checkContents(${rtcParam.publicOpeSource})})${rtcParam.publicOpeSource}
+#end
+#if(${tmpltHelper.checkContents(${rtcParam.protectedOpeSource})})${rtcParam.protectedOpeSource}
+#end
+#if(${tmpltHelper.checkContents(${rtcParam.privateOpeSource})})${rtcParam.privateOpeSource}
+#end
 
 
 extern "C"

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_RTC.h.vsl
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_RTC.h.vsl	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_RTC.h.vsl	2013-01-29 10:39:20 UTC (rev 394)
@@ -78,14 +78,14 @@
 
   // <rtc-template block="public_attribute">
 #foreach($publicAttribute in ${rtcParam.publicAttributes})
-  ${publicAttribute};
+  ${publicAttribute}
 #end
   
   // </rtc-template>
 
   // <rtc-template block="public_operation">
 #foreach($publicOperation in ${rtcParam.publicOperations})
-  ${publicOperation};
+  ${publicOperation}
 #end
   
   // </rtc-template>
@@ -318,21 +318,21 @@
  protected:
   // <rtc-template block="protected_attribute">
 #foreach($protectedAttribute in ${rtcParam.protectedAttributes})
-  ${protectedAttribute};
+  ${protectedAttribute}
 #end
   
   // </rtc-template>
 
   // <rtc-template block="protected_operation">
 #foreach($protectedOperation in ${rtcParam.protectedOperations})
-  ${protectedOperation};
+  ${protectedOperation}
 #end
   
   // </rtc-template>
 
-#if( ${rtcParam.configParams.size()} > 0 )
   // Configuration variable declaration
   // <rtc-template block="config_declare">
+#if( ${rtcParam.configParams.size()} > 0 )
 #foreach($configParam in ${rtcParam.configParams})
   /*!
    * ${tmpltHelper.convertDescDoc(${configParam.docDescription})}
@@ -347,13 +347,14 @@
    */
   ${cXXConv.convConfigSetType(${configParam.type})} ${rtcParam.commonPrefix}${rtcParam.configurationPrefix}${configParam.tmplVarName}${rtcParam.configurationSuffix}${rtcParam.commonSuffix};
 #end
+#end
+
   // </rtc-template>
 
-#end
   // DataInPort declaration
   // <rtc-template block="inport_declare">
 #foreach($port in ${rtcParam.inports})
-#if(${port.type}!="")  ${cXXConv.getDataTypeName(${port.type})} ${rtcParam.commonPrefix}${rtcParam.dataPortPrefix}${port.tmplVarName}${rtcParam.dataPortSuffix}${rtcParam.commonSuffix};
+#if(${port.type}!="")  ${port.type} ${rtcParam.commonPrefix}${rtcParam.dataPortPrefix}${port.tmplVarName}${rtcParam.dataPortSuffix}${rtcParam.commonSuffix};
   /*!
 #if(${port.docDescription.length()}>0)   * ${tmpltHelper.convertDescDoc(${port.docDescription})}
 #end
@@ -370,7 +371,7 @@
 #if(${port.docOperation.length()}>0)   * - Operation Cycle: ${tmpltHelper.convertCycleDoc(${port.docOperation})}
 #end
    */
-  InPort<${cXXConv.getDataTypeName(${port.type})}> ${rtcParam.commonPrefix}${rtcParam.dataPortPrefix}${port.tmplVarName}In${rtcParam.dataPortSuffix}${rtcParam.commonSuffix};
+  InPort<${port.type}> ${rtcParam.commonPrefix}${rtcParam.dataPortPrefix}${port.tmplVarName}In${rtcParam.dataPortSuffix}${rtcParam.commonSuffix};
 #end
 #end
   
@@ -380,7 +381,7 @@
   // DataOutPort declaration
   // <rtc-template block="outport_declare">
 #foreach($port in ${rtcParam.outports})
-#if(${port.type}!="")  ${cXXConv.getDataTypeName(${port.type})} ${rtcParam.commonPrefix}${rtcParam.dataPortPrefix}${port.tmplVarName}${rtcParam.dataPortSuffix}${rtcParam.commonSuffix};
+#if(${port.type}!="")  ${port.type} ${rtcParam.commonPrefix}${rtcParam.dataPortPrefix}${port.tmplVarName}${rtcParam.dataPortSuffix}${rtcParam.commonSuffix};
   /*!
 #if(${port.docDescription.length()}>0)   * ${tmpltHelper.convertDescDoc(${port.docDescription})}
 #end
@@ -397,7 +398,7 @@
 #if(${port.docOperation.length()}>0)   * - Operation Cycle: ${tmpltHelper.convertCycleDoc(${port.docOperation})}
 #end
    */
-  OutPort<${cXXConv.getDataTypeName(${port.type})}> ${rtcParam.commonPrefix}${rtcParam.dataPortPrefix}${port.tmplVarName}Out${rtcParam.dataPortSuffix}${rtcParam.commonSuffix};
+  OutPort<${port.type}> ${rtcParam.commonPrefix}${rtcParam.dataPortPrefix}${port.tmplVarName}Out${rtcParam.dataPortSuffix}${rtcParam.commonSuffix};
 #end
 #end
   
@@ -474,14 +475,14 @@
  private:
   // <rtc-template block="private_attribute">
 #foreach($privateAttribute in ${rtcParam.privateAttributes})
-  ${privateAttribute};
+  ${privateAttribute}
 #end
   
   // </rtc-template>
 
   // <rtc-template block="private_operation">
 #foreach($privateOperation in ${rtcParam.privateOperations})
-  ${privateOperation};
+  ${privateOperation}
 #end
   
   // </rtc-template>

Copied: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_STAND_ALONE.vsl (from rev 393, trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_STAND_ALONE.vsl)
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_STAND_ALONE.vsl	                        (rev 0)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_STAND_ALONE.vsl	2013-01-29 10:39:20 UTC (rev 394)
@@ -0,0 +1,42 @@
+// -*- C++ -*-
+/*!
+ * @file standalone.cpp
+ * @brief Standalone component
+ * @date ${dol}Date${dol}
+#parse("${template}/cpp/_doc.vsl")
+ * ${dol}Id${dol}
+ */
+
+${sharp}include "${rtcParam.name}/rtc.h"
+
+${sharp}include <rtm/Manager.h>
+${sharp}include <iostream>
+${sharp}include <string>
+${sharp}include <stdlib.h>
+
+void ModuleInit(RTC::Manager* manager)
+{
+    rtc_init(manager);
+    RTC::RtcBase* comp;
+    comp = manager->createComponent("${rtcParam.name}");
+
+    if (comp == NULL)
+    {
+        std::cerr << "${rtcParam.name} component creation failed." << std::endl;
+        abort();
+    }
+}
+
+
+int main(int argc, char** argv)
+{
+    RTC::Manager *manager;
+    manager = RTC::Manager::init(argc, argv);
+    manager->init(argc, argv);
+    manager->setModuleInitProc(ModuleInit);
+    manager->activateManager();
+    manager->runManager();
+
+    return 0;
+}
+

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/StringUtil.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/StringUtil.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/StringUtil.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -13,9 +13,9 @@
 	public static boolean checkDigitAlphabet(String source) {
 	    for(int intIdx = 0; intIdx < source.length(); intIdx++) {
 	        char target = source.charAt(intIdx);
-	        if( (target < '0' || target > '9') &&    //”Žšƒ`ƒFƒbƒN
-	            (target < 'a' || target > 'z') &&    //¬•¶ŽšƒAƒ‹ƒtƒ@ƒxƒbƒgƒ`ƒFƒbƒN
-	            (target < 'A' || target > 'Z') &&    //‘啶ŽšƒAƒ‹ƒtƒ@ƒxƒbƒgƒ`ƒFƒbƒN
+	        if( (target < '0' || target > '9') &&    //数字チェック
+	            (target < 'a' || target > 'z') &&    //小文字アルファベットチェック
+	            (target < 'A' || target > 'Z') &&    //大文字アルファベットチェック
 	            (target != '_') && (target != '-') && (target != ':')) {
 	             return false;
 	        }
@@ -29,12 +29,12 @@
 		String sep = System.getProperty("line.separator");
 		String lines[] = source.split(IRtcBuilderConstants.NEWLINE_CODE);
 
-		// ˆê•¶Žš‚¸‚•ێ
+		// 一文字ずつ保持
 		StringBuffer strBuf = new StringBuffer();
-		// –ß‚è’l—p
+		// 戻り値用
 		StringBuffer result = new StringBuffer();
 		
-		// result‚É“Š“ü‚·‚é‘O‚Ìwork
+		// resultに投入する前のwork
 		ArrayList<StringBuffer> workResult = new ArrayList<StringBuffer>();
 		ArrayList<StringBuffer> temp = new ArrayList<StringBuffer>();
 		
@@ -45,9 +45,9 @@
 			source = lines[intline];
 			for( int intIdx=0; intIdx<source.length(); intIdx++ ) {
 				length += String.valueOf(source.charAt(intIdx)).getBytes().length;
-				// ˆê•¶Žš‚¸‚Ž擾‚·‚é
+				// 一文字ずつ取得する
 				strBuf.append(source.charAt(intIdx));
-				// ‰üs•¶Žš‚̏ꍇ‚́C‚»‚Ì‘O‚Ü‚Å‚ð“Š“ü
+				// 改行文字の場合は，その前までを投入
 				if (String.valueOf(source.charAt(intIdx)).equals(sep)) {
 					workResult.add(strBuf);
 					strBuf = new StringBuffer();
@@ -55,7 +55,7 @@
 				}
 				
 				if (String.valueOf(source.charAt(intIdx)).equals(START_MARK)) {
-					// temp‚Ì’l‚ðwork‚É“Š“ü
+					// tempの値をworkに投入
 					if (temp.size() > 0) {
 						workResult.addAll(temp);
 						temp = new ArrayList<StringBuffer>();
@@ -66,14 +66,14 @@
 				if (String.valueOf(source.charAt(intIdx)).equals(END_MARK)) {
 					bolFlg = true;
 					if (temp.size() > 0) {
-						// I—¹•¶Žš‚Ü‚Å‚ðStringBuffer‚É‚½‚߁Awork‚É“Š“ü
+						// 終了文字までをStringBufferにため、workに投入
 						StringBuffer workBuffer = new StringBuffer();
 						for (int intIdx2=0; intIdx2 < temp.size(); intIdx2++) {
 							workBuffer.append(temp.get(intIdx2));
 						}
 						workBuffer.append(strBuf);
 						workResult.add(workBuffer);
-						// ‰Šú‰»
+						// 初期化
 						bolFlg = false;
 						temp = new ArrayList<StringBuffer>();
 						strBuf = new StringBuffer();
@@ -82,8 +82,8 @@
 				}
 				
 				if(length >= width) {
-					// width•ª•¶Žš—ñ‚ðŽæ“¾‚µ‚½Žž‚ɏI—¹•¶Žš‚ªŠÜ‚Ü‚ê‚Ä‚¢‚È‚¯‚ê‚Îtemp‚Ö
-					// ŠÜ‚Ü‚ê‚Ä‚¢‚½‚çwork‚ցB
+					// width分文字列を取得した時に終了文字が含まれていなければtempへ
+					// 含まれていたらworkへ。
 					if (bolFlg == false) {
 						temp.add(strBuf);
 					} else {
@@ -95,16 +95,16 @@
 				
 			}
 	
-			// temp‚ÉŽc‚Á‚Ä‚¢‚镶Žš—ñ‚ðwork‚Ö
+			// tempに残っている文字列をworkへ
 			if (temp.size() > 0) workResult.addAll(temp);
-			// strBuf‚ÉŽc‚Á‚Ä‚¢‚镶Žš—ñ‚ðwork‚Ö
+			// strBufに残っている文字列をworkへ
 			if (strBuf.length() > 0) workResult.add(strBuf);
 			temp = new ArrayList<StringBuffer>();
 			strBuf = new StringBuffer();
 			length = 0;
 		}
 		
-		// workResult‚©‚çresult‚𐬌`‚·‚é
+		// workResultからresultを成形する
 		for (int intIdx=0; intIdx < workResult.size();intIdx++){
 			if (intIdx > 0)	result.append(prefix);
 			result.append(workResult.get(intIdx));

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/AbstractEditorFormPage.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/AbstractEditorFormPage.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/AbstractEditorFormPage.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -16,6 +16,7 @@
 import jp.go.aist.rtm.rtcbuilder.ui.preference.DataTypePreferenceManager;
 import jp.go.aist.rtm.rtcbuilder.util.FileUtil;
 
+import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
@@ -29,6 +30,8 @@
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.events.TraverseEvent;
+import org.eclipse.swt.events.TraverseListener;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.Point;
@@ -213,6 +216,15 @@
 		}
 		
 		final Text text = toolkit.createText(composite, "", style);
+		text.addTraverseListener(new TraverseListener() {
+			
+			@Override
+			public void keyTraversed(TraverseEvent e) {
+				if( e.detail == SWT.TRAVERSE_TAB_NEXT || e.detail == SWT.TRAVERSE_TAB_PREVIOUS ) {
+					e.doit = true;
+				}
+			}
+		});
 		text.addKeyListener(new KeyListener() {
 			public void keyReleased(KeyEvent e) {
 				update();
@@ -226,11 +238,9 @@
 			}
 
 			public void mouseDown(MouseEvent e) {
-				text.setSelection(0, text.getText().length());
 			}
 
 			public void mouseUp(MouseEvent e) {
-				text.setSelection(0, text.getText().length());
 			}
 
 		});
@@ -457,7 +467,12 @@
 		List<String> sources = new ArrayList<String>(DataTypePreferenceManager
 				.getInstance().getIdlFileDirectories());
 		String defaultPath = System.getenv("RTM_ROOT");
+		int baseindex = -1;
 		if (defaultPath != null) {
+			baseindex = 0;
+			if(!defaultPath.endsWith(FS)) {
+				defaultPath += FS;
+			}
 			sources.add(0, defaultPath + "rtm" + FS + "idl");
 		}
 		List<DataTypeParam> sourceContents = new ArrayList<DataTypeParam>();
@@ -487,7 +502,7 @@
 					param.setContent(idlContent);
 					param.setFullPath(source + FS + idlName);
 					sourceContents.add(param);
-					if (intidx > 0) {
+					if( baseindex<intidx) {
 						param.setAddition(true);
 					}
 				}
@@ -498,8 +513,10 @@
 			}
 		}
 		String[] defaultTypeList = new String[0];
-		List<String> dataTypes = IDLParamConverter
-				.extractTypeDef(sourceContents);
+		List<String> dataTypes = new ArrayList<String>();
+		if( IDLParamConverter.extractTypeDef(sourceContents, dataTypes)==false ) {
+			MessageDialog.openWarning(RtcBuilderPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell(), "IDL Parse", IMessageConstants.IDL_PARSE_EROOR);
+		}
 		defaultTypeList = new String[dataTypes.size()];
 		defaultTypeList = dataTypes.toArray(defaultTypeList);
 		//

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/ActivityEditorFormPage.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/ActivityEditorFormPage.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/ActivityEditorFormPage.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -301,6 +301,8 @@
 			for( int intidx=IRtcBuilderConstants.ACTIVITY_INITIALIZE; intidx<IRtcBuilderConstants.ACTIVITY_DUMMY; intidx++) {
 				if( rtcParam.getActionImplemented(intidx) ) {
 					implChk.get(intidx).setBackground(new Color(PlatformUI.getWorkbench().getDisplay(), BuilderViewPreferenceManager.defaultRGBMap.get(BuilderViewPreferenceManager.COLOR_COMPONENT)));
+				} else {
+					implChk.get(intidx).setBackground(getSite().getShell().getDisplay().getSystemColor(SWT.COLOR_WHITE));
 				}
 			}
 		}

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/BasicEditorFormPage.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/BasicEditorFormPage.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/BasicEditorFormPage.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -21,6 +21,7 @@
 import jp.go.aist.rtm.rtcbuilder.ui.Perspective.LanguageProperty;
 import jp.go.aist.rtm.rtcbuilder.ui.preference.ComponentPreferenceManager;
 import jp.go.aist.rtm.rtcbuilder.ui.wizard.RtcExportWizard;
+import jp.go.aist.rtm.rtcbuilder.util.FileUtil;
 import jp.go.aist.rtm.rtcbuilder.util.StringUtil;
 
 import org.eclipse.core.resources.IFile;
@@ -372,6 +373,8 @@
 					//
 					saveRtcProfile(project);
 					switchPerspective();
+	        		editor.getRtcParam().resetUpdated();
+	        		editor.updateDirty();
 				}
 			}
 
@@ -388,6 +391,8 @@
 					if (orgRtcxml.exists()) {
 						IFile renameFile = project.getFile(IRtcBuilderConstants.DEFAULT_RTC_XML + DATE_FORMAT.format(new GregorianCalendar().getTime()) );
 						orgRtcxml.move(renameFile.getFullPath(), true, null);
+						//バックアップ最大数以上のファイルは削除
+						FileUtil.removeBackupFiles(project, IRtcBuilderConstants.DEFAULT_RTC_XML);
 					}
 					IFile saveRtcxml = project.getFile(IRtcBuilderConstants.DEFAULT_RTC_XML);
 					saveRtcxml.create(new ByteArrayInputStream(strXml.getBytes("UTF-8")), true, null);
@@ -591,9 +596,10 @@
 							editor.getRtcParam().getInports(), editor.getRtcParam().getOutports(),
 							editor.getRtcParam().getServicePorts());
 					editor.setEnabledInfoByLang();
+					extractDataTypes();
 					load();
 					//
-					editor.getRtcParam().resetUpdated();
+//					editor.getRtcParam().resetUpdated();
 					editor.updateDirty();
 		        }
 			}

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/ConfigurationEditorFormPage.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/ConfigurationEditorFormPage.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/ConfigurationEditorFormPage.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -167,7 +167,7 @@
 				IMessageConstants.CONFIGURATION_LBL_UNIT, SWT.BORDER);
 		constraintConfigText = createLabelAndText(toolkit, detailGroup,
 				IMessageConstants.CONFIGURATION_LBL_CONSTRAINT, SWT.BORDER);
-		String[] widgetItems = {"text", "slider", "spin", "radio" };
+		String[] widgetItems = {"text", "slider", "spin", "radio", "checkbox", "ordered_list" };
 		widgetCombo = createLabelAndCombo(toolkit, detailGroup, IMessageConstants.CONFIGURATION_LBL_WIDGET,
 				widgetItems);
 		stepText = createLabelAndText(toolkit, detailGroup,
@@ -218,7 +218,7 @@
 		//
 		final TableViewer configSetTableViewer = createTableViewer(toolkit,	composite);
 		final TableViewerColumn col = super.createColumn(configSetTableViewer,
-				IMessageConstants.REQUIRED + IMessageConstants.CONFIGURATION_TBLLBL_NAME, 200);
+				IMessageConstants.REQUIRED + IMessageConstants.CONFIGURATION_TBLLBL_NAME, IRtcBuilderConstants.SINGLE_COLUMN_WIDTH);
 		col.setEditingSupport(new ConfigSetCellModifier(configSetTableViewer));
 //		col.getColumn().setResizable(false);
 		configSetTableViewer.setLabelProvider(new ConfigSetLabelProvider());
@@ -337,8 +337,8 @@
 				IMessageConstants.CONFIGURATION_PARAMETER_TITLE, IMessageConstants.CONFIGURATION_PARAMETER_EXPL, 3);
 		//
 		final TableViewer configParameterTableViewer = createTableViewer(toolkit,	configurationParameterSectionComposite);
-		createConfigProfileColumn(configParameterTableViewer, IMessageConstants.CONFIGURATION_TBLLBL_CONFIGURATION, 200, CONFIGPROFILE_CONFIGURATION);
-		createConfigProfileColumn(configParameterTableViewer, IMessageConstants.CONFIGURATION_TBLLBL_DEFAULTVAL, 200, CONFIGPROFILE_DEFAULT);
+		createConfigProfileColumn(configParameterTableViewer, IMessageConstants.CONFIGURATION_TBLLBL_CONFIGURATION, IRtcBuilderConstants.SINGLE_COLUMN_WIDTH, CONFIGPROFILE_CONFIGURATION);
+		createConfigProfileColumn(configParameterTableViewer, IMessageConstants.CONFIGURATION_TBLLBL_DEFAULTVAL, IRtcBuilderConstants.SINGLE_COLUMN_WIDTH, CONFIGPROFILE_DEFAULT);
 		configParameterTableViewer.setLabelProvider(new ConfigParamLabelProvider());
 		//
 		Composite buttonComposite = toolkit.createComposite(configurationParameterSectionComposite, SWT.NONE);
@@ -482,8 +482,9 @@
 		//
 		RtcParam rtcParam = editor.getRtcParam();
 		configurationSetTableViewer.setInput(rtcParam.getConfigParams());
-		configurationProfileTableViewer.setInput(rtcParam
-				.getConfigParameterParams());
+		configurationProfileTableViewer.setInput(rtcParam.getConfigParameterParams());
+		//Mac版では列の幅が最小化してしまうため，再度列幅を設定
+		configurationSetTableViewer.getTable().getColumn(0).setWidth(IRtcBuilderConstants.SINGLE_COLUMN_WIDTH);
 		//
 		StructuredSelection selection = (StructuredSelection) configurationSetTableViewer
 				.getSelection();

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/DataPortEditorFormPage.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/DataPortEditorFormPage.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/DataPortEditorFormPage.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,9 +1,11 @@
 package jp.go.aist.rtm.rtcbuilder.ui.editors;
 
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import jp.go.aist.rtm.rtcbuilder.IRtcBuilderConstants;
 import jp.go.aist.rtm.rtcbuilder.RtcBuilderPlugin;
 import jp.go.aist.rtm.rtcbuilder.generator.param.DataPortParam;
 import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
@@ -87,7 +89,7 @@
 		updateDefaultValue();
 	}
 
-	private void updateDefaultValue() {
+	public void updateDefaultValue() {
 		IPreferenceStore store = RtcBuilderPlugin.getDefault().getPreferenceStore();
 		defaultPortName = ComponentPreferenceManager.getInstance().getDataPort_Name();
 		defaultPortType = store.getString(ComponentPreferenceManager.Generate_DataPort_Type);
@@ -151,6 +153,10 @@
 		//
 		typeCombo = createLabelAndCombo(toolkit, detailGroup,
 				IMessageConstants.REQUIRED + IMessageConstants.DATAPORT_TBLLBL_DATATYPE, defaultTypeList, SWT.COLOR_RED);
+		String[] items = typeCombo.getItems();
+		Arrays.sort(items);
+		typeCombo.setItems(items);
+		//
 		varNameText = createLabelAndText(toolkit, detailGroup, IMessageConstants.DATAPORT_TBLLBL_VARNAME, SWT.BORDER);
 		positionCombo = createLabelAndCombo(toolkit, detailGroup, IMessageConstants.DATAPORT_TBLLBL_POSITION, DataPortParam.COMBO_ITEM);
 		/////
@@ -188,7 +194,7 @@
 
 		final TableViewer portParamTableViewer = createTableViewer(toolkit,	parent, 70);
 
-		final TableViewerColumn col = super.createColumn(portParamTableViewer, columnLabel, 200);
+		final TableViewerColumn col = super.createColumn(portParamTableViewer, columnLabel, IRtcBuilderConstants.SINGLE_COLUMN_WIDTH);
 		col.setEditingSupport(new DataPortEditingSuport(portParamTableViewer));
 //		col.getColumn().setResizable(false);
 		portParamTableViewer.setLabelProvider(new DataPortParamLabelProvider());
@@ -349,6 +355,9 @@
 		RtcParam rtcParam = editor.getRtcParam();
 		outportTableViewer.setInput(rtcParam.getOutports());
 		inportTableViewer.setInput(rtcParam.getInports());
+		//Mac版では列の幅が最小化してしまうため，再度列幅を設定
+		outportTableViewer.getTable().getColumn(0).setWidth(IRtcBuilderConstants.SINGLE_COLUMN_WIDTH);
+		inportTableViewer.getTable().getColumn(0).setWidth(IRtcBuilderConstants.SINGLE_COLUMN_WIDTH);
 		//
 		StructuredSelection selection = (StructuredSelection) outportTableViewer
 				.getSelection();

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/IMessageConstants.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/IMessageConstants.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/IMessageConstants.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -299,7 +299,9 @@
 	public static final String CONFIGURATION_HINT_UNIT_TITLE = Messages.getString("IMessageConstants.CONFIGURATION_HINT_UNIT_TITLE"); //$NON-NLS-1$
 	public static final String CONFIGURATION_HINT_UNIT_DESC = Messages.getString("IMessageConstants.CONFIGURATION_HINT_UNIT_DESC"); //$NON-NLS-1$
 	public static final String CONFIGURATION_HINT_WIDGET_TITLE = Messages.getString("IMessageConstants.CONFIGURATION_HINT_WIDGET_TITLE"); //$NON-NLS-1$
-	public static final String CONFIGURATION_HINT_WIDGET_DESC = Messages.getString("IMessageConstants.CONFIGURATION_HINT_WIDGET_DESC"); //$NON-NLS-1$
+	public static final String CONFIGURATION_HINT_WIDGET_DESC_P1 = Messages.getString("IMessageConstants.CONFIGURATION_HINT_WIDGET_DESC_P1"); //$NON-NLS-1$
+	public static final String CONFIGURATION_HINT_WIDGET_DESC_P2 = Messages.getString("IMessageConstants.CONFIGURATION_HINT_WIDGET_DESC_P2"); //$NON-NLS-1$
+	public static final String CONFIGURATION_HINT_WIDGET_DESC = StringUtil.connectMessageWithSepalator( new String[]{CONFIGURATION_HINT_WIDGET_DESC_P1, CONFIGURATION_HINT_WIDGET_DESC_P2});
 	public static final String CONFIGURATION_HINT_STEP_TITLE = Messages.getString("IMessageConstants.CONFIGURATION_HINT_STEP_TITLE"); //$NON-NLS-1$
 	public static final String CONFIGURATION_HINT_STEP_DESC_P1 = Messages.getString("IMessageConstants.CONFIGURATION_HINT_STEP_DESC_P1"); //$NON-NLS-1$
 	public static final String CONFIGURATION_HINT_STEP_DESC_P2 = Messages.getString("IMessageConstants.CONFIGURATION_HINT_STEP_DESC_P2"); //$NON-NLS-1$
@@ -452,20 +454,18 @@
 	public static final String PROFILE_COMPARE_MESSAGE = StringUtil.connectMessageWithSepalator( new String[]{PROFILE_COMPARE_MESSAGE_P1, PROFILE_COMPARE_MESSAGE_P2});
 
 	public static final String CREATE_FILE_ERROR = Messages.getString("IMessageConstants.CREATE_FILE_ERROR"); //$NON-NLS-1$
-
-
 	public static final String FILETYPE_YAML = Messages.getString("IMessageConstants.FILETYPE_YAML"); //$NON-NLS-1$
-
-
 	public static final String COMPARE_TITLE = Messages.getString("IMessageConstants.COMPARE_TITLE"); //$NON-NLS-1$
-
-
 	public static final String COMMON_LABEL_UPDATE = Messages.getString("IMessageConstants.COMMON_LABEL_UPDATE"); //$NON-NLS-1$
 
-
+	public static final String BACKUP_FILE_NUM = Messages.getString("IMessageConstants.BACKUP_FILE_NUM"); //$NON-NLS-1$
+	
 	public static final String TITLE_FONT = Messages.getString("IMessageConstants.TITLE_FONT"); //$NON-NLS-1$
 
 	public static final String PROFILE_VALIDATE_ERROR_MESSAGE = Messages.getString("IMessageConstants.PROFILE_VALIDATE_ERROR_MESSAGE"); //$NON-NLS-1$
 
 	public static final String SELECT_DIRECTORY = Messages.getString("IMessageConstants.SELECT_DIRECTORY"); //$NON-NLS-1$
+	
+	public static final String SAVE_MESSAGE = Messages.getString("IMessageConstants.SAVE_MESSAGE"); //$NON-NLS-1$
+	public static final String IDL_PARSE_EROOR = Messages.getString("IMessageConstants.IDL_PARSE_EROOR"); //$NON-NLS-1$
 }

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/RtcBuilderEditor.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/RtcBuilderEditor.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/RtcBuilderEditor.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -348,6 +348,14 @@
 	protected void addDefaultComboValue(){
 		basicFormPage.addDefaultComboValue();
 	}
+	
+	public void updateDataTypes() {
+		if( dataPortFormPage != null ) dataPortFormPage.updateDefaultValue();
+	}
+	
+	public void updatePages() {
+		if( activityFormPage != null ) activityFormPage.load();
+	}
 
 	public String validateParam() {
 		String result = null;
@@ -373,6 +381,7 @@
 	public void doSave(IProgressMonitor monitor) {
 		boolean isRtcXml = getCurrentPage() == rtcXmlFormPage.getIndex();
 		this.allUpdates();
+		RtcBuilderPlugin.getDefault().setCanExit(true);
 
 		if (isRtcXml) {
 			try {
@@ -386,6 +395,8 @@
 					errMessage = e.getCause().toString();
 				}
 				MessageDialog.openError(getSite().getShell(), "XML Save Error", errMessage);
+				//例外発生時には処理中断
+				RtcBuilderPlugin.getDefault().setCanExit(false);
 				return;
 			}
 		}else{
@@ -399,9 +410,14 @@
 						ex.getMessage(),
     					IMessageConstants.PROFILE_VALIDATE_ERROR_MESSAGE + System.getProperty("line.separator") + ex.getCause().toString()
     				); 
-    			if( !result ) return;// 「いいえ」のときは保存しない
+    			if( !result ) {
+    				RtcBuilderPlugin.getDefault().setCanExit(false);
+    				return;// 「いいえ」のときは保存しない
+    			}
 			} catch (Exception e) {
 				MessageDialog.openError(getSite().getShell(), "XML Save Error", e.getMessage());
+				//例外発生時には処理中断
+				RtcBuilderPlugin.getDefault().setCanExit(false);
 				return;
 			}
 		}
@@ -524,7 +540,7 @@
 		return isDirty;
 	}
 
-	private void setDirty(boolean isDirty) {
+	public void setDirty(boolean isDirty) {
 		this.isDirty = isDirty;
 	}
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/preference/CodeGeneratePreferencePage.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/preference/CodeGeneratePreferencePage.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/preference/CodeGeneratePreferencePage.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -46,6 +46,7 @@
 		IPreferenceStore store = RtcBuilderPlugin.getDefault().getPreferenceStore();
 		storeComponentInitialSetting(store);
 		storeConfigurationSetInitialSetting(store);
+		storeBackupInitialSetting(store);
 	}
 
 	@Override
@@ -57,8 +58,16 @@
 		composite.setLayoutData(gd);
 		createComponentPart(composite);
 		createConfigurationSetParts(composite);
+		createBackupParts(composite);
 	}
 
+	private void createBackupParts(Composite composite) {
+		Composite backupGroup = createGroup(composite, IPreferenceMessageConstants.CODE_GEN_TITLE_BACKUP);
+		IntegerFieldEditor moduleMaxInstanceTextEditor = new IntegerFieldEditor(ComponentPreferenceManager.Generate_Backup_Num,
+				IMessageConstants.BACKUP_FILE_NUM, backupGroup);
+		addField(moduleMaxInstanceTextEditor);
+	}
+	
 	private void createConfigurationSetParts(Composite composite) {
 		Composite configGroup = createGroup(composite, IPreferenceMessageConstants.CODE_GEN_TITLE_CONFIG);
 		DigitAlphabetStringFieldEditor configurationNameEditor = 
@@ -154,6 +163,10 @@
 		addField(commonSuffixEditor);
 	}
 	
+	private void storeBackupInitialSetting(IPreferenceStore store) {
+		store.setDefault(ComponentPreferenceManager.Generate_Backup_Num, ComponentPreferenceManager.DEFAULT_BACKUP_NUM);
+	}
+
 	private void storeConfigurationSetInitialSetting(IPreferenceStore store) {
 		store.setDefault(ComponentPreferenceManager.Generate_Configuration_Name, ComponentPreferenceManager.DEFAULT_CONFIGURATION_NAME);
 		store.setDefault(ComponentPreferenceManager.Generate_Configuration_Type, ComponentPreferenceManager.DEFAULT_CONFIGURATION_TYPE);

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/preference/ComponentPreferenceManager.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/preference/ComponentPreferenceManager.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/preference/ComponentPreferenceManager.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -153,6 +153,11 @@
 	 * ServiceInterfacet Instance 接尾語のキー
 	 */
 	public static final String Generate_ServiceIF_Suffix = getClassName() + "GENERATE_SERVICEIF_SUFFIX";
+	//
+	/**
+	 * バックアップファイル設定数のキー
+	 */
+	public static final String Generate_Backup_Num = getClassName() + "GENERATE_BACKUP_NUM";
 	
 	//デフォルト値を空白から変更する場合には，getterの定義が必要
 	public static final String DEFAULT_COMPONENT_NAME = "ModuleName";
@@ -195,6 +200,8 @@
 	public static final String DEFAULT_SERVICEIF_VARNAME = "";
 	public static final String DEFAULT_SERVICEIF_PREFIX = "";
 	public static final String DEFAULT_SERVICEIF_SUFFIX = "";
+	//
+	public static final int DEFAULT_BACKUP_NUM = 3;
 	
 	/**
 	 * コード生成時の ModuleName デフォルト値を取得する
@@ -356,6 +363,17 @@
 	public String getServiceIF_Name() {
 		return getStringStoreValue(Generate_ServiceIF_Name, DEFAULT_SERVICEIF_NAME);
 	}
+	//
+	/**
+	 * コード生成時の バックアップファイル数を取得する
+	 * 
+	 * @param key キー
+	 * @return バックアップファイル数 デフォルト値
+	 */
+	public int getBackup_Num() {
+		return getIntegaerStoreValue(Generate_Backup_Num, DEFAULT_BACKUP_NUM);
+	}
+
 	/////
 	private String getStringStoreValue(String key, String defaultValue) {
 		RtcBuilderPlugin.getDefault().getPreferenceStore().setDefault(key, "");

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/preference/DataTypePreferenceManager.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/preference/DataTypePreferenceManager.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/preference/DataTypePreferenceManager.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -39,10 +39,12 @@
 	 * @return IDLFile Directories デフォルト値
 	 */
 	public List<String> getIdlFileDirectories() {
+		List<String> result = new ArrayList<String>();
+		if(RtcBuilderPlugin.getDefault()==null) return result;
 		RtcBuilderPlugin.getDefault().getPreferenceStore().setDefault(IDLFILE_DIRECTORIES, "");
 
 		String resultTemp = RtcBuilderPlugin.getDefault().getPreferenceStore().getString(IDLFILE_DIRECTORIES);
-		List<String> result = Arrays.asList(resultTemp.split(File.pathSeparator));
+		result = Arrays.asList(resultTemp.split(File.pathSeparator));
 		if (resultTemp.equals("")) { // defaultvalue
 			result = defaultIdlFileDirectories;
 		}

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/preference/IPreferenceMessageConstants.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/preference/IPreferenceMessageConstants.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/preference/IPreferenceMessageConstants.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -26,6 +26,7 @@
 	public static final String CODE_GEN_TITLE_DOCUMENT = Messages.getString("IPreferenceMessageConstants.CODE_GEN_TITLE_DOCUMENT"); //$NON-NLS-1$
 	public static final String CODE_GEN_TITLE_CONFIG = Messages.getString("IPreferenceMessageConstants.CODE_GEN_TITLE_CONFIG"); //$NON-NLS-1$
 	public static final String CODE_GEN_TITLE_PRESUFFIX = Messages.getString("IPreferenceMessageConstants.CODE_GEN_TITLE_PRESUFFIX"); //$NON-NLS-1$
+	public static final String CODE_GEN_TITLE_BACKUP = Messages.getString("IPreferenceMessageConstants.CODE_GEN_TITLE_BACKUP"); //$NON-NLS-1$
 
 	public static final String CONFIG_CLMN_CONFIGURATION = Messages.getString("IPreferenceMessageConstants.CONFIG_CLMN_CONFIGURATION"); //$NON-NLS-1$
 	public static final String CONFIG_CLMN_DEFAUT_VALUE = Messages.getString("IPreferenceMessageConstants.CONFIG_CLMN_DEFAUT_VALUE"); //$NON-NLS-1$

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/wizard/NewWizard.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/wizard/NewWizard.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/wizard/NewWizard.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -3,7 +3,8 @@
 import java.io.ByteArrayInputStream;
 import java.util.GregorianCalendar;
 
-import javax.xml.datatype.DatatypeFactory;
+import javax.xml.datatype.DatatypeConstants;
+import javax.xml.datatype.XMLGregorianCalendar;
 
 import jp.go.aist.rtm.rtcbuilder.IRtcBuilderConstants;
 import jp.go.aist.rtm.rtcbuilder.generator.ProfileHandler;
@@ -28,7 +29,7 @@
 import org.eclipse.ui.part.FileEditorInput;
 import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard;
 
-import com.sun.org.apache.xerces.internal.jaxp.datatype.DatatypeFactoryImpl;
+import com.sun.org.apache.xerces.internal.jaxp.datatype.XMLGregorianCalendarImpl;
 
 public class NewWizard extends Wizard implements INewWizard, IExecutableExtension {
 
@@ -57,8 +58,9 @@
 			}
 			projectHandle.open(null);
 			//
-			DatatypeFactory dateFactory = new DatatypeFactoryImpl();
-			String dateTime = dateFactory.newXMLGregorianCalendar(new GregorianCalendar()).toString();
+			XMLGregorianCalendar calendar = new XMLGregorianCalendarImpl(new GregorianCalendar());
+			calendar.setMillisecond(DatatypeConstants.FIELD_UNDEFINED);
+			String dateTime = calendar.toString();
 			ProfileHandler handler = new ProfileHandler();
 			String xmlFile = handler.createInitialRtcXml(dateTime);
 			//
@@ -87,7 +89,6 @@
 		IConfigurationElement cfig, String propertyName, Object data) {
         configElement = cfig;
     }
-	
 
 	public void init(IWorkbench workbench, IStructuredSelection selection) {
 	}
@@ -96,5 +97,4 @@
 		newProjectPage = new WizardNewProjectCreationPage("ProjectCreation");
 		addPage(newProjectPage);
 	}
-
 }

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/util/FileUtil.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/util/FileUtil.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/util/FileUtil.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -5,11 +5,16 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 import jp.go.aist.rtm.rtcbuilder.IRtcBuilderConstants;
 import jp.go.aist.rtm.rtcbuilder.nl.Messages;
+import jp.go.aist.rtm.rtcbuilder.ui.preference.ComponentPreferenceManager;
 
 import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.swt.SWT;
@@ -109,4 +114,60 @@
 
 		return result == null ? null : result.toString();
 	}
+	
+	/**
+	 * バックアップファイルの整理を行う
+	 * 
+	 * @param project 対象プロジェクト
+	 * @param targetFile 対象ファイル名
+	 */
+	public static void removeBackupFiles(IProject project, String targetFile) {
+		String targetPath = project.getLocation().toOSString();
+		String targetRealFile = targetPath;
+		//
+		if(targetFile.contains("\\")) {
+			//ファイル名にパスが含まれる場合
+			String paths[] = targetFile.split("\\\\");
+			
+			for(int index=0;index<paths.length;index++) {
+				targetRealFile = targetRealFile + File.separator + paths[index];
+				if(index<paths.length-1) {
+					targetPath = targetPath + File.separator + paths[index];
+				}
+			}
+		
+			File dir = new File(targetPath);
+			File[] files = dir.listFiles();
+			List<String> targets = new ArrayList<String>();
+			for(File target : files) {
+				if( target.getPath().startsWith(targetRealFile) ) {
+					targets.add(target.getPath());
+				}
+			}
+			if(ComponentPreferenceManager.getInstance().getBackup_Num() < targets.size()) {
+				Collections.sort(targets);
+				for(int index=0;index<targets.size()-ComponentPreferenceManager.getInstance().getBackup_Num();index++) {
+					File remTarget = new File(targets.get(index));
+					remTarget.delete();
+				}
+			}
+		} else {
+			//ファイル名のみの場合
+			File dir = new File(project.getLocation().toOSString());
+			File[] files = dir.listFiles();
+			List<String> targets = new ArrayList<String>();
+			for(File target : files) {
+				if( target.getName().startsWith(targetFile) ) {
+					targets.add(target.getName());
+				}
+			}
+			if(ComponentPreferenceManager.getInstance().getBackup_Num() < targets.size()) {
+				Collections.sort(targets);
+				for(int index=0;index<targets.size()-ComponentPreferenceManager.getInstance().getBackup_Num();index++) {
+					File remTarget = new File(project.getLocation().toOSString() + File.separator + targets.get(index));
+					remTarget.delete();
+				}
+			}
+		}
+	}
 }

Copied: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/util/ShutdownListener.java (from rev 393, trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/util/ShutdownListener.java)
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/util/ShutdownListener.java	                        (rev 0)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/util/ShutdownListener.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -0,0 +1,48 @@
+package jp.go.aist.rtm.rtcbuilder.util;
+
+import jp.go.aist.rtm.rtcbuilder.RtcBuilderPlugin;
+import jp.go.aist.rtm.rtcbuilder.ui.editors.IMessageConstants;
+import jp.go.aist.rtm.rtcbuilder.ui.editors.RtcBuilderEditor;
+
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchListener;
+import org.eclipse.ui.internal.WorkbenchMessages;
+
+public class ShutdownListener implements IWorkbenchListener {
+	private final int RETURN_YES = 0;
+	private final int RETURN_NO = 1;
+	private final int RETURN_CANCEL = 2;
+
+	@Override
+	public void postShutdown(IWorkbench workbench) {
+	}
+
+	@Override
+	public boolean preShutdown(IWorkbench workbench, boolean forced) {
+		if( workbench.getActiveWorkbenchWindow().getActivePage().getActiveEditor() instanceof RtcBuilderEditor ) {
+			RtcBuilderEditor editor = (RtcBuilderEditor)workbench.getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+			if( editor.isDirty() ) {
+				String[] buttons = new String[] { IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.CANCEL_LABEL };
+				MessageDialog dialog = new MessageDialog(workbench.getDisplay().getActiveShell(), WorkbenchMessages.Save_Resource,
+					null, IMessageConstants.SAVE_MESSAGE, MessageDialog.QUESTION, buttons, 0);
+				int result = dialog.open();
+				switch (result) {
+					case RETURN_YES:
+						editor.doSave(new NullProgressMonitor());
+						break;
+					case RETURN_NO: // no
+						editor.setDirty(false);
+						break;
+					case RETURN_CANCEL: // cancel
+						return false;
+				}
+			}
+			return RtcBuilderPlugin.getDefault().isCanExit();
+		} else {
+			return true;
+		}
+	}
+}

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/util/StringUtil.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/util/StringUtil.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/util/StringUtil.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -45,74 +45,92 @@
 		
 		for( int intline=0; intline<lines.length; intline++ ) {
 			source = lines[intline];
-			for( int intIdx=0; intIdx<source.length(); intIdx++ ) {
-				char c = source.charAt(intIdx);
-				if ((c <= '\u007e') || // 英数字
-						(c == '\u00a5') || // \記号
-						(c == '\u203e') || // ~記号
-						(c >= '\uff61' && c <= '\uff9f') // 半角カナ
-				) {
-					length += 1;
-				} else {
-					length += 2;
-				}
-				// 一文字ずつ取得する
-				strBuf.append(c);
-				// 改行文字の場合は，その前までを投入
-				if (String.valueOf(c).equals(sep)) {
-					workResult.add(strBuf);
-					strBuf = new StringBuffer();
-					length = 0;
-				}
-				
-				if (String.valueOf(c).equals(START_MARK)) {
-					// tempの値をworkに投入
-					if (temp.size() > 0) {
-						workResult.addAll(temp);
-						temp = new ArrayList<StringBuffer>();
+			String[] eachWord = source.split(" ");
+			
+			for(int idxWord=0;idxWord<eachWord.length;idxWord++) {
+				String target = eachWord[idxWord];
+				for( int intIdx=0; intIdx<target.length(); intIdx++ ) {
+					char c = target.charAt(intIdx);
+					if ((c <= '\u007e') || // 英数字
+							(c == '\u00a5') || // \記号
+							(c == '\u203e') || // ~記号
+							(c >= '\uff61' && c <= '\uff9f') // 半角カナ
+					) {
+						length += 1;
+					} else {
+						length += 2;
 					}
-					bolFlg = false;
-				}
-				
-				if (String.valueOf(c).equals(END_MARK)) {
-					bolFlg = true;
-					if (temp.size() > 0) {
-						// 終了文字までをStringBufferにため、workに投入
-						StringBuffer workBuffer = new StringBuffer();
-						for (int intIdx2=0; intIdx2 < temp.size(); intIdx2++) {
-							workBuffer.append(temp.get(intIdx2));
+					// 一文字ずつ取得する
+					strBuf.append(c);
+					// 改行文字の場合は，その前までを投入
+					if (String.valueOf(c).equals(sep)) {
+						workResult.add(strBuf);
+						strBuf = new StringBuffer();
+						length = offset;
+					}
+					
+					if (String.valueOf(c).equals(START_MARK)) {
+						// tempの値をworkに投入
+						if (temp.size() > 0) {
+							workResult.addAll(temp);
+							temp = new ArrayList<StringBuffer>();
 						}
-						workBuffer.append(strBuf);
-						workResult.add(workBuffer);
-						// 初期化
 						bolFlg = false;
-						temp = new ArrayList<StringBuffer>();
+					}
+					
+					if (String.valueOf(c).equals(END_MARK)) {
+						bolFlg = true;
+						if (temp.size() > 0) {
+							// 終了文字までをStringBufferにため、workに投入
+							StringBuffer workBuffer = new StringBuffer();
+							for (int intIdx2=0; intIdx2 < temp.size(); intIdx2++) {
+								workBuffer.append(temp.get(intIdx2));
+							}
+							workBuffer.append(strBuf);
+							workResult.add(workBuffer);
+							// 初期化
+							bolFlg = false;
+							temp = new ArrayList<StringBuffer>();
+							strBuf = new StringBuffer();
+							length = offset;
+						}
+					}
+					
+					if(length >= width) {
+						//単語の途中で改行になった場合
+						if(intIdx<target.length()) {
+							if(intIdx+2< strBuf.length()) {
+								//追加した単語の長さ分を削除
+								strBuf.delete(strBuf.length()-intIdx-2,strBuf.length());
+								//再度同じ単語を解析
+								intIdx = -1;
+							}
+						}
+						// width分文字列を取得した時に終了文字が含まれていなければtempへ
+						// 含まれていたらworkへ。
+						if (bolFlg == false) {
+							temp.add(strBuf);
+						} else {
+							workResult.add(strBuf);
+						}
 						strBuf = new StringBuffer();
-						length = 0;
+						length = offset;
 					}
+					
 				}
-				
-				if(length >= width) {
-					// width分文字列を取得した時に終了文字が含まれていなければtempへ
-					// 含まれていたらworkへ。
-					if (bolFlg == false) {
-						temp.add(strBuf);
-					} else {
-						workResult.add(strBuf);
-					}
-					strBuf = new StringBuffer();
-					length = 0;
+				if( idxWord<eachWord.length-1 && 0<strBuf.length()) {
+					strBuf.append(" ");
+					length += 1;
 				}
-				
 			}
-	
+			
 			// tempに残っている文字列をworkへ
 			if (temp.size() > 0) workResult.addAll(temp);
 			// strBufに残っている文字列をworkへ
 			if (strBuf.length() > 0) workResult.add(strBuf);
 			temp = new ArrayList<StringBuffer>();
 			strBuf = new StringBuffer();
-			length = 0;
+			length = offset;
 		}
 		
 		// workResultからresultを成形する

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/TestBase.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/TestBase.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/TestBase.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -53,7 +53,8 @@
 		String result = content.replace("__ROOT_PATH__", rootPath);
 		String origPathes[] = {
 				"C:\\Tech-Arts\\EclipseRTM\\jp.go.aist.rtm.rtcbuilder\\",
-				"C:\\Tech-Arts\\EclipseRTM34\\jp.go.aist.rtm.rtcbuilder\\" };
+				"C:\\Tech-Arts\\EclipseRTM34\\jp.go.aist.rtm.rtcbuilder\\",
+				"C:\\GlobalAssist\\EclipseAISTRep\\jp.go.aist.rtm.rtcbuilder\\" };
 		for (String path : origPathes) {
 			result = result.replace(path, rootPath);
 		}

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/AllTestsCXX.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/AllTestsCXX.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/AllTestsCXX.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -29,6 +29,9 @@
 		suite.addTestSuite(CXXBaseClass.class);
 		suite.addTestSuite(CXXLibraryTest.class);
 		suite.addTestSuite(CXXConfigSetTest.class);
+		suite.addTestSuite(CXXIDLStructTest.class);
+		suite.addTestSuite(CXXManipTest.class);
+		suite.addTestSuite(CXXContentTest.class);
 		//$JUnit-END$
 		return suite;
 	}

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBaseClass.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBaseClass.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBaseClass.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -65,7 +65,7 @@
 	}
 	
 	private void checkResults(List<GeneratedResult> result, String resourceDir) {
-		assertEquals(22, result.size());
+		assertEquals(15, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBasicTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBasicTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBasicTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -39,6 +39,7 @@
 		rtcParam.setActivityType("PERIODIC2");
 		rtcParam.setMaxInstance(5);
 		rtcParam.setComponentKind("DataFlowComponent");
+		rtcParam.setEnableOldBuildEnv(true);
 
 		rtcParam.getPrivateAttributes().clear();
 		rtcParam.getPrivateAttributes().add("int private1");
@@ -62,7 +63,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/basic/operation/";
 
-		assertEquals(13, result.size());
+		assertEquals(15, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");
@@ -78,6 +79,7 @@
 		rtcParam.setActivityType("PERIODIC2");
 		rtcParam.setMaxInstance(5);
 		rtcParam.setComponentKind("DataFlowComponent");
+		rtcParam.setEnableOldBuildEnv(true);
 
 		rtcParam.getPrivateAttributes().clear();
 		rtcParam.getPrivateAttributes().add("int private1");
@@ -96,7 +98,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/basic/attribute/";
 
-		assertEquals(13, result.size());
+		assertEquals(15, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");
@@ -112,6 +114,7 @@
 		rtcParam.setActivityType("PERIODIC2");
 		rtcParam.setMaxInstance(5);
 		rtcParam.setComponentKind("DataFlowComponent");
+		rtcParam.setEnableOldBuildEnv(true);
 
 		List<DataPortParam> dataport = new ArrayList<DataPortParam>();
 		dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
@@ -149,7 +152,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/basic/service2/";
 
-		assertEquals(15, result.size());
+		assertEquals(17, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");
@@ -167,6 +170,7 @@
 		rtcParam.setActivityType("PERIODIC2");
 		rtcParam.setMaxInstance(5);
 		rtcParam.setComponentKind("DataFlowComponent");
+		rtcParam.setEnableOldBuildEnv(true);
 
 		List<DataPortParam> dataport = new ArrayList<DataPortParam>();
 		dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
@@ -193,7 +197,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/basic/service1/";
 
-		assertEquals(15, result.size());
+		assertEquals(17, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");
@@ -211,6 +215,7 @@
 		rtcParam.setActivityType("PERIODIC2");
 		rtcParam.setMaxInstance(5);
 		rtcParam.setComponentKind("DataFlowComponent");
+		rtcParam.setEnableOldBuildEnv(true);
 
 		List<DataPortParam> dataport = new ArrayList<DataPortParam>();
 		dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
@@ -226,7 +231,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/basic/outport2/";
 
-		assertEquals(13, result.size());
+		assertEquals(15, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");
@@ -242,6 +247,7 @@
 		rtcParam.setActivityType("PERIODIC2");
 		rtcParam.setMaxInstance(5);
 		rtcParam.setComponentKind("DataFlowComponent");
+		rtcParam.setEnableOldBuildEnv(true);
 
 		List<DataPortParam> dataport = new ArrayList<DataPortParam>();
 		dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
@@ -256,7 +262,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/basic/outport1/";
 
-		assertEquals(13, result.size());
+		assertEquals(15, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");
@@ -272,6 +278,7 @@
 		rtcParam.setActivityType("PERIODIC2");
 		rtcParam.setComponentKind("DataFlowComponent");
 		rtcParam.setMaxInstance(5);
+		rtcParam.setEnableOldBuildEnv(true);
 
 		List<DataPortParam> dataport = new ArrayList<DataPortParam>();
 		dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
@@ -283,7 +290,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/basic/inport2/";
 
-		assertEquals(13, result.size());
+		assertEquals(15, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");
@@ -299,6 +306,7 @@
 		rtcParam.setComponentKind("DataFlowComponent");
 		rtcParam.setActivityType("PERIODIC2");
 		rtcParam.setMaxInstance(5);
+		rtcParam.setEnableOldBuildEnv(true);
 
 		List<DataPortParam> dataport = new ArrayList<DataPortParam>();
 		dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
@@ -309,7 +317,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/basic/inport1/";
 
-		assertEquals(13, result.size());
+		assertEquals(15, result.size());
 		checkCode(result, resourceDir, "testComp.cpp");
 		checkCode(result, resourceDir, "test.h");
 		checkCode(result, resourceDir, "test.cpp");
@@ -325,13 +333,14 @@
 		rtcParam.setComponentKind("DataFlowComponent");
 		rtcParam.setActivityType("PERIODIC2");
 		rtcParam.setMaxInstance(5);
+		rtcParam.setEnableOldBuildEnv(true);
 
 		Generator generator = new Generator();
 		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
 
 		String resourceDir = rootPath + "/resource/100/CXX/basic/name/";
 
-		assertEquals(13, result.size());
+		assertEquals(15, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBuildTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBuildTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBuildTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -69,7 +69,7 @@
 		ServicePortParam service1 = new ServicePortParam("svPort", 0);
 		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
 		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(
-				service1, "acc", "", "", rootPath + "/resource/MyService.idl",
+				service1, "acc", "", "", rootPath + "resource/MyService.idl",
 				"MyService", "", 0);
 		srvinterts.add(int1);
 		service1.getServicePortInterfaces().addAll(srvinterts);
@@ -80,7 +80,7 @@
 		List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>();
 		ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(
 				service2, "rate", "", "",
-				rootPath + "/resource/DAQService.idl", "DAQService", "", 1);
+				rootPath + "resource/DAQService.idl", "DAQService", "", 1);
 		srvinterts2.add(int2);
 		service2.getServicePortInterfaces().addAll(srvinterts2);
 		srvports.add(service2);
@@ -91,22 +91,23 @@
 
 		String resourceDir = fixturePath(name) + "/";
 
-		assertEquals(24, result.size());
+		assertEquals(17, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");
 		checkCode(result, resourceDir, "MyServiceSVC_impl.h");
 		checkCode(result, resourceDir, "MyServiceSVC_impl.cpp");
 		//
-		checkCode(result, resourceDir, "CMakeLists.txt");
-		checkCode(result, resourceDir, "Doxyfile.in");
-		checkCode(result, resourceDir, "cmake_modules/cmake_uninstall.cmake.in");
-		checkCode(result, resourceDir, "cmake_modules/CPackWIX.cmake");
-		checkCode(result, resourceDir, "cmake_modules/FindOpenRTM.cmake");
-		checkCode(result, resourceDir, "cpack_resources/Description.txt");
-		checkCode(result, resourceDir, "cpack_resources/License.txt");
-		checkCode(result, resourceDir, "cpack_resources/License.rtf");
-		checkCode(result, resourceDir, "cpack_resources/wix.xsl.in");
+		// checkCode(result, resourceDir, "CMakeLists.txt");
+		// checkCode(result, resourceDir, "Doxyfile.in");
+		// checkCode(result, resourceDir,
+		// "cmake_modules/cmake_uninstall.cmake.in");
+		// checkCode(result, resourceDir, "cmake_modules/CPackWIX.cmake");
+		// checkCode(result, resourceDir, "cmake_modules/FindOpenRTM.cmake");
+		// checkCode(result, resourceDir, "cpack_resources/Description.txt");
+		// checkCode(result, resourceDir, "cpack_resources/License.txt");
+		// checkCode(result, resourceDir, "cpack_resources/License.rtf");
+		// checkCode(result, resourceDir, "cpack_resources/wix.xsl.in");
 		//
 		checkCode(result, resourceDir, "Makefile.foo");
 		checkCode(result, resourceDir, "foo_vc8.sln");
@@ -173,7 +174,7 @@
 
 		String resourceDir = fixturePath(name) + "/";
 
-		assertEquals(26, result.size());
+		assertEquals(19, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");
@@ -182,15 +183,16 @@
 		checkCode(result, resourceDir, "MyServiceChildWithTypeSVC_impl.h");
 		checkCode(result, resourceDir, "MyServiceChildWithTypeSVC_impl.cpp");
 		//
-		checkCode(result, resourceDir, "CMakeLists.txt");
-		checkCode(result, resourceDir, "Doxyfile.in");
-		checkCode(result, resourceDir, "cmake_modules/cmake_uninstall.cmake.in");
-		checkCode(result, resourceDir, "cmake_modules/CPackWIX.cmake");
-		checkCode(result, resourceDir, "cmake_modules/FindOpenRTM.cmake");
-		checkCode(result, resourceDir, "cpack_resources/Description.txt");
-		checkCode(result, resourceDir, "cpack_resources/License.txt");
-		checkCode(result, resourceDir, "cpack_resources/License.rtf");
-		checkCode(result, resourceDir, "cpack_resources/wix.xsl.in");
+		// checkCode(result, resourceDir, "CMakeLists.txt");
+		// checkCode(result, resourceDir, "Doxyfile.in");
+		// checkCode(result, resourceDir,
+		// "cmake_modules/cmake_uninstall.cmake.in");
+		// checkCode(result, resourceDir, "cmake_modules/CPackWIX.cmake");
+		// checkCode(result, resourceDir, "cmake_modules/FindOpenRTM.cmake");
+		// checkCode(result, resourceDir, "cpack_resources/Description.txt");
+		// checkCode(result, resourceDir, "cpack_resources/License.txt");
+		// checkCode(result, resourceDir, "cpack_resources/License.rtf");
+		// checkCode(result, resourceDir, "cpack_resources/wix.xsl.in");
 		//
 		checkCode(result, resourceDir, "Makefile.foo");
 		checkCode(result, resourceDir, "foo_vc8.sln");
@@ -251,22 +253,22 @@
 
 		String resourceDir = fixturePath(name) + "/";
 
-		assertEquals(15, result.size());
-		checkCode(result, resourceDir, "fooComp.cpp");
-		checkCode(result, resourceDir, "foo.h");
-		checkCode(result, resourceDir, "foo.cpp");
-		checkCode(result, resourceDir, "MyServiceSVC_impl.h");
-		checkCode(result, resourceDir, "MyServiceSVC_impl.cpp");
+		assertEquals(30, result.size());
+		checkCode(result, resourceDir, "src/fooComp.cpp");
+		checkCode(result, resourceDir, "include/foo/foo.h");
+		checkCode(result, resourceDir, "src/foo.cpp");
+		checkCode(result, resourceDir, "include/foo/MyServiceSVC_impl.h");
+		checkCode(result, resourceDir, "src/MyServiceSVC_impl.cpp");
 		//
-		checkCode(result, resourceDir, "CMakeLists.txt");
-		checkCode(result, resourceDir, "Doxyfile.in");
-		checkCode(result, resourceDir, "cmake_modules/cmake_uninstall.cmake.in");
-		checkCode(result, resourceDir, "cmake_modules/CPackWIX.cmake");
-		checkCode(result, resourceDir, "cmake_modules/FindOpenRTM.cmake");
-		checkCode(result, resourceDir, "cpack_resources/Description.txt");
-		checkCode(result, resourceDir, "cpack_resources/License.txt");
-		checkCode(result, resourceDir, "cpack_resources/License.rtf");
-		checkCode(result, resourceDir, "cpack_resources/wix.xsl.in");
+//		checkCode(result, resourceDir, "CMakeLists.txt");
+//		checkCode(result, resourceDir, "Doxyfile.in");
+//		checkCode(result, resourceDir, "cmake_modules/cmake_uninstall.cmake.in");
+//		checkCode(result, resourceDir, "cmake_modules/CPackWIX.cmake");
+//		checkCode(result, resourceDir, "cmake_modules/FindOpenRTM.cmake");
+//		checkCode(result, resourceDir, "cpack_resources/Description.txt");
+//		checkCode(result, resourceDir, "cpack_resources/License.txt");
+//		checkCode(result, resourceDir, "cpack_resources/License.rtf");
+//		checkCode(result, resourceDir, "cpack_resources/wix.xsl.in");
 		//
 		nonexist(result, resourceDir, "Makefile.foo");
 		nonexist(result, resourceDir, "foo_vc8.sln");
@@ -330,24 +332,24 @@
 
 		String resourceDir = fixturePath(name) + "/";
 
-		assertEquals(17, result.size());
-		checkCode(result, resourceDir, "fooComp.cpp");
-		checkCode(result, resourceDir, "foo.h");
-		checkCode(result, resourceDir, "foo.cpp");
-		checkCode(result, resourceDir, "MyServiceChildMultiSVC_impl.h");
-		checkCode(result, resourceDir, "MyServiceChildMultiSVC_impl.cpp");
-		checkCode(result, resourceDir, "MyServiceChildWithTypeSVC_impl.h");
-		checkCode(result, resourceDir, "MyServiceChildWithTypeSVC_impl.cpp");
+		assertEquals(32, result.size());
+		checkCode(result, resourceDir, "src/fooComp.cpp");
+		checkCode(result, resourceDir, "include/foo/foo.h");
+		checkCode(result, resourceDir, "src/foo.cpp");
+		checkCode(result, resourceDir, "include/foo/MyServiceChildMultiSVC_impl.h");
+		checkCode(result, resourceDir, "src/MyServiceChildMultiSVC_impl.cpp");
+		checkCode(result, resourceDir, "include/foo/MyServiceChildWithTypeSVC_impl.h");
+		checkCode(result, resourceDir, "src/MyServiceChildWithTypeSVC_impl.cpp");
 		//
-		checkCode(result, resourceDir, "CMakeLists.txt");
-		checkCode(result, resourceDir, "Doxyfile.in");
-		checkCode(result, resourceDir, "cmake_modules/cmake_uninstall.cmake.in");
-		checkCode(result, resourceDir, "cmake_modules/CPackWIX.cmake");
-		checkCode(result, resourceDir, "cmake_modules/FindOpenRTM.cmake");
-		checkCode(result, resourceDir, "cpack_resources/Description.txt");
-		checkCode(result, resourceDir, "cpack_resources/License.txt");
-		checkCode(result, resourceDir, "cpack_resources/License.rtf");
-		checkCode(result, resourceDir, "cpack_resources/wix.xsl.in");
+//		checkCode(result, resourceDir, "CMakeLists.txt");
+//		checkCode(result, resourceDir, "Doxyfile.in");
+//		checkCode(result, resourceDir, "cmake_modules/cmake_uninstall.cmake.in");
+//		checkCode(result, resourceDir, "cmake_modules/CPackWIX.cmake");
+//		checkCode(result, resourceDir, "cmake_modules/FindOpenRTM.cmake");
+//		checkCode(result, resourceDir, "cpack_resources/Description.txt");
+//		checkCode(result, resourceDir, "cpack_resources/License.txt");
+//		checkCode(result, resourceDir, "cpack_resources/License.rtf");
+//		checkCode(result, resourceDir, "cpack_resources/wix.xsl.in");
 		//
 		nonexist(result, resourceDir, "Makefile.foo");
 		nonexist(result, resourceDir, "foo_vc8.sln");

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConfigSetTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConfigSetTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConfigSetTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -32,6 +32,7 @@
 		rtcParam.setMaxInstance(3);
 		rtcParam.setRtmVersion("1.0.0");
 		rtcParam.setIsTest(true);
+		rtcParam.setEnableOldBuildEnv(true);
 		genParam.getRtcParams().add(rtcParam);
 	}
 
@@ -95,7 +96,7 @@
 	}
 
 	private void checkResults(List<GeneratedResult> result, String resourceDir) {
-		assertEquals(13, result.size());
+		assertEquals(15, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConstraint.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConstraint.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConstraint.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -32,6 +32,7 @@
 		rtcParam.setMaxInstance(3);
 		rtcParam.setRtmVersion("1.0.0");
 		rtcParam.setIsTest(true);
+		rtcParam.setEnableOldBuildEnv(true);
 		genParam.getRtcParams().add(rtcParam);
 	}
 
@@ -76,7 +77,7 @@
 	}
 
 	private void checkResults(List<GeneratedResult> result, String resourceDir) {
-		assertEquals(14, result.size());
+		assertEquals(15, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");

Copied: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXContentTest.java (from rev 393, trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXContentTest.java)
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXContentTest.java	                        (rev 0)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXContentTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -0,0 +1,68 @@
+package jp.go.aist.rtm.rtcbuilder._test._100;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import jp.go.aist.rtm.rtcbuilder.Generator;
+import jp.go.aist.rtm.rtcbuilder.IRtcBuilderConstants;
+import jp.go.aist.rtm.rtcbuilder._test.TestBase;
+import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
+import jp.go.aist.rtm.rtcbuilder.generator.param.DataPortParam;
+import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
+import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
+import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortInterfaceParam;
+import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortParam;
+
+public class CXXContentTest extends TestBase {
+
+	RtcParam rtcParam;
+	GeneratorParam genParam;
+
+	protected void setUp() throws Exception {
+		genParam = new GeneratorParam();
+		rtcParam = new RtcParam(genParam, true);
+		rtcParam.setOutputProject(rootPath + "/resource/work");
+		rtcParam.setLanguage(IRtcBuilderConstants.LANG_CPP);
+		rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
+		rtcParam.setRtmVersion("1.0.0");
+		rtcParam.setIsTest(true);
+		genParam.getRtcParams().add(rtcParam);
+	}
+
+	public void testBasic() throws Exception {
+		rtcParam.setName("foo");
+		rtcParam.setDescription("MDesc");
+		rtcParam.setVersion("1.0.1");
+		rtcParam.setVender("TA");
+		rtcParam.setCategory("Manip");
+		rtcParam.setComponentType("STATIC2");
+		rtcParam.setComponentKind("DataFlowComponent");
+		rtcParam.setActivityType("PERIODIC2");
+		rtcParam.setMaxInstance(5);
+		rtcParam.setEnableOldBuildEnv(true);
+		//
+		rtcParam.setDetailContent(IRtcBuilderConstants.ACTIVITY_INITIALIZE, "  init();");
+		rtcParam.setDetailContent(IRtcBuilderConstants.ACTIVITY_FINALIZE, "  fin();");
+		rtcParam.getPrivateAttributes().add("  privateParam");
+		rtcParam.getPrivateAttributes().add("  privateParam2");
+		rtcParam.getProtectedAttributes().add("  protectedParam");
+		rtcParam.getPublicAttributes().add("  publicdParam");
+		rtcParam.getPrivateOperations().add("  privateOpe()");
+		rtcParam.getProtectedOperations().add("  protectedOpe()");
+		rtcParam.getPublicOperations().add("  publicOpe()");
+		rtcParam.setPrivateOpeSource("  private void privateOpe(){}");
+		rtcParam.setProtectedOpeSource("  protected void protectedOpe(){}");
+		rtcParam.setPublicOpeSource("  public void publicOpe(){}");
+
+		Generator generator = new Generator();
+		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
+
+		String resourceDir = rootPath + "/resource/100/CXX/Content/";
+
+		assertEquals(15, result.size());
+		checkCode(result, resourceDir, "fooComp.cpp");
+		checkCode(result, resourceDir, "foo.h");
+		checkCode(result, resourceDir, "foo.cpp");
+	}
+
+}

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDataPortIDLTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDataPortIDLTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDataPortIDLTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -24,6 +24,7 @@
 		rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
 		rtcParam.setRtmVersion("1.0.0");
 		rtcParam.setIsTest(true);
+		rtcParam.setEnableOldBuildEnv(true);
 		genParam.getRtcParams().add(rtcParam);
 	}
 
@@ -60,7 +61,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/DataPortIDL/";
 
-		assertEquals(13, result.size());
+		assertEquals(15, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDocLongTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDocLongTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDocLongTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -28,6 +28,7 @@
 		rtcParam.setLanguageArg(LANG_CPP_ARG);
 		rtcParam.setRtmVersion("1.0.0");
 		rtcParam.setIsTest(true);
+		rtcParam.setEnableOldBuildEnv(true);
 		genParam.getRtcParams().add(rtcParam);
 	}
 
@@ -42,7 +43,7 @@
 		rtcParam.setMaxInstance(5);
 		rtcParam.setComponentKind("DataFlowComponent");
 		//
-		rtcParam.setDocCreator("Noriaki Ando <n-ando at aist.go.jp>34567894123456789512345678961234567897123456789812345");
+		rtcParam.setDocCreator("Noriaki Ando <n-ando at aist.go.jp> one two three four five six seven eight nine ten");
 		rtcParam.setDocLicense("Copyright (C) 2006-2008 ライセンス12345678901234567890123456789012345678901234567890");
 		rtcParam.setDocDescription("本コンポーネントの概要説明1234567890123456789012345678901234567890123456789012345678901234567890");
 		rtcParam.setDocInOut("本コンポーネントの入出力1234567890123456789012345678901234567890123456789012345678901234567890");
@@ -181,17 +182,17 @@
 		List<ConfigSetParam> configset = new ArrayList<ConfigSetParam>(); 
 		ConfigSetParam config1 = new ConfigSetParam("int_param0","int","", "0");
 		config1.setDocDataName("Config1の名前");
-		config1.setDocDescription("Config1の概要1234567890123456789012345678901234567890123456789012345678901234567890");
+		config1.setDocDescription("０１２３４５６７８９０１２３４５６７８９０１２３４５６７８９０１２３４５６７８９");
 		config1.setDocDefaultVal("Config1のデフォルト値");
-		config1.setDocUnit("Config1の単位1234567890123456789012345678901234567890123456789012345678901234567890");
-		config1.setDocRange("Config1の範囲1234567890123456789012345678901234567890123456789012345678901234567890");
-		config1.setDocConstraint("Config1の制約条件1234567890123456789012345678901234567890123456789012345678901234567890");
+		config1.setDocUnit("01234567890123456789０１２３４５01234567890123456789０１２３４５01234567890123456789");
+		config1.setDocRange("0123456789012345678901234567890123456789 one two three four five six");
+		config1.setDocConstraint("Config1の制約条件123456789012345678901234567890 one two 1234567890 one two three four five six");
 		configset.add(config1);
 		ConfigSetParam config2 = new ConfigSetParam("int_param1","int","", "1");
 		config2.setDocDataName("Config2の名前");
 		config2.setDocDescription("Config2の概要1234567890123456789012345678901234567890123456789012345678901234567890");
 		config2.setDocDefaultVal("Config2のデフォルト値");
-		config2.setDocUnit("Config2の単位1234567890123456789012345678901234567890123456789012345678901234567890");
+		config2.setDocUnit("Config2の単位 1234567890123456789012345678901234567890123456789012345678901234567890 1234567890");
 		config2.setDocRange("Config2の範囲1234567890123456789012345678901234567890123456789012345678901234567890");
 		config2.setDocConstraint("Config2の制約条件1234567890123456789012345678901234567890123456789012345678901234567890");
 		configset.add(config2);
@@ -228,7 +229,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/Doc/fullLong/";
 
-		assertEquals(15, result.size());
+		assertEquals(17, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXExCxtTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXExCxtTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXExCxtTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -24,6 +24,7 @@
 		rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
 		rtcParam.setRtmVersion("1.0.0");
 		rtcParam.setIsTest(true);
+		rtcParam.setEnableOldBuildEnv(true);
 		genParam.getRtcParams().add(rtcParam);
 	}
 
@@ -52,7 +53,7 @@
 
 		String resourceDir = rootPath +  "/resource/100/CXX/ExecutionCxt/";
 
-		assertEquals(14, result.size());
+		assertEquals(15, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLInheritTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLInheritTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLInheritTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -38,6 +38,7 @@
 		rtcParam.setMaxInstance(2);
 		rtcParam.setRtmVersion(IRtcBuilderConstants.RTM_VERSION_100);
 		rtcParam.setIsTest(true);
+		rtcParam.setEnableOldBuildEnv(true);
 		genParam.getRtcParams().add(rtcParam);
 
 		generator = new Generator();
@@ -78,7 +79,7 @@
 
 		String resourceDir = fixturePath(name) + "/";
 
-		assertEquals(15, result.size());
+		assertEquals(17, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");
@@ -127,7 +128,7 @@
 
 		String resourceDir = fixturePath(name) + "/";
 
-		assertEquals(17, result.size());
+		assertEquals(19, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLModuleTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLModuleTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLModuleTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -25,6 +25,7 @@
 		rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
 		rtcParam.setRtmVersion("1.0.0");
 		rtcParam.setIsTest(true);
+		rtcParam.setEnableOldBuildEnv(true);
 		genParam.getRtcParams().add(rtcParam);
 	}
 
@@ -54,7 +55,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/idlmodule/serviceM/";
 
-		assertEquals(15, result.size());
+		assertEquals(17, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");
@@ -89,7 +90,7 @@
 		String resourceDir = rootPath
 				+ "/resource/100/CXX/idlmodule/serviceCon/";
 
-		assertEquals(13, result.size());
+		assertEquals(15, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");
@@ -98,4 +99,71 @@
 		nonexist(result, resourceDir, "MyServiceSVC_impl.cpp");
 	}
 
+	public void testArgModule() throws Exception {
+		rtcParam.setName("foo");
+		rtcParam.setDescription("ModuleDescription");
+		rtcParam.setVersion("1.0.0");
+		rtcParam.setVender("VenderName");
+		rtcParam.setCategory("Category");
+		rtcParam.setComponentType("UNIQUE");
+		rtcParam.setActivityType("EVENTDRIVEN");
+		rtcParam.setMaxInstance(0);
+		rtcParam.setComponentKind("DataFlowComponent");
+
+		ServicePortParam service1 = new ServicePortParam("sv_name", 0);
+		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
+		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "if_name", "", "", 
+				rootPath + "/resource/100/CXX/idlmodule/serviceArg/MyServiceModuleTypeDef.idl", "RTC::RTM::MyService", "", 0);
+		srvinterts.add(int1);
+		service1.getServicePortInterfaces().addAll(srvinterts);
+		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
+		srvports.add(service1);
+		rtcParam.getServicePorts().addAll(srvports);
+
+		Generator generator = new Generator();
+		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
+
+		String resourceDir = rootPath + "/resource/100/CXX/idlmodule/serviceArg/";
+
+		assertEquals(17, result.size());
+		checkCode(result, resourceDir, "fooComp.cpp");
+		checkCode(result, resourceDir, "foo.h");
+		checkCode(result, resourceDir, "foo.cpp");
+		checkCode(result, resourceDir, "MyServiceModuleTypeDefSVC_impl.h");
+		checkCode(result, resourceDir, "MyServiceModuleTypeDefSVC_impl.cpp");
+	}
+	
+	public void testArgStructModule() throws Exception {
+		rtcParam.setName("foo");
+		rtcParam.setDescription("ModuleDescription");
+		rtcParam.setVersion("1.0.0");
+		rtcParam.setVender("VenderName");
+		rtcParam.setCategory("Category");
+		rtcParam.setComponentType("UNIQUE");
+		rtcParam.setActivityType("EVENTDRIVEN");
+		rtcParam.setMaxInstance(0);
+		rtcParam.setComponentKind("DataFlowComponent");
+
+		ServicePortParam service1 = new ServicePortParam("sv_name", 0);
+		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
+		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "if_name", "", "", 
+				rootPath + "/resource/100/CXX/idlmodule/serviceArgStruct/MyServiceModuleTypeDef.idl", "MyService", "", 0);
+		srvinterts.add(int1);
+		service1.getServicePortInterfaces().addAll(srvinterts);
+		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
+		srvports.add(service1);
+		rtcParam.getServicePorts().addAll(srvports);
+
+		Generator generator = new Generator();
+		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
+
+		String resourceDir = rootPath + "/resource/100/CXX/idlmodule/serviceArgStruct/";
+
+		assertEquals(17, result.size());
+		checkCode(result, resourceDir, "fooComp.cpp");
+		checkCode(result, resourceDir, "foo.h");
+		checkCode(result, resourceDir, "foo.cpp");
+		checkCode(result, resourceDir, "MyServiceModuleTypeDefSVC_impl.h");
+		checkCode(result, resourceDir, "MyServiceModuleTypeDefSVC_impl.cpp");
+	}
 }

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLPathTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLPathTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLPathTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -26,6 +26,7 @@
 		rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
 		rtcParam.setRtmVersion("1.0.0");
 		rtcParam.setIsTest(true);
+		rtcParam.setEnableOldBuildEnv(true);
 		genParam.getRtcParams().add(rtcParam);
 	}
 
@@ -76,7 +77,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/idlpath/IDLPath3/";
 
-		assertEquals(15, result.size());
+		assertEquals(17, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");
@@ -131,7 +132,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/idlpath/IDLPath2/";
 
-		assertEquals(15, result.size());
+		assertEquals(17, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");
@@ -185,7 +186,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/idlpath/IDLPath1/";
 
-		assertEquals(15, result.size());
+		assertEquals(17, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");

Copied: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLStructTest.java (from rev 393, trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLStructTest.java)
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLStructTest.java	                        (rev 0)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLStructTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -0,0 +1,68 @@
+package jp.go.aist.rtm.rtcbuilder._test._100;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import jp.go.aist.rtm.rtcbuilder.Generator;
+import jp.go.aist.rtm.rtcbuilder.IRtcBuilderConstants;
+import jp.go.aist.rtm.rtcbuilder._test.TestBase;
+import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
+import jp.go.aist.rtm.rtcbuilder.generator.param.DataPortParam;
+import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
+import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
+import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortInterfaceParam;
+import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortParam;
+
+public class CXXIDLStructTest extends TestBase {
+
+	RtcParam rtcParam;
+	GeneratorParam genParam;
+
+	protected void setUp() throws Exception {
+		genParam = new GeneratorParam();
+		rtcParam = new RtcParam(genParam, true);
+		rtcParam.setOutputProject(rootPath + "/resource/work");
+		rtcParam.setLanguage(IRtcBuilderConstants.LANG_CPP);
+		rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
+		rtcParam.setRtmVersion("1.0.0");
+		rtcParam.setIsTest(true);
+		rtcParam.setEnableOldBuildEnv(true);
+		genParam.getRtcParams().add(rtcParam);
+	}
+
+	public void testIDLStruct() throws Exception {
+		rtcParam.setName("TestModule");
+		rtcParam.setDescription("ModuleDescription");
+		rtcParam.setVersion("1.0.0");
+		rtcParam.setVender("ysuga_net");
+		rtcParam.setCategory("Category");
+		rtcParam.setComponentType("STATIC");
+		rtcParam.setActivityType("PERIODIC");
+		rtcParam.setMaxInstance(1);
+		rtcParam.setComponentKind("DataFlowComponent");
+
+		ServicePortParam service1 = new ServicePortParam("svcPort", 0);
+		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
+		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(
+				service1, "inf0", "inf0", "", rootPath + "/resource/100/CXX/idlstruct/module_ysuga_net.idl",
+				"ysuga_net::Hoge", rootPath + "/resource/100/CXX/idlstruct/", 0);
+		srvinterts.add(int1);
+		service1.getServicePortInterfaces().addAll(srvinterts);
+		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
+		srvports.add(service1);
+
+		rtcParam.getServicePorts().addAll(srvports);
+
+		Generator generator = new Generator();
+		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
+
+		String resourceDir = rootPath + "/resource/100/CXX/idlstruct/";
+
+		assertEquals(17, result.size());
+		checkCode(result, resourceDir, "TestModuleComp.cpp");
+		checkCode(result, resourceDir, "TestModule.h");
+		checkCode(result, resourceDir, "TestModule.cpp");
+		checkCode(result, resourceDir, "module_ysuga_netSVC_impl.h");
+		checkCode(result, resourceDir, "module_ysuga_netSVC_impl.cpp");
+	}
+}

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLType.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLType.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLType.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -25,6 +25,7 @@
 		rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
 		rtcParam.setRtmVersion("1.0.0");
 		rtcParam.setIsTest(true);
+		rtcParam.setEnableOldBuildEnv(true);
 	}
 
 	public void testIDLStruct() throws Exception {
@@ -56,7 +57,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/idltype/Struct/";
 
-		assertEquals(16, result.size());
+		assertEquals(17, result.size());
 		checkCode(result, resourceDir, "ModuleNameComp.cpp");
 		checkCode(result, resourceDir, "ModuleName.h");
 		checkCode(result, resourceDir, "ModuleName.cpp");
@@ -92,7 +93,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/idltype/SeqString/";
 
-		assertEquals(15, result.size());
+		assertEquals(17, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");
@@ -163,7 +164,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/idltype/Struct2/";
 
-		assertEquals(16, result.size());
+		assertEquals(17, result.size());
 		checkCode(result, resourceDir, "ModuleNameComp.cpp");
 		checkCode(result, resourceDir, "ModuleName.h");
 		checkCode(result, resourceDir, "ModuleName.cpp");
@@ -200,7 +201,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/idltype/IDLType1/";
 
-		assertEquals(16, result.size());
+		assertEquals(17, result.size());
 		checkCode(result, resourceDir, "ModuleNameComp.cpp");
 		checkCode(result, resourceDir, "ModuleName.h");
 		checkCode(result, resourceDir, "ModuleName.cpp");

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXImplTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXImplTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXImplTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -22,6 +22,7 @@
 		rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
 		rtcParam.setRtmVersion("1.0.0");
 		rtcParam.setIsTest(true);
+		rtcParam.setEnableOldBuildEnv(true);
 		genParam.getRtcParams().add(rtcParam);
 	}
 
@@ -53,7 +54,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/impl/all/";
 
-		assertEquals(13, result.size());
+		assertEquals(15, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");
@@ -80,7 +81,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/impl/execute/";
 
-		assertEquals(13, result.size());
+		assertEquals(15, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");
@@ -106,7 +107,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/impl/finalize/";
 
-		assertEquals(13, result.size());
+		assertEquals(15, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");
@@ -129,7 +130,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/impl/initialize/";
 
-		assertEquals(13, result.size());
+		assertEquals(15, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXLibraryTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXLibraryTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXLibraryTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -23,6 +23,7 @@
 		rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
 		rtcParam.setRtmVersion("1.0.0");
 		rtcParam.setIsTest(true);
+		rtcParam.setEnableOldBuildEnv(true);
 		genParam.getRtcParams().add(rtcParam);
 	}
 
@@ -47,7 +48,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/library/library2/";
 
-		assertEquals(13, result.size());
+		assertEquals(15, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");
@@ -73,7 +74,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/library/library1/";
 
-		assertEquals(13, result.size());
+		assertEquals(15, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");

Copied: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXManipTest.java (from rev 393, trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXManipTest.java)
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXManipTest.java	                        (rev 0)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXManipTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -0,0 +1,138 @@
+package jp.go.aist.rtm.rtcbuilder._test._100;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import jp.go.aist.rtm.rtcbuilder.Generator;
+import jp.go.aist.rtm.rtcbuilder.IRtcBuilderConstants;
+import jp.go.aist.rtm.rtcbuilder._test.TestBase;
+import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
+import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
+import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
+import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortInterfaceParam;
+import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortParam;
+
+public class CXXManipTest extends TestBase {
+
+	RtcParam rtcParam;
+	GeneratorParam genParam;
+
+	protected void setUp() throws Exception {
+		genParam = new GeneratorParam();
+		rtcParam = new RtcParam(genParam, true);
+		rtcParam.setOutputProject(rootPath + "/resource/work");
+		rtcParam.setLanguage(IRtcBuilderConstants.LANG_CPP);
+		rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
+		rtcParam.setRtmVersion("1.0.0");
+		rtcParam.setIsTest(true);
+		rtcParam.setEnableOldBuildEnv(true);
+		genParam.getRtcParams().add(rtcParam);
+	}
+
+	public void testArgStructModule() throws Exception {
+		rtcParam.setName("foo");
+		rtcParam.setDescription("ModuleDescription");
+		rtcParam.setVersion("1.0.0");
+		rtcParam.setVender("VenderName");
+		rtcParam.setCategory("Category");
+		rtcParam.setComponentType("UNIQUE");
+		rtcParam.setActivityType("EVENTDRIVEN");
+		rtcParam.setMaxInstance(0);
+		rtcParam.setComponentKind("DataFlowComponent");
+
+		ServicePortParam service1 = new ServicePortParam("sv_name", 0);
+		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
+		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "if_name", "", "", 
+				rootPath + "/resource/100/CXX/idlmodule/serviceArgStruct/MyServiceModuleTypeDef.idl", "MyService", "", 0);
+		srvinterts.add(int1);
+		service1.getServicePortInterfaces().addAll(srvinterts);
+		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
+		srvports.add(service1);
+		rtcParam.getServicePorts().addAll(srvports);
+
+		Generator generator = new Generator();
+		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
+
+		String resourceDir = rootPath + "/resource/100/CXX/idlmodule/serviceArgStruct/";
+
+		assertEquals(17, result.size());
+		checkCode(result, resourceDir, "fooComp.cpp");
+		checkCode(result, resourceDir, "foo.h");
+		checkCode(result, resourceDir, "foo.cpp");
+		checkCode(result, resourceDir, "MyServiceModuleTypeDefSVC_impl.h");
+		checkCode(result, resourceDir, "MyServiceModuleTypeDefSVC_impl.cpp");
+	}
+	
+	public void testIDLType() throws Exception {
+		rtcParam.setName("ModuleName");
+		rtcParam.setDescription("ModuleDescription");
+		rtcParam.setVersion("1.0.0");
+		rtcParam.setVender("VenderName");
+		rtcParam.setCategory("Category");
+		rtcParam.setComponentType("STATIC");
+		rtcParam.setComponentKind("DataFlowComponent");
+		rtcParam.setActivityType("PERIODIC");
+		rtcParam.setExecutionRate(1.0);
+		rtcParam.setMaxInstance(1);
+
+		ServicePortParam service1 = new ServicePortParam("sV1",0);
+		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
+		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "sIF1", "", "sIFv", 
+				rootPath + "resource/100/CXX/idltype/IDLType1/TestIDL.idl", "ComFk", "", 0);
+		srvinterts.add(int1);
+		service1.getServicePortInterfaces().addAll(srvinterts);
+		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
+		srvports.add(service1);
+		
+		rtcParam.getServicePorts().addAll(srvports);
+		genParam.getRtcParams().add(rtcParam);
+
+		Generator generator = new Generator();
+		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
+
+		String resourceDir = rootPath + "/resource/100/CXX/idltype/IDLType1/";
+
+		assertEquals(34, result.size());
+		checkCode(result, resourceDir, "ModuleNameComp.cpp");
+		checkCode(result, resourceDir, "ModuleName.h");
+		checkCode(result, resourceDir, "ModuleName.cpp");
+		checkCode(result, resourceDir, "TestIDLSVC_impl.h");
+		checkCode(result, resourceDir, "TestIDLSVC_impl.cpp");
+	}
+	
+	public void testManip() throws Exception{
+		rtcParam.setName("ModuleName");
+		rtcParam.setDescription("ModuleDescription");
+		rtcParam.setVersion("1.0.0");
+		rtcParam.setVender("VenderName");
+		rtcParam.setCategory("Category");
+		rtcParam.setComponentType("STATIC");
+		rtcParam.setActivityType("PERIODIC");
+		rtcParam.setMaxInstance(1);
+		rtcParam.setExecutionRate(1000.0);;
+		rtcParam.setComponentKind("DataFlowComponent");
+
+		ServicePortParam service1 = new ServicePortParam("sv_name", 0);
+		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
+		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(
+				service1, "if_name", "", "if_variable_name", rootPath + "/resource/100/CXX/Manip/ManipulatorCommonInterface_MiddleLevel.idl",
+				"ManipulatorCommonInterface_Middle", rootPath + "/resource/100/CXX/Manip", 0);
+		srvinterts.add(int1);
+		service1.getServicePortInterfaces().addAll(srvinterts);
+		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
+		srvports.add(service1);
+		rtcParam.getServicePorts().addAll(srvports);
+
+		Generator generator = new Generator();
+		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
+
+		String resourceDir = rootPath +  "/resource/100/CXX/Manip/";
+
+		assertEquals(17, result.size());
+		checkCode(result, resourceDir, "ModuleNameComp.cpp");
+		checkCode(result, resourceDir, "ModuleName.h");
+		checkCode(result, resourceDir, "ModuleName.cpp");
+		checkCode(result, resourceDir, "ManipulatorCommonInterface_MiddleLevelSVC_impl.h");
+		checkCode(result, resourceDir, "ManipulatorCommonInterface_MiddleLevelSVC_impl.cpp");
+	}
+}

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXMultiTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXMultiTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXMultiTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -35,6 +35,7 @@
 		rtcParam.setMaxInstance(2);
 		rtcParam.setRtmVersion("1.0.0");
 		rtcParam.setIsTest(true);
+		rtcParam.setEnableOldBuildEnv(true);
 
 		genParam.getRtcParams().add(rtcParam);
 
@@ -87,7 +88,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/Multi/ProConMulti/";
 
-		assertEquals(17, result.size());
+		assertEquals(19, result.size());
 		checkResults(result, resourceDir);
 		checkCode(result, resourceDir, "MyServiceSVC_impl.h");
 		checkCode(result, resourceDir, "MyServiceSVC_impl.cpp");
@@ -119,7 +120,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/Multi/ConMulti/";
 
-		assertEquals(13, result.size());
+		assertEquals(15, result.size());
 		checkResults(result, resourceDir);
 		nonexist(result, resourceDir, "MyServiceSVC_impl.h");
 		nonexist(result, resourceDir, "MyServiceSVC_impl.cpp");
@@ -151,7 +152,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/Multi/ProMulti/";
 
-		assertEquals(17, result.size());
+		assertEquals(19, result.size());
 		checkResults(result, resourceDir);
 		checkCode(result, resourceDir, "MyServiceSVC_impl.h");
 		checkCode(result, resourceDir, "MyServiceSVC_impl.cpp");

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXPrefixSuffixTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXPrefixSuffixTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXPrefixSuffixTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -36,6 +36,7 @@
 		rtcParam.setComponentKind("DataFlowComponent");
 		rtcParam.setRtmVersion("1.0.0");
 		rtcParam.setIsTest(true);
+		rtcParam.setEnableOldBuildEnv(true);
 		genParam.getRtcParams().add(rtcParam);
 		//
 		List<DataPortParam> dataport = new ArrayList<DataPortParam>();
@@ -219,7 +220,7 @@
 	}
 
 	private void checkResults(List<GeneratedResult> result, String resourceDir) {
-		assertEquals(15, result.size());
+		assertEquals(17, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXSystemConfigTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXSystemConfigTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXSystemConfigTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -25,6 +25,7 @@
 		rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
 		rtcParam.setRtmVersion("1.0.0");
 		rtcParam.setIsTest(true);
+		rtcParam.setEnableOldBuildEnv(true);
 		genParam.getRtcParams().add(rtcParam);
 	}
 
@@ -58,7 +59,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/SystemConfig/";
 
-		assertEquals(14, result.size());
+		assertEquals(15, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXTemplateTestAIST2.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXTemplateTestAIST2.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXTemplateTestAIST2.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -25,6 +25,7 @@
 		rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
 		rtcParam.setRtmVersion("1.0.0");
 		rtcParam.setIsTest(true);
+		rtcParam.setEnableOldBuildEnv(true);
 		genParam.getRtcParams().add(rtcParam);
 	}
 
@@ -53,7 +54,7 @@
 		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
 
 		String targetDir = rootPath + "/resource/100/CXX/AIST2/";
-		assertEquals(15, result.size());
+		assertEquals(17, result.size());
 		checkCode(result, targetDir, "ModuleNameComp.cpp");
 		checkCode(result, targetDir, "ModuleName.h");
 		checkCode(result, targetDir, "ModuleName.cpp");

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXVariableTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXVariableTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXVariableTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -26,6 +26,7 @@
 		rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
 		rtcParam.setRtmVersion("1.0.0");
 		rtcParam.setIsTest(true);
+		rtcParam.setEnableOldBuildEnv(true);
 		genParam.getRtcParams().add(rtcParam);
 	}
 
@@ -76,7 +77,7 @@
 		String resourceDir = rootPath
 				+ "/resource/100/CXX/Variable/ServicePort2/";
 
-		assertEquals(15, result.size());
+		assertEquals(17, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");
@@ -131,7 +132,7 @@
 		String resourceDir = rootPath
 				+ "/resource/100/CXX/Variable/ServicePort1/";
 
-		assertEquals(15, result.size());
+		assertEquals(17, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");
@@ -167,7 +168,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/Variable/DataPort/";
 
-		assertEquals(13, result.size());
+		assertEquals(15, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/CORBAParseInheritTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/CORBAParseInheritTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/CORBAParseInheritTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -37,7 +37,7 @@
 		assertEquals("getGain", serviceClassParams.get(1).getMethods().get(3).getName());
 		//
 		assertEquals(1, includeFiles.size());
-		assertEquals("C:\\Tech-Arts\\EclipseRTM34\\jp.go.aist.rtm.rtcbuilder\\resource\\IDL\\MyServiceParent.idl",
+		assertEquals("D:\\GlobalAssist\\EclipseAISTRep\\jp.go.aist.rtm.rtcbuilder\\resource\\IDL\\MyServiceParent.idl",
 				includeFiles.get(0));
 	}
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/CORBAParseMethodTypeTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/CORBAParseMethodTypeTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/CORBAParseMethodTypeTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -37,9 +37,11 @@
 				.convert_typedef(spec, "");
 		
 		assertEquals(2, typedefParams.size());
-		assertEquals("string[]", typedefParams.get(0).getOriginalDef());
+//		assertEquals("string[]", typedefParams.get(0).getOriginalDef());
+		assertEquals("string", typedefParams.get(0).getOriginalDef());
 		assertEquals(true, typedefParams.get(0).isSequence());
-		assertEquals("float[]", typedefParams.get(1).getOriginalDef());
+//		assertEquals("float[]", typedefParams.get(1).getOriginalDef());
+		assertEquals("float", typedefParams.get(1).getOriginalDef());
 		assertEquals(true, typedefParams.get(1).isSequence());
 	}
 }

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/CORBAParseTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/CORBAParseTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/CORBAParseTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -12,6 +12,7 @@
 
 	public void testDuplicate() throws Exception{
 		List<DataTypeParam> sourceContents = new ArrayList<DataTypeParam>();
+		List<String> dataTypes = new ArrayList<String>();
 		sourceContents.add(new DataTypeParam(rootPath + "\\resource\\IDL\\DupliDataTypes1.idl"));
 		sourceContents.add(new DataTypeParam(rootPath + "\\resource\\IDL\\DupliDataTypes2.idl"));
 		
@@ -21,7 +22,7 @@
 		}
 			
 		try {
-			IDLParamConverter.extractTypeDef(sourceContents);
+			IDLParamConverter.extractTypeDef(sourceContents, dataTypes);
 		} catch (Exception e) {
 			fail();
 		}
@@ -38,7 +39,7 @@
 			sourceContents.get(intidx).setContent(idlContent);
 		}
 			
-		results = IDLParamConverter.extractTypeDef(sourceContents);
+		IDLParamConverter.extractTypeDef(sourceContents, results);
 		
 		assertEquals(7, results.size());
 		assertTrue(results.contains("RTC::MyData"));
@@ -60,7 +61,7 @@
 			sourceContents.get(intidx).setContent(idlContent);
 		}
 			
-		results = IDLParamConverter.extractTypeDef(sourceContents);
+		IDLParamConverter.extractTypeDef(sourceContents, results);
 
 		assertEquals(2, results.size());
 		assertTrue(results.contains("RTC::MyData"));
@@ -77,7 +78,7 @@
 			sourceContents.get(intidx).setContent(idlContent);
 		}
 		
-		results = IDLParamConverter.extractTypeDef(sourceContents);
+		IDLParamConverter.extractTypeDef(sourceContents, results);
 
 		assertEquals(2, results.size());
 		assertTrue(results.contains("Time"));
@@ -93,7 +94,7 @@
 			String idlContent = FileUtil.readFile(sourceContents.get(intidx).getFullPath());
 			sourceContents.get(intidx).setContent(idlContent);
 		}
-		results = IDLParamConverter.extractTypeDef(sourceContents);
+		IDLParamConverter.extractTypeDef(sourceContents, results);
 
 		assertEquals(5, results.size());
 		assertTrue(results.contains("Time"));
@@ -112,7 +113,7 @@
 			String idlContent = FileUtil.readFile(sourceContents.get(intidx).getFullPath());
 			sourceContents.get(intidx).setContent(idlContent);
 		}
-		results = IDLParamConverter.extractTypeDef(sourceContents);
+		IDLParamConverter.extractTypeDef(sourceContents, results);
 		assertEquals(0, results.size());
 	}
 	
@@ -125,7 +126,7 @@
 			String idlContent = FileUtil.readFile(sourceContents.get(intidx).getFullPath());
 			sourceContents.get(intidx).setContent(idlContent);
 		}
-		results = IDLParamConverter.extractTypeDef(sourceContents);
+		IDLParamConverter.extractTypeDef(sourceContents, results);
 
 		assertEquals(5, results.size());
 		assertTrue(results.contains("RTC::Time"));
@@ -144,7 +145,7 @@
 			String idlContent = FileUtil.readFile(sourceContents.get(intidx).getFullPath());
 			sourceContents.get(intidx).setContent(idlContent);
 		}
-		results = IDLParamConverter.extractTypeDef(sourceContents);
+		IDLParamConverter.extractTypeDef(sourceContents, results);
 
 		assertEquals(22, results.size());
 		assertTrue(results.contains("RTC::Time"));
@@ -180,7 +181,7 @@
 			String idlContent = FileUtil.readFile(sourceContents.get(intidx).getFullPath());
 			sourceContents.get(intidx).setContent(idlContent);
 		}
-		results = IDLParamConverter.extractTypeDef(sourceContents);
+		IDLParamConverter.extractTypeDef(sourceContents, results);
 
 		assertEquals(22, results.size());
 		assertTrue(results.contains("RTC::Time"));
@@ -216,7 +217,7 @@
 			String idlContent = FileUtil.readFile(sourceContents.get(intidx).getFullPath());
 			sourceContents.get(intidx).setContent(idlContent);
 		}
-		results = IDLParamConverter.extractTypeDef(sourceContents);
+		IDLParamConverter.extractTypeDef(sourceContents, results);
 
 		assertEquals(1, results.size());
 		assertTrue(results.contains("RTC::Time"));
@@ -224,6 +225,7 @@
 	
 	public void testError() throws Exception{
 		List<DataTypeParam> sourceContents = new ArrayList<DataTypeParam>();
+		List<String> results = new ArrayList<String>();
 		sourceContents.add(new DataTypeParam(rootPath + "\\resource\\IDL\\Error.idl"));
 		
 		for(int intidx=0;intidx<sourceContents.size();intidx++) {
@@ -231,7 +233,7 @@
 			sourceContents.get(intidx).setContent(idlContent);
 		}
 		try {
-			IDLParamConverter.extractTypeDef(sourceContents);
+			IDLParamConverter.extractTypeDef(sourceContents, results);
 		} catch (Exception ex) {
 			System.out.println("Error");
 			fail();

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/CORBAParseTypeTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/CORBAParseTypeTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/CORBAParseTypeTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -10,6 +10,21 @@
 
 public class CORBAParseTypeTest extends TestBase {
 
+	public void testModules() throws Exception{
+		List<DataTypeParam> sourceContents = new ArrayList<DataTypeParam>();
+		List<String> results = new ArrayList<String>();
+		sourceContents.add(new DataTypeParam(rootPath + "\\resource\\IDL\\Modules.idl"));
+		
+		for(int intidx=0;intidx<sourceContents.size();intidx++) {
+			String idlContent = FileUtil.readFile(sourceContents.get(intidx).getFullPath());
+			sourceContents.get(intidx).setContent(idlContent);
+		}
+		IDLParamConverter.extractTypeDef(sourceContents, results);
+
+		assertEquals(1, results.size());
+		assertTrue(results.contains("AAA::BBB::CCC::TimeBBB"));
+	}
+	
 	public void testException() throws Exception{
 		List<DataTypeParam> sourceContents = new ArrayList<DataTypeParam>();
 		List<String> results = new ArrayList<String>();
@@ -19,7 +34,7 @@
 			String idlContent = FileUtil.readFile(sourceContents.get(intidx).getFullPath());
 			sourceContents.get(intidx).setContent(idlContent);
 		}
-		results = IDLParamConverter.extractTypeDef(sourceContents);
+		IDLParamConverter.extractTypeDef(sourceContents, results);
 		
 		assertEquals(9, results.size());
 		assertTrue(results.contains("SDOPackage::NameValue"));
@@ -43,7 +58,7 @@
 			sourceContents.get(intidx).setContent(idlContent);
 		}
 			
-		results = IDLParamConverter.extractTypeDef(sourceContents);
+		IDLParamConverter.extractTypeDef(sourceContents, results);
 		
 		assertEquals(2, results.size());
 		assertTrue(results.contains("RTM::ModuleProfile"));
@@ -60,7 +75,7 @@
 			String idlContent = FileUtil.readFile(sourceContents.get(intidx).getFullPath());
 			sourceContents.get(intidx).setContent(idlContent);
 		}
-		results = IDLParamConverter.extractTypeDef(sourceContents);
+		IDLParamConverter.extractTypeDef(sourceContents, results);
 		
 		assertEquals(2, results.size());
 		assertTrue(results.contains("RTC::Time"));
@@ -69,6 +84,7 @@
 	
 	public void testDuplicate() throws Exception{
 		List<DataTypeParam> sourceContents = new ArrayList<DataTypeParam>();
+		List<String> results = new ArrayList<String>();
 		sourceContents.add(new DataTypeParam(rootPath + "\\resource\\IDL\\DupliDataTypes1.idl"));
 		sourceContents.add(new DataTypeParam(rootPath + "\\resource\\IDL\\DupliDataTypes2.idl"));
 		
@@ -78,7 +94,7 @@
 		}
 			
 		try {
-			IDLParamConverter.extractTypeDef(sourceContents);
+			IDLParamConverter.extractTypeDef(sourceContents, results);
 		} catch (Exception e) {
 			fail();
 		}
@@ -94,7 +110,7 @@
 			String idlContent = FileUtil.readFile(sourceContents.get(intidx).getFullPath());
 			sourceContents.get(intidx).setContent(idlContent);
 		}
-		results = IDLParamConverter.extractTypeDef(sourceContents);
+		IDLParamConverter.extractTypeDef(sourceContents, results);
 		
 		assertEquals(7, results.size());
 		assertTrue(results.contains("RTC::MyData"));
@@ -115,7 +131,7 @@
 			String idlContent = FileUtil.readFile(sourceContents.get(intidx).getFullPath());
 			sourceContents.get(intidx).setContent(idlContent);
 		}
-		results = IDLParamConverter.extractTypeDef(sourceContents);
+		IDLParamConverter.extractTypeDef(sourceContents, results);
 
 		assertEquals(2, results.size());
 		assertTrue(results.contains("RTC::MyData"));
@@ -131,7 +147,7 @@
 			String idlContent = FileUtil.readFile(sourceContents.get(intidx).getFullPath());
 			sourceContents.get(intidx).setContent(idlContent);
 		}
-		results = IDLParamConverter.extractTypeDef(sourceContents);
+		IDLParamConverter.extractTypeDef(sourceContents, results);
 
 		assertEquals(2, results.size());
 		assertTrue(results.contains("Time"));
@@ -147,7 +163,7 @@
 			String idlContent = FileUtil.readFile(sourceContents.get(intidx).getFullPath());
 			sourceContents.get(intidx).setContent(idlContent);
 		}
-		results = IDLParamConverter.extractTypeDef(sourceContents);
+		IDLParamConverter.extractTypeDef(sourceContents, results);
 
 		assertEquals(5, results.size());
 		assertTrue(results.contains("Time"));
@@ -166,7 +182,7 @@
 			String idlContent = FileUtil.readFile(sourceContents.get(intidx).getFullPath());
 			sourceContents.get(intidx).setContent(idlContent);
 		}
-		results = IDLParamConverter.extractTypeDef(sourceContents);
+		IDLParamConverter.extractTypeDef(sourceContents, results);
 		assertEquals(0, results.size());
 	}
 	
@@ -179,7 +195,7 @@
 			String idlContent = FileUtil.readFile(sourceContents.get(intidx).getFullPath());
 			sourceContents.get(intidx).setContent(idlContent);
 		}
-		results = IDLParamConverter.extractTypeDef(sourceContents);
+		IDLParamConverter.extractTypeDef(sourceContents, results);
 
 		assertEquals(5, results.size());
 		assertTrue(results.contains("RTC::Time"));
@@ -198,7 +214,7 @@
 			String idlContent = FileUtil.readFile(sourceContents.get(intidx).getFullPath());
 			sourceContents.get(intidx).setContent(idlContent);
 		}
-		results = IDLParamConverter.extractTypeDef(sourceContents);
+		IDLParamConverter.extractTypeDef(sourceContents, results);
 
 		assertEquals(22, results.size());
 		assertTrue(results.contains("RTC::Time"));
@@ -234,7 +250,7 @@
 			String idlContent = FileUtil.readFile(sourceContents.get(intidx).getFullPath());
 			sourceContents.get(intidx).setContent(idlContent);
 		}
-		results = IDLParamConverter.extractTypeDef(sourceContents);
+		IDLParamConverter.extractTypeDef(sourceContents, results);
 
 		assertEquals(22, results.size());
 		assertTrue(results.contains("RTC::Time"));
@@ -270,7 +286,7 @@
 			String idlContent = FileUtil.readFile(sourceContents.get(intidx).getFullPath());
 			sourceContents.get(intidx).setContent(idlContent);
 		}
-		results = IDLParamConverter.extractTypeDef(sourceContents);
+		IDLParamConverter.extractTypeDef(sourceContents, results);
 
 		assertEquals(1, results.size());
 		assertTrue(results.contains("RTC::Time"));
@@ -278,6 +294,7 @@
 	
 	public void testError() throws Exception{
 		List<DataTypeParam> sourceContents = new ArrayList<DataTypeParam>();
+		List<String> results = new ArrayList<String>();
 		sourceContents.add(new DataTypeParam(rootPath + "\\resource\\IDL\\Error.idl"));
 		
 		for(int intidx=0;intidx<sourceContents.size();intidx++) {
@@ -285,7 +302,7 @@
 			sourceContents.get(intidx).setContent(idlContent);
 		}
 		try {
-			IDLParamConverter.extractTypeDef(sourceContents);
+			IDLParamConverter.extractTypeDef(sourceContents, results);
 		} catch (Exception ex) {
 			fail();
 			System.out.println("Error");

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/StringUtilTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/StringUtilTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/StringUtilTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -49,7 +49,7 @@
 	public void testSplit7() throws Exception{
 		String original = "12３４５67８９０";
 		String result = StringUtil.splitString(original, 5, " * ", 3);
-		String expected = "12\r\n * ３４５\r\n * 67８９\r\n * ０";
+		String expected = "12\r\n * ３\r\n * ４\r\n * ５\r\n * 67\r\n * ８\r\n * ９\r\n * ０";
 		assertEquals(expected, result);
 	}
 
@@ -67,12 +67,12 @@
 		assertEquals(expected, result);
 	}
 	
-	public void testSplit10() throws Exception{
-		String original = "<li><a href=\"/news-and-topics/\" title=\"新着情報\">新着情報</a></li>";
-		String result = StringUtil.splitString(original, 5, " * ", 0);
-		String expected = "<li><a href=\"/news-and-topics/\" title=\"新着情報\">\r\n * 新着情\r\n * 報</a>\r\n * </li>";
-		assertEquals(expected, result);
-	}
+//	public void testSplit10() throws Exception{
+//		String original = "<li><a href=\"/news-and-topics/\" title=\"新着情報\">新着情報</a></li>";
+//		String result = StringUtil.splitString(original, 5, " * ", 0);
+//		String expected = "<li><a href=\"/news-and-topics/\" title=\"新着情報\">\r\n * 新着情\r\n * 報</a>\r\n * </li>";
+//		assertEquals(expected, result);
+//	}
 
 //	public void testSplit11() throws Exception{
 //		String original = "<li><a href=\"/news-and-topics/\" title=\"新着情報\">新着情報</a></li>";
@@ -81,12 +81,12 @@
 //		assertEquals(expected, result);
 //	}
 
-	public void testSplit12() throws Exception{
-		String original = "<li><a href=\"/news-and-topics/\" title=\"新着情報\">新着情報</a></li>";
-		String result = StringUtil.splitString(original, 4, " * ", 0);
-		String expected = "<li>\r\n * <a href=\"/news-and-topics/\" title=\"新着情報\">\r\n * 新着\r\n * 情報\r\n * </a>\r\n * </li>";
-		assertEquals(expected, result);
-	}
+//	public void testSplit12() throws Exception{
+//		String original = "<li><a href=\"/news-and-topics/\" title=\"新着情報\">新着情報</a></li>";
+//		String result = StringUtil.splitString(original, 4, " * ", 0);
+//		String expected = "<li>\r\n * <a href=\"/news-and-topics/\" title=\"新着情報\">\r\n * 新着\r\n * 情報\r\n * </a>\r\n * </li>";
+//		assertEquals(expected, result);
+//	}
 	
 	public void testSplit13() throws Exception{
 		String original = "<li><span><br></span></li>";
@@ -116,24 +116,24 @@
 		assertEquals(expected, result);
 	}
 
-	public void testSplit10_2() throws Exception{
-	String original = "<li><a href=\"/news-and-topics/\" title=\"新着情報\">新着情報</a></li>";
-	String result = StringUtil.splitString(original, 5, " * ", 1);
-	String expected = "<li>\r\n * <a href=\"/news-and-topics/\" title=\"新着情報\">\r\n * 新着情\r\n * 報</a>\r\n * </li>";
-	assertEquals(expected, result);
-}
+//	public void testSplit10_2() throws Exception{
+//		String original = "<li><a href=\"/news-and-topics/\" title=\"新着情報\">新着情報</a></li>";
+//		String result = StringUtil.splitString(original, 5, " * ", 1);
+//		String expected = "<li>\r\n * <a href=\"/news-and-topics/\" title=\"新着情報\">\r\n * 新着情\r\n * 報</a>\r\n * </li>";
+//		assertEquals(expected, result);
+//	}
 	
-	public void testSplit11_2() throws Exception{
-		String original = "<li><a href=\"/news-and-topics/\" title=\"新着情報\">新着情報</a></li>";
-		String result = StringUtil.splitString(original, 50, " * ", 45);
-		String expected = "<li><a href=\"/news-and-topics/\" title=\"新着情報\">\r\n * 新着情報</a></li>";
-		assertEquals(expected, result);
-	}
+//	public void testSplit11_2() throws Exception{
+//		String original = "<li><a href=\"/news-and-topics/\" title=\"新着情報\">新着情報</a></li>";
+//		String result = StringUtil.splitString(original, 50, " * ", 45);
+//		String expected = "<li><a href=\"/news-and-topics/\" title=\"新着情報\">\r\n * 新着情報</a></li>";
+//		assertEquals(expected, result);
+//	}
 	
 	public void testSplit13_2() throws Exception{
 		String original = "<li><span><br></span></li>";
 		String result = StringUtil.splitString(original, 15, " * ", 5);
-		String expected = "<li><span>\r\n * <br></span></li>";
+		String expected = "<li><span>\r\n * <br></span>\r\n * </li>";
 		System.out.println(expected);
 		System.out.println(result);
 		assertEquals(expected, result);
@@ -142,7 +142,7 @@
 	public void testSplit14_2() throws Exception{
 		String original = "<li><span><br></span></li>";
 		String result = StringUtil.splitString(original, 14, " * ", 4);
-		String expected = "<li><span>\r\n * <br></span></li>";
+		String expected = "<li><span>\r\n * <br></span>\r\n * </li>";
 		System.out.println(expected);
 		System.out.println(result);
 		assertEquals(expected, result);

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/META-INF/MANIFEST.MF
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/META-INF/MANIFEST.MF	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/META-INF/MANIFEST.MF	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,19 +1,22 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: jp.go.aist.rtm.rtcbuilder.java;singleton:=true
-Bundle-Version: 1.1.0.v20110411
-Bundle-Activator: jp.go.aist.rtm.rtcbuilder.java.RtcBuilderJavaPlugin
-Bundle-Localization: plugin
-Require-Bundle: jp.go.aist.rtm.rtcbuilder,
- org.eclipse.ui,
- org.eclipse.core.runtime
-Bundle-ActivationPolicy: lazy
-Bundle-Vendor: %providerName
-Export-Package: jp.go.aist.rtm.rtcbuilder.java,
- jp.go.aist.rtm.rtcbuilder.java.manager,
- jp.go.aist.rtm.rtcbuilder.java.template.cmake,
- jp.go.aist.rtm.rtcbuilder.java.template.java,
- jp.go.aist.rtm.rtcbuilder.java.template.java_04
-Eclipse-BuddyPolicy: registered
-Eclipse-RegisterBuddy: jp.go.aist.rtm.rtcbuilder
+Manifest-Version: 1.0
+Ant-Version: Apache Ant 1.7.1
+Created-By: 20.0-b12 (Sun Microsystems Inc.)
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: jp.go.aist.rtm.rtcbuilder.java;singleton:=true
+Bundle-Version: 1.1.0.rc4v20130124
+Bundle-Activator: jp.go.aist.rtm.rtcbuilder.java.RtcBuilderJavaPlugin
+Bundle-Localization: plugin
+Require-Bundle: jp.go.aist.rtm.rtcbuilder,org.eclipse.ui,org.eclipse.c
+ ore.runtime
+Bundle-ActivationPolicy: lazy
+Bundle-Vendor: %providerName
+Export-Package: jp.go.aist.rtm.rtcbuilder.java,jp.go.aist.rtm.rtcbuild
+ er.java.manager,jp.go.aist.rtm.rtcbuilder.java.template.cmake,jp.go.a
+ ist.rtm.rtcbuilder.java.template.java,jp.go.aist.rtm.rtcbuilder.java.
+ template.java_04,jp.go.aist.rtm.rtcbuilder.java.ui.Perspective
+Eclipse-BuddyPolicy: registered
+Eclipse-RegisterBuddy: jp.go.aist.rtm.rtcbuilder
+Built-By: n-ando
+Built-Date: 2013/01/25 00:47:16
+

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/build.xml
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/build.xml	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/build.xml	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,6 +1,8 @@
-<project name="jp.go.aist.rtm.rtcbuilder.java_1.0.0" default="jar">
-	<property name="target.name" value="jp.go.aist.rtm.rtcbuilder.java_1.0.0"/>
+<project name="jp.go.aist.rtm.rtcbuilder.java" default="jar">
+	<property name="target.name" value="jp.go.aist.rtm.rtcbuilder.java" />
 
+	<taskdef name="manifesttask" classname="aist.ManifestTask" />
+
 	<property name="source" value="src"/>
 
 	<property name="dist.dir" value="jar" />
@@ -15,6 +17,9 @@
 	<property name="targetPlatformLocation" value="${eclipse.home}" />
 	<property name="workspace" value="${basedir}/.." />
 	<property name="project.name" value="jp.go.aist.rtm.rtcbuilder.java" />
+	<tstamp>
+		<format property="built.date" pattern="yyyy/MM/dd HH:mm:ss" />
+	</tstamp>
 
 	<target name="buildAll">
 		<antcall target="clean" />
@@ -23,29 +28,50 @@
 	</target>
 
 	<target name="clean" description="ビルドで生成されたファイルを削除します">
-		<delete includeEmptyDirs="true">
+		<delete includeEmptyDirs="true" quiet="true">
 			<fileset dir="${build.dir}" includes="**/*.class" />
+			<fileset dir="." includes="**/*.log" />
 		</delete>
+		<delete dir="${build.dir}/jp" quiet="true" />
+		<delete dir="${dist.dir}" quiet="true"/>
 	</target>
 
 	<target name="compile" description="ソースをコンパイルします">
 		<getEclipseClasspath pathid="build.classpath" targetplatformlocation="${targetPlatformLocation}"
 					workspace="${workspace}" projectname="${project.name}"/>
 		<javac srcdir="${source}" destdir="${build.dir}"
-			classpathref="build.classpath"  encoding="Shift_JIS" />
+			classpathref="build.classpath"  encoding="UTF-8" />
 	</target>
 
 	<target name="jar" description="jarファイルを作成します">
 		<copy todir="${build.dir}/jp/go/aist/rtm/rtcbuilder/java/template">
 			<fileset dir="${source}/jp/go/aist/rtm/rtcbuilder/java/template">
-				<include name="_100/**/**.template" />
-				<include name="**.template" />
+				<include name="cmake/**/**.vsl" />
+				<include name="java/**/**.vsl" />
+				<include name="java_04/**/**.vsl" />
 			</fileset>
 		</copy>
 		<mkdir dir="${dist.dir}" />
-		<delete file="${dist.dir}/${target.name}.jar" />
-
-		<jar destfile="${dist.dir}/${target.name}.jar" manifest="META-INF/MANIFEST.MF">
+		<delete>
+			<fileset dir="${dist.dir}" includes="${target.name}_*.jar" />
+		</delete>
+		<!-- Version settings -->
+		<manifesttask file="META-INF/MANIFEST.MF" key="Bundle-Version" property="manifest.project.version" />
+		<condition property="project.version"
+                   value="${env.PROJECT_VERSION}"
+                   else="${manifest.project.version}">
+			<isset property="env.PROJECT_VERSION" />
+		</condition>
+		<property name="jar.version" value="_${project.version}"/>
+		<property name="jar.name" value="${target.name}${jar.version}"/>
+		<!-- Updating MANIFEST.MF -->
+		<manifest file="META-INF/MANIFEST.MF" mode="update">
+			<attribute name="Bundle-Version" value="${project.version}"/>
+			<attribute name="Built-By" value="${user.name}"/>
+			<attribute name="Built-Date" value="${built.date}"/>
+		</manifest>
+		<!-- Creating a jar file -->
+		<jar destfile="${dist.dir}/${jar.name}.jar" manifest="META-INF/MANIFEST.MF">
 			<fileset dir="${build.dir}" />
 			<fileset dir=".">
 				<include name="icons/**.**" />
@@ -55,4 +81,5 @@
 			</fileset>
 		</jar>
 	</target>
+
 </project>

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/ConfigSet/configset4/src/foo.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/ConfigSet/configset4/src/foo.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/ConfigSet/configset4/src/foo.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -32,7 +32,7 @@
             "conf.default.int_param0", "0",
             "conf.default.int_param1", "1",
             "conf.default.double_param0", "0.11",
-            "conf.default.str_param0", "“ú–{Œê",
+            "conf.default.str_param0", "日本語",
             "conf.default.str_param1", "dara",
     	    ""
             };

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/ConfigSet/configset4/src/fooImpl.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/ConfigSet/configset4/src/fooImpl.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/ConfigSet/configset4/src/fooImpl.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -32,7 +32,7 @@
         bindParameter("int_param0", m_int_param0, "0");
         bindParameter("int_param1", m_int_param1, "1");
         bindParameter("double_param0", m_double_param0, "0.11");
-        bindParameter("str_param0", m_str_param0, "“ú–{Œê");
+        bindParameter("str_param0", m_str_param0, "日本語");
         bindParameter("str_param1", m_str_param1, "dara");
         return super.onInitialize();
     }

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/Multi/ConMulti/build_foo.xml
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/Multi/ConMulti/build_foo.xml	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/Multi/ConMulti/build_foo.xml	2013-01-29 10:39:20 UTC (rev 394)
@@ -10,20 +10,17 @@
 	<property name="source" value="src" />
 	<property name="dest" value="bin" />
 	<property environment="env" />
-
 	<target name="mkdir">
 		<mkdir dir="${dest}" />
 	</target>
-
 	<target name="idlcompile"  depends="mkdir">
 		<exec executable="${java.home}/../bin/idlj">
-			<arg line="-td 'src' -fall 'MyService.idl'"/>
+			<arg line="-td 'src' -fall 'idl/MyService.idl'"/>
 		</exec>
 		<exec executable="${java.home}/../bin/idlj">
-			<arg line="-td 'src' -fall 'DAQService.idl'"/>
+			<arg line="-td 'src' -fall 'idl/DAQService.idl'"/>
 		</exec>
 	</target>
-
 	<target name="compile" depends="idlcompile">
 		<javac srcdir="${source}" destdir="${dest}">
 			<classpath>

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/Multi/ProConMulti/build_foo.xml
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/Multi/ProConMulti/build_foo.xml	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/Multi/ProConMulti/build_foo.xml	2013-01-29 10:39:20 UTC (rev 394)
@@ -10,23 +10,20 @@
 	<property name="source" value="src" />
 	<property name="dest" value="bin" />
 	<property environment="env" />
-
 	<target name="mkdir">
 		<mkdir dir="${dest}" />
 	</target>
-
 	<target name="idlcompile"  depends="mkdir">
 		<exec executable="${java.home}/../bin/idlj">
-			<arg line="-td 'src' -fall 'MyService.idl'"/>
+			<arg line="-td 'src' -fall 'idl/MyService.idl'"/>
 		</exec>
 		<exec executable="${java.home}/../bin/idlj">
-			<arg line="-td 'src' -fall 'MyService2.idl'"/>
+			<arg line="-td 'src' -fall 'idl/MyService2.idl'"/>
 		</exec>
 		<exec executable="${java.home}/../bin/idlj">
-			<arg line="-td 'src' -fall 'DAQService.idl'"/>
+			<arg line="-td 'src' -fall 'idl/DAQService.idl'"/>
 		</exec>
 	</target>
-
 	<target name="compile" depends="idlcompile">
 		<javac srcdir="${source}" destdir="${dest}">
 			<classpath>

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/Multi/ProMulti/build_foo.xml
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/Multi/ProMulti/build_foo.xml	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/Multi/ProMulti/build_foo.xml	2013-01-29 10:39:20 UTC (rev 394)
@@ -10,20 +10,17 @@
 	<property name="source" value="src" />
 	<property name="dest" value="bin" />
 	<property environment="env" />
-
 	<target name="mkdir">
 		<mkdir dir="${dest}" />
 	</target>
-
 	<target name="idlcompile"  depends="mkdir">
 		<exec executable="${java.home}/../bin/idlj">
-			<arg line="-td 'src' -fall 'MyService.idl'"/>
+			<arg line="-td 'src' -fall 'idl/MyService.idl'"/>
 		</exec>
 		<exec executable="${java.home}/../bin/idlj">
-			<arg line="-td 'src' -fall 'DAQService.idl'"/>
+			<arg line="-td 'src' -fall 'idl/DAQService.idl'"/>
 		</exec>
 	</target>
-
 	<target name="compile" depends="idlcompile">
 		<javac srcdir="${source}" destdir="${dest}">
 			<classpath>

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/inport1/.classpath
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/inport1/.classpath	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/inport1/.classpath	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,6 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="C:/Program Files/OpenRTM-aist/1.0/jar/OpenRTM-aist-1.0.0.jar"/>
+	<classpathentry kind="lib" path="C:/Program Files (x86)/OpenRTM-aist/1.1//jar/OpenRTM-aist-1.1.0.jar"/>
 	<classpathentry kind="output" path="bin"/>
-</classpath>
\ No newline at end of file
+</classpath>

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/inport2/.classpath
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/inport2/.classpath	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/inport2/.classpath	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,6 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="C:/Program Files/OpenRTM-aist/1.0/jar/OpenRTM-aist-1.0.0.jar"/>
+	<classpathentry kind="lib" path="C:/Program Files (x86)/OpenRTM-aist/1.1//jar/OpenRTM-aist-1.1.0.jar"/>
 	<classpathentry kind="output" path="bin"/>
-</classpath>
\ No newline at end of file
+</classpath>

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/name/.classpath
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/name/.classpath	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/name/.classpath	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,6 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="C:/Program Files/OpenRTM-aist/1.0/jar/OpenRTM-aist-1.0.0.jar"/>
+	<classpathentry kind="lib" path="C:/Program Files (x86)/OpenRTM-aist/1.1//jar/OpenRTM-aist-1.1.0.jar"/>
 	<classpathentry kind="output" path="bin"/>
-</classpath>
\ No newline at end of file
+</classpath>

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/outport1/.classpath
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/outport1/.classpath	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/outport1/.classpath	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,6 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="C:/Program Files/OpenRTM-aist/1.0/jar/OpenRTM-aist-1.0.0.jar"/>
+	<classpathentry kind="lib" path="C:/Program Files (x86)/OpenRTM-aist/1.1//jar/OpenRTM-aist-1.1.0.jar"/>
 	<classpathentry kind="output" path="bin"/>
-</classpath>
\ No newline at end of file
+</classpath>

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/outport2/.classpath
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/outport2/.classpath	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/outport2/.classpath	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,6 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="C:/Program Files/OpenRTM-aist/1.0/jar/OpenRTM-aist-1.0.0.jar"/>
+	<classpathentry kind="lib" path="C:/Program Files (x86)/OpenRTM-aist/1.1//jar/OpenRTM-aist-1.1.0.jar"/>
 	<classpathentry kind="output" path="bin"/>
-</classpath>
\ No newline at end of file
+</classpath>

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/service1/build_foo.xml
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/service1/build_foo.xml	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/service1/build_foo.xml	2013-01-29 10:39:20 UTC (rev 394)
@@ -10,17 +10,14 @@
 	<property name="source" value="src" />
 	<property name="dest" value="bin" />
 	<property environment="env" />
-
 	<target name="mkdir">
 		<mkdir dir="${dest}" />
 	</target>
-
 	<target name="idlcompile"  depends="mkdir">
 		<exec executable="${java.home}/../bin/idlj">
-			<arg line="-td 'src' -fall 'MyService.idl'"/>
+			<arg line="-td 'src' -fall 'idl/MyService.idl'"/>
 		</exec>
 	</target>
-
 	<target name="compile" depends="idlcompile">
 		<javac srcdir="${source}" destdir="${dest}">
 			<classpath>

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/service2/DAQService.idl
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/service2/DAQService.idl	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/service2/DAQService.idl	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,7 +1,7 @@
 // -*- IDL -*-
 /*!
  * @file RTCService.idl
- * @brief RTComponent ƒT[ƒrƒXƒCƒ“ƒ^[ƒtƒF[ƒX
+ * @brief RTComponent サービスインターフェース
  * @date $Date: 2007/12/25 05:43:02 $
  * @author Noriaki Ando <n-ando at aist.go.jp>
  *
@@ -23,7 +23,7 @@
  * *** empty log message ***
  *
  * Revision 1.1  2007/03/14 12:14:35  tsakamoto
- * ‘®«¶¬”Å
+ * 属性生成版
  *
  * Revision 1.1  2005/09/07 05:06:13  n-ando
  * RTComponent's service management feature was added.

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/service2/build_foo.xml
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/service2/build_foo.xml	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/service2/build_foo.xml	2013-01-29 10:39:20 UTC (rev 394)
@@ -10,20 +10,17 @@
 	<property name="source" value="src" />
 	<property name="dest" value="bin" />
 	<property environment="env" />
-
 	<target name="mkdir">
 		<mkdir dir="${dest}" />
 	</target>
-
 	<target name="idlcompile"  depends="mkdir">
 		<exec executable="${java.home}/../bin/idlj">
-			<arg line="-td 'src' -fall 'MyService.idl'"/>
+			<arg line="-td 'src' -fall 'idl/MyService.idl'"/>
 		</exec>
 		<exec executable="${java.home}/../bin/idlj">
-			<arg line="-td 'src' -fall 'DAQService.idl'"/>
+			<arg line="-td 'src' -fall 'idl/DAQService.idl'"/>
 		</exec>
 	</target>
-
 	<target name="compile" depends="idlcompile">
 		<javac srcdir="${source}" destdir="${dest}">
 			<classpath>

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake1/DAQService.idl
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake1/DAQService.idl	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake1/DAQService.idl	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,7 +1,7 @@
 // -*- IDL -*-
 /*!
  * @file RTCService.idl
- * @brief RTComponent ƒT[ƒrƒXƒCƒ“ƒ^[ƒtƒF[ƒX
+ * @brief RTComponent サービスインターフェース
  * @date $Date: 2007/03/14 12:14:35 $
  * @author Noriaki Ando <n-ando at aist.go.jp>
  *
@@ -20,7 +20,7 @@
 /*
  * $Log: DAQService.idl,v $
  * Revision 1.1  2007/03/14 12:14:35  tsakamoto
- * ‘®«¶¬”Å
+ * 属性生成版
  *
  * Revision 1.1  2005/09/07 05:06:13  n-ando
  * RTComponent's service management feature was added.

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake1/build_foo.xml
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake1/build_foo.xml	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake1/build_foo.xml	2013-01-29 10:39:20 UTC (rev 394)
@@ -15,10 +15,10 @@
 	</target>
 	<target name="idlcompile"  depends="mkdir">
 		<exec executable="${java.home}/../bin/idlj">
-			<arg line="-td 'src' -fall 'MyService.idl'"/>
+			<arg line="-td 'src' -fall 'idl/MyService.idl'"/>
 		</exec>
 		<exec executable="${java.home}/../bin/idlj">
-			<arg line="-td 'src' -fall 'DAQService.idl'"/>
+			<arg line="-td 'src' -fall 'idl/DAQService.idl'"/>
 		</exec>
 	</target>
 	<target name="compile" depends="idlcompile">

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake1/foo.bat
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake1/foo.bat	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake1/foo.bat	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,4 +1,4 @@
-set CLASSPATH=.;%RTM_JAVA_ROOT%\jar\OpenRTM-aist-1.0.0.jar;%RTM_JAVA_ROOT%\jar\commons-cli-1.1.jar
+set CLASSPATH=.;%RTM_JAVA_ROOT%\jar\OpenRTM-aist-1.1.0.jar;%RTM_JAVA_ROOT%\jar\commons-cli-1.1.jar
 cd /d %~dp0
 cd bin
 java fooComp -f rtc.conf %*

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake1/foo.sh
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake1/foo.sh	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake1/foo.sh	2013-01-29 10:39:20 UTC (rev 394)
@@ -5,6 +5,6 @@
     echo "Abort."
     exit 1
 fi
-export CLASSPATH=.:${RTM_JAVA_ROOT}/jar/OpenRTM-aist-1.0.0.jar:${RTM_JAVA_ROOT}/jar/commons-cli-1.1.jar
+export CLASSPATH=.:${RTM_JAVA_ROOT}/jar/OpenRTM-aist-1.1.0.jar:${RTM_JAVA_ROOT}/jar/commons-cli-1.1.jar
 cd `dirname $0`/bin
 java fooComp -f rtc.conf $*

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake2/build_foo.xml
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake2/build_foo.xml	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake2/build_foo.xml	2013-01-29 10:39:20 UTC (rev 394)
@@ -15,19 +15,19 @@
 	</target>
 	<target name="idlcompile"  depends="mkdir">
 		<exec executable="${java.home}/../bin/idlj">
-			<arg line="-td 'src' -i '__ROOT_PATH__resource/100/build/cmake2' -i '__ROOT_PATH__resource/100/build/cmake2' -fall 'MyServiceChildMulti.idl'"/>
+			<arg line="-td 'src' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/build/cmake2' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/build/cmake2' -fall 'idl/MyServiceChildMulti.idl'"/>
 		</exec>
 		<exec executable="${java.home}/../bin/idlj">
-			<arg line="-td 'src' -i '__ROOT_PATH__resource/100/build/cmake2' -i '__ROOT_PATH__resource/100/build/cmake2' -fall 'MyServiceParent1.idl'"/>
+			<arg line="-td 'src' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/build/cmake2' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/build/cmake2' -fall 'idl/MyServiceParent1.idl'"/>
 		</exec>
 		<exec executable="${java.home}/../bin/idlj">
-			<arg line="-td 'src' -i '__ROOT_PATH__resource/100/build/cmake2' -i '__ROOT_PATH__resource/100/build/cmake2' -fall 'MyServiceParent2.idl'"/>
+			<arg line="-td 'src' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/build/cmake2' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/build/cmake2' -fall 'idl/MyServiceParent2.idl'"/>
 		</exec>
 		<exec executable="${java.home}/../bin/idlj">
-			<arg line="-td 'src' -i '__ROOT_PATH__resource/100/build/cmake2' -i '__ROOT_PATH__resource/100/build/cmake2' -fall 'MyServiceChildWithType.idl'"/>
+			<arg line="-td 'src' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/build/cmake2' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/build/cmake2' -fall 'idl/MyServiceChildWithType.idl'"/>
 		</exec>
 		<exec executable="${java.home}/../bin/idlj">
-			<arg line="-td 'src' -i '__ROOT_PATH__resource/100/build/cmake2' -i '__ROOT_PATH__resource/100/build/cmake2' -fall 'MyServiceParentWithType.idl'"/>
+			<arg line="-td 'src' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/build/cmake2' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/build/cmake2' -fall 'idl/MyServiceParentWithType.idl'"/>
 		</exec>
 	</target>
 	<target name="compile" depends="idlcompile">

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake2/foo.bat
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake2/foo.bat	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake2/foo.bat	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,4 +1,4 @@
-set CLASSPATH=.;%RTM_JAVA_ROOT%\jar\OpenRTM-aist-1.0.0.jar;%RTM_JAVA_ROOT%\jar\commons-cli-1.1.jar
+set CLASSPATH=.;%RTM_JAVA_ROOT%\jar\OpenRTM-aist-1.1.0.jar;%RTM_JAVA_ROOT%\jar\commons-cli-1.1.jar
 cd /d %~dp0
 cd bin
 java fooComp -f rtc.conf %*

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake2/foo.sh
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake2/foo.sh	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake2/foo.sh	2013-01-29 10:39:20 UTC (rev 394)
@@ -5,6 +5,6 @@
     echo "Abort."
     exit 1
 fi
-export CLASSPATH=.:${RTM_JAVA_ROOT}/jar/OpenRTM-aist-1.0.0.jar:${RTM_JAVA_ROOT}/jar/commons-cli-1.1.jar
+export CLASSPATH=.:${RTM_JAVA_ROOT}/jar/OpenRTM-aist-1.1.0.jar:${RTM_JAVA_ROOT}/jar/commons-cli-1.1.jar
 cd `dirname $0`/bin
 java fooComp -f rtc.conf $*

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/idlinherit/inherit1/build_foo.xml
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/idlinherit/inherit1/build_foo.xml	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/idlinherit/inherit1/build_foo.xml	2013-01-29 10:39:20 UTC (rev 394)
@@ -10,19 +10,18 @@
 	<property name="source" value="src" />
 	<property name="dest" value="bin" />
 	<property environment="env" />
-
 	<target name="mkdir">
 		<mkdir dir="${dest}" />
 	</target>
 	<target name="idlcompile"  depends="mkdir">
 		<exec executable="${java.home}/../bin/idlj">
-			<arg line="-td 'src' -i '__ROOT_PATH__resource/100/idlinherit/inherit1' -i '__ROOT_PATH__resource/100/idlinherit/inherit1' -fall 'MyServiceChildMulti.idl'"/>
+			<arg line="-td 'src' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/idlinherit/inherit1' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/idlinherit/inherit1' -fall 'idl/MyServiceChildMulti.idl'"/>
 		</exec>
 		<exec executable="${java.home}/../bin/idlj">
-			<arg line="-td 'src' -i '__ROOT_PATH__resource/100/idlinherit/inherit1' -i '__ROOT_PATH__resource/100/idlinherit/inherit1' -fall 'MyServiceParent1.idl'"/>
+			<arg line="-td 'src' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/idlinherit/inherit1' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/idlinherit/inherit1' -fall 'idl/MyServiceParent1.idl'"/>
 		</exec>
 		<exec executable="${java.home}/../bin/idlj">
-			<arg line="-td 'src' -i '__ROOT_PATH__resource/100/idlinherit/inherit1' -i '__ROOT_PATH__resource/100/idlinherit/inherit1' -fall 'MyServiceParent2.idl'"/>
+			<arg line="-td 'src' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/idlinherit/inherit1' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/idlinherit/inherit1' -fall 'idl/MyServiceParent2.idl'"/>
 		</exec>
 	</target>
 	<target name="compile" depends="idlcompile">

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/idlinherit/inherit2/build_foo.xml
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/idlinherit/inherit2/build_foo.xml	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/idlinherit/inherit2/build_foo.xml	2013-01-29 10:39:20 UTC (rev 394)
@@ -10,25 +10,24 @@
 	<property name="source" value="src" />
 	<property name="dest" value="bin" />
 	<property environment="env" />
-
 	<target name="mkdir">
 		<mkdir dir="${dest}" />
 	</target>
 	<target name="idlcompile"  depends="mkdir">
 		<exec executable="${java.home}/../bin/idlj">
-			<arg line="-td 'src' -i '__ROOT_PATH__resource/100/idlinherit/inherit2' -i '__ROOT_PATH__resource/100/idlinherit/inherit2' -fall 'MyServiceChildMulti.idl'"/>
+			<arg line="-td 'src' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/idlinherit/inherit2' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/idlinherit/inherit2' -fall 'idl/MyServiceChildMulti.idl'"/>
 		</exec>
 		<exec executable="${java.home}/../bin/idlj">
-			<arg line="-td 'src' -i '__ROOT_PATH__resource/100/idlinherit/inherit2' -i '__ROOT_PATH__resource/100/idlinherit/inherit2' -fall 'MyServiceParent1.idl'"/>
+			<arg line="-td 'src' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/idlinherit/inherit2' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/idlinherit/inherit2' -fall 'idl/MyServiceParent1.idl'"/>
 		</exec>
 		<exec executable="${java.home}/../bin/idlj">
-			<arg line="-td 'src' -i '__ROOT_PATH__resource/100/idlinherit/inherit2' -i '__ROOT_PATH__resource/100/idlinherit/inherit2' -fall 'MyServiceParent2.idl'"/>
+			<arg line="-td 'src' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/idlinherit/inherit2' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/idlinherit/inherit2' -fall 'idl/MyServiceParent2.idl'"/>
 		</exec>
 		<exec executable="${java.home}/../bin/idlj">
-			<arg line="-td 'src' -i '__ROOT_PATH__resource/100/idlinherit/inherit2' -i '__ROOT_PATH__resource/100/idlinherit/inherit2' -fall 'MyServiceChildWithType.idl'"/>
+			<arg line="-td 'src' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/idlinherit/inherit2' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/idlinherit/inherit2' -fall 'idl/MyServiceChildWithType.idl'"/>
 		</exec>
 		<exec executable="${java.home}/../bin/idlj">
-			<arg line="-td 'src' -i '__ROOT_PATH__resource/100/idlinherit/inherit2' -i '__ROOT_PATH__resource/100/idlinherit/inherit2' -fall 'MyServiceParentWithType.idl'"/>
+			<arg line="-td 'src' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/idlinherit/inherit2' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/idlinherit/inherit2' -fall 'idl/MyServiceParentWithType.idl'"/>
 		</exec>
 	</target>
 	<target name="compile" depends="idlcompile">

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/idltype/type1/build_test.xml
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/idltype/type1/build_test.xml	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/idltype/type1/build_test.xml	2013-01-29 10:39:20 UTC (rev 394)
@@ -15,7 +15,7 @@
 	</target>
 	<target name="idlcompile"  depends="mkdir">
 		<exec executable="${java.home}/../bin/idlj">
-			<arg line="-td 'src' -fall 'TestIDL.idl'"/>
+			<arg line="-td 'src' -fall 'idl/TestIDL.idl'"/>
 		</exec>
 	</target>
 	<target name="compile" depends="idlcompile">

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/idltype/type2/build_test.xml
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/idltype/type2/build_test.xml	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/idltype/type2/build_test.xml	2013-01-29 10:39:20 UTC (rev 394)
@@ -10,17 +10,14 @@
 	<property name="source" value="src" />
 	<property name="dest" value="bin" />
 	<property environment="env" />
-
 	<target name="mkdir">
 		<mkdir dir="${dest}" />
 	</target>
-
 	<target name="idlcompile"  depends="mkdir">
 		<exec executable="${java.home}/../bin/idlj">
-			<arg line="-td 'src' -fall 'MyService.idl'"/>
+			<arg line="-td 'src' -fall 'idl/MyService.idl'"/>
 		</exec>
 	</target>
-
 	<target name="compile" depends="idlcompile">
 		<javac srcdir="${source}" destdir="${dest}">
 			<classpath>

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/module/serviceCon/build_foo.xml
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/module/serviceCon/build_foo.xml	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/module/serviceCon/build_foo.xml	2013-01-29 10:39:20 UTC (rev 394)
@@ -10,17 +10,14 @@
 	<property name="source" value="src" />
 	<property name="dest" value="bin" />
 	<property environment="env" />
-
 	<target name="mkdir">
 		<mkdir dir="${dest}" />
 	</target>
-
 	<target name="idlcompile"  depends="mkdir">
 		<exec executable="${java.home}/../bin/idlj">
-			<arg line="-td 'src' -fall 'MyService.idl'"/>
+			<arg line="-td 'src' -fall 'idl/MyService.idl'"/>
 		</exec>
 	</target>
-
 	<target name="compile" depends="idlcompile">
 		<javac srcdir="${source}" destdir="${dest}">
 			<classpath>

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/module/serviceM/build_foo.xml
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/module/serviceM/build_foo.xml	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/module/serviceM/build_foo.xml	2013-01-29 10:39:20 UTC (rev 394)
@@ -10,17 +10,14 @@
 	<property name="source" value="src" />
 	<property name="dest" value="bin" />
 	<property environment="env" />
-
 	<target name="mkdir">
 		<mkdir dir="${dest}" />
 	</target>
-
 	<target name="idlcompile"  depends="mkdir">
 		<exec executable="${java.home}/../bin/idlj">
-			<arg line="-td 'src' -fall 'MyService.idl'"/>
+			<arg line="-td 'src' -fall 'idl/MyService.idl'"/>
 		</exec>
 	</target>
-
 	<target name="compile" depends="idlcompile">
 		<javac srcdir="${source}" destdir="${dest}">
 			<classpath>

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/module/serviceMC/build_foo.xml
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/module/serviceMC/build_foo.xml	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/module/serviceMC/build_foo.xml	2013-01-29 10:39:20 UTC (rev 394)
@@ -10,17 +10,14 @@
 	<property name="source" value="src" />
 	<property name="dest" value="bin" />
 	<property environment="env" />
-
 	<target name="mkdir">
 		<mkdir dir="${dest}" />
 	</target>
-
 	<target name="idlcompile"  depends="mkdir">
 		<exec executable="${java.home}/../bin/idlj">
-			<arg line="-td 'src' -fall 'MyService.idl'"/>
+			<arg line="-td 'src' -fall 'idl/MyService.idl'"/>
 		</exec>
 	</target>
-
 	<target name="compile" depends="idlcompile">
 		<javac srcdir="${source}" destdir="${dest}">
 			<classpath>

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/DAQService.idl
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/DAQService.idl	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/DAQService.idl	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,7 +1,7 @@
 // -*- IDL -*-
 /*!
  * @file RTCService.idl
- * @brief RTComponent ƒT[ƒrƒXƒCƒ“ƒ^[ƒtƒF[ƒX
+ * @brief RTComponent サービスインターフェース
  * @date $Date: 2007/12/25 05:43:04 $
  * @author Noriaki Ando <n-ando at aist.go.jp>
  *
@@ -23,7 +23,7 @@
  * *** empty log message ***
  *
  * Revision 1.1  2007/03/14 12:14:35  tsakamoto
- * ‘®«¶¬”Å
+ * 属性生成版
  *
  * Revision 1.1  2005/09/07 05:06:13  n-ando
  * RTComponent's service management feature was added.

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/manager/JavaGenerateManager.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/manager/JavaGenerateManager.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/manager/JavaGenerateManager.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,5 +1,6 @@
 package jp.go.aist.rtm.rtcbuilder.java.manager;
 
+import java.io.File;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -31,6 +32,8 @@
 	static final String TEMPLATE_PATH = "jp/go/aist/rtm/rtcbuilder/java/template";
 
 	static final String MSG_ERROR_GENERATE_FILE = IRTCBMessageConstants.ERROR_CODE_GENERATION;
+	
+	private final String DEFAULT_VERSION = "1.1.0"; 
 
 	@Override
 	public String getTargetVersion() {
@@ -69,6 +72,34 @@
 		if (!rtcParam.isLanguageExist(LANG_JAVA) || rtcParam.getName() == null) {
 			return result;
 		}
+		try {
+			String rootPath = System.getenv("RTM_JAVA_ROOT") + File.separator + "jar";
+			File targetDir = new File(rootPath);
+			File[] targetFiles = targetDir.listFiles();
+			long lastDate = 0;
+			File targetJar = null;
+			if( targetFiles==null) {
+				rtcParam.setRtmJavaVersion(DEFAULT_VERSION);
+			} else {
+				for(File target : targetFiles) {
+					if( target.getName().startsWith("OpenRTM-aist") ) {
+						if( lastDate<target.lastModified() ) {
+							targetJar = target;
+						}
+					}
+				}
+				//
+				if( targetJar!=null ) {
+					String javaVersion = targetJar.getName().substring(13,18);
+					rtcParam.setRtmJavaVersion(javaVersion);
+				} else {
+					rtcParam.setRtmJavaVersion(DEFAULT_VERSION);
+				}
+			}
+		} catch (NullPointerException ex) {
+			rtcParam.setRtmJavaVersion(DEFAULT_VERSION);
+		}
+		
 		Map<String, Object> contextMap = new HashMap<String, Object>();
 		contextMap.put("template", TEMPLATE_PATH);
 		contextMap.put("rtcParam", rtcParam);
@@ -84,9 +115,6 @@
 
 		resetIDLServiceClass(rtcParam);
 
-		if (rtcParam.getRtmVersion().equals(RTM_VERSION_042)) {
-			return generateTemplateCode04(contextMap);
-		}
 		return generateTemplateCode10(contextMap);
 	}
 
@@ -126,38 +154,6 @@
 		return result;
 	}
 
-	// RTM 0.4ç³»
-	public List<GeneratedResult> generateTemplateCode04(
-			Map<String, Object> contextMap) {
-		List<GeneratedResult> result = new ArrayList<GeneratedResult>();
-		RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
-
-		GeneratedResult gr;
-		gr = generateCompSource_04(contextMap);
-		result.add(gr);
-		gr = generateRTCSource_04(contextMap);
-		result.add(gr);
-		gr = generateRTCImplSource_04(contextMap);
-		result.add(gr);
-
-		gr = generateClassPath(contextMap);
-		result.add(gr);
-
-		gr = generateBuildXML_04(contextMap);
-		result.add(gr);
-
-		for (IdlFileParam idl : rtcParam.getProviderIdlPathes()) {
-			contextMap.put("idlFileParam", idl);
-			for (ServiceClassParam svc : idl.getServiceClassParams()) {
-				contextMap.put("serviceClassParam", svc);
-				gr = generateSVCSource_04(contextMap);
-				result.add(gr);
-			}
-		}
-
-		return result;
-	}
-
 	// 1.0ç³» (Java)
 
 	public GeneratedResult generateCompSource(Map<String, Object> contextMap) {
@@ -210,39 +206,6 @@
 		return generate(infile, outfile, contextMap);
 	}
 
-	// 0.4ç³» (Java)
-
-	public GeneratedResult generateCompSource_04(Map<String, Object> contextMap) {
-		RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
-		String outfile = rtcParam.getName() + "Comp.java";
-		String infile = "java/Java_Comp.java.vsl";
-		return generate(infile, outfile, contextMap);
-	}
-
-	public GeneratedResult generateRTCSource_04(Map<String, Object> contextMap) {
-		RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
-		String outfile = rtcParam.getName() + ".java";
-		String infile = "java_04/Java_RTC.java.vsl";
-		return generate(infile, outfile, contextMap);
-	}
-
-	public GeneratedResult generateRTCImplSource_04(
-			Map<String, Object> contextMap) {
-		RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
-		String outfile = rtcParam.getName() + "Impl.java";
-		String infile = "java_04/Java_RTC_Impl.java.vsl";
-		return generate(infile, outfile, contextMap);
-	}
-
-	public GeneratedResult generateSVCSource_04(Map<String, Object> contextMap) {
-		ServiceClassParam svc = (ServiceClassParam) contextMap
-				.get("serviceClassParam");
-		String outfile = TemplateHelper.getBasename(svc.getName())
-				+ TemplateHelper.getServiceImplSuffix() + ".java";
-		String infile = "java/Java_SVC.java.vsl";
-		return generate(infile, outfile, contextMap);
-	}
-
 	// 1.0系 (ビルド環境)
 
 	public GeneratedResult generateBuildXML(Map<String, Object> contextMap) {
@@ -252,15 +215,6 @@
 		return generate(infile, outfile, contextMap);
 	}
 
-	// 0.4系 (ビルド環境)
-
-	public GeneratedResult generateBuildXML_04(Map<String, Object> contextMap) {
-		RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
-		String outfile = "build_" + rtcParam.getName() + ".xml";
-		String infile = "java_04/build.xml.vsl";
-		return generate(infile, outfile, contextMap);
-	}
-
 	public GeneratedResult generate(String infile, String outfile,
 			Map<String, Object> contextMap) {
 		try {

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/Java_RTC_Impl.java.vsl
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/Java_RTC_Impl.java.vsl	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/Java_RTC_Impl.java.vsl	2013-01-29 10:39:20 UTC (rev 394)
@@ -180,6 +180,8 @@
 #foreach($configParam in ${rtcParam.configParams})  
         bindParameter("${configParam.name}", m_${configParam.tmplVarName}, "${configParam.defaultVal}");
 #end
+#if(${tmpltHelper.checkDetailContent(0,${rtcParam})})${rtcParam.getDetailContent(0)}
+#end
         return super.onInitialize();
     }
 #else
@@ -209,6 +211,8 @@
      */
 #if(${rtcParam.IsNotImplemented(1)})//#end    @Override
 #if(${rtcParam.IsNotImplemented(1)})//#end    protected ReturnCode_t onFinalize() {
+#if(${tmpltHelper.checkDetailContent(1,${rtcParam})})${rtcParam.getDetailContent(1)}
+#end
 #if(${rtcParam.IsNotImplemented(1)})//#end        return super.onFinalize();
 #if(${rtcParam.IsNotImplemented(1)})//#end    }
 
@@ -231,6 +235,8 @@
      */
 #if(${rtcParam.IsNotImplemented(2)})//#end    @Override
 #if(${rtcParam.IsNotImplemented(2)})//#end    protected ReturnCode_t onStartup(int ec_id) {
+#if(${tmpltHelper.checkDetailContent(2,${rtcParam})})${rtcParam.getDetailContent(2)}
+#end
 #if(${rtcParam.IsNotImplemented(2)})//#end        return super.onStartup(ec_id);
 #if(${rtcParam.IsNotImplemented(2)})//#end    }
 
@@ -253,6 +259,8 @@
      */
 #if(${rtcParam.IsNotImplemented(3)})//#end    @Override
 #if(${rtcParam.IsNotImplemented(3)})//#end    protected ReturnCode_t onShutdown(int ec_id) {
+#if(${tmpltHelper.checkDetailContent(3,${rtcParam})})${rtcParam.getDetailContent(3)}
+#end
 #if(${rtcParam.IsNotImplemented(3)})//#end        return super.onShutdown(ec_id);
 #if(${rtcParam.IsNotImplemented(3)})//#end    }
 
@@ -275,6 +283,8 @@
      */
 #if(${rtcParam.IsNotImplemented(4)})//#end    @Override
 #if(${rtcParam.IsNotImplemented(4)})//#end    protected ReturnCode_t onActivated(int ec_id) {
+#if(${tmpltHelper.checkDetailContent(4,${rtcParam})})${rtcParam.getDetailContent(4)}
+#end
 #if(${rtcParam.IsNotImplemented(4)})//#end        return super.onActivated(ec_id);
 #if(${rtcParam.IsNotImplemented(4)})//#end    }
 
@@ -297,6 +307,8 @@
      */
 #if(${rtcParam.IsNotImplemented(5)})//#end    @Override
 #if(${rtcParam.IsNotImplemented(5)})//#end    protected ReturnCode_t onDeactivated(int ec_id) {
+#if(${tmpltHelper.checkDetailContent(5,${rtcParam})})${rtcParam.getDetailContent(5)}
+#end
 #if(${rtcParam.IsNotImplemented(5)})//#end        return super.onDeactivated(ec_id);
 #if(${rtcParam.IsNotImplemented(5)})//#end    }
 
@@ -319,6 +331,8 @@
      */
 #if(${rtcParam.IsNotImplemented(9)})//#end    @Override
 #if(${rtcParam.IsNotImplemented(9)})//#end    protected ReturnCode_t onExecute(int ec_id) {
+#if(${tmpltHelper.checkDetailContent(9,${rtcParam})})${rtcParam.getDetailContent(9)}
+#end
 #if(${rtcParam.IsNotImplemented(9)})//#end        return super.onExecute(ec_id);
 #if(${rtcParam.IsNotImplemented(9)})//#end    }
 
@@ -341,6 +355,8 @@
      */
 #if(${rtcParam.IsNotImplemented(6)})//#end  @Override
 #if(${rtcParam.IsNotImplemented(6)})//#end  public ReturnCode_t onAborting(int ec_id) {
+#if(${tmpltHelper.checkDetailContent(6,${rtcParam})})${rtcParam.getDetailContent(6)}
+#end
 #if(${rtcParam.IsNotImplemented(6)})//#end      return super.onAborting(ec_id);
 #if(${rtcParam.IsNotImplemented(6)})//#end  }
 
@@ -363,6 +379,8 @@
      */
 #if(${rtcParam.IsNotImplemented(7)})//#end    @Override
 #if(${rtcParam.IsNotImplemented(7)})//#end    public ReturnCode_t onError(int ec_id) {
+#if(${tmpltHelper.checkDetailContent(7,${rtcParam})})${rtcParam.getDetailContent(7)}
+#end
 #if(${rtcParam.IsNotImplemented(7)})//#end        return super.onError(ec_id);
 #if(${rtcParam.IsNotImplemented(7)})//#end    }
 
@@ -385,6 +403,8 @@
      */
 #if(${rtcParam.IsNotImplemented(8)})//#end    @Override
 #if(${rtcParam.IsNotImplemented(8)})//#end    protected ReturnCode_t onReset(int ec_id) {
+#if(${tmpltHelper.checkDetailContent(8,${rtcParam})})${rtcParam.getDetailContent(8)}
+#end
 #if(${rtcParam.IsNotImplemented(8)})//#end        return super.onReset(ec_id);
 #if(${rtcParam.IsNotImplemented(8)})//#end    }
 
@@ -407,6 +427,8 @@
      */
 #if(${rtcParam.IsNotImplemented(10)})//#end    @Override
 #if(${rtcParam.IsNotImplemented(10)})//#end    protected ReturnCode_t onStateUpdate(int ec_id) {
+#if(${tmpltHelper.checkDetailContent(10,${rtcParam})})${rtcParam.getDetailContent(10)}
+#end
 #if(${rtcParam.IsNotImplemented(10)})//#end        return super.onStateUpdate(ec_id);
 #if(${rtcParam.IsNotImplemented(10)})//#end    }
 
@@ -429,6 +451,8 @@
      */
 #if(${rtcParam.IsNotImplemented(11)})//#end    @Override
 #if(${rtcParam.IsNotImplemented(11)})//#end    protected ReturnCode_t onRateChanged(int ec_id) {
+#if(${tmpltHelper.checkDetailContent(11,${rtcParam})})${rtcParam.getDetailContent(11)}
+#end
 #if(${rtcParam.IsNotImplemented(11)})//#end        return super.onRateChanged(ec_id);
 #if(${rtcParam.IsNotImplemented(11)})//#end    }
 //
@@ -575,5 +599,29 @@
     
     // </rtc-template>
 
+#foreach($privateAttribute in ${rtcParam.privateAttributes})
+  ${privateAttribute}
+#end
+#foreach($privateOperation in ${rtcParam.privateOperations})
+  ${privateOperation}
+#end
+#foreach($protectedAttribute in ${rtcParam.protectedAttributes})
+  ${protectedAttribute}
+#end
+#foreach($protectedOperation in ${rtcParam.protectedOperations})
+  ${protectedOperation}
+#end
+#foreach($publicAttribute in ${rtcParam.publicAttributes})
+  ${publicAttribute}
+#end
+#foreach($publicOperation in ${rtcParam.publicOperations})
+  ${publicOperation}
+#end
+#if(${tmpltHelper.checkContents(${rtcParam.publicOpeSource})})${rtcParam.publicOpeSource}
+#end
+#if(${tmpltHelper.checkContents(${rtcParam.protectedOpeSource})})${rtcParam.protectedOpeSource}
+#end
+#if(${tmpltHelper.checkContents(${rtcParam.privateOpeSource})})${rtcParam.privateOpeSource}
+#end
 
 }

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/build.xml.vsl
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/build.xml.vsl	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/build.xml.vsl	2013-01-29 10:39:20 UTC (rev 394)
@@ -20,21 +20,21 @@
 	<target name="idlcompile"  depends="mkdir">
 #foreach($idlPath in ${rtcParam.providerIdlPathes})
 		<exec executable="${dollarStr}{java.home}/../bin/idlj">
-			<arg line="-td 'src' #foreach($idlSearchPath in ${idlPath.idlSearchPathes})-i '${idlSearchPath}' #end-fall '${tmpltHelper.getFileName(${idlPath.idlFile})}'"/>
+			<arg line="-td 'src' #foreach($idlSearchPath in ${idlPath.idlSearchPathes})-i '${idlSearchPath}' #end-fall 'idl/${tmpltHelper.getFileName(${idlPath.idlFile})}'"/>
 		</exec>
 #foreach ($idl in ${idlPath.includeIdlParams})
 		<exec executable="${dollarStr}{java.home}/../bin/idlj">
-			<arg line="-td 'src' #foreach($idlSearchPath in ${idlPath.idlSearchPathes})-i '${idlSearchPath}' #end-fall '${tmpltHelper.getFileName(${idl.idlFile})}'"/>
+			<arg line="-td 'src' #foreach($idlSearchPath in ${idlPath.idlSearchPathes})-i '${idlSearchPath}' #end-fall 'idl/${tmpltHelper.getFileName(${idl.idlFile})}'"/>
 		</exec>
 #end
 #end
 #foreach($idlPath in ${rtcParam.consumerIdlPathes})
 		<exec executable="${dollarStr}{java.home}/../bin/idlj">
-			<arg line="-td 'src' #foreach($idlSearchPath in ${idlPath.idlSearchPathes})-i '${idlSearchPath}' #end-fall '${tmpltHelper.getFileName(${idlPath.idlFile})}'"/>
+			<arg line="-td 'src' #foreach($idlSearchPath in ${idlPath.idlSearchPathes})-i '${idlSearchPath}' #end-fall 'idl/${tmpltHelper.getFileName(${idlPath.idlFile})}'"/>
 		</exec>
 #foreach ($idl in ${idlPath.includeIdlParams})
 		<exec executable="${dollarStr}{java.home}/../bin/idlj">
-			<arg line="-td 'src' #foreach($idlSearchPath in ${idlPath.idlSearchPathes})-i '${idlSearchPath}' #end-fall '${tmpltHelper.getFileName(${idl.idlFile})}'"/>
+			<arg line="-td 'src' #foreach($idlSearchPath in ${idlPath.idlSearchPathes})-i '${idlSearchPath}' #end-fall 'idl/${tmpltHelper.getFileName(${idl.idlFile})}'"/>
 		</exec>
 #end
 #end

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/classpath.vsl
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/classpath.vsl	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/classpath.vsl	2013-01-29 10:39:20 UTC (rev 394)
@@ -3,7 +3,7 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 #if( ${tmpltHelperJava.notNullRTMRoot()} )
-	<classpathentry kind="lib" path="${javaRoot}jar/OpenRTM-aist-${rtcParam.rtmVersion}.jar"/>
+	<classpathentry kind="lib" path="${javaRoot}/jar/OpenRTM-aist-${rtcParam.rtmJavaVersion}.jar"/>
 #end
 	<classpathentry kind="output" path="bin"/>
 </classpath>
\ No newline at end of file

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/run.bat.vsl
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/run.bat.vsl	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/run.bat.vsl	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,4 +1,4 @@
-set CLASSPATH=.;%RTM_JAVA_ROOT%\jar\OpenRTM-aist-${rtcParam.rtmVersion}.jar;%RTM_JAVA_ROOT%\jar\commons-cli-1.1.jar
+set CLASSPATH=.;%RTM_JAVA_ROOT%\jar\OpenRTM-aist-${rtcParam.rtmJavaVersion}.jar;%RTM_JAVA_ROOT%\jar\commons-cli-1.1.jar
 cd /d %~dp0
 cd bin
 java ${rtcParam.name}Comp -f rtc.conf %*

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/run.sh.vsl
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/run.sh.vsl	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/run.sh.vsl	2013-01-29 10:39:20 UTC (rev 394)
@@ -5,6 +5,6 @@
     echo "Abort."
     exit 1
 fi
-export CLASSPATH=.:${dol}{RTM_JAVA_ROOT}/jar/OpenRTM-aist-${rtcParam.rtmVersion}.jar:${dol}{RTM_JAVA_ROOT}/jar/commons-cli-1.1.jar
+export CLASSPATH=.:${dol}{RTM_JAVA_ROOT}/jar/OpenRTM-aist-${rtcParam.rtmJavaVersion}.jar:${dol}{RTM_JAVA_ROOT}/jar/commons-cli-1.1.jar
 cd `dirname ${dol}0`/bin
 java ${rtcParam.name}Comp -f rtc.conf ${dol}*

Deleted: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/AISTTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/AISTTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/AISTTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,279 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.java._test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import jp.go.aist.rtm.rtcbuilder.Generator;
-import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ConfigSetParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.DataPortParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortInterfaceParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortParam;
-import jp.go.aist.rtm.rtcbuilder.java.IRtcBuilderConstantsJava;
-import jp.go.aist.rtm.rtcbuilder.java.manager.JavaGenerateManager;
-import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
-
-public class AISTTest extends TestBase {
-	private GeneratorParam genParam;
-	private RtcParam rtcParam;
-
-	protected void setUp() throws Exception {
-		genParam = new GeneratorParam();
-		rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsJava.LANG_JAVA);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsJava.LANG_JAVA_ARG);
-		rtcParam.setRtmVersion("0.4.2");
-	}
-
-	public void testAIST6() throws Exception{
-		rtcParam.setName("ModuleName");
-		rtcParam.setDescription("ModuleDescription");
-		rtcParam.setVersion("1.0.0");
-		rtcParam.setVender("VenderName");
-		rtcParam.setCategory("Category");
-		rtcParam.setComponentType("DataFlowComponent");
-		rtcParam.setActivityType("PERIODIC");
-		rtcParam.setMaxInstance(1);
-
-		genParam.getRtcParams().add(rtcParam);
-		List<ConfigSetParam> configset = new ArrayList<ConfigSetParam>(); 
-		configset.add(new ConfigSetParam("int_param0","int","","0"));
-		configset.add(new ConfigSetParam("vector_param","Vector","", "1.0,2.0,3.0"));
-		rtcParam.getConfigParams().addAll(configset);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String targetDir = rootPath + "\\resource\\Java\\ConfigSet\\AIST6\\";
-		checkCode(result, targetDir, "ModuleNameComp.java");
-		checkCode(result, targetDir, "build_ModuleName.xml");
-		checkCode(result, targetDir, "ModuleName.java");
-		checkCode(result, targetDir, "ModuleNameImpl.java");
-		checkCode(result, targetDir, "README.ModuleName");
-	}
-
-	public void testAIST5() throws Exception{
-		rtcParam.setName("test");
-		rtcParam.setDescription("test component");
-		rtcParam.setVersion("1.0.0");
-		rtcParam.setVender("S.Kurihara");
-		rtcParam.setCategory("sample");
-		rtcParam.setComponentType("STATIC");
-		rtcParam.setActivityType("PERIODIC");
-		rtcParam.setMaxInstance(1);
-
-		ServicePortParam service1 = new ServicePortParam("MySVPro0",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "myservice0", "", "", 
-				rootPath + "resource\\Java\\AIST5\\MyService.idl", "MyServiceT", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-
-		ServicePortParam service2 = new ServicePortParam("MySVPro1",0);
-		List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service1, "myservice", "", "", 
-				rootPath + "resource\\Java\\AIST5\\MyService.idl", "MyServiceOpen", "", 0);
-		srvinterts2.add(int2);
-		service2.getServicePortInterfaces().addAll(srvinterts2);
-		srvports.add(service2);
-		rtcParam.getServicePorts().addAll(srvports);
-		genParam.getRtcParams().add(rtcParam);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\AIST5\\";
-
-		checkCode(result, resourceDir, "testComp.java");
-		checkCode(result, resourceDir, "build_test.xml");
-		checkCode(result, resourceDir, "test.java");
-		checkCode(result, resourceDir, "testImpl.java");
-		checkCode(result, resourceDir, "MyServiceTSVC_impl.java");
-		checkCode(result, resourceDir, "MyServiceOpenSVC_impl.java");
-		checkCode(result, resourceDir, "README.test");
-	}
-
-	public void testAIST4() throws Exception{
-		rtcParam.setName("test");
-		rtcParam.setDescription("test component");
-		rtcParam.setVersion("1.0.0");
-		rtcParam.setVender("S.Kurihara");
-		rtcParam.setCategory("sample");
-		rtcParam.setComponentType("STATIC");
-		rtcParam.setActivityType("PERIODIC");
-		rtcParam.setMaxInstance(1);
-
-		ServicePortParam service1 = new ServicePortParam("MySVPro0",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "myservice0", "", "", 
-				rootPath + "resource\\Java\\AIST4\\MyService.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-
-		ServicePortParam service2 = new ServicePortParam("MySVPro1",0);
-		List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service1, "myservice", "", "", 
-				rootPath + "resource\\Java\\AIST4\\MyService.idl", "MyService", "", 0);
-		srvinterts2.add(int2);
-		service2.getServicePortInterfaces().addAll(srvinterts2);
-		srvports.add(service2);
-		rtcParam.getServicePorts().addAll(srvports);
-		genParam.getRtcParams().add(rtcParam);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\AIST4\\";
-
-		checkCode(result, resourceDir, "testComp.java");
-		checkCode(result, resourceDir, "build_test.xml");
-		checkCode(result, resourceDir, "test.java");
-		checkCode(result, resourceDir, "testImpl.java");
-		checkCode(result, resourceDir, "MyServiceSVC_impl.java");
-		checkCode(result, resourceDir, "README.test");
-	}
-
-	public void testAIST3() throws Exception{
-		rtcParam.setName("test");
-		rtcParam.setDescription("test component");
-		rtcParam.setVersion("1.0.0");
-		rtcParam.setVender("S.Kurihara");
-		rtcParam.setCategory("example");
-		rtcParam.setComponentType("STATIC");
-		rtcParam.setActivityType("PERIODIC");
-		rtcParam.setMaxInstance(1);
-
-		List<DataPortParam> dataport = new ArrayList<DataPortParam>(); 
-		dataport.add(new DataPortParam("in", "RTC::TimedFloatSeq", "", 0));
-		rtcParam.getInports().addAll(dataport);
-
-		List<DataPortParam> dataoutport = new ArrayList<DataPortParam>(); 
-		dataoutport.add(new DataPortParam("out", "RTC::TimedFloatSeq", "", 0));
-		rtcParam.getOutports().addAll(dataoutport);
-
-		ServicePortParam service1 = new ServicePortParam("MySVPro",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "myservice0", "", "", 
-				rootPath + "resource\\Java\\AIST3\\MyService.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-
-		ServicePortParam service2 = new ServicePortParam("MySVCon",0);
-		List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service1, "myservice1", "", "", 
-				rootPath + "resource\\Java\\AIST3\\MyService.idl", "MyService", "", 1);
-		srvinterts2.add(int2);
-		service2.getServicePortInterfaces().addAll(srvinterts2);
-		srvports.add(service2);
-		rtcParam.getServicePorts().addAll(srvports);
-		genParam.getRtcParams().add(rtcParam);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\AIST3\\";
-
-		checkCode(result, resourceDir, "testComp.java");
-		checkCode(result, resourceDir, "build_test.xml");
-		checkCode(result, resourceDir, "test.java");
-		checkCode(result, resourceDir, "testImpl.java");
-		checkCode(result, resourceDir, "MyServiceSVC_impl.java");
-		checkCode(result, resourceDir, "README.test");
-	}
-	
-	public void testAIST2() throws Exception{
-		rtcParam.setName("test");
-		rtcParam.setDescription("test component");
-		rtcParam.setVersion("1.0.0");
-		rtcParam.setVender("S.Kurihara");
-		rtcParam.setCategory("example");
-		rtcParam.setComponentType("STATIC");
-		rtcParam.setActivityType("PERIODIC");
-		rtcParam.setMaxInstance(1);
-
-		List<DataPortParam> dataport = new ArrayList<DataPortParam>(); 
-		dataport.add(new DataPortParam("in", "RTC::TimedFloatSeq", "", 0));
-		rtcParam.getInports().addAll(dataport);
-
-		List<DataPortParam> dataoutport = new ArrayList<DataPortParam>(); 
-		dataoutport.add(new DataPortParam("out", "RTC::TimedFloatSeq", "", 0));
-		rtcParam.getOutports().addAll(dataoutport);
-
-		ServicePortParam service1 = new ServicePortParam("MySVCon",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "myservice", "", "", 
-				rootPath + "resource\\Java\\AIST2\\MyService.idl", "MyService", "", 1);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		rtcParam.getServicePorts().addAll(srvports);
-		genParam.getRtcParams().add(rtcParam);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\AIST2\\";
-
-		checkCode(result, resourceDir, "testComp.java");
-		checkCode(result, resourceDir, "build_test.xml");
-		checkCode(result, resourceDir, "test.java");
-		checkCode(result, resourceDir, "testImpl.java");
-		checkCode(result, resourceDir, "README.test");
-	}
-
-	public void testServicePort() throws Exception{
-		rtcParam.setName("test");
-		rtcParam.setDescription("test component");
-		rtcParam.setVersion("1.0.0");
-		rtcParam.setVender("S.Kurihara");
-		rtcParam.setCategory("exmple");
-		rtcParam.setComponentType("STATIC");
-		rtcParam.setActivityType("PERIODIC");
-		rtcParam.setMaxInstance(1);
-
-		ServicePortParam service1 = new ServicePortParam("MySVPro",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "myservice", "", "", 
-				rootPath + "resource\\Java\\AIST1\\MyService.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		rtcParam.getServicePorts().addAll(srvports);
-		genParam.getRtcParams().add(rtcParam);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\AIST1\\";
-
-		checkCode(result, resourceDir, "testComp.java");
-		checkCode(result, resourceDir, "build_test.xml");
-		checkCode(result, resourceDir, "test.java");
-		checkCode(result, resourceDir, "testImpl.java");
-		checkCode(result, resourceDir, "MyServiceSVC_impl.java");
-		checkCode(result, resourceDir, "README.test");
-	}
-}

Deleted: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/AllTestsJava.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/AllTestsJava.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/AllTestsJava.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,32 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.java._test;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllTestsJava {
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite(
-				"Test for jp.go.aist.rtm.rtcbuilder._test");
-		//$JUnit-BEGIN$
-		suite.addTestSuite(ConfigSetTest.class);
-		suite.addTestSuite(DiffTest.class);
-		suite.addTestSuite(LuckTest.class);
-		suite.addTestSuite(MultiTest.class);
-		suite.addTestSuite(AISTTest.class);
-		suite.addTestSuite(BaseTest.class);
-		suite.addTestSuite(BuildPathTest.class);
-		suite.addTestSuite(VarTest.class);
-//		suite.addTestSuite(JavaIDLPathTest.class);
-		suite.addTestSuite(JavaDocTest.class);
-		suite.addTestSuite(JavaDocLongTest.class);
-		suite.addTestSuite(MLTest.class);
-		suite.addTestSuite(JavaExCxtTest.class);
-		suite.addTestSuite(JavaSystemConfigTest.class);
-		suite.addTestSuite(JavaImplTest.class);
-		suite.addTestSuite(JavaVariableTest.class);
-		//$JUnit-END$
-		return suite;
-	}
-
-}

Deleted: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/BaseTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/BaseTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/BaseTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,191 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.java._test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import jp.go.aist.rtm.rtcbuilder.Generator;
-import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
-import jp.go.aist.rtm.rtcbuilder.generator.param.DataPortParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortInterfaceParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortParam;
-import jp.go.aist.rtm.rtcbuilder.java.IRtcBuilderConstantsJava;
-import jp.go.aist.rtm.rtcbuilder.java.manager.JavaGenerateManager;
-import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
-
-public class BaseTest extends TestBase {
-	private GeneratorParam genParam;
-	private RtcParam rtcParam;
-
-	protected void setUp() throws Exception {
-		genParam = new GeneratorParam();
-		rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsJava.LANG_JAVA);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsJava.LANG_JAVA_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("MDesc");
-		rtcParam.setVersion("1.0.1");
-		rtcParam.setVender("TA");
-		rtcParam.setCategory("Manip");
-		rtcParam.setComponentType("STATIC2");
-		rtcParam.setActivityType("PERIODIC2");
-		rtcParam.setMaxInstance(5);
-		rtcParam.setRtmVersion("0.4.2");
-		genParam.getRtcParams().add(rtcParam);
-	}
-
-	public void testServicePort2() throws Exception{
-		List<DataPortParam> dataport = new ArrayList<DataPortParam>(); 
-		dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
-		dataport.add(new DataPortParam("InP2", "RTC::TimedLong", "", 0));
-		rtcParam.getInports().addAll(dataport);
-		List<DataPortParam> outport = new ArrayList<DataPortParam>(); 
-		outport.add(new DataPortParam("OutP1", "RTC::TimedLong", "", 0));
-		outport.add(new DataPortParam("OutP2", "RTC::TimedFloat", "", 0));
-		rtcParam.getOutports().addAll(outport);
-
-		ServicePortParam service1 = new ServicePortParam("svPort",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "acc", "", "", 
-				rootPath + "\\resource\\MyService.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		
-		ServicePortParam service2 = new ServicePortParam("cmPort",0);
-		List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service2, "rate", "", "", 
-				rootPath + "\\resource\\DAQService.idl", "DAQService", "", 1);
-		srvinterts2.add(int2);
-		service2.getServicePortInterfaces().addAll(srvinterts2);
-		srvports.add(service2);
-		
-		rtcParam.getServicePorts().addAll(srvports);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\service2\\";
-		checkResults(result, resourceDir);
-		checkCode(result, resourceDir, "MyServiceSVC_impl.java");
-	}
-
-	public void testServicePort1() throws Exception{
-		List<DataPortParam> dataport = new ArrayList<DataPortParam>(); 
-		dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
-		dataport.add(new DataPortParam("InP2", "RTC::TimedLong", "", 0));
-		rtcParam.getInports().addAll(dataport);
-		List<DataPortParam> outport = new ArrayList<DataPortParam>(); 
-		outport.add(new DataPortParam("OutP1", "RTC::TimedLong", "", 0));
-		outport.add(new DataPortParam("OutP2", "RTC::TimedFloat", "", 0));
-		rtcParam.getOutports().addAll(outport);
-
-		ServicePortParam service1 = new ServicePortParam("svPort",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "acc", "", "", 
-				rootPath + "\\resource\\MyService.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		rtcParam.getServicePorts().addAll(srvports);
-		
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\service1\\";
-		checkResults(result, resourceDir);
-		checkCode(result, resourceDir, "MyServiceSVC_impl.java");
-	}
-
-	public void testOutPort2() throws Exception{
-		List<DataPortParam> dataport = new ArrayList<DataPortParam>(); 
-		dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
-		dataport.add(new DataPortParam("InP2", "RTC::TimedLong", "", 0));
-		rtcParam.getInports().addAll(dataport);
-		List<DataPortParam> outport = new ArrayList<DataPortParam>(); 
-		outport.add(new DataPortParam("OutP1", "RTC::TimedLong", "", 0));
-		outport.add(new DataPortParam("OutP2", "RTC::TimedFloat", "", 0));
-		rtcParam.getOutports().addAll(outport);
-		
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\outport2\\";
-		checkResults(result, resourceDir);
-	}
-
-	public void testOutPort1() throws Exception{
-		List<DataPortParam> dataport = new ArrayList<DataPortParam>(); 
-		dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
-		dataport.add(new DataPortParam("InP2", "RTC::TimedLong", "", 0));
-		rtcParam.getInports().addAll(dataport);
-		List<DataPortParam> outport = new ArrayList<DataPortParam>(); 
-		outport.add(new DataPortParam("OutP1", "RTC::TimedLong", "", 0));
-		rtcParam.getOutports().addAll(outport);
-		
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\outport1\\";
-		checkResults(result, resourceDir);
-	}
-
-	public void testInPort2() throws Exception{
-		List<DataPortParam> dataport = new ArrayList<DataPortParam>(); 
-		dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
-		dataport.add(new DataPortParam("InP2", "RTC::TimedLong", "", 0));
-		rtcParam.getInports().addAll(dataport);
-		
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\inport2\\";
-		checkResults(result, resourceDir);
-	}
-
-	public void testInPort() throws Exception{
-		List<DataPortParam> dataport = new ArrayList<DataPortParam>(); 
-		dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
-		rtcParam.getInports().addAll(dataport);
-		
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\inport1\\";
-		checkResults(result, resourceDir);
-	}
-
-	public void testBasic() throws Exception{
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\name\\";
-		checkResults(result, resourceDir);
-	}
-
-	private void checkResults(List<GeneratedResult> result, String resourceDir) {
-		checkCode(result, resourceDir, "fooComp.java");
-		checkCode(result, resourceDir, "build_foo.xml");
-		checkCode(result, resourceDir, "foo.java");
-		checkCode(result, resourceDir, "fooImpl.java");
-		checkCode(result, resourceDir, "README.foo");
-	}
-}

Deleted: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/BuildPathTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/BuildPathTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/BuildPathTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,126 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.java._test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import jp.go.aist.rtm.rtcbuilder.Generator;
-import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
-import jp.go.aist.rtm.rtcbuilder.generator.param.DataPortParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortInterfaceParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortParam;
-import jp.go.aist.rtm.rtcbuilder.java.IRtcBuilderConstantsJava;
-import jp.go.aist.rtm.rtcbuilder.java.manager.JavaGenerateManager;
-import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
-
-public class BuildPathTest extends TestBase {
-	private GeneratorParam genParam;
-	private RtcParam rtcParam;
-
-	protected void setUp() throws Exception {
-		genParam = new GeneratorParam();
-		rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsJava.LANG_JAVA);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsJava.LANG_JAVA_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("MDesc");
-		rtcParam.setVersion("1.0.1");
-		rtcParam.setVender("TA");
-		rtcParam.setCategory("Manip");
-		rtcParam.setComponentType("STATIC2");
-		rtcParam.setActivityType("PERIODIC2");
-		rtcParam.setMaxInstance(5);
-		rtcParam.setRtmVersion("0.4.2");
-		genParam.getRtcParams().add(rtcParam);
-	}
-	
-	public void testPath4() throws Exception{
-		List<DataPortParam> dataport = new ArrayList<DataPortParam>(); 
-		dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
-		dataport.add(new DataPortParam("InP2", "RTC::TimedLong", "", 0));
-		rtcParam.getInports().addAll(dataport);
-		List<DataPortParam> outport = new ArrayList<DataPortParam>(); 
-		outport.add(new DataPortParam("OutP1", "RTC::TimedLong", "", 0));
-		outport.add(new DataPortParam("OutP2", "RTC::TimedFloat", "", 0));
-		ArrayList<String> pathList = new ArrayList<String>();
-		pathList.add(new String("C:\\xxx\\yyy\\zzz.jar"));
-		pathList.add(new String("C:\\aaa\\bbb\\ccc.jar"));
-		pathList.add(new String("C:\\xxx\\yyy\\zzz.jar"));
-		rtcParam.getLibraryPathes().addAll(pathList);
-		rtcParam.getOutports().addAll(outport);
-
-		ServicePortParam service1 = new ServicePortParam("svPort",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "acc", "", "", 
-				rootPath + "\\resource\\MyService.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		rtcParam.getServicePorts().addAll(srvports);
-		
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\buildpath\\path4\\";
-		checkResults(result, resourceDir);
-		checkCode(result, resourceDir, "MyServiceSVC_impl.java");
-	}
-
-	public void testPath3() throws Exception{
-		ArrayList<String> pathList = new ArrayList<String>();
-		pathList.add(new String("C:\\xxx\\yyy\\zzz.jar"));
-		pathList.add(new String("C:\\aaa\\bbb\\ccc.jar"));
-		pathList.add(new String("C:\\xxx\\yyy\\zzz.jar"));
-		rtcParam.getLibraryPathes().addAll(pathList);
-		
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\buildpath\\path2\\";
-		checkResults(result, resourceDir);
-	}
-
-	public void testPath2() throws Exception{
-		ArrayList<String> pathList = new ArrayList<String>();
-		pathList.add(new String("C:\\xxx\\yyy\\zzz.jar"));
-		pathList.add(new String("C:\\aaa\\bbb\\ccc.jar"));
-		rtcParam.getLibraryPathes().addAll(pathList);
-		
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\buildpath\\path2\\";
-		checkResults(result, resourceDir);
-	}
-
-	public void testPath1() throws Exception{
-		ArrayList<String> pathList = new ArrayList<String>();
-		pathList.add(new String("C:\\xxx\\yyy\\zzz.jar"));
-		rtcParam.getLibraryPathes().addAll(pathList);
-		
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\buildpath\\path1\\";
-		checkResults(result, resourceDir);
-	}
-	
-	private void checkResults(List<GeneratedResult> result, String resourceDir) {
-		checkCode(result, resourceDir, "fooComp.java");
-		checkCode(result, resourceDir, "build_foo.xml");
-		checkCode(result, resourceDir, "foo.java");
-		checkCode(result, resourceDir, "fooImpl.java");
-		checkCode(result, resourceDir, "README.foo");
-	}
-}

Deleted: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/ConfigSetTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/ConfigSetTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/ConfigSetTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,92 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.java._test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import jp.go.aist.rtm.rtcbuilder.Generator;
-import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ConfigSetParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.java.IRtcBuilderConstantsJava;
-import jp.go.aist.rtm.rtcbuilder.java.manager.JavaGenerateManager;
-import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
-
-public class ConfigSetTest extends TestBase {
-	private GeneratorParam genParam;
-	private RtcParam rtcParam;
-
-	protected void setUp() throws Exception {
-		genParam = new GeneratorParam();
-		rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsJava.LANG_JAVA);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsJava.LANG_JAVA_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("MDesc");
-		rtcParam.setVersion("1.0.3");
-		rtcParam.setVender("TA2");
-		rtcParam.setCategory("manip2");
-		rtcParam.setComponentType("STATIC2");
-		rtcParam.setActivityType("PERIODIC2");
-		rtcParam.setMaxInstance(3);
-		rtcParam.setRtmVersion("0.4.2");
-
-		genParam.getRtcParams().add(rtcParam);
-	}
-
-	public void testConfigSet() throws Exception{
-		List<ConfigSetParam> configset = new ArrayList<ConfigSetParam>(); 
-		configset.add(new ConfigSetParam("int_param0","int","","0"));
-		rtcParam.getConfigParams().addAll(configset);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\ConfigSet\\configset1\\";
-		checkResults(result, resourceDir);
-	}
-
-	public void testConfigSet2() throws Exception{
-		List<ConfigSetParam> configset = new ArrayList<ConfigSetParam>(); 
-		configset.add(new ConfigSetParam("int_param0","int","","0"));
-		configset.add(new ConfigSetParam("int_param1","int","","1"));
-		rtcParam.getConfigParams().addAll(configset);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\ConfigSet\\configset2\\";
-		checkResults(result, resourceDir);
-	}
-
-	public void testConfigSet3() throws Exception{
-		List<ConfigSetParam> configset = new ArrayList<ConfigSetParam>(); 
-		configset.add(new ConfigSetParam("int_param0","int","","0"));
-		configset.add(new ConfigSetParam("int_param1","int","","1"));
-		configset.add(new ConfigSetParam("double_param0","double","","0.11"));
-		configset.add(new ConfigSetParam("str_param0","String","","hoge"));
-		configset.add(new ConfigSetParam("str_param1","String","","dara"));
-		rtcParam.getConfigParams().addAll(configset);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\ConfigSet\\configset3\\";
-		checkResults(result, resourceDir);
-	}
-
-	private void checkResults(List<GeneratedResult> result, String resourceDir) {
-		checkCode(result, resourceDir, "fooComp.java");
-		checkCode(result, resourceDir, "build_foo.xml");
-		checkCode(result, resourceDir, "foo.java");
-		checkCode(result, resourceDir, "fooImpl.java");
-		checkCode(result, resourceDir, "README.foo");
-	}
-}

Deleted: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/DiffTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/DiffTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/DiffTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,86 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.java._test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import jp.go.aist.rtm.rtcbuilder.Generator;
-import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
-import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortInterfaceParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortParam;
-import jp.go.aist.rtm.rtcbuilder.java.IRtcBuilderConstantsJava;
-import jp.go.aist.rtm.rtcbuilder.java.manager.JavaGenerateManager;
-import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
-
-public class DiffTest extends TestBase {
-	private GeneratorParam genParam;
-	private RtcParam rtcParam;
-
-	protected void setUp() throws Exception {
-		genParam = new GeneratorParam();
-		rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsJava.LANG_JAVA);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsJava.LANG_JAVA_ARG);
-		rtcParam.setName("test");
-		rtcParam.setDescription("test component");
-		rtcParam.setVersion("1.0.0");
-		rtcParam.setVender("S.Kurihara");
-		rtcParam.setCategory("sample");
-		rtcParam.setComponentType("STATIC");
-		rtcParam.setActivityType("PERIODIC");
-		rtcParam.setMaxInstance(1);
-		genParam.getRtcParams().add(rtcParam);
-		rtcParam.setRtmVersion("0.4.2");
-	}
-
-	public void testDiffName2() throws Exception{
-		ServicePortParam service1 = new ServicePortParam("MySVPro0",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "myservice0", "", "", 
-				rootPath + "\\resource\\MyService3.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		rtcParam.getServicePorts().addAll(srvports);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\diffname2\\";
-		checkResults(result, resourceDir);
-	}
-
-	public void testDiffName() throws Exception{
-		ServicePortParam service1 = new ServicePortParam("MySVPro0",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "myservice0", "", "", 
-				rootPath + "\\resource\\MyService3.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		rtcParam.getServicePorts().addAll(srvports);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\diffname\\";
-		checkResults(result, resourceDir);
-	}
-
-	private void checkResults(List<GeneratedResult> result, String resourceDir) {
-		checkCode(result, resourceDir, "testComp.java");
-		checkCode(result, resourceDir, "build_test.xml");
-		checkCode(result, resourceDir, "test.java");
-		checkCode(result, resourceDir, "testImpl.java");
-		checkCode(result, resourceDir, "MyServiceSVC_impl.java");
-		checkCode(result, resourceDir, "README.test");
-	}
-}

Deleted: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaDocLongTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaDocLongTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaDocLongTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,237 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.java._test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import jp.go.aist.rtm.rtcbuilder.Generator;
-import jp.go.aist.rtm.rtcbuilder.IRtcBuilderConstants;
-import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ConfigSetParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.DataPortParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortInterfaceParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortParam;
-import jp.go.aist.rtm.rtcbuilder.java.IRtcBuilderConstantsJava;
-import jp.go.aist.rtm.rtcbuilder.java.manager.JavaGenerateManager;
-import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
-
-public class JavaDocLongTest extends TestBase {
-
-	protected void setUp() throws Exception {
-	}
-
-	public void testDocAllLong() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsJava.LANG_JAVA);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsJava.LANG_JAVA_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("MDesc");
-		rtcParam.setVersion("1.0.1");
-		rtcParam.setVender("TA");
-		rtcParam.setCategory("Manip");
-		rtcParam.setComponentType("STATIC2");
-		rtcParam.setActivityType("PERIODIC2");
-		rtcParam.setRtmVersion("0.4.2");
-		rtcParam.setMaxInstance(5);
-		//
-		rtcParam.setDocCreator("Noriaki Ando <n-ando at aist.go.jp>34567894123456789512345678961234567897123456789812345");
-		rtcParam.setDocLicense("Copyright (C) 2006-2008 ライセンス12345678901234567890123456789012345678901234567890");
-		rtcParam.setDocDescription("本コンポーネントの概要説明1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocInOut("本コンポーネントの入出力1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocAlgorithm("本コンポーネントのアルゴリズムなど1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocReference("参考文献の情報1234567890123456789012345678901234567890123456789012345678901234567890");
-		//
-		rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_INITIALIZE, "on_initialize概要説明1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_INITIALIZE, "on_initialize事前条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_INITIALIZE, "on_initialize事後条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		//
-		rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_FINALIZE, "on_finalize概要説明1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_FINALIZE, "on_finalize事前条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_FINALIZE, "on_finalize事後条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		//
-		rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_STARTUP, "on_startup概要説明1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_STARTUP, "on_startup事前条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_STARTUP, "on_startup事後条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		//
-		rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_SHUTDOWN, "on_shutdown概要説明1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_SHUTDOWN, "on_shutdown事前条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_SHUTDOWN, "on_shutdown事後条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		//
-		rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_ACTIVATED, "on_activated概要説明1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_ACTIVATED, "on_activated事前条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_ACTIVATED, "on_activated事後条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		//
-		rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_DEACTIVATED, "on_deactivated概要説明1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_DEACTIVATED, "on_deactivated事前条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_DEACTIVATED, "on_deactivated事後条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		//
-		rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_EXECUTE, "on_execute概要説明1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_EXECUTE, "on_execute事前条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_EXECUTE, "on_execute事後条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		//
-		rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_ABORTING, "on_aborting概要説明1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_ABORTING, "on_aborting事前条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_ABORTING, "on_aborting事後条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		//
-		rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_ERROR, "on_error概要説明1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_ERROR, "on_error事前条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_ERROR, "on_error事後条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		//
-		rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_RESET, "on_reset概要説明1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_RESET, "on_reset事前条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_RESET, "on_reset事後条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		//
-		rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_STATE_UPDATE, "on_state_update概要説明1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_STATE_UPDATE, "on_state_update事前条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_STATE_UPDATE, "on_state_update事後条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		//
-		rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_RATE_CHANGED, "on_rate_changed概要説明1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_RATE_CHANGED, "on_rate_changed事前条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_RATE_CHANGED, "on_rate_changed事後条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		//
-		genParam.getRtcParams().add(rtcParam);
-		List<DataPortParam> dataport = new ArrayList<DataPortParam>(); 
-
-		DataPortParam datap1 = new DataPortParam("InP1", "RTC::TimedShort", "", 0);
-		datap1.setDocDescription("InPort1の概要1234567890123456789012345678901234567890123456789012345678901234567890");
-		datap1.setDocType("InPort1のデータの型1234567890123456789012345678901234567890123456789012345678901234567890");
-		datap1.setDocNum("InPort1のデータの数1234567890123456789012345678901234567890123456789012345678901234567890");
-		datap1.setDocSemantics("InPort1のデータの意味1234567890123456789012345678901234567890123456789012345678901234567890");
-		datap1.setDocUnit("InPort1のデータの単位1234567890123456789012345678901234567890123456789012345678901234567890");
-		datap1.setDocOccurrence("InPort1のデータの発生頻度1234567890123456789012345678901234567890123456789012345678901234567890");
-		datap1.setDocOperation("InPort1のデータの処理周期1234567890123456789012345678901234567890123456789012345678901234567890");
-		dataport.add(datap1);
-
-		DataPortParam datap2 = new DataPortParam("InP2", "RTC::TimedLong", "", 0);
-		datap2.setDocDescription("InPort2の概要1234567890123456789012345678901234567890123456789012345678901234567890");
-		datap2.setDocType("InPort2のデータの型1234567890123456789012345678901234567890123456789012345678901234567890");
-		datap2.setDocNum("InPort2のデータの数1234567890123456789012345678901234567890123456789012345678901234567890");
-		datap2.setDocSemantics("InPort2のデータの意味1234567890123456789012345678901234567890123456789012345678901234567890");
-		datap2.setDocUnit("InPort2のデータの単位1234567890123456789012345678901234567890123456789012345678901234567890");
-		datap2.setDocOccurrence("InPort2のデータの発生頻度1234567890123456789012345678901234567890123456789012345678901234567890");
-		datap2.setDocOperation("InPort2のデータの処理周期1234567890123456789012345678901234567890123456789012345678901234567890");
-		dataport.add(datap2);
-		
-		rtcParam.getInports().addAll(dataport);
-		//
-		List<DataPortParam> outport = new ArrayList<DataPortParam>(); 
-
-		DataPortParam datap3 = new DataPortParam("OutP1", "RTC::TimedLong", "", 0);
-		datap3.setDocDescription("OutPort1の概要1234567890123456789012345678901234567890123456789012345678901234567890");
-		datap3.setDocType("OutPort1のデータの型1234567890123456789012345678901234567890123456789012345678901234567890");
-		datap3.setDocNum("OutPort1のデータの数1234567890123456789012345678901234567890123456789012345678901234567890");
-		datap3.setDocSemantics("OutPort1のデータの意味1234567890123456789012345678901234567890123456789012345678901234567890");
-		datap3.setDocUnit("OutPort1のデータの単位1234567890123456789012345678901234567890123456789012345678901234567890");
-		datap3.setDocOccurrence("OutPort1のデータの発生頻度1234567890123456789012345678901234567890123456789012345678901234567890");
-		datap3.setDocOperation("OutPort1のデータの処理周期1234567890123456789012345678901234567890123456789012345678901234567890");
-		outport.add(datap3);
-
-		DataPortParam datap4 = new DataPortParam("OutP2", "RTC::TimedFloat", "", 0);
-		datap4.setDocDescription("OutPort2の概要1234567890123456789012345678901234567890123456789012345678901234567890");
-		datap4.setDocType("OutPort2のデータの型1234567890123456789012345678901234567890123456789012345678901234567890");
-		datap4.setDocNum("OutPort2のデータの数1234567890123456789012345678901234567890123456789012345678901234567890");
-		datap4.setDocSemantics("OutPort2のデータの意味1234567890123456789012345678901234567890123456789012345678901234567890");
-		datap4.setDocUnit("OutPort2のデータの単位1234567890123456789012345678901234567890123456789012345678901234567890");
-		datap4.setDocOccurrence("OutPort2のデータの発生頻度1234567890123456789012345678901234567890123456789012345678901234567890");
-		datap4.setDocOperation("OutPort2のデータの処理周期1234567890123456789012345678901234567890123456789012345678901234567890");
-		outport.add(datap4);
-
-		rtcParam.getOutports().addAll(outport);
-
-		ServicePortParam service1 = new ServicePortParam("svPort",0);
-		service1.setDocDescription("ServicePort1の概要1234567890123456789012345678901234567890123456789012345678901234567890");
-		service1.setDocIfDescription("ServicePort1のインターフェースの概要1234567890123456789012345678901234567890123456789012345678901234567890");
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "acc", "", "", 
-				rootPath + "\\resource\\MyService.idl", "MyService", "", 0);
-		int1.setDocDescription("ServiceIF1の概要説明1234567890123456789012345678901234567890123456789012345678901234567890");
-		int1.setDocArgument("ServiceIF1の引数1234567890123456789012345678901234567890123456789012345678901234567890");
-		int1.setDocReturn("ServiceIF1の返値1234567890123456789012345678901234567890123456789012345678901234567890");
-		int1.setDocException("ServiceIF1の例外1234567890123456789012345678901234567890123456789012345678901234567890");
-		int1.setDocPreCondition("ServiceIF1の事前条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		int1.setDocPostCondition("ServiceIF1の事後条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		
-		ServicePortParam service2 = new ServicePortParam("cmPort",0);
-		service2.setDocDescription("ServicePort2の概要1234567890123456789012345678901234567890123456789012345678901234567890");
-		service2.setDocIfDescription("ServicePort2のインターフェースの概要1234567890123456789012345678901234567890123456789012345678901234567890");
-		List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service2, "rate", "", "", 
-				rootPath + "\\resource\\DAQService.idl", "DAQService", "", 1);
-		int2.setDocDescription("ServiceIF2の概要説明1234567890123456789012345678901234567890123456789012345678901234567890");
-		int2.setDocArgument("ServiceIF2の引数1234567890123456789012345678901234567890123456789012345678901234567890");
-		int2.setDocReturn("ServiceIF2の返値1234567890123456789012345678901234567890123456789012345678901234567890");
-		int2.setDocException("ServiceIF2の例外1234567890123456789012345678901234567890123456789012345678901234567890");
-		int2.setDocPreCondition("ServiceIF2の事前条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		int2.setDocPostCondition("ServiceIF2の事後条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		srvinterts2.add(int2);
-		service2.getServicePortInterfaces().addAll(srvinterts2);
-		srvports.add(service2);
-		
-		List<ConfigSetParam> configset = new ArrayList<ConfigSetParam>(); 
-		ConfigSetParam config1 = new ConfigSetParam("int_param0","int","", "0");
-		config1.setDocDataName("Config1の名前");
-		config1.setDocDescription("Config1の概要1234567890123456789012345678901234567890123456789012345678901234567890");
-		config1.setDocDefaultVal("Config1のデフォルト値");
-		config1.setDocUnit("Config1の単位1234567890123456789012345678901234567890123456789012345678901234567890");
-		config1.setDocRange("Config1の範囲1234567890123456789012345678901234567890123456789012345678901234567890");
-		config1.setDocConstraint("Config1の制約条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		configset.add(config1);
-		ConfigSetParam config2 = new ConfigSetParam("int_param1","int","", "1");
-		config2.setDocDataName("Config2の名前");
-		config2.setDocDescription("Config2の概要1234567890123456789012345678901234567890123456789012345678901234567890");
-		config2.setDocDefaultVal("Config2のデフォルト値");
-		config2.setDocUnit("Config2の単位1234567890123456789012345678901234567890123456789012345678901234567890");
-		config2.setDocRange("Config2の範囲1234567890123456789012345678901234567890123456789012345678901234567890");
-		config2.setDocConstraint("Config2の制約条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		configset.add(config2);
-		ConfigSetParam config3 = new ConfigSetParam("double_param0","double","", "0.11");
-		config3.setDocDataName("Config3の名前");
-		config3.setDocDescription("Config3の概要1234567890123456789012345678901234567890123456789012345678901234567890");
-		config3.setDocDefaultVal("Config3のデフォルト値");
-		config3.setDocUnit("Config3の単位1234567890123456789012345678901234567890123456789012345678901234567890");
-		config3.setDocRange("Config3の範囲1234567890123456789012345678901234567890123456789012345678901234567890");
-		config3.setDocConstraint("Config3の制約条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		configset.add(config3);
-		ConfigSetParam config4 = new ConfigSetParam("str_param0","String","", "日本語");
-		config4.setDocDataName("Config4の名前");
-		config4.setDocDescription("Config4の概要1234567890123456789012345678901234567890123456789012345678901234567890");
-		config4.setDocDefaultVal("Config4のデフォルト値");
-		config4.setDocUnit("Config4の単位1234567890123456789012345678901234567890123456789012345678901234567890");
-		config4.setDocRange("Config4の範囲1234567890123456789012345678901234567890123456789012345678901234567890");
-		config4.setDocConstraint("Config4の制約条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		configset.add(config4);
-		ConfigSetParam config5 = new ConfigSetParam("str_param1","String","", "dara");
-		config5.setDocDataName("Config5の名前");
-		config5.setDocDescription("Config5の概要1234567890123456789012345678901234567890123456789012345678901234567890");
-		config5.setDocDefaultVal("Config5のデフォルト値");
-		config5.setDocUnit("Config5の単位1234567890123456789012345678901234567890123456789012345678901234567890");
-		config5.setDocRange("Config5の範囲1234567890123456789012345678901234567890123456789012345678901234567890");
-		config5.setDocConstraint("Config5の制約条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		configset.add(config5);
-		rtcParam.getConfigParams().addAll(configset);
-
-		rtcParam.getServicePorts().addAll(srvports);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\Doc\\fullLong\\";
-
-		checkCode(result, resourceDir, "fooComp.java");
-		checkCode(result, resourceDir, "build_foo.xml");
-		checkCode(result, resourceDir, "foo.java");
-		checkCode(result, resourceDir, "fooImpl.java");
-		checkCode(result, resourceDir, "MyServiceSVC_impl.java");
-		checkCode(result, resourceDir, "README.foo");
-	}
-
-}

Deleted: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaDocTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaDocTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaDocTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,403 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.java._test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import jp.go.aist.rtm.rtcbuilder.Generator;
-import jp.go.aist.rtm.rtcbuilder.IRtcBuilderConstants;
-import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ConfigSetParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.DataPortParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortInterfaceParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortParam;
-import jp.go.aist.rtm.rtcbuilder.java.IRtcBuilderConstantsJava;
-import jp.go.aist.rtm.rtcbuilder.java.manager.JavaGenerateManager;
-import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
-
-public class JavaDocTest extends TestBase {
-	private GeneratorParam genParam;
-	private RtcParam rtcParam;
-
-	protected void setUp() throws Exception {
-		genParam = new GeneratorParam();
-		rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsJava.LANG_JAVA);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsJava.LANG_JAVA_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("MDesc");
-		rtcParam.setVersion("1.0.1");
-		rtcParam.setVender("TA");
-		rtcParam.setCategory("Manip");
-		rtcParam.setComponentType("STATIC2");
-		rtcParam.setActivityType("PERIODIC2");
-		rtcParam.setMaxInstance(5);
-		rtcParam.setRtmVersion("0.4.2");
-		genParam.getRtcParams().add(rtcParam);
-	}
-
-	public void testDocAll() throws Exception{
-		rtcParam.setDocCreator("Noriaki Ando <n-ando at aist.go.jp>");
-		rtcParam.setDocLicense("Copyright (C) 2006-2008 ライセンス");
-		rtcParam.setDocDescription("本コンポーネントの概要説明");
-		rtcParam.setDocInOut("本コンポーネントの入出力");
-		rtcParam.setDocAlgorithm("本コンポーネントのアルゴリズムなど");
-		rtcParam.setDocReference("参考文献の情報");
-		//
-		rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_INITIALIZE, "on_initialize概要説明");
-		rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_INITIALIZE, "on_initialize事前条件");
-		rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_INITIALIZE, "on_initialize事後条件");
-		//
-		rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_FINALIZE, "on_finalize概要説明");
-		rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_FINALIZE, "on_finalize事前条件");
-		rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_FINALIZE, "on_finalize事後条件");
-		//
-		rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_STARTUP, "on_startup概要説明");
-		rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_STARTUP, "on_startup事前条件");
-		rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_STARTUP, "on_startup事後条件");
-		//
-		rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_SHUTDOWN, "on_shutdown概要説明");
-		rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_SHUTDOWN, "on_shutdown事前条件");
-		rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_SHUTDOWN, "on_shutdown事後条件");
-		//
-		rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_ACTIVATED, "on_activated概要説明");
-		rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_ACTIVATED, "on_activated事前条件");
-		rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_ACTIVATED, "on_activated事後条件");
-		//
-		rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_DEACTIVATED, "on_deactivated概要説明");
-		rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_DEACTIVATED, "on_deactivated事前条件");
-		rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_DEACTIVATED, "on_deactivated事後条件");
-		//
-		rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_EXECUTE, "on_execute概要説明");
-		rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_EXECUTE, "on_execute事前条件");
-		rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_EXECUTE, "on_execute事後条件");
-		//
-		rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_ABORTING, "on_aborting概要説明");
-		rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_ABORTING, "on_aborting事前条件");
-		rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_ABORTING, "on_aborting事後条件");
-		//
-		rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_ERROR, "on_error概要説明");
-		rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_ERROR, "on_error事前条件");
-		rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_ERROR, "on_error事後条件");
-		//
-		rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_RESET, "on_reset概要説明");
-		rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_RESET, "on_reset事前条件");
-		rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_RESET, "on_reset事後条件");
-		//
-		rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_STATE_UPDATE, "on_state_update概要説明");
-		rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_STATE_UPDATE, "on_state_update事前条件");
-		rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_STATE_UPDATE, "on_state_update事後条件");
-		//
-		rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_RATE_CHANGED, "on_rate_changed概要説明");
-		rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_RATE_CHANGED, "on_rate_changed事前条件");
-		rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_RATE_CHANGED, "on_rate_changed事後条件");
-		//
-		List<DataPortParam> dataport = new ArrayList<DataPortParam>(); 
-
-		DataPortParam datap1 = new DataPortParam("InP1", "RTC::TimedShort", "", 0);
-		datap1.setDocDescription("InPort1の概要");
-		datap1.setDocType("InPort1のデータの型");
-		datap1.setDocNum("InPort1のデータの数");
-		datap1.setDocSemantics("InPort1のデータの意味");
-		datap1.setDocUnit("InPort1のデータの単位");
-		datap1.setDocOccurrence("InPort1のデータの発生頻度");
-		datap1.setDocOperation("InPort1のデータの処理周期");
-		dataport.add(datap1);
-
-		DataPortParam datap2 = new DataPortParam("InP2", "RTC::TimedLong", "", 0);
-		datap2.setDocDescription("InPort2の概要");
-		datap2.setDocType("InPort2のデータの型");
-		datap2.setDocNum("InPort2のデータの数");
-		datap2.setDocSemantics("InPort2のデータの意味");
-		datap2.setDocUnit("InPort2のデータの単位");
-		datap2.setDocOccurrence("InPort2のデータの発生頻度");
-		datap2.setDocOperation("InPort2のデータの処理周期");
-		dataport.add(datap2);
-		
-		rtcParam.getInports().addAll(dataport);
-		//
-		List<DataPortParam> outport = new ArrayList<DataPortParam>(); 
-
-		DataPortParam datap3 = new DataPortParam("OutP1", "RTC::TimedLong", "", 0);
-		datap3.setDocDescription("OutPort1の概要");
-		datap3.setDocType("OutPort1のデータの型");
-		datap3.setDocNum("OutPort1のデータの数");
-		datap3.setDocSemantics("OutPort1のデータの意味");
-		datap3.setDocUnit("OutPort1のデータの単位");
-		datap3.setDocOccurrence("OutPort1のデータの発生頻度");
-		datap3.setDocOperation("OutPort1のデータの処理周期");
-		outport.add(datap3);
-
-		DataPortParam datap4 = new DataPortParam("OutP2", "RTC::TimedFloat", "", 0);
-		datap4.setDocDescription("OutPort2の概要");
-		datap4.setDocType("OutPort2のデータの型");
-		datap4.setDocNum("OutPort2のデータの数");
-		datap4.setDocSemantics("OutPort2のデータの意味");
-		datap4.setDocUnit("OutPort2のデータの単位");
-		datap4.setDocOccurrence("OutPort2のデータの発生頻度");
-		datap4.setDocOperation("OutPort2のデータの処理周期");
-		outport.add(datap4);
-
-		rtcParam.getOutports().addAll(outport);
-
-		ServicePortParam service1 = new ServicePortParam("svPort",0);
-		service1.setDocDescription("ServicePort1の概要");
-		service1.setDocIfDescription("ServicePort1のインターフェースの概要");
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "acc", "", "", 
-				rootPath + "\\resource\\MyService.idl", "MyService", "", 0);
-		int1.setDocDescription("ServiceIF1の概要説明");
-		int1.setDocArgument("ServiceIF1の引数");
-		int1.setDocReturn("ServiceIF1の返値");
-		int1.setDocException("ServiceIF1の例外");
-		int1.setDocPreCondition("ServiceIF1の事前条件");
-		int1.setDocPostCondition("ServiceIF1の事後条件");
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		
-		ServicePortParam service2 = new ServicePortParam("cmPort",0);
-		service2.setDocDescription("ServicePort2の概要");
-		service2.setDocIfDescription("ServicePort2のインターフェースの概要");
-		List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service2, "rate", "", "", 
-				rootPath + "\\resource\\DAQService.idl", "DAQService", "", 1);
-		int2.setDocDescription("ServiceIF2の概要説明");
-		int2.setDocArgument("ServiceIF2の引数");
-		int2.setDocReturn("ServiceIF2の返値");
-		int2.setDocException("ServiceIF2の例外");
-		int2.setDocPreCondition("ServiceIF2の事前条件");
-		int2.setDocPostCondition("ServiceIF2の事後条件");
-		srvinterts2.add(int2);
-		service2.getServicePortInterfaces().addAll(srvinterts2);
-		srvports.add(service2);
-		
-		List<ConfigSetParam> configset = new ArrayList<ConfigSetParam>(); 
-		ConfigSetParam config1 = new ConfigSetParam("int_param0","int","", "0");
-		config1.setDocDataName("Config1の名前");
-		config1.setDocDescription("Config1の概要");
-		config1.setDocDefaultVal("Config1のデフォルト値");
-		config1.setDocUnit("Config1の単位");
-		config1.setDocRange("Config1の範囲");
-		config1.setDocConstraint("Config1の制約条件");
-		configset.add(config1);
-		ConfigSetParam config2 = new ConfigSetParam("int_param1","int","", "1");
-		config2.setDocDataName("Config2の名前");
-		config2.setDocDescription("Config2の概要");
-		config2.setDocDefaultVal("Config2のデフォルト値");
-		config2.setDocUnit("Config2の単位");
-		config2.setDocRange("Config2の範囲");
-		config2.setDocConstraint("Config2の制約条件");
-		configset.add(config2);
-		ConfigSetParam config3 = new ConfigSetParam("double_param0","double","", "0.11");
-		config3.setDocDataName("Config3の名前");
-		config3.setDocDescription("Config3の概要");
-		config3.setDocDefaultVal("Config3のデフォルト値");
-		config3.setDocUnit("Config3の単位");
-		config3.setDocRange("Config3の範囲");
-		config3.setDocConstraint("Config3の制約条件");
-		configset.add(config3);
-		ConfigSetParam config4 = new ConfigSetParam("str_param0","String","", "日本語");
-		config4.setDocDataName("Config4の名前");
-		config4.setDocDescription("Config4の概要");
-		config4.setDocDefaultVal("Config4のデフォルト値");
-		config4.setDocUnit("Config4の単位");
-		config4.setDocRange("Config4の範囲");
-		config4.setDocConstraint("Config4の制約条件");
-		configset.add(config4);
-		ConfigSetParam config5 = new ConfigSetParam("str_param1","String","", "dara");
-		config5.setDocDataName("Config5の名前");
-		config5.setDocDescription("Config5の概要");
-		config5.setDocDefaultVal("Config5のデフォルト値");
-		config5.setDocUnit("Config5の単位");
-		config5.setDocRange("Config5の範囲");
-		config5.setDocConstraint("Config5の制約条件");
-		configset.add(config5);
-		rtcParam.getConfigParams().addAll(configset);
-
-		rtcParam.getServicePorts().addAll(srvports);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\Doc\\full\\";
-		checkResults(result, resourceDir);
-	}
-
-	public void testDocRefer() throws Exception{
-		rtcParam.setDocCreator("Noriaki Ando <n-ando at aist.go.jp>");
-		rtcParam.setDocLicense("Copyright (C) 2006-2008 ライセンス");
-		rtcParam.setDocDescription("本コンポーネントの概要説明");
-		rtcParam.setDocInOut("本コンポーネントの入出力");
-		rtcParam.setDocAlgorithm("本コンポーネントのアルゴリズムなど");
-		rtcParam.setDocReference("参考文献の情報");
-		//
-		List<DataPortParam> dataport = new ArrayList<DataPortParam>(); 
-		dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
-		dataport.add(new DataPortParam("InP2", "RTC::TimedLong", "", 0));
-		rtcParam.getInports().addAll(dataport);
-		List<DataPortParam> outport = new ArrayList<DataPortParam>(); 
-		outport.add(new DataPortParam("OutP1", "RTC::TimedLong", "", 0));
-		outport.add(new DataPortParam("OutP2", "RTC::TimedFloat", "", 0));
-		rtcParam.getOutports().addAll(outport);
-
-		ServicePortParam service1 = new ServicePortParam("svPort",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "acc", "", "", 
-				rootPath + "\\resource\\MyService.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		
-		ServicePortParam service2 = new ServicePortParam("cmPort",0);
-		List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service2, "rate", "", "", 
-				rootPath + "\\resource\\DAQService.idl", "DAQService", "", 1);
-		srvinterts2.add(int2);
-		service2.getServicePortInterfaces().addAll(srvinterts2);
-		srvports.add(service2);
-		
-		rtcParam.getServicePorts().addAll(srvports);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\Doc\\refer\\";
-		checkResults(result, resourceDir);
-	}
-	
-	public void testDocAuthorLong() throws Exception{
-		rtcParam.setDocCreator("Noriaki Ando <n-ando at aist.go.jp>34567894123456789512345678961234567897123456789812345");
-		//
-		List<DataPortParam> dataport = new ArrayList<DataPortParam>(); 
-		dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
-		dataport.add(new DataPortParam("InP2", "RTC::TimedLong", "", 0));
-		rtcParam.getInports().addAll(dataport);
-		List<DataPortParam> outport = new ArrayList<DataPortParam>(); 
-		outport.add(new DataPortParam("OutP1", "RTC::TimedLong", "", 0));
-		outport.add(new DataPortParam("OutP2", "RTC::TimedFloat", "", 0));
-		rtcParam.getOutports().addAll(outport);
-
-		ServicePortParam service1 = new ServicePortParam("svPort",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "acc", "", "", 
-				rootPath + "\\resource\\MyService.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		
-		ServicePortParam service2 = new ServicePortParam("cmPort",0);
-		List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service2, "rate", "", "", 
-				rootPath + "\\resource\\DAQService.idl", "DAQService", "", 1);
-		srvinterts2.add(int2);
-		service2.getServicePortInterfaces().addAll(srvinterts2);
-		srvports.add(service2);
-		
-		rtcParam.getServicePorts().addAll(srvports);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\Doc\\authorLong\\";
-		checkResults(result, resourceDir);
-	}
-
-	public void testDocAuthor() throws Exception{
-		rtcParam.setDocCreator("Noriaki Ando <n-ando at aist.go.jp>");
-		//
-		List<DataPortParam> dataport = new ArrayList<DataPortParam>(); 
-		dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
-		dataport.add(new DataPortParam("InP2", "RTC::TimedLong", "", 0));
-		rtcParam.getInports().addAll(dataport);
-		List<DataPortParam> outport = new ArrayList<DataPortParam>(); 
-		outport.add(new DataPortParam("OutP1", "RTC::TimedLong", "", 0));
-		outport.add(new DataPortParam("OutP2", "RTC::TimedFloat", "", 0));
-		rtcParam.getOutports().addAll(outport);
-
-		ServicePortParam service1 = new ServicePortParam("svPort",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "acc", "", "", 
-				rootPath + "\\resource\\MyService.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		
-		ServicePortParam service2 = new ServicePortParam("cmPort",0);
-		List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service2, "rate", "", "", 
-				rootPath + "\\resource\\DAQService.idl", "DAQService", "", 1);
-		srvinterts2.add(int2);
-		service2.getServicePortInterfaces().addAll(srvinterts2);
-		srvports.add(service2);
-		
-		rtcParam.getServicePorts().addAll(srvports);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\Doc\\author\\";
-		checkResults(result, resourceDir);
-	}
-
-	public void testOriginal() throws Exception{
-		List<DataPortParam> dataport = new ArrayList<DataPortParam>(); 
-		dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
-		dataport.add(new DataPortParam("InP2", "RTC::TimedLong", "", 0));
-		rtcParam.getInports().addAll(dataport);
-		List<DataPortParam> outport = new ArrayList<DataPortParam>(); 
-		outport.add(new DataPortParam("OutP1", "RTC::TimedLong", "", 0));
-		outport.add(new DataPortParam("OutP2", "RTC::TimedFloat", "", 0));
-		rtcParam.getOutports().addAll(outport);
-
-		ServicePortParam service1 = new ServicePortParam("svPort",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "acc", "", "", 
-				rootPath + "\\resource\\MyService.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		
-		ServicePortParam service2 = new ServicePortParam("cmPort",0);
-		List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service2, "rate", "", "", 
-				rootPath + "\\resource\\DAQService.idl", "DAQService", "", 1);
-		srvinterts2.add(int2);
-		service2.getServicePortInterfaces().addAll(srvinterts2);
-		srvports.add(service2);
-		
-		rtcParam.getServicePorts().addAll(srvports);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\service2\\";
-		checkResults(result, resourceDir);
-	}
-
-	private void checkResults(List<GeneratedResult> result, String resourceDir) {
-		checkCode(result, resourceDir, "fooComp.java");
-		checkCode(result, resourceDir, "build_foo.xml");
-		checkCode(result, resourceDir, "foo.java");
-		checkCode(result, resourceDir, "fooImpl.java");
-		checkCode(result, resourceDir, "MyServiceSVC_impl.java");
-		checkCode(result, resourceDir, "README.foo");
-	}
-}

Deleted: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaExCxtTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaExCxtTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaExCxtTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,60 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.java._test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import jp.go.aist.rtm.rtcbuilder.Generator;
-import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ConfigSetParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.java.IRtcBuilderConstantsJava;
-import jp.go.aist.rtm.rtcbuilder.java.manager.JavaGenerateManager;
-import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
-
-public class JavaExCxtTest extends TestBase {
-
-	protected void setUp() throws Exception {
-	}
-
-	public void testExecutionContext() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsJava.LANG_JAVA);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsJava.LANG_JAVA_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("MDesc");
-		rtcParam.setVersion("1.0.3");
-		rtcParam.setVender("TA2");
-		rtcParam.setCategory("manip2");
-		rtcParam.setComponentType("STATIC2");
-		rtcParam.setActivityType("PERIODIC2");
-		rtcParam.setMaxInstance(3);
-		rtcParam.setExecutionRate(5.0);
-		rtcParam.setRtmVersion("0.4.2");
-
-		genParam.getRtcParams().add(rtcParam);
-		List<ConfigSetParam> configset = new ArrayList<ConfigSetParam>(); 
-		configset.add(new ConfigSetParam("int_param0","int","","0"));
-		configset.add(new ConfigSetParam("int_param1","int","","1"));
-		configset.add(new ConfigSetParam("double_param0","double","","0.11"));
-		configset.add(new ConfigSetParam("str_param0","String","","hoge"));
-		configset.add(new ConfigSetParam("str_param1","String","","dara"));
-		rtcParam.getConfigParams().addAll(configset);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\ExecutionCxt\\";
-
-		checkCode(result, resourceDir, "fooComp.java");
-		checkCode(result, resourceDir, "build_foo.xml");
-		checkCode(result, resourceDir, "foo.java");
-		checkCode(result, resourceDir, "fooImpl.java");
-		checkCode(result, resourceDir, "README.foo");
-		checkCode(result, resourceDir, "rtc.conf");
-	}
-}

Deleted: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaIDLPathTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaIDLPathTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaIDLPathTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,171 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.java._test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import jp.go.aist.rtm.rtcbuilder.Generator;
-import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
-import jp.go.aist.rtm.rtcbuilder.generator.param.DataPortParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortInterfaceParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortParam;
-import jp.go.aist.rtm.rtcbuilder.java.IRtcBuilderConstantsJava;
-import jp.go.aist.rtm.rtcbuilder.java.manager.JavaGenerateManager;
-import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
-
-public class JavaIDLPathTest extends TestBase {
-	private GeneratorParam genParam;
-	private RtcParam rtcParam;
-
-	protected void setUp() throws Exception {
-		genParam = new GeneratorParam();
-		rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsJava.LANG_JAVA);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsJava.LANG_JAVA_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("MDesc");
-		rtcParam.setVersion("1.0.1");
-		rtcParam.setVender("TA");
-		rtcParam.setCategory("Manip");
-		rtcParam.setComponentType("STATIC2");
-		rtcParam.setActivityType("PERIODIC2");
-		rtcParam.setMaxInstance(5);
-		genParam.getRtcParams().add(rtcParam);
-		//
-		List<DataPortParam> dataport = new ArrayList<DataPortParam>(); 
-		dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
-		dataport.add(new DataPortParam("InP2", "RTC::TimedLong", "", 0));
-		rtcParam.getInports().addAll(dataport);
-		List<DataPortParam> outport = new ArrayList<DataPortParam>(); 
-		outport.add(new DataPortParam("OutP1", "RTC::TimedLong", "", 0));
-		outport.add(new DataPortParam("OutP2", "RTC::TimedFloat", "", 0));
-		rtcParam.getOutports().addAll(outport);
-	}
-
-	public void testIDLSearchPath3() throws Exception{
-		ServicePortParam service1 = new ServicePortParam("svPort",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "acc", "", "", 
-				rootPath + "MyService.idl", "MyService", rootPath + "\\resource", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		
-		ServicePortParam service2 = new ServicePortParam("cmPort",0);
-		List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service2, "rate", "", "", 
-				"resource\\DAQService.idl", "DAQService", rootPath, 1);
-		srvinterts2.add(int2);
-		service2.getServicePortInterfaces().addAll(srvinterts2);
-		srvports.add(service2);
-		
-		rtcParam.getServicePorts().addAll(srvports);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\IDLPath3\\";
-		checkResults(result, resourceDir);
-	}
-
-	public void testIDLSearchPath2() throws Exception{
-		ServicePortParam service1 = new ServicePortParam("svPort",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "acc", "", "", 
-				"MyService.idl", "MyService", rootPath + "\\resource", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		
-		ServicePortParam service2 = new ServicePortParam("cmPort",0);
-		List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service2, "rate", "", "", 
-				"DAQService.idl", "DAQService", rootPath + "\\resource", 1);
-		srvinterts2.add(int2);
-		service2.getServicePortInterfaces().addAll(srvinterts2);
-		srvports.add(service2);
-		
-		rtcParam.getServicePorts().addAll(srvports);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\IDLPath2\\";
-		checkResults(result, resourceDir);
-	}
-
-	public void testIDLSearchPath1() throws Exception{
-		ServicePortParam service1 = new ServicePortParam("svPort",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "acc", "", "", 
-				"MyService.idl", "MyService", rootPath + "\\resource", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		
-		ServicePortParam service2 = new ServicePortParam("cmPort",0);
-		List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service2, "rate", "", "", 
-				rootPath + "\\resource\\DAQService.idl", "DAQService", "", 1);
-		srvinterts2.add(int2);
-		service2.getServicePortInterfaces().addAll(srvinterts2);
-		srvports.add(service2);
-		
-		rtcParam.getServicePorts().addAll(srvports);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\IDLPath1\\";
-		checkResults(result, resourceDir);
-	}
-
-	public void testOriginalPort() throws Exception{
-		ServicePortParam service1 = new ServicePortParam("svPort",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "acc", "", "", 
-				rootPath + "\\resource\\MyService.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		
-		ServicePortParam service2 = new ServicePortParam("cmPort",0);
-		List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service2, "rate", "", "", 
-				rootPath + "\\resource\\DAQService.idl", "DAQService", "", 1);
-		srvinterts2.add(int2);
-		service2.getServicePortInterfaces().addAll(srvinterts2);
-		srvports.add(service2);
-		
-		rtcParam.getServicePorts().addAll(srvports);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\service2\\";
-		checkResults(result, resourceDir);
-	}
-
-	private void checkResults(List<GeneratedResult> result, String resourceDir) {
-		checkCode(result, resourceDir, "fooComp.java");
-		checkCode(result, resourceDir, "build_foo.xml");
-		checkCode(result, resourceDir, "foo.java");
-		checkCode(result, resourceDir, "fooImpl.java");
-		checkCode(result, resourceDir, "MyServiceSVC_impl.java");
-		checkCode(result, resourceDir, "README.foo");
-	}
-}

Deleted: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaImplTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaImplTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaImplTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,106 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.java._test;
-
-import java.util.List;
-
-import jp.go.aist.rtm.rtcbuilder.Generator;
-import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
-import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.java.IRtcBuilderConstantsJava;
-import jp.go.aist.rtm.rtcbuilder.java.manager.JavaGenerateManager;
-import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
-
-public class JavaImplTest extends TestBase {
-	private RtcParam rtcParam;
-	private GeneratorParam genParam;
-
-	protected void setUp() throws Exception {
-		genParam = new GeneratorParam();
-		rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsJava.LANG_JAVA);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsJava.LANG_JAVA_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("MDesc");
-		rtcParam.setVersion("1.0.1");
-		rtcParam.setVender("TA");
-		rtcParam.setCategory("Manip");
-		rtcParam.setComponentType("STATIC2");
-		rtcParam.setActivityType("PERIODIC2");
-		rtcParam.setMaxInstance(5);
-		rtcParam.setRtmVersion("0.4.2");
-		genParam.getRtcParams().add(rtcParam);
-	}
-
-	public void testAll() throws Exception{
-		rtcParam.setActionImplemented(0, true);
-		rtcParam.setActionImplemented(1, true);
-		rtcParam.setActionImplemented(2, true);
-		rtcParam.setActionImplemented(3, true);
-		rtcParam.setActionImplemented(4, true);
-		rtcParam.setActionImplemented(5, true);
-		rtcParam.setActionImplemented(6, true);
-		rtcParam.setActionImplemented(7, true);
-		rtcParam.setActionImplemented(8, true);
-		rtcParam.setActionImplemented(9, true);
-		rtcParam.setActionImplemented(10, true);
-		rtcParam.setActionImplemented(11, true);
-		
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-		String resourceDir = rootPath +  "\\resource\\Java\\impl\\all\\";
-
-		checkResults(result, resourceDir);
-	}
-
-	public void testExecute() throws Exception{
-		rtcParam.setActionImplemented(0, true);
-		rtcParam.setActionImplemented(1, true);
-		rtcParam.setActionImplemented(3, true);
-		rtcParam.setActionImplemented(5, true);
-		rtcParam.setActionImplemented(9, true);
-		
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\impl\\execute\\";
-		checkResults(result, resourceDir);
-	}
-
-	public void testFinalize() throws Exception{
-		rtcParam.setActionImplemented(0, true);
-		rtcParam.setActionImplemented(1, true);
-		
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\impl\\finalize\\";
-		checkResults(result, resourceDir);
-	}
-
-	public void testInitialize() throws Exception{
-		rtcParam.setActionImplemented(0, true);
-		
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\impl\\initialize\\";
-		checkResults(result, resourceDir);
-	}
-
-	private void checkResults(List<GeneratedResult> result, String resourceDir) {
-		checkCode(result, resourceDir, "fooComp.java");
-		checkCode(result, resourceDir, "build_foo.xml");
-		checkCode(result, resourceDir, "foo.java");
-		checkCode(result, resourceDir, "fooImpl.java");
-		checkCode(result, resourceDir, "README.foo");
-	}
-}

Deleted: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaSystemConfigTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaSystemConfigTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaSystemConfigTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,66 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.java._test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import jp.go.aist.rtm.rtcbuilder.Generator;
-import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ConfigParameterParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ConfigSetParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.java.IRtcBuilderConstantsJava;
-import jp.go.aist.rtm.rtcbuilder.java.manager.JavaGenerateManager;
-import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
-
-public class JavaSystemConfigTest extends TestBase {
-
-	protected void setUp() throws Exception {
-	}
-
-	public void testExecutionContext() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsJava.LANG_JAVA);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsJava.LANG_JAVA_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("MDesc");
-		rtcParam.setVersion("1.0.3");
-		rtcParam.setVender("TA2");
-		rtcParam.setCategory("manip2");
-		rtcParam.setComponentType("STATIC2");
-		rtcParam.setActivityType("PERIODIC2");
-		rtcParam.setMaxInstance(3);
-		rtcParam.setExecutionRate(5.0);
-		rtcParam.setRtmVersion("0.4.2");
-
-		genParam.getRtcParams().add(rtcParam);
-		List<ConfigSetParam> configset = new ArrayList<ConfigSetParam>(); 
-		configset.add(new ConfigSetParam("int_param0","int","","0"));
-		configset.add(new ConfigSetParam("int_param1","int","","1"));
-		configset.add(new ConfigSetParam("double_param0","double","","0.11"));
-		configset.add(new ConfigSetParam("str_param0","String","","hoge"));
-		configset.add(new ConfigSetParam("str_param1","String","","dara"));
-		rtcParam.getConfigParams().addAll(configset);
-
-		List<ConfigParameterParam> configparam = new ArrayList<ConfigParameterParam>(); 
-		configparam.add(new ConfigParameterParam("timer.tick","0.1"));
-		configparam.add(new ConfigParameterParam("naming.update.interval","10.0"));
-		rtcParam.getConfigParameterParams().addAll(configparam);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\SystemConfig\\";
-
-		checkCode(result, resourceDir, "fooComp.java");
-		checkCode(result, resourceDir, "build_foo.xml");
-		checkCode(result, resourceDir, "foo.java");
-		checkCode(result, resourceDir, "fooImpl.java");
-		checkCode(result, resourceDir, "README.foo");
-		checkCode(result, resourceDir, "rtc.conf");
-	}
-}

Deleted: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaVariableTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaVariableTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaVariableTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,143 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.java._test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import jp.go.aist.rtm.rtcbuilder.Generator;
-import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
-import jp.go.aist.rtm.rtcbuilder.generator.param.DataPortParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortInterfaceParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortParam;
-import jp.go.aist.rtm.rtcbuilder.java.IRtcBuilderConstantsJava;
-import jp.go.aist.rtm.rtcbuilder.java.manager.JavaGenerateManager;
-import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
-
-public class JavaVariableTest extends TestBase {
-	private RtcParam rtcParam;
-	private GeneratorParam genParam;
-
-	protected void setUp() throws Exception {
-		genParam = new GeneratorParam();
-		rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsJava.LANG_JAVA);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsJava.LANG_JAVA_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("MDesc");
-		rtcParam.setVersion("1.0.1");
-		rtcParam.setVender("TA");
-		rtcParam.setCategory("Manip");
-		rtcParam.setComponentType("STATIC2");
-		rtcParam.setActivityType("PERIODIC2");
-		rtcParam.setMaxInstance(5);
-		rtcParam.setRtmVersion("0.4.2");
-		genParam.getRtcParams().add(rtcParam);
-	}
-
-	public void testServicePort2() throws Exception{
-		List<DataPortParam> dataport = new ArrayList<DataPortParam>(); 
-		dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
-		dataport.add(new DataPortParam("InP2", "RTC::TimedLong", "", 0));
-		rtcParam.getInports().addAll(dataport);
-		List<DataPortParam> outport = new ArrayList<DataPortParam>(); 
-		outport.add(new DataPortParam("OutP1", "RTC::TimedLong", "", 0));
-		outport.add(new DataPortParam("OutP2", "RTC::TimedFloat", "", 0));
-		rtcParam.getOutports().addAll(outport);
-
-		ServicePortParam service1 = new ServicePortParam("svPort",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "acc", "acinst", "acvaria", 
-				rootPath + "\\resource\\MyService.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		
-		ServicePortParam service2 = new ServicePortParam("cmPort",0);
-		List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service2, "rate", "rinst", "rvaria", 
-				rootPath + "\\resource\\DAQService.idl", "DAQService", "", 1);
-		srvinterts2.add(int2);
-		service2.getServicePortInterfaces().addAll(srvinterts2);
-		srvports.add(service2);
-		
-		rtcParam.getServicePorts().addAll(srvports);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\Variable\\ServicePort2\\";
-		checkResults(result, resourceDir);
-		checkCode(result, resourceDir, "MyServiceSVC_impl.java");
-	}
-
-	public void testServicePort1() throws Exception{
-		List<DataPortParam> dataport = new ArrayList<DataPortParam>(); 
-		dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
-		dataport.add(new DataPortParam("InP2", "RTC::TimedLong", "", 0));
-		rtcParam.getInports().addAll(dataport);
-		List<DataPortParam> outport = new ArrayList<DataPortParam>(); 
-		outport.add(new DataPortParam("OutP1", "RTC::TimedLong", "", 0));
-		outport.add(new DataPortParam("OutP2", "RTC::TimedFloat", "", 0));
-		rtcParam.getOutports().addAll(outport);
-
-		ServicePortParam service1 = new ServicePortParam("svPort",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "acc", "acinst", "", 
-				rootPath + "\\resource\\MyService.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		
-		ServicePortParam service2 = new ServicePortParam("cmPort",0);
-		List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service2, "rate", "rinst", "", 
-				rootPath + "\\resource\\DAQService.idl", "DAQService", "", 1);
-		srvinterts2.add(int2);
-		service2.getServicePortInterfaces().addAll(srvinterts2);
-		srvports.add(service2);
-		
-		rtcParam.getServicePorts().addAll(srvports);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\Variable\\ServicePort1\\";
-		checkResults(result, resourceDir);
-		checkCode(result, resourceDir, "MyServiceSVC_impl.java");
-	}
-
-	public void testDataPort() throws Exception{
-		List<DataPortParam> dataport = new ArrayList<DataPortParam>(); 
-		dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "VarInP1", 0));
-		dataport.add(new DataPortParam("InP2", "RTC::TimedLong", "", 0));
-		rtcParam.getInports().addAll(dataport);
-		List<DataPortParam> outport = new ArrayList<DataPortParam>(); 
-		outport.add(new DataPortParam("OutP1", "RTC::TimedLong", "", 0));
-		outport.add(new DataPortParam("OutP2", "RTC::TimedFloat", "VarOutP2", 0));
-		rtcParam.getOutports().addAll(outport);
-		
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\Variable\\DataPort\\";
-		checkResults(result, resourceDir);
-	}
-
-	private void checkResults(List<GeneratedResult> result, String resourceDir) {
-		checkCode(result, resourceDir, "fooComp.java");
-		checkCode(result, resourceDir, "build_foo.xml");
-		checkCode(result, resourceDir, "foo.java");
-		checkCode(result, resourceDir, "fooImpl.java");
-		checkCode(result, resourceDir, "README.foo");
-	}
-}

Deleted: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/LuckTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/LuckTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/LuckTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,315 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.java._test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import jp.go.aist.rtm.rtcbuilder.Generator;
-import jp.go.aist.rtm.rtcbuilder.generator.param.DataPortParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortInterfaceParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortParam;
-import jp.go.aist.rtm.rtcbuilder.java.IRtcBuilderConstantsJava;
-import jp.go.aist.rtm.rtcbuilder.java.manager.JavaGenerateManager;
-import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
-
-public class LuckTest extends TestBase {
-	private RtcParam rtcParam;
-	private GeneratorParam genParam;
-
-	protected void setUp() throws Exception {
-		genParam = new GeneratorParam();
-		rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsJava.LANG_JAVA);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsJava.LANG_JAVA_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("test module");
-		rtcParam.setVersion("1.0.1");
-		rtcParam.setVender("TA");
-		rtcParam.setCategory("sample");
-		rtcParam.setComponentType("STATIC");
-		rtcParam.setActivityType("PERIODIC");
-		rtcParam.setMaxInstance(2);
-		genParam.getRtcParams().add(rtcParam);
-		
-	}
-
-	public void testConsumerNoType() throws Exception{
-		List<DataPortParam> dataInport = new ArrayList<DataPortParam>(); 
-		dataInport.add(new DataPortParam("in1", "RTC::TimedShort", "", 0));
-		rtcParam.getInports().addAll(dataInport);
-
-		List<DataPortParam> dataOutport = new ArrayList<DataPortParam>(); 
-		dataOutport.add(new DataPortParam("out1", "RTC::TimedLong", "", 0));
-		rtcParam.getOutports().addAll(dataOutport);
-
-		ServicePortParam service1 = new ServicePortParam("MySVPro",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "myservice0", "", "", 
-				rootPath + "\\resource\\Java\\Exception\\MyService.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		
-		ServicePortParam service2 = new ServicePortParam("MyConPro",0);
-		List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service1, "myservice1", "", "", 
-				rootPath + "\\resource\\Java\\Exception\\MyService.idl", "", "", 1);
-		srvinterts2.add(int2);
-		service2.getServicePortInterfaces().addAll(srvinterts2);
-		srvports.add(service2);
-
-		rtcParam.getServicePorts().addAll(srvports);
-		genParam.getRtcParams().add(rtcParam);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		try {
-			generator.generateTemplateCode(genParam);
-			fail();
-		} catch ( Exception ex ) {
-			assertEquals("Please enter Service Interface type. : foo", ex.getMessage());
-		}
-	}
-
-	public void testConsumerNoName() throws Exception{
-		List<DataPortParam> dataInport = new ArrayList<DataPortParam>(); 
-		dataInport.add(new DataPortParam("in1", "RTC::TimedShort", "", 0));
-		rtcParam.getInports().addAll(dataInport);
-
-		List<DataPortParam> dataOutport = new ArrayList<DataPortParam>(); 
-		dataOutport.add(new DataPortParam("out1", "RTC::TimedLong", "", 0));
-		rtcParam.getOutports().addAll(dataOutport);
-
-		ServicePortParam service1 = new ServicePortParam("MySVPro",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "myservice0", "", "", 
-				rootPath + "\\resource\\Java\\Exception\\MyService.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		
-		ServicePortParam service2 = new ServicePortParam("MyConPro",0);
-		List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service1, "", "", "", 
-				rootPath + "\\resource\\Java\\Exception\\MyService.idl", "MyService", "", 1);
-		srvinterts2.add(int2);
-		service2.getServicePortInterfaces().addAll(srvinterts2);
-		srvports.add(service2);
-
-		rtcParam.getServicePorts().addAll(srvports);
-		genParam.getRtcParams().add(rtcParam);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		try {
-			generator.generateTemplateCode(genParam);
-			fail();
-		} catch(Exception e) {
-		}
-	}
-
-	public void testConsumerNoPortName() throws Exception{
-		List<DataPortParam> dataInport = new ArrayList<DataPortParam>(); 
-		dataInport.add(new DataPortParam("in1", "RTC::TimedShort", "", 0));
-		rtcParam.getInports().addAll(dataInport);
-
-		List<DataPortParam> dataOutport = new ArrayList<DataPortParam>(); 
-		dataOutport.add(new DataPortParam("out1", "RTC::TimedLong", "", 0));
-		rtcParam.getOutports().addAll(dataOutport);
-
-		ServicePortParam service1 = new ServicePortParam("MySVPro",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "myservice0", "", "", 
-				rootPath + "\\resource\\Java\\Exception\\MyService.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		
-		ServicePortParam service2 = new ServicePortParam("",0);
-		List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service1, "myservice1", "", "", 
-				rootPath + "\\resource\\Java\\Exception\\MyService.idl", "MyService", "", 1);
-		srvinterts2.add(int2);
-		service2.getServicePortInterfaces().addAll(srvinterts2);
-		srvports.add(service2);
-
-		rtcParam.getServicePorts().addAll(srvports);
-		genParam.getRtcParams().add(rtcParam);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		try {
-			generator.generateTemplateCode(genParam);
-			fail();
-		} catch(Exception e) {
-		}
-	}
-
-	public void testProviderNoType() throws Exception{
-		List<DataPortParam> dataInport = new ArrayList<DataPortParam>(); 
-		dataInport.add(new DataPortParam("in1", "RTC::TimedShort", "", 0));
-		rtcParam.getInports().addAll(dataInport);
-
-		List<DataPortParam> dataOutport = new ArrayList<DataPortParam>(); 
-		dataOutport.add(new DataPortParam("out1", "RTC::TimedLong", "", 0));
-		rtcParam.getOutports().addAll(dataOutport);
-
-		ServicePortParam service1 = new ServicePortParam("MySVPro",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "myservice0", "", "", 
-				rootPath + "\\resource\\Java\\Exception\\MyService.idl", "", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		rtcParam.getServicePorts().addAll(srvports);
-		genParam.getRtcParams().add(rtcParam);
-		
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		try {
-			generator.generateTemplateCode(genParam);
-			fail();
-		} catch ( Exception ex ) {
-			assertEquals("Please enter Service Interface type. : foo", ex.getMessage());
-		}
-
-	}
-
-	public void testProviderNoName() throws Exception{
-		List<DataPortParam> dataInport = new ArrayList<DataPortParam>(); 
-		dataInport.add(new DataPortParam("in1", "RTC::TimedShort", "", 0));
-		rtcParam.getInports().addAll(dataInport);
-
-		List<DataPortParam> dataOutport = new ArrayList<DataPortParam>(); 
-		dataOutport.add(new DataPortParam("out1", "RTC::TimedLong", "", 0));
-		rtcParam.getOutports().addAll(dataOutport);
-
-		ServicePortParam service1 = new ServicePortParam("MySVPro",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "", "", "", 
-				rootPath + "\\resource\\Java\\Exception\\MyService.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		rtcParam.getServicePorts().addAll(srvports);
-		genParam.getRtcParams().add(rtcParam);
-		
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		try {
-			generator.generateTemplateCode(genParam);
-			fail();
-		} catch(Exception e) {
-		}
-	}
-
-	public void testProviderNoPortName() throws Exception{
-		List<DataPortParam> dataInport = new ArrayList<DataPortParam>(); 
-		dataInport.add(new DataPortParam("in1", "RTC::TimedShort", "", 0));
-		rtcParam.getInports().addAll(dataInport);
-
-		List<DataPortParam> dataOutport = new ArrayList<DataPortParam>(); 
-		dataOutport.add(new DataPortParam("out1", "RTC::TimedLong", "", 0));
-		rtcParam.getOutports().addAll(dataOutport);
-
-		ServicePortParam service1 = new ServicePortParam("",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "myservice0", "", "", 
-				rootPath + "\\resource\\Java\\Exception\\MyService.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		rtcParam.getServicePorts().addAll(srvports);
-		genParam.getRtcParams().add(rtcParam);
-		
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		try {
-			generator.generateTemplateCode(genParam);
-			fail();
-		} catch(Exception e) {
-		}
-	}
-
-	public void testOutPortNoType() throws Exception{
-		List<DataPortParam> dataInport = new ArrayList<DataPortParam>(); 
-		dataInport.add(new DataPortParam("in1", "RTC::TimedShort", "", 0));
-		rtcParam.getInports().addAll(dataInport);
-
-		List<DataPortParam> dataOutport = new ArrayList<DataPortParam>(); 
-		dataOutport.add(new DataPortParam("out1", "", "", 0));
-		rtcParam.getOutports().addAll(dataOutport);
-		
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		try {
-			generator.generateTemplateCode(genParam);
-			fail();
-		} catch(Exception e) {
-		}
-	}
-
-	public void testOutPortNoName() throws Exception{
-		List<DataPortParam> dataInport = new ArrayList<DataPortParam>(); 
-		dataInport.add(new DataPortParam("in1", "RTC::TimedShort", "", 0));
-		rtcParam.getInports().addAll(dataInport);
-
-		List<DataPortParam> dataOutport = new ArrayList<DataPortParam>(); 
-		dataOutport.add(new DataPortParam("", "RTC::TimedLong", "", 0));
-		rtcParam.getOutports().addAll(dataOutport);
-		
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		try {
-			generator.generateTemplateCode(genParam);
-			fail();
-		} catch(Exception e) {
-		}
-	}
-
-	public void testInPortNoType() throws Exception{
-		List<DataPortParam> dataport = new ArrayList<DataPortParam>(); 
-		dataport.add(new DataPortParam("in1", "", "", 0));
-		rtcParam.getInports().addAll(dataport);
-		
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		try {
-			generator.generateTemplateCode(genParam);
-			fail();
-		} catch(Exception e) {
-		}
-	}
-
-	public void testInPortNoName() throws Exception{
-		List<DataPortParam> dataport = new ArrayList<DataPortParam>(); 
-		dataport.add(new DataPortParam("", "RTC::TimedShort", "", 0));
-		rtcParam.getInports().addAll(dataport);
-		
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		try {
-			generator.generateTemplateCode(genParam);
-			fail();
-		} catch(Exception e) {
-		}
-	}
-}

Deleted: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/MLTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/MLTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/MLTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,109 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.java._test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import jp.go.aist.rtm.rtcbuilder.Generator;
-import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
-import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortInterfaceParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortParam;
-import jp.go.aist.rtm.rtcbuilder.java.IRtcBuilderConstantsJava;
-import jp.go.aist.rtm.rtcbuilder.java.manager.JavaGenerateManager;
-import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
-
-public class MLTest extends TestBase {
-	private RtcParam rtcParam;
-	private GeneratorParam genParam;
-
-	protected void setUp() throws Exception {
-		genParam = new GeneratorParam();
-		rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsJava.LANG_JAVA);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsJava.LANG_JAVA_ARG);
-		rtcParam.setName("ModuleName");
-		rtcParam.setDescription("ModuleDescription");
-		rtcParam.setVersion("1.0.0");
-		rtcParam.setVender("VenderName");
-		rtcParam.setCategory("Category");
-		rtcParam.setComponentType("DataFlowComponent");
-		rtcParam.setActivityType("PERIODIC");
-		rtcParam.setMaxInstance(1);
-		rtcParam.setRtmVersion("0.4.2");
-		genParam.getRtcParams().add(rtcParam);
-	}
-
-	public void testML3() throws Exception{
-		ServicePortParam service1 = new ServicePortParam("portName",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "name", "", "", 
-				rootPath + "\\resource\\Java\\ML\\ML3\\MyServiceType1.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		
-		rtcParam.getServicePorts().addAll(srvports);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\ML\\ML3\\";
-		checkResults(result, resourceDir);
-	}
-
-	public void testML2() throws Exception{
-		ServicePortParam service1 = new ServicePortParam("portName",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "name", "", "", 
-				rootPath + "\\resource\\Java\\ML\\ML2\\MyServiceType1.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		
-		rtcParam.getServicePorts().addAll(srvports);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\ML\\ML2\\";
-		checkResults(result, resourceDir);
-	}
-
-	public void testML1() throws Exception{
-		ServicePortParam service1 = new ServicePortParam("portName",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "name", "", "", 
-				rootPath + "\\resource\\Java\\ML\\ML1\\MyServiceAIST2.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		
-		rtcParam.getServicePorts().addAll(srvports);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\ML\\ML1\\";
-		checkResults(result, resourceDir);
-	}
-
-	private void checkResults(List<GeneratedResult> result, String resourceDir) {
-		checkCode(result, resourceDir, "ModuleNameComp.java");
-		checkCode(result, resourceDir, "build_ModuleName.xml");
-		checkCode(result, resourceDir, "ModuleName.java");
-		checkCode(result, resourceDir, "ModuleNameImpl.java");
-		checkCode(result, resourceDir, "MyServiceSVC_impl.java");
-		checkCode(result, resourceDir, "README.ModuleName");
-	}
-}

Deleted: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/MultiTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/MultiTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/MultiTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,173 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.java._test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import jp.go.aist.rtm.rtcbuilder.Generator;
-import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
-import jp.go.aist.rtm.rtcbuilder.generator.param.DataPortParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortInterfaceParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortParam;
-import jp.go.aist.rtm.rtcbuilder.java.IRtcBuilderConstantsJava;
-import jp.go.aist.rtm.rtcbuilder.java.manager.JavaGenerateManager;
-import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
-
-public class MultiTest extends TestBase {
-	private RtcParam rtcParam;
-	private GeneratorParam genParam;
-
-	protected void setUp() throws Exception {
-		genParam = new GeneratorParam();
-		rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsJava.LANG_JAVA);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsJava.LANG_JAVA_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("test module");
-		rtcParam.setVersion("1.0.1");
-		rtcParam.setVender("TA");
-		rtcParam.setCategory("sample");
-		rtcParam.setComponentType("STATIC");
-		rtcParam.setActivityType("PERIODIC");
-		rtcParam.setMaxInstance(2);
-		rtcParam.setRtmVersion("0.4.2");
-		genParam.getRtcParams().add(rtcParam);
-	}
-
-	public void testProConMulti() throws Exception{
-		List<DataPortParam> dataInport = new ArrayList<DataPortParam>(); 
-		dataInport.add(new DataPortParam("in1", "RTC::TimedShort", "", 0));
-		rtcParam.getInports().addAll(dataInport);
-
-		List<DataPortParam> dataOutport = new ArrayList<DataPortParam>(); 
-		dataOutport.add(new DataPortParam("out1", "RTC::TimedLong", "", 0));
-		rtcParam.getOutports().addAll(dataOutport);
-
-		ServicePortParam service1 = new ServicePortParam("MySVPro",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "myserviceP1", "", "", 
-				rootPath + "resource\\Java\\Multi\\MyService.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-
-		ServicePortParam service2 = new ServicePortParam("MySVPro2",0);
-		List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service1, "myserviceP2", "", "", 
-				rootPath + "resource\\Java\\Multi\\MyService2.idl", "MyService2", "", 0);
-		srvinterts2.add(int2);
-		service2.getServicePortInterfaces().addAll(srvinterts2);
-		srvports.add(service2);
-
-		ServicePortParam service3 = new ServicePortParam("MyConPro",0);
-		List<ServicePortInterfaceParam> srvintert3 = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int3 = new ServicePortInterfaceParam(service1, "myservice0", "", "", 
-				rootPath + "resource\\Java\\Multi\\MyService.idl", "MyService", "", 1);
-		srvintert3.add(int3);
-		service3.getServicePortInterfaces().addAll(srvintert3);
-		srvports.add(service3);
-
-		ServicePortParam service4 = new ServicePortParam("MyConPro2",0);
-		List<ServicePortInterfaceParam> srvinterts4 = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int4 = new ServicePortInterfaceParam(service1, "myservice2", "", "", 
-				rootPath + "resource\\Java\\Multi\\DAQService.idl", "DAQService", "", 1);
-		srvinterts4.add(int4);
-		service4.getServicePortInterfaces().addAll(srvinterts4);
-		srvports.add(service4);
-		rtcParam.getServicePorts().addAll(srvports);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\Multi\\ProConMulti\\";
-		checkResults(result, resourceDir);
-		checkCode(result, resourceDir, "MyServiceSVC_impl.java");
-		checkCode(result, resourceDir, "MyService2SVC_impl.java");
-	}
-
-	public void testConsumerMulti() throws Exception{
-		List<DataPortParam> dataInport = new ArrayList<DataPortParam>(); 
-		dataInport.add(new DataPortParam("in1", "RTC::TimedShort", "", 0));
-		rtcParam.getInports().addAll(dataInport);
-
-		List<DataPortParam> dataOutport = new ArrayList<DataPortParam>(); 
-		dataOutport.add(new DataPortParam("out1", "RTC::TimedLong", "", 0));
-		rtcParam.getOutports().addAll(dataOutport);
-
-		ServicePortParam service1 = new ServicePortParam("MyConPro",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "myservice0", "", "", 
-				rootPath + "resource\\Java\\Multi\\MyService.idl", "MyService", "", 1);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-
-		ServicePortParam service2 = new ServicePortParam("MyConPro2",0);
-		List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service1, "myservice2", "", "", 
-				rootPath + "resource\\Java\\Multi\\DAQService.idl", "DAQService", "", 1);
-		srvinterts2.add(int2);
-		service2.getServicePortInterfaces().addAll(srvinterts2);
-		srvports.add(service2);
-		rtcParam.getServicePorts().addAll(srvports);
-		
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\Multi\\ConMulti\\";
-		checkResults(result, resourceDir);
-	}
-
-	public void testProviderMulti() throws Exception{
-		List<DataPortParam> dataInport = new ArrayList<DataPortParam>(); 
-		dataInport.add(new DataPortParam("in1", "RTC::TimedShort", "", 0));
-		rtcParam.getInports().addAll(dataInport);
-
-		List<DataPortParam> dataOutport = new ArrayList<DataPortParam>(); 
-		dataOutport.add(new DataPortParam("out1", "RTC::TimedLong", "", 0));
-		rtcParam.getOutports().addAll(dataOutport);
-
-		ServicePortParam service1 = new ServicePortParam("MySVPro",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "myservice0", "", "", 
-				rootPath + "resource\\Java\\Multi\\MyService.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-
-		ServicePortParam service2 = new ServicePortParam("MySVPro2",0);
-		List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service1, "myservice2", "", "", 
-				rootPath + "resource\\Java\\Multi\\DAQService.idl", "DAQService", "", 0);
-		srvinterts2.add(int2);
-		service2.getServicePortInterfaces().addAll(srvinterts2);
-		srvports.add(service2);
-		rtcParam.getServicePorts().addAll(srvports);
-		
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\Multi\\ProMulti\\";
-		checkResults(result, resourceDir);
-		checkCode(result, resourceDir, "MyServiceSVC_impl.java");
-		checkCode(result, resourceDir, "DAQServiceSVC_impl.java");
-	}
-	private void checkResults(List<GeneratedResult> result, String resourceDir) {
-		checkCode(result, resourceDir, "fooComp.java");
-		checkCode(result, resourceDir, "build_foo.xml");
-		checkCode(result, resourceDir, "foo.java");
-		checkCode(result, resourceDir, "fooImpl.java");
-		checkCode(result, resourceDir, "README.foo");
-	}
-}

Deleted: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/VarTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/VarTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/VarTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,183 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.java._test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import jp.go.aist.rtm.rtcbuilder.Generator;
-import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ConfigSetParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.DataPortParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortInterfaceParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortParam;
-import jp.go.aist.rtm.rtcbuilder.java.IRtcBuilderConstantsJava;
-import jp.go.aist.rtm.rtcbuilder.java.manager.JavaGenerateManager;
-import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
-
-public class VarTest extends TestBase {
-	private RtcParam rtcParam;
-	private GeneratorParam genParam;
-
-	protected void setUp() throws Exception {
-		genParam = new GeneratorParam();
-		rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsJava.LANG_JAVA);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsJava.LANG_JAVA_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("MDesc");
-		rtcParam.setRtmVersion("0.4.2");
-	}
-
-	public void testConfigSetVar() throws Exception{
-		rtcParam.setVersion("1.0.3");
-		rtcParam.setVender("TA2");
-		rtcParam.setCategory("manip2");
-		rtcParam.setComponentType("STATIC2");
-		rtcParam.setActivityType("PERIODIC2");
-		rtcParam.setMaxInstance(3);
-
-		genParam.getRtcParams().add(rtcParam);
-		List<ConfigSetParam> configset = new ArrayList<ConfigSetParam>(); 
-		configset.add(new ConfigSetParam("int_param0","int","varname1","0"));
-		configset.add(new ConfigSetParam("int_param1","int","","1"));
-		configset.add(new ConfigSetParam("double_param0","double","varname2","0.11"));
-		configset.add(new ConfigSetParam("str_param0","String","","hoge"));
-		configset.add(new ConfigSetParam("str_param1","String","varname3","dara"));
-		rtcParam.getConfigParams().addAll(configset);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\ConfigSet\\ConfigVar\\";
-		checkResults(result, resourceDir);
-	}
-	public void testConfigSetOriginal() throws Exception{
-		rtcParam.setVersion("1.0.3");
-		rtcParam.setVender("TA2");
-		rtcParam.setCategory("manip2");
-		rtcParam.setComponentType("STATIC2");
-		rtcParam.setActivityType("PERIODIC2");
-		rtcParam.setMaxInstance(3);
-
-		genParam.getRtcParams().add(rtcParam);
-		List<ConfigSetParam> configset = new ArrayList<ConfigSetParam>(); 
-		configset.add(new ConfigSetParam("int_param0","int","","0"));
-		configset.add(new ConfigSetParam("int_param1","int","","1"));
-		configset.add(new ConfigSetParam("double_param0","double","","0.11"));
-		configset.add(new ConfigSetParam("str_param0","String","","hoge"));
-		configset.add(new ConfigSetParam("str_param1","String","","dara"));
-		rtcParam.getConfigParams().addAll(configset);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\ConfigSet\\configset3\\";
-		checkResults(result, resourceDir);
-	}
-
-	public void testDataPortVar() throws Exception{
-		rtcParam.setVersion("1.0.1");
-		rtcParam.setVender("TA");
-		rtcParam.setCategory("Manip");
-		rtcParam.setComponentType("STATIC2");
-		rtcParam.setActivityType("PERIODIC2");
-		rtcParam.setMaxInstance(5);
-		genParam.getRtcParams().add(rtcParam);
-		List<DataPortParam> dataport = new ArrayList<DataPortParam>(); 
-		dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "InName1", 0));
-		dataport.add(new DataPortParam("InP2", "RTC::TimedLong", "InNm2", 0));
-		rtcParam.getInports().addAll(dataport);
-		List<DataPortParam> outport = new ArrayList<DataPortParam>(); 
-		outport.add(new DataPortParam("OutP1", "RTC::TimedLong", "OutName1", 0));
-		outport.add(new DataPortParam("OutP2", "RTC::TimedFloat", "OutNme2", 0));
-		rtcParam.getOutports().addAll(outport);
-
-		ServicePortParam service1 = new ServicePortParam("svPort",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "acc", "", "", 
-				rootPath + "\\resource\\MyService.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		
-		ServicePortParam service2 = new ServicePortParam("cmPort",0);
-		List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service2, "rate", "", "", 
-				rootPath + "\\resource\\DAQService.idl", "DAQService", "", 1);
-		srvinterts2.add(int2);
-		service2.getServicePortInterfaces().addAll(srvinterts2);
-		srvports.add(service2);
-		
-		rtcParam.getServicePorts().addAll(srvports);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\PortVar\\";
-		checkResults(result, resourceDir);
-		checkCode(result, resourceDir, "MyServiceSVC_impl.java");
-	}
-	
-	public void testOriginalPort() throws Exception{
-		rtcParam.setVersion("1.0.1");
-		rtcParam.setVender("TA");
-		rtcParam.setCategory("Manip");
-		rtcParam.setComponentType("STATIC2");
-		rtcParam.setActivityType("PERIODIC2");
-		rtcParam.setMaxInstance(5);
-		genParam.getRtcParams().add(rtcParam);
-		List<DataPortParam> dataport = new ArrayList<DataPortParam>(); 
-		dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
-		dataport.add(new DataPortParam("InP2", "RTC::TimedLong", "", 0));
-		rtcParam.getInports().addAll(dataport);
-		List<DataPortParam> outport = new ArrayList<DataPortParam>(); 
-		outport.add(new DataPortParam("OutP1", "RTC::TimedLong", "", 0));
-		outport.add(new DataPortParam("OutP2", "RTC::TimedFloat", "", 0));
-		rtcParam.getOutports().addAll(outport);
-
-		ServicePortParam service1 = new ServicePortParam("svPort",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "acc", "", "", 
-				rootPath + "\\resource\\MyService.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		
-		ServicePortParam service2 = new ServicePortParam("cmPort",0);
-		List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service2, "rate", "", "", 
-				rootPath + "\\resource\\DAQService.idl", "DAQService", "", 1);
-		srvinterts2.add(int2);
-		service2.getServicePortInterfaces().addAll(srvinterts2);
-		srvports.add(service2);
-		
-		rtcParam.getServicePorts().addAll(srvports);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new JavaGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Java\\service2\\";
-		checkResults(result, resourceDir);
-		checkCode(result, resourceDir, "MyServiceSVC_impl.java");
-	}
-	
-	private void checkResults(List<GeneratedResult> result, String resourceDir) {
-		checkCode(result, resourceDir, "fooComp.java");
-		checkCode(result, resourceDir, "build_foo.xml");
-		checkCode(result, resourceDir, "foo.java");
-		checkCode(result, resourceDir, "fooImpl.java");
-		checkCode(result, resourceDir, "README.foo");
-	}
-}

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/BaseTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/BaseTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/BaseTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -83,7 +83,7 @@
 
 		String resourceDir = rootPath + "/resource/100/base/service2/";
 
-		assertEquals(19, result.size());
+		assertEquals(34, result.size());
 		checkCode(result, resourceDir, "src/fooComp.java");
 		checkCode(result, resourceDir, "src/foo.java");
 		checkCode(result, resourceDir, "src/fooImpl.java");
@@ -127,7 +127,7 @@
 
 		String resourceDir = rootPath + "/resource/100/base/service1/";
 
-		assertEquals(19, result.size());
+		assertEquals(34, result.size());
 		checkCode(result, resourceDir, "src/fooComp.java");
 		checkCode(result, resourceDir, "src/foo.java");
 		checkCode(result, resourceDir, "src/fooImpl.java");
@@ -160,7 +160,7 @@
 
 		String resourceDir = rootPath + "/resource/100/base/outport2/";
 
-		assertEquals(18, result.size());
+		assertEquals(33, result.size());
 		checkCode(result, resourceDir, "src/fooComp.java");
 		checkCode(result, resourceDir, "src/foo.java");
 		checkCode(result, resourceDir, "src/fooImpl.java");
@@ -192,7 +192,7 @@
 
 		String resourceDir = rootPath + "/resource/100/base/outport1/";
 
-		assertEquals(18, result.size());
+		assertEquals(33, result.size());
 		checkCode(result, resourceDir, "src/fooComp.java");
 		checkCode(result, resourceDir, "src/foo.java");
 		checkCode(result, resourceDir, "src/fooImpl.java");
@@ -221,7 +221,7 @@
 
 		String resourceDir = rootPath + "/resource/100/base/inport2/";
 
-		assertEquals(18, result.size());
+		assertEquals(33, result.size());
 		checkCode(result, resourceDir, "src/fooComp.java");
 		checkCode(result, resourceDir, "src/foo.java");
 		checkCode(result, resourceDir, "src/fooImpl.java");
@@ -249,7 +249,7 @@
 
 		String resourceDir = rootPath + "/resource/100/base/inport1/";
 
-		assertEquals(18, result.size());
+		assertEquals(33, result.size());
 		checkCode(result, resourceDir, "src/fooComp.java");
 		checkCode(result, resourceDir, "src/foo.java");
 		checkCode(result, resourceDir, "src/fooImpl.java");
@@ -273,7 +273,7 @@
 
 		String resourceDir = rootPath + "/resource/100/base/name/";
 
-		assertEquals(18, result.size());
+		assertEquals(33, result.size());
 		checkCode(result, resourceDir, "src/fooComp.java");
 		checkCode(result, resourceDir, "src/foo.java");
 		checkCode(result, resourceDir, "src/fooImpl.java");

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/BuildTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/BuildTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/BuildTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -89,7 +89,7 @@
 
 		String resourceDir = fixturePath(name) + "/";
 
-		assertEquals(19, result.size());
+		assertEquals(34, result.size());
 		checkCode(result, resourceDir, "src/fooComp.java");
 		checkCode(result, resourceDir, "src/foo.java");
 		checkCode(result, resourceDir, "src/fooImpl.java");
@@ -97,17 +97,17 @@
 		checkCode(result, resourceDir, "foo.sh");
 		checkCode(result, resourceDir, "foo.bat");
 		//
-		checkCode(result, resourceDir, "CMakeLists.txt");
-		checkCode(result, resourceDir, "Doxyfile.in");
-		checkCode(result, resourceDir, "cmake_modules/cmake_uninstall.cmake.in");
-		checkCode(result, resourceDir,
-				"cmake_modules/cmake_javacompile.cmake.in");
-		checkCode(result, resourceDir, "cmake_modules/CPackWIX.cmake");
-		checkCode(result, resourceDir, "cmake_modules/FindOpenRTMJava.cmake");
-		checkCode(result, resourceDir, "cpack_resources/Description.txt");
-		checkCode(result, resourceDir, "cpack_resources/License.txt");
-		checkCode(result, resourceDir, "cpack_resources/License.rtf");
-		checkCode(result, resourceDir, "cpack_resources/wix.xsl.in");
+//		checkCode(result, resourceDir, "CMakeLists.txt");
+//		checkCode(result, resourceDir, "Doxyfile.in");
+//		checkCode(result, resourceDir, "cmake_modules/cmake_uninstall.cmake.in");
+//		checkCode(result, resourceDir,
+//				"cmake_modules/cmake_javacompile.cmake.in");
+//		checkCode(result, resourceDir, "cmake_modules/CPackWIX.cmake");
+//		checkCode(result, resourceDir, "cmake_modules/FindOpenRTMJava.cmake");
+//		checkCode(result, resourceDir, "cpack_resources/Description.txt");
+//		checkCode(result, resourceDir, "cpack_resources/License.txt");
+//		checkCode(result, resourceDir, "cpack_resources/License.rtf");
+//		checkCode(result, resourceDir, "cpack_resources/wix.xsl.in");
 		//
 		checkCode(result, resourceDir, "build_foo.xml");
 	}
@@ -163,7 +163,7 @@
 
 		String resourceDir = fixturePath(name) + "/";
 
-		assertEquals(23, result.size());
+		assertEquals(38, result.size());
 		checkCode(result, resourceDir, "src/fooComp.java");
 		checkCode(result, resourceDir, "src/foo.java");
 		checkCode(result, resourceDir, "src/fooImpl.java");
@@ -171,17 +171,17 @@
 		checkCode(result, resourceDir, "foo.sh");
 		checkCode(result, resourceDir, "foo.bat");
 		//
-		checkCode(result, resourceDir, "CMakeLists.txt");
-		checkCode(result, resourceDir, "Doxyfile.in");
-		checkCode(result, resourceDir, "cmake_modules/cmake_uninstall.cmake.in");
-		checkCode(result, resourceDir,
-				"cmake_modules/cmake_javacompile.cmake.in");
-		checkCode(result, resourceDir, "cmake_modules/CPackWIX.cmake");
-		checkCode(result, resourceDir, "cmake_modules/FindOpenRTMJava.cmake");
-		checkCode(result, resourceDir, "cpack_resources/Description.txt");
-		checkCode(result, resourceDir, "cpack_resources/License.txt");
-		checkCode(result, resourceDir, "cpack_resources/License.rtf");
-		checkCode(result, resourceDir, "cpack_resources/wix.xsl.in");
+//		checkCode(result, resourceDir, "CMakeLists.txt");
+//		checkCode(result, resourceDir, "Doxyfile.in");
+//		checkCode(result, resourceDir, "cmake_modules/cmake_uninstall.cmake.in");
+//		checkCode(result, resourceDir,
+//				"cmake_modules/cmake_javacompile.cmake.in");
+//		checkCode(result, resourceDir, "cmake_modules/CPackWIX.cmake");
+//		checkCode(result, resourceDir, "cmake_modules/FindOpenRTMJava.cmake");
+//		checkCode(result, resourceDir, "cpack_resources/Description.txt");
+//		checkCode(result, resourceDir, "cpack_resources/License.txt");
+//		checkCode(result, resourceDir, "cpack_resources/License.rtf");
+//		checkCode(result, resourceDir, "cpack_resources/wix.xsl.in");
 		//
 		checkCode(result, resourceDir, "build_foo.xml");
 	}

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/ConfigSetTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/ConfigSetTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/ConfigSetTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -56,7 +56,7 @@
 
 		String targetDir = rootPath + "/resource/100/ConfigSet/AIST6/";
 
-		assertEquals(18, result.size());
+		assertEquals(33, result.size());
 		checkCode(result, targetDir, "src/ModuleNameComp.java");
 		checkCode(result, targetDir, "src/ModuleName.java");
 		checkCode(result, targetDir, "src/ModuleNameImpl.java");
@@ -83,7 +83,7 @@
 
 		String resourceDir = rootPath + "/resource/100/ConfigSet/configset1/";
 
-		assertEquals(18, result.size());
+		assertEquals(33, result.size());
 		checkCode(result, resourceDir, "src/fooComp.java");
 		checkCode(result, resourceDir, "src/foo.java");
 		checkCode(result, resourceDir, "src/fooImpl.java");
@@ -112,7 +112,7 @@
 
 		String resourceDir = rootPath + "/resource/100/ConfigSet/configset2/";
 
-		assertEquals(18, result.size());
+		assertEquals(33, result.size());
 		checkCode(result, resourceDir, "src/fooComp.java");
 		checkCode(result, resourceDir, "src/foo.java");
 		checkCode(result, resourceDir, "src/fooImpl.java");
@@ -144,7 +144,7 @@
 
 		String resourceDir = rootPath + "/resource/100/ConfigSet/configset3/";
 
-		assertEquals(18, result.size());
+		assertEquals(33, result.size());
 		checkCode(result, resourceDir, "src/fooComp.java");
 		checkCode(result, resourceDir, "src/foo.java");
 		checkCode(result, resourceDir, "src/fooImpl.java");
@@ -178,7 +178,7 @@
 		String resourceDir = rootPath
 				+ "/resource/100/ConfigSet/ConfigSetType/";
 
-		assertEquals(18, result.size());
+		assertEquals(33, result.size());
 		checkCode(result, resourceDir, "src/fooComp.java");
 		checkCode(result, resourceDir, "src/foo.java");
 		checkCode(result, resourceDir, "src/fooImpl.java");

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/JavaIDLInheritTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/JavaIDLInheritTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/JavaIDLInheritTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -81,7 +81,7 @@
 
 		String resourceDir = fixturePath(name) + "/";
 
-		assertEquals(21, result.size());
+		assertEquals(36, result.size());
 		checkCode(result, resourceDir, "src/fooComp.java");
 		checkCode(result, resourceDir, "src/foo.java");
 		checkCode(result, resourceDir, "src/fooImpl.java");
@@ -133,7 +133,7 @@
 
 		String resourceDir = fixturePath(name) + "/";
 
-		assertEquals(23, result.size());
+		assertEquals(38, result.size());
 		checkCode(result, resourceDir, "src/fooComp.java");
 		checkCode(result, resourceDir, "src/foo.java");
 		checkCode(result, resourceDir, "src/fooImpl.java");

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/ModuleTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/ModuleTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/ModuleTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -63,7 +63,7 @@
 
 		String resourceDir = rootPath + "/resource/100/module/serviceM/";
 
-		assertEquals(19, result.size());
+		assertEquals(34, result.size());
 		checkCode(result, resourceDir, "src/fooComp.java");
 		checkCode(result, resourceDir, "src/foo.java");
 		checkCode(result, resourceDir, "src/fooImpl.java");
@@ -99,7 +99,7 @@
 
 		String resourceDir = rootPath + "/resource/100/module/serviceCon/";
 
-		assertEquals(18, result.size());
+		assertEquals(33, result.size());
 		checkCode(result, resourceDir, "src/fooComp.java");
 		checkCode(result, resourceDir, "src/foo.java");
 		checkCode(result, resourceDir, "src/fooImpl.java");
@@ -146,7 +146,7 @@
 
 		String resourceDir = rootPath + "/resource/100/module/serviceMC/";
 
-		assertEquals(19, result.size());
+		assertEquals(34, result.size());
 		checkCode(result, resourceDir, "src/fooComp.java");
 		checkCode(result, resourceDir, "src/foo.java");
 		checkCode(result, resourceDir, "src/fooImpl.java");

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/MultiTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/MultiTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/MultiTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -102,7 +102,7 @@
 
 		String resourceDir = rootPath + "/resource/100/Multi/ProConMulti/";
 
-		assertEquals(20, result.size());
+		assertEquals(35, result.size());
 		checkCode(result, resourceDir, "src/fooComp.java");
 		checkCode(result, resourceDir, "src/foo.java");
 		checkCode(result, resourceDir, "src/fooImpl.java");
@@ -157,7 +157,7 @@
 
 		String resourceDir = rootPath + "/resource/100/Multi/ConMulti/";
 
-		assertEquals(18, result.size());
+		assertEquals(33, result.size());
 		checkCode(result, resourceDir, "src/fooComp.java");
 		checkCode(result, resourceDir, "src/foo.java");
 		checkCode(result, resourceDir, "src/fooImpl.java");
@@ -210,7 +210,7 @@
 
 		String resourceDir = rootPath + "/resource/100/Multi/ProMulti/";
 
-		assertEquals(20, result.size());
+		assertEquals(35, result.size());
 		checkCode(result, resourceDir, "src/fooComp.java");
 		checkCode(result, resourceDir, "src/foo.java");
 		checkCode(result, resourceDir, "src/fooImpl.java");

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.nl1/META-INF/MANIFEST.MF
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.nl1/META-INF/MANIFEST.MF	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.nl1/META-INF/MANIFEST.MF	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,8 +1,13 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: RTC Builder Nl1 Fragment
-Bundle-SymbolicName: jp.go.aist.rtm.rtcbuilder.nl1
-Bundle-Version: 1.1.0.v20110411
-Fragment-Host: jp.go.aist.rtm.rtcbuilder;bundle-version="1.0.0"
-Bundle-Localization: plugin
-Bundle-Vendor: AIST
+Manifest-Version: 1.0
+Ant-Version: Apache Ant 1.7.1
+Created-By: 20.0-b12 (Sun Microsystems Inc.)
+Bundle-ManifestVersion: 2
+Bundle-Name: RTC Builder Nl1 Fragment
+Bundle-SymbolicName: jp.go.aist.rtm.rtcbuilder.nl1
+Bundle-Version: 1.1.0.rc4v20130124
+Fragment-Host: jp.go.aist.rtm.rtcbuilder;bundle-version="1.1.0"
+Bundle-Localization: plugin
+Bundle-Vendor: AIST
+Built-By: n-ando
+Built-Date: 2013/01/25 00:47:15
+

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.nl1/build.xml
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.nl1/build.xml	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.nl1/build.xml	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,6 +1,8 @@
-<project name="jp.go.aist.rtm.rtcbuilder.nl1_1.0.0" default="jar">
-	<property name="target.name" value="jp.go.aist.rtm.rtcbuilder.nl1_1.0.0"/>
+<project name="jp.go.aist.rtm.rtcbuilder.nl1" default="jar">
+	<property name="target.name" value="jp.go.aist.rtm.rtcbuilder.nl1" />
 
+	<taskdef name="manifesttask" classname="aist.ManifestTask" />
+
 	<property name="source" value="src"/>
 
 	<property name="dist.dir" value="jar" />
@@ -14,6 +16,9 @@
 	<property name="targetPlatformLocation" value="${eclipse.home}" />
 	<property name="workspace" value="${basedir}/.." />
 	<property name="project.name" value="jp.go.aist.rtm.toolscommon" />
+	<tstamp>
+		<format property="built.date" pattern="yyyy/MM/dd HH:mm:ss" />
+	</tstamp>
 
 	<target name="buildAll">
 		<!--
@@ -25,24 +30,43 @@
 
 
 	<target name="clean" description="ビルドで生成されたファイルを削除します">
-		<delete includeEmptyDirs="true">
+		<delete includeEmptyDirs="true" quiet="true">
 			<fileset dir="${build.dir}" includes="**/*.class" />
 		</delete>
+		<delete dir="${dist.dir}" quiet="true"/>
 	</target>
 
 	<target name="compile" description="ソースをコンパイルします">
 		<getEclipseClasspath pathid="build.classpath" targetplatformlocation="${targetPlatformLocation}"
 					workspace="${workspace}" projectname="${project.name}"/>
 		<javac srcdir="${source}" destdir="${build.dir}"
-			classpathref="build.classpath" classpath="lib/commons-lang-2.2.jar" encoding="Shift_JIS" />
+			classpathref="build.classpath" classpath="lib/commons-lang-2.2.jar" encoding="UTF-8" />
 	</target>
 
 	<target name="jar" description="jarファイルを作成します">
 		<mkdir dir="${dist.dir}" />
-		<delete file="${dist.dir}/${target.name}.jar" />
-
-		<jar destfile="${dist.dir}/${target.name}.jar" manifest="META-INF/MANIFEST.MF">
+		<delete>
+			<fileset dir="${dist.dir}" includes="${target.name}_*.jar" />
+		</delete>
+		<!-- Version settings -->
+		<manifesttask file="META-INF/MANIFEST.MF" key="Bundle-Version" property="manifest.project.version" />
+		<condition property="project.version"
+                   value="${env.PROJECT_VERSION}"
+                   else="${manifest.project.version}">
+			<isset property="env.PROJECT_VERSION" />
+		</condition>
+		<property name="jar.version" value="_${project.version}"/>
+		<property name="jar.name" value="${target.name}${jar.version}"/>
+		<!-- Updating MANIFEST.MF -->
+		<manifest file="META-INF/MANIFEST.MF" mode="update">
+			<attribute name="Bundle-Version" value="${project.version}"/>
+			<attribute name="Built-By" value="${user.name}"/>
+			<attribute name="Built-Date" value="${built.date}"/>
+		</manifest>
+		<!-- Creating a jar file -->
+		<jar destfile="${dist.dir}/${jar.name}.jar" manifest="META-INF/MANIFEST.MF">
 			<fileset dir="${source}" />
 		</jar>
 	</target>
+
 </project>

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.nl1/src/jp/go/aist/rtm/rtcbuilder/nl/messages_ja.properties
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.nl1/src/jp/go/aist/rtm/rtcbuilder/nl/messages_ja.properties	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.nl1/src/jp/go/aist/rtm/rtcbuilder/nl/messages_ja.properties	2013-01-29 10:39:20 UTC (rev 394)
@@ -262,7 +262,8 @@
 IMessageConstants.CONFIGURATION_HINT_UNIT_TITLE=\u5358\u4f4d\uff1a
 IMessageConstants.CONFIGURATION_HINT_UNIT_DESC=\u30b3\u30f3\u30d5\u30a3\u30ae\u30e5\u30ec\u30fc\u30b7\u30e7\u30f3\u30fb\u30d1\u30e9\u30e1\u30fc\u30bf\u306e\u5358\u4f4d\u3092\u6307\u5b9a\u3057\u307e\u3059\u3002
 IMessageConstants.CONFIGURATION_HINT_WIDGET_TITLE=Widget\uff1a
-IMessageConstants.CONFIGURATION_HINT_WIDGET_DESC=\u30b3\u30f3\u30d5\u30a3\u30ae\u30e5\u30ec\u30fc\u30b7\u30e7\u30f3\u30fb\u30d1\u30e9\u30e1\u30fc\u30bf\u8a2d\u5b9a\u6642\u306b\u5229\u7528\u3059\u308b\u30a6\u30a3\u30b8\u30c3\u30c8\u3092\u6307\u5b9a\u3057\u307e\u3059\u3002
+IMessageConstants.CONFIGURATION_HINT_WIDGET_DESC_P1=\u30b3\u30f3\u30d5\u30a3\u30ae\u30e5\u30ec\u30fc\u30b7\u30e7\u30f3\u30fb\u30d1\u30e9\u30e1\u30fc\u30bf\u8a2d\u5b9a\u6642\u306b\u5229\u7528\u3059\u308b\u30a6\u30a3\u30b8\u30c3\u30c8\u3092\u6307\u5b9a\u3057\u307e\u3059\u3002
+IMessageConstants.CONFIGURATION_HINT_WIDGET_DESC_P2=(Widget\u30bf\u30a4\u30d7\u3068\u3057\u3066\uff62radio\uff63\u3092\u6307\u5b9a\u3059\u308b\u5834\u5408\u306b\u306f\u3001\u5236\u7d04\u6761\u4ef6\u3068\u3057\u3066enum\u578b\u3092\u6307\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002)
 IMessageConstants.CONFIGURATION_HINT_STEP_TITLE=Step\uff1a
 IMessageConstants.CONFIGURATION_HINT_STEP_DESC_P1=\u8a2d\u5b9a\u7528\u30a6\u30a3\u30b8\u30c3\u30c8\u3068\u3057\u3066\uff62slider\uff63\u3092\u9078\u629e\u3057\u305f\u5834\u5408\u306e\u6700\u5c0f\u30b9\u30c6\u30c3\u30d7\u3092\u6307\u5b9a\u3057\u307e\u3059\u3002
 IMessageConstants.CONFIGURATION_HINT_STEP_DESC_P2=
@@ -407,16 +408,11 @@
 IMessageConstants.PROFILE_COMPARE_MESSAGE_P2=\u5909\u66f4\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b\uff1f
 
 IMessageConstants.CREATE_FILE_ERROR=\u30d5\u30a1\u30a4\u30eb\u306e\u4f5c\u6210\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
-
-
 IMessageConstants.FILETYPE_YAML=YAML\u5f62\u5f0f
-
-
 IMessageConstants.COMPARE_TITLE=\u7d50\u679c\u6bd4\u8f03
-
-
 IMessageConstants.COMMON_LABEL_UPDATE=Update
 
+IMessageConstants.BACKUP_FILE_NUM=\u30d0\u30c3\u30af\u30a2\u30c3\u30d7\u30d5\u30a1\u30a4\u30eb\u6700\u5927\u6570 :
 
 IMessageConstants.TITLE_FONT=\uff2d\uff33 \u30b4\u30b7\u30c3\u30af
 
@@ -424,6 +420,9 @@
 
 IMessageConstants.SELECT_DIRECTORY=\u51fa\u529b\u5148\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u9078\u629e
 
+IMessageConstants.SAVE_MESSAGE=\u5bfe\u8c61\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306f\u5909\u66f4\u3055\u308c\u3066\u3044\u307e\u3059\u3002\u5909\u66f4\u3092\u4fdd\u7ba1\u3057\u307e\u3059\u304b\uff1f
+IMessageConstants.IDL_PARSE_EROOR=IDL\u30d5\u30a1\u30a4\u30eb\u306e\u30d1\u30fc\u30b9\u306b\u5931\u6557\u3057\u307e\u3057\u305f\uff61
+
 IRTCBMessageConstants.VALIDATE_ERROR_OUTPUTPROJECT=OutputProject\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
 IRTCBMessageConstants.VALIDATE_ERROR_COMPONENTNAME=Component Name\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
 IRTCBMessageConstants.VALIDATE_ERROR_PORTSAMENAME=Port\u306b\u540c\u3058\u540d\u524d\u304c\u5b58\u5728\u3057\u307e\u3059\u3002 :
@@ -468,6 +467,8 @@
 IPreferenceMessageConstants.CODE_GEN_TITLE_CONFIG=Configuration
 IPreferenceMessageConstants.CODE_GEN_TITLE_PRESUFFIX=\u63a5\u982d\u8a9e\u30fb\u63a5\u5c3e\u8a9e
 
+IPreferenceMessageConstants.CODE_GEN_TITLE_BACKUP=\u30d0\u30c3\u30af\u30a2\u30c3\u30d7
+
 IPreferenceMessageConstants.CONFIG_CLMN_CONFIGURATION=Configuration
 IPreferenceMessageConstants.CONFIG_CLMN_DEFAUT_VALUE=\u30c7\u30d5\u30a9\u30eb\u30c8\u5024
 IPreferenceMessageConstants.CONFIG_BTN_ADD=Add

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/META-INF/MANIFEST.MF
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/META-INF/MANIFEST.MF	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/META-INF/MANIFEST.MF	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,18 +1,22 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: jp.go.aist.rtm.rtcbuilder.python;singleton:=true
-Bundle-Version: 1.1.0.v20110411
-Bundle-Activator: jp.go.aist.rtm.rtcbuilder.python.RtcBuilderPythonPlugin
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- jp.go.aist.rtm.rtcbuilder
-Eclipse-LazyStart: true
-Bundle-Vendor: %providerName
-Export-Package: jp.go.aist.rtm.rtcbuilder.python,
- jp.go.aist.rtm.rtcbuilder.python.manager,
- jp.go.aist.rtm.rtcbuilder.python.template.cmake,
- jp.go.aist.rtm.rtcbuilder.python.template.python,
- jp.go.aist.rtm.rtcbuilder.python.template.python_04
-Eclipse-BuddyPolicy: registered
+Manifest-Version: 1.0
+Ant-Version: Apache Ant 1.7.1
+Created-By: 20.0-b12 (Sun Microsystems Inc.)
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: jp.go.aist.rtm.rtcbuilder.python;singleton:=true
+Bundle-Version: 1.1.0.rc4v20130124
+Bundle-Activator: jp.go.aist.rtm.rtcbuilder.python.RtcBuilderPythonPlu
+ gin
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,jp.go.aist.rtm
+ .rtcbuilder
+Eclipse-LazyStart: true
+Bundle-Vendor: %providerName
+Export-Package: jp.go.aist.rtm.rtcbuilder.python,jp.go.aist.rtm.rtcbui
+ lder.python.manager,jp.go.aist.rtm.rtcbuilder.python.template.cmake,j
+ p.go.aist.rtm.rtcbuilder.python.template.python,jp.go.aist.rtm.rtcbui
+ lder.python.template.python_04
+Eclipse-BuddyPolicy: registered
+Built-By: n-ando
+Built-Date: 2013/01/25 00:47:18
+

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/build.xml
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/build.xml	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/build.xml	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,6 +1,8 @@
-<project name="jp.go.aist.rtm.rtcbuilder.python_1.0.0" default="jar">
-	<property name="target.name" value="jp.go.aist.rtm.rtcbuilder.python_1.0.0"/>
+<project name="jp.go.aist.rtm.rtcbuilder.python" default="jar">
+	<property name="target.name" value="jp.go.aist.rtm.rtcbuilder.python" />
 
+	<taskdef name="manifesttask" classname="aist.ManifestTask" />
+
 	<property name="source" value="src"/>
 
 	<property name="dist.dir" value="jar" />
@@ -15,6 +17,9 @@
 	<property name="targetPlatformLocation" value="${eclipse.home}" />
 	<property name="workspace" value="${basedir}/.." />
 	<property name="project.name" value="jp.go.aist.rtm.rtcbuilder.python" />
+	<tstamp>
+		<format property="built.date" pattern="yyyy/MM/dd HH:mm:ss" />
+	</tstamp>
 
 	<target name="buildAll">
 		<antcall target="clean" />
@@ -23,29 +28,50 @@
 	</target>
 
 	<target name="clean" description="ビルドで生成されたファイルを削除します">
-		<delete includeEmptyDirs="true">
+		<delete includeEmptyDirs="true" quiet="true">
 			<fileset dir="${build.dir}" includes="**/*.class" />
+			<fileset dir="." includes="**/*.log" />
 		</delete>
+		<delete dir="${build.dir}/jp" quiet="true"/>
+		<delete dir="${dist.dir}" quiet="true"/>
 	</target>
 
 	<target name="compile" description="ソースをコンパイルします">
 		<getEclipseClasspath pathid="build.classpath" targetplatformlocation="${targetPlatformLocation}"
 					workspace="${workspace}" projectname="${project.name}"/>
 		<javac srcdir="${source}" destdir="${build.dir}"
-			classpathref="build.classpath"  encoding="Shift_JIS" />
+			classpathref="build.classpath"  encoding="UTF-8" />
 	</target>
 
 	<target name="jar" description="jarファイルを作成します">
 		<copy todir="${build.dir}/jp/go/aist/rtm/rtcbuilder/python/template">
 			<fileset dir="${source}/jp/go/aist/rtm/rtcbuilder/python/template">
-				<include name="_100/**/**.template" />
-				<include name="**.template" />
+				<include name="cmake/**/**.vsl" />
+				<include name="python/**/**.vsl" />
+				<include name="python_04/**/**.vsl" />
 			</fileset>
 		</copy>
 		<mkdir dir="${dist.dir}" />
-		<delete file="${dist.dir}/${target.name}.jar" />
-
-		<jar destfile="${dist.dir}/${target.name}.jar" manifest="META-INF/MANIFEST.MF">
+		<delete>
+			<fileset dir="${dist.dir}" includes="${target.name}_*.jar" />
+		</delete>
+		<!-- Version settings -->
+		<manifesttask file="META-INF/MANIFEST.MF" key="Bundle-Version" property="manifest.project.version" />
+		<condition property="project.version"
+                   value="${env.PROJECT_VERSION}"
+                   else="${manifest.project.version}">
+			<isset property="env.PROJECT_VERSION" />
+		</condition>
+		<property name="jar.version" value="_${project.version}"/>
+		<property name="jar.name" value="${target.name}${jar.version}"/>
+		<!-- Updating MANIFEST.MF -->
+		<manifest file="META-INF/MANIFEST.MF" mode="update">
+			<attribute name="Bundle-Version" value="${project.version}"/>
+			<attribute name="Built-By" value="${user.name}"/>
+			<attribute name="Built-Date" value="${built.date}"/>
+		</manifest>
+		<!-- Creating a jar file -->
+		<jar destfile="${dist.dir}/${jar.name}.jar" manifest="META-INF/MANIFEST.MF">
 			<fileset dir="${build.dir}">
 				<exclude name="jp/go/aist/rtm/rtcbuilder/python/_test/_100/**" />
 			</fileset>
@@ -57,4 +83,5 @@
 			</fileset>
 		</jar>
 	</target>
+
 </project>

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/author/foo.py
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/author/foo.py	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/author/foo.py	2013-01-29 10:39:20 UTC (rev 394)
@@ -13,6 +13,8 @@
 # Import RTM module
 import RTC
 import OpenRTM_aist
+import MyService_idl
+import DAQService_idl
 # Import Service implementation class
 # <rtc-template block="service_impl">
 from MyService_idl_example import *
@@ -270,13 +272,10 @@
     manager.registerFactory(profile,
                             foo,
                             OpenRTM_aist.Delete)
-
 def MyModuleInit(manager):
     fooInit(manager)
-
     # Create a component
     comp = manager.createComponent("foo")
-
 def main():
 	mgr = OpenRTM_aist.Manager.init(sys.argv)
 	mgr.setModuleInitProc(MyModuleInit)

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/author/idlcompile.bat
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/author/idlcompile.bat	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/author/idlcompile.bat	2013-01-29 10:39:20 UTC (rev 394)
@@ -1 +1,10 @@
-omniidl.exe -bpython MyService.idl DAQService.idl 
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% do (
+  %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl idl/DAQService.idl 
+) else do (
+  echo "python.exe" can not be found.
+  echo Please modify PATH environmental variable for python command.
+)
+endlocal

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/author/idlcompile.sh
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/author/idlcompile.sh	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/author/idlcompile.sh	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,2 +1,2 @@
 #!/bin/sh
-omniidl -bpython MyService.idl DAQService.idl 
+omniidl -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl idl/DAQService.idl 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/authorLong/MyService_idl_example.py
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/authorLong/MyService_idl_example.py	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/authorLong/MyService_idl_example.py	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,49 +1,38 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # -*- Python -*-
-
 """
  \file MyService_idl_examplefile.py
  \brief Python example implementations generated from MyService.idl
  \date $Date$
-
- \author Noriaki Ando <n-ando at aist.go.jp>345678941234567895123456789612345678971
- 23456789812345
-
+ \author Noriaki Ando
+ <n-ando at aist.go.jp>3456789412345678951234567896123456789712345678981234
+ 5
 """
-
 import omniORB
 from omniORB import CORBA, PortableServer
-
 import _GlobalIDL, _GlobalIDL__POA
-
-
 class MyService_i (_GlobalIDL__POA.MyService):
     """
     \class MyService_i
     Example class implementing IDL interface MyService
     """
-
     def __init__(self):
         """
         \brief standard constructor
         Initialise member variables here
         """
         pass
-
     # void setGain(in float gain)
     def setGain(self, gain):
         raise CORBA.NO_IMPLEMENT(0, CORBA.COMPLETED_NO)
         # *** Implement me
         # Must return: None
-
     # float getGain()
     def getGain(self):
         raise CORBA.NO_IMPLEMENT(0, CORBA.COMPLETED_NO)
         # *** Implement me
         # Must return: result
-
-
 if __name__ == "__main__":
     import sys
     
@@ -52,22 +41,16 @@
     
     # As an example, we activate an object in the Root POA
     poa = orb.resolve_initial_references("RootPOA")
-
     # Create an instance of a servant class
     servant = MyService_i()
-
     # Activate it in the Root POA
     poa.activate_object(servant)
-
     # Get the object reference to the object
     objref = servant._this()
     
     # Print a stringified IOR for it
     print orb.object_to_string(objref)
-
     # Activate the Root POA's manager
     poa._get_the_POAManager().activate()
-
     # Run the ORB, blocking this thread
     orb.run()
-

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/authorLong/foo.py
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/authorLong/foo.py	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/authorLong/foo.py	2013-01-29 10:39:20 UTC (rev 394)
@@ -5,8 +5,9 @@
  \file foo.py
  \brief MDesc
  \date $Date$
- \author Noriaki Ando <n-ando at aist.go.jp>345678941234567895123456789612345678971
- 23456789812345
+ \author Noriaki Ando
+ <n-ando at aist.go.jp>3456789412345678951234567896123456789712345678981234
+ 5
 """
 import sys
 import time
@@ -14,6 +15,8 @@
 # Import RTM module
 import RTC
 import OpenRTM_aist
+import MyService_idl
+import DAQService_idl
 # Import Service implementation class
 # <rtc-template block="service_impl">
 from MyService_idl_example import *
@@ -271,13 +274,10 @@
     manager.registerFactory(profile,
                             foo,
                             OpenRTM_aist.Delete)
-
 def MyModuleInit(manager):
     fooInit(manager)
-
     # Create a component
     comp = manager.createComponent("foo")
-
 def main():
 	mgr = OpenRTM_aist.Manager.init(sys.argv)
 	mgr.setModuleInitProc(MyModuleInit)

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/authorLong/idlcompile.bat
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/authorLong/idlcompile.bat	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/authorLong/idlcompile.bat	2013-01-29 10:39:20 UTC (rev 394)
@@ -1 +1,10 @@
-omniidl.exe -bpython MyService.idl DAQService.idl 
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% do (
+  %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl idl/DAQService.idl 
+) else do (
+  echo "python.exe" can not be found.
+  echo Please modify PATH environmental variable for python command.
+)
+endlocal

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/authorLong/idlcompile.sh
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/authorLong/idlcompile.sh	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/authorLong/idlcompile.sh	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,2 +1,2 @@
 #!/bin/sh
-omniidl -bpython MyService.idl DAQService.idl 
+omniidl -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl idl/DAQService.idl 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/full/foo.py
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/full/foo.py	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/full/foo.py	2013-01-29 10:39:20 UTC (rev 394)
@@ -14,6 +14,8 @@
 # Import RTM module
 import RTC
 import OpenRTM_aist
+import MyService_idl
+import DAQService_idl
 # Import Service implementation class
 # <rtc-template block="service_impl">
 from MyService_idl_example import *
@@ -414,13 +416,10 @@
     manager.registerFactory(profile,
                             foo,
                             OpenRTM_aist.Delete)
-
 def MyModuleInit(manager):
     fooInit(manager)
-
     # Create a component
     comp = manager.createComponent("foo")
-
 def main():
 	mgr = OpenRTM_aist.Manager.init(sys.argv)
 	mgr.setModuleInitProc(MyModuleInit)

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/full/idlcompile.bat
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/full/idlcompile.bat	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/full/idlcompile.bat	2013-01-29 10:39:20 UTC (rev 394)
@@ -1 +1,10 @@
-omniidl.exe -bpython MyService.idl DAQService.idl 
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% do (
+  %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl idl/DAQService.idl 
+) else do (
+  echo "python.exe" can not be found.
+  echo Please modify PATH environmental variable for python command.
+)
+endlocal

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/full/idlcompile.sh
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/full/idlcompile.sh	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/full/idlcompile.sh	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,2 +1,2 @@
 #!/bin/sh
-omniidl -bpython MyService.idl DAQService.idl 
+omniidl -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl idl/DAQService.idl 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/refer/foo.py
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/refer/foo.py	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/refer/foo.py	2013-01-29 10:39:20 UTC (rev 394)
@@ -14,6 +14,8 @@
 # Import RTM module
 import RTC
 import OpenRTM_aist
+import MyService_idl
+import DAQService_idl
 # Import Service implementation class
 # <rtc-template block="service_impl">
 from MyService_idl_example import *
@@ -279,13 +281,10 @@
     manager.registerFactory(profile,
                             foo,
                             OpenRTM_aist.Delete)
-
 def MyModuleInit(manager):
     fooInit(manager)
-
     # Create a component
     comp = manager.createComponent("foo")
-
 def main():
 	mgr = OpenRTM_aist.Manager.init(sys.argv)
 	mgr.setModuleInitProc(MyModuleInit)

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/refer/idlcompile.bat
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/refer/idlcompile.bat	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/refer/idlcompile.bat	2013-01-29 10:39:20 UTC (rev 394)
@@ -1 +1,10 @@
-omniidl.exe -bpython MyService.idl DAQService.idl 
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% do (
+  %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl idl/DAQService.idl 
+) else do (
+  echo "python.exe" can not be found.
+  echo Please modify PATH environmental variable for python command.
+)
+endlocal

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/refer/idlcompile.sh
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/refer/idlcompile.sh	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/refer/idlcompile.sh	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,2 +1,2 @@
 #!/bin/sh
-omniidl -bpython MyService.idl DAQService.idl 
+omniidl -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl idl/DAQService.idl 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST1/idlcompile.bat
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST1/idlcompile.bat	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST1/idlcompile.bat	2013-01-29 10:39:20 UTC (rev 394)
@@ -1 +1,10 @@
-omniidl.exe -bpython MyService.idl 
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% do (
+  %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl 
+) else do (
+  echo "python.exe" can not be found.
+  echo Please modify PATH environmental variable for python command.
+)
+endlocal

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST1/idlcompile.sh
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST1/idlcompile.sh	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST1/idlcompile.sh	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,2 +1,2 @@
 #!/bin/sh
-omniidl -bpython MyService.idl 
+omniidl -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST1/test.py
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST1/test.py	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST1/test.py	2013-01-29 10:39:20 UTC (rev 394)
@@ -12,6 +12,7 @@
 # Import RTM module
 import RTC
 import OpenRTM_aist
+import MyService_idl
 # Import Service implementation class
 # <rtc-template block="service_impl">
 from MyService_idl_example import *
@@ -240,13 +241,10 @@
     manager.registerFactory(profile,
                             test,
                             OpenRTM_aist.Delete)
-
 def MyModuleInit(manager):
     testInit(manager)
-
     # Create a component
     comp = manager.createComponent("test")
-
 def main():
 	mgr = OpenRTM_aist.Manager.init(sys.argv)
 	mgr.setModuleInitProc(MyModuleInit)

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST2/idlcompile.bat
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST2/idlcompile.bat	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST2/idlcompile.bat	2013-01-29 10:39:20 UTC (rev 394)
@@ -1 +1,10 @@
-omniidl.exe -bpython MyService.idl 
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% do (
+  %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl 
+) else do (
+  echo "python.exe" can not be found.
+  echo Please modify PATH environmental variable for python command.
+)
+endlocal

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST2/idlcompile.sh
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST2/idlcompile.sh	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST2/idlcompile.sh	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,2 +1,2 @@
 #!/bin/sh
-omniidl -bpython MyService.idl 
+omniidl -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST2/test.py
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST2/test.py	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST2/test.py	2013-01-29 10:39:20 UTC (rev 394)
@@ -12,6 +12,7 @@
 # Import RTM module
 import RTC
 import OpenRTM_aist
+import MyService_idl
 # Import Service implementation class
 # <rtc-template block="service_impl">
 # </rtc-template>
@@ -250,13 +251,10 @@
     manager.registerFactory(profile,
                             test,
                             OpenRTM_aist.Delete)
-
 def MyModuleInit(manager):
     testInit(manager)
-
     # Create a component
     comp = manager.createComponent("test")
-
 def main():
 	mgr = OpenRTM_aist.Manager.init(sys.argv)
 	mgr.setModuleInitProc(MyModuleInit)

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST3/idlcompile.bat
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST3/idlcompile.bat	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST3/idlcompile.bat	2013-01-29 10:39:20 UTC (rev 394)
@@ -1 +1,10 @@
-omniidl.exe -bpython MyService.idl 
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% do (
+  %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl 
+) else do (
+  echo "python.exe" can not be found.
+  echo Please modify PATH environmental variable for python command.
+)
+endlocal

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST3/idlcompile.sh
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST3/idlcompile.sh	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST3/idlcompile.sh	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,2 +1,2 @@
 #!/bin/sh
-omniidl -bpython MyService.idl 
+omniidl -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST3/test.py
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST3/test.py	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST3/test.py	2013-01-29 10:39:20 UTC (rev 394)
@@ -12,6 +12,7 @@
 # Import RTM module
 import RTC
 import OpenRTM_aist
+import MyService_idl
 # Import Service implementation class
 # <rtc-template block="service_impl">
 from MyService_idl_example import *
@@ -259,13 +260,10 @@
     manager.registerFactory(profile,
                             test,
                             OpenRTM_aist.Delete)
-
 def MyModuleInit(manager):
     testInit(manager)
-
     # Create a component
     comp = manager.createComponent("test")
-
 def main():
 	mgr = OpenRTM_aist.Manager.init(sys.argv)
 	mgr.setModuleInitProc(MyModuleInit)

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST4/idlcompile.bat
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST4/idlcompile.bat	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST4/idlcompile.bat	2013-01-29 10:39:20 UTC (rev 394)
@@ -1 +1,10 @@
-omniidl.exe -bpython MyService.idl 
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% do (
+  %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl 
+) else do (
+  echo "python.exe" can not be found.
+  echo Please modify PATH environmental variable for python command.
+)
+endlocal

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST4/idlcompile.sh
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST4/idlcompile.sh	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST4/idlcompile.sh	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,2 +1,2 @@
 #!/bin/sh
-omniidl -bpython MyService.idl 
+omniidl -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST4/test.py
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST4/test.py	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST4/test.py	2013-01-29 10:39:20 UTC (rev 394)
@@ -12,6 +12,7 @@
 # Import RTM module
 import RTC
 import OpenRTM_aist
+import MyService_idl
 # Import Service implementation class
 # <rtc-template block="service_impl">
 from MyService_idl_example import *
@@ -248,13 +249,10 @@
     manager.registerFactory(profile,
                             test,
                             OpenRTM_aist.Delete)
-
 def MyModuleInit(manager):
     testInit(manager)
-
     # Create a component
     comp = manager.createComponent("test")
-
 def main():
 	mgr = OpenRTM_aist.Manager.init(sys.argv)
 	mgr.setModuleInitProc(MyModuleInit)

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/inport1/foo.py
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/inport1/foo.py	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/inport1/foo.py	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,32 +1,23 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # -*- Python -*-
-
 """
- \file foo.py
- \brief MDesc
- \date $Date$
-
-
+ @file foo.py
+ @brief MDesc
+ @date $Date$
 """
 import sys
 import time
 sys.path.append(".")
-
 # Import RTM module
 import RTC
 import OpenRTM_aist
-
 # Import Service implementation class
 # <rtc-template block="service_impl">
-
 # </rtc-template>
-
 # Import Service stub modules
 # <rtc-template block="consumer_import">
 # </rtc-template>
-
-
 # This module's spesification
 # <rtc-template block="module_spec">
 foo_spec = ["implementation_id", "foo", 
@@ -41,21 +32,19 @@
 		 "lang_type",         "SCRIPT",
 		 ""]
 # </rtc-template>
-
+##
+# @class foo
+# @brief MDesc
+# 
+# 
 class foo(OpenRTM_aist.DataFlowComponentBase):
 	
-	"""
-	\class foo
-	\brief MDesc
-	
-	"""
+	##
+	# @brief constructor
+	# @param manager Maneger Object
+	# 
 	def __init__(self, manager):
-		"""
-		\brief constructor
-		\param manager Maneger Object
-		"""
 		OpenRTM_aist.DataFlowComponentBase.__init__(self, manager)
-
 		self._d_InP1 = RTC.TimedShort(RTC.Time(0,0),0)
 		"""
 		"""
@@ -65,18 +54,16 @@
 		# <rtc-template block="init_conf_param">
 		
 		# </rtc-template>
-
-
 		 
+	##
+	#
+	# The initialize action (on CREATED->ALIVE transition)
+	# formaer rtc_init_entry() 
+	# 
+	# @return RTC::ReturnCode_t
+	# 
+	#
 	def onInitialize(self):
-		"""
-		
-		The initialize action (on CREATED->ALIVE transition)
-		formaer rtc_init_entry() 
-		
-		\return RTC::ReturnCode_t
-		
-		"""
 		# Bind variables and configuration variable
 		
 		# Set InPort buffers
@@ -91,183 +78,172 @@
 		# Set CORBA Service Ports
 		
 		return RTC.RTC_OK
-
 	
+	#	##
+	#	# 
+	#	# The finalize action (on ALIVE->END transition)
+	#	# formaer rtc_exiting_entry()
+	#	# 
+	#	# @return RTC::ReturnCode_t
+	#
+	#	# 
 	#def onFinalize(self, ec_id):
-	#	"""
 	#
-	#	The finalize action (on ALIVE->END transition)
-	#	formaer rtc_exiting_entry()
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The startup action when ExecutionContext startup
+	#	# former rtc_starting_entry()
+	#	# 
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onStartup(self, ec_id):
-	#	"""
 	#
-	#	The startup action when ExecutionContext startup
-	#	former rtc_starting_entry()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The shutdown action when ExecutionContext stop
+	#	# former rtc_stopping_entry()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onShutdown(self, ec_id):
-	#	"""
 	#
-	#	The shutdown action when ExecutionContext stop
-	#	former rtc_stopping_entry()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The activated action (Active state entry action)
+	#	# former rtc_active_entry()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	# 
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onActivated(self, ec_id):
-	#	"""
 	#
-	#	The activated action (Active state entry action)
-	#	former rtc_active_entry()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The deactivated action (Active state exit action)
+	#	# former rtc_active_exit()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onDeactivated(self, ec_id):
-	#	"""
 	#
-	#	The deactivated action (Active state exit action)
-	#	former rtc_active_exit()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The execution action that is invoked periodically
+	#	# former rtc_active_do()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onExecute(self, ec_id):
-	#	"""
 	#
-	#	The execution action that is invoked periodically
-	#	former rtc_active_do()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The aborting action when main logic error occurred.
+	#	# former rtc_aborting_entry()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onAborting(self, ec_id):
-	#	"""
 	#
-	#	The aborting action when main logic error occurred.
-	#	former rtc_aborting_entry()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The error action in ERROR state
+	#	# former rtc_error_do()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onError(self, ec_id):
-	#	"""
 	#
-	#	The error action in ERROR state
-	#	former rtc_error_do()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The reset action that is invoked resetting
+	#	# This is same but different the former rtc_init_entry()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onReset(self, ec_id):
-	#	"""
 	#
-	#	The reset action that is invoked resetting
-	#	This is same but different the former rtc_init_entry()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The state update action that is invoked after onExecute() action
+	#	# no corresponding operation exists in OpenRTm-aist-0.2.0
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onStateUpdate(self, ec_id):
-	#	"""
 	#
-	#	The state update action that is invoked after onExecute() action
-	#	no corresponding operation exists in OpenRTm-aist-0.2.0
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The action that is invoked when execution context's rate is changed
+	#	# no corresponding operation exists in OpenRTm-aist-0.2.0
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onRateChanged(self, ec_id):
-	#	"""
 	#
-	#	The action that is invoked when execution context's rate is changed
-	#	no corresponding operation exists in OpenRTm-aist-0.2.0
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
-
-
-
 def fooInit(manager):
     profile = OpenRTM_aist.Properties(defaults_str=foo_spec)
     manager.registerFactory(profile,
                             foo,
                             OpenRTM_aist.Delete)
-
 def MyModuleInit(manager):
     fooInit(manager)
-
     # Create a component
     comp = manager.createComponent("foo")
-
-
-
 def main():
 	mgr = OpenRTM_aist.Manager.init(sys.argv)
 	mgr.setModuleInitProc(MyModuleInit)
 	mgr.activateManager()
 	mgr.runManager()
-
 if __name__ == "__main__":
 	main()
-

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/inport2/foo.py
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/inport2/foo.py	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/inport2/foo.py	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,32 +1,23 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # -*- Python -*-
-
 """
- \file foo.py
- \brief MDesc
- \date $Date$
-
-
+ @file foo.py
+ @brief MDesc
+ @date $Date$
 """
 import sys
 import time
 sys.path.append(".")
-
 # Import RTM module
 import RTC
 import OpenRTM_aist
-
 # Import Service implementation class
 # <rtc-template block="service_impl">
-
 # </rtc-template>
-
 # Import Service stub modules
 # <rtc-template block="consumer_import">
 # </rtc-template>
-
-
 # This module's spesification
 # <rtc-template block="module_spec">
 foo_spec = ["implementation_id", "foo", 
@@ -41,21 +32,19 @@
 		 "lang_type",         "SCRIPT",
 		 ""]
 # </rtc-template>
-
+##
+# @class foo
+# @brief MDesc
+# 
+# 
 class foo(OpenRTM_aist.DataFlowComponentBase):
 	
-	"""
-	\class foo
-	\brief MDesc
-	
-	"""
+	##
+	# @brief constructor
+	# @param manager Maneger Object
+	# 
 	def __init__(self, manager):
-		"""
-		\brief constructor
-		\param manager Maneger Object
-		"""
 		OpenRTM_aist.DataFlowComponentBase.__init__(self, manager)
-
 		self._d_InP1 = RTC.TimedShort(RTC.Time(0,0),0)
 		"""
 		"""
@@ -69,18 +58,16 @@
 		# <rtc-template block="init_conf_param">
 		
 		# </rtc-template>
-
-
 		 
+	##
+	#
+	# The initialize action (on CREATED->ALIVE transition)
+	# formaer rtc_init_entry() 
+	# 
+	# @return RTC::ReturnCode_t
+	# 
+	#
 	def onInitialize(self):
-		"""
-		
-		The initialize action (on CREATED->ALIVE transition)
-		formaer rtc_init_entry() 
-		
-		\return RTC::ReturnCode_t
-		
-		"""
 		# Bind variables and configuration variable
 		
 		# Set InPort buffers
@@ -96,183 +83,172 @@
 		# Set CORBA Service Ports
 		
 		return RTC.RTC_OK
-
 	
+	#	##
+	#	# 
+	#	# The finalize action (on ALIVE->END transition)
+	#	# formaer rtc_exiting_entry()
+	#	# 
+	#	# @return RTC::ReturnCode_t
+	#
+	#	# 
 	#def onFinalize(self, ec_id):
-	#	"""
 	#
-	#	The finalize action (on ALIVE->END transition)
-	#	formaer rtc_exiting_entry()
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The startup action when ExecutionContext startup
+	#	# former rtc_starting_entry()
+	#	# 
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onStartup(self, ec_id):
-	#	"""
 	#
-	#	The startup action when ExecutionContext startup
-	#	former rtc_starting_entry()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The shutdown action when ExecutionContext stop
+	#	# former rtc_stopping_entry()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onShutdown(self, ec_id):
-	#	"""
 	#
-	#	The shutdown action when ExecutionContext stop
-	#	former rtc_stopping_entry()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The activated action (Active state entry action)
+	#	# former rtc_active_entry()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	# 
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onActivated(self, ec_id):
-	#	"""
 	#
-	#	The activated action (Active state entry action)
-	#	former rtc_active_entry()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The deactivated action (Active state exit action)
+	#	# former rtc_active_exit()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onDeactivated(self, ec_id):
-	#	"""
 	#
-	#	The deactivated action (Active state exit action)
-	#	former rtc_active_exit()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The execution action that is invoked periodically
+	#	# former rtc_active_do()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onExecute(self, ec_id):
-	#	"""
 	#
-	#	The execution action that is invoked periodically
-	#	former rtc_active_do()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The aborting action when main logic error occurred.
+	#	# former rtc_aborting_entry()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onAborting(self, ec_id):
-	#	"""
 	#
-	#	The aborting action when main logic error occurred.
-	#	former rtc_aborting_entry()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The error action in ERROR state
+	#	# former rtc_error_do()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onError(self, ec_id):
-	#	"""
 	#
-	#	The error action in ERROR state
-	#	former rtc_error_do()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The reset action that is invoked resetting
+	#	# This is same but different the former rtc_init_entry()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onReset(self, ec_id):
-	#	"""
 	#
-	#	The reset action that is invoked resetting
-	#	This is same but different the former rtc_init_entry()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The state update action that is invoked after onExecute() action
+	#	# no corresponding operation exists in OpenRTm-aist-0.2.0
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onStateUpdate(self, ec_id):
-	#	"""
 	#
-	#	The state update action that is invoked after onExecute() action
-	#	no corresponding operation exists in OpenRTm-aist-0.2.0
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The action that is invoked when execution context's rate is changed
+	#	# no corresponding operation exists in OpenRTm-aist-0.2.0
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onRateChanged(self, ec_id):
-	#	"""
 	#
-	#	The action that is invoked when execution context's rate is changed
-	#	no corresponding operation exists in OpenRTm-aist-0.2.0
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
-
-
-
 def fooInit(manager):
     profile = OpenRTM_aist.Properties(defaults_str=foo_spec)
     manager.registerFactory(profile,
                             foo,
                             OpenRTM_aist.Delete)
-
 def MyModuleInit(manager):
     fooInit(manager)
-
     # Create a component
     comp = manager.createComponent("foo")
-
-
-
 def main():
 	mgr = OpenRTM_aist.Manager.init(sys.argv)
 	mgr.setModuleInitProc(MyModuleInit)
 	mgr.activateManager()
 	mgr.runManager()
-
 if __name__ == "__main__":
 	main()
-

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/name/foo.py
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/name/foo.py	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/name/foo.py	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,9 +2,9 @@
 # -*- coding: utf-8 -*-
 # -*- Python -*-
 """
- \file foo.py
- \brief MDesc
- \date $Date$
+ @file foo.py
+ @brief MDesc
+ @date $Date$
 """
 import sys
 import time
@@ -32,18 +32,18 @@
 		 "lang_type",         "SCRIPT",
 		 ""]
 # </rtc-template>
+##
+# @class foo
+# @brief MDesc
+# 
+# 
 class foo(OpenRTM_aist.DataFlowComponentBase):
 	
-	"""
-	\class foo
-	\brief MDesc
-	
-	"""
+	##
+	# @brief constructor
+	# @param manager Maneger Object
+	# 
 	def __init__(self, manager):
-		"""
-		\brief constructor
-		\param manager Maneger Object
-		"""
 		OpenRTM_aist.DataFlowComponentBase.__init__(self, manager)
 		
 		# initialize of configuration-data.
@@ -51,15 +51,15 @@
 		
 		# </rtc-template>
 		 
+	##
+	#
+	# The initialize action (on CREATED->ALIVE transition)
+	# formaer rtc_init_entry() 
+	# 
+	# @return RTC::ReturnCode_t
+	# 
+	#
 	def onInitialize(self):
-		"""
-		
-		The initialize action (on CREATED->ALIVE transition)
-		formaer rtc_init_entry() 
-		
-		\return RTC::ReturnCode_t
-		
-		"""
 		# Bind variables and configuration variable
 		
 		# Set InPort buffers
@@ -74,156 +74,156 @@
 		
 		return RTC.RTC_OK
 	
+	#	##
+	#	# 
+	#	# The finalize action (on ALIVE->END transition)
+	#	# formaer rtc_exiting_entry()
+	#	# 
+	#	# @return RTC::ReturnCode_t
+	#
+	#	# 
 	#def onFinalize(self, ec_id):
-	#	"""
 	#
-	#	The finalize action (on ALIVE->END transition)
-	#	formaer rtc_exiting_entry()
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The startup action when ExecutionContext startup
+	#	# former rtc_starting_entry()
+	#	# 
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onStartup(self, ec_id):
-	#	"""
 	#
-	#	The startup action when ExecutionContext startup
-	#	former rtc_starting_entry()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The shutdown action when ExecutionContext stop
+	#	# former rtc_stopping_entry()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onShutdown(self, ec_id):
-	#	"""
 	#
-	#	The shutdown action when ExecutionContext stop
-	#	former rtc_stopping_entry()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The activated action (Active state entry action)
+	#	# former rtc_active_entry()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	# 
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onActivated(self, ec_id):
-	#	"""
 	#
-	#	The activated action (Active state entry action)
-	#	former rtc_active_entry()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The deactivated action (Active state exit action)
+	#	# former rtc_active_exit()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onDeactivated(self, ec_id):
-	#	"""
 	#
-	#	The deactivated action (Active state exit action)
-	#	former rtc_active_exit()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The execution action that is invoked periodically
+	#	# former rtc_active_do()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onExecute(self, ec_id):
-	#	"""
 	#
-	#	The execution action that is invoked periodically
-	#	former rtc_active_do()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The aborting action when main logic error occurred.
+	#	# former rtc_aborting_entry()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onAborting(self, ec_id):
-	#	"""
 	#
-	#	The aborting action when main logic error occurred.
-	#	former rtc_aborting_entry()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The error action in ERROR state
+	#	# former rtc_error_do()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onError(self, ec_id):
-	#	"""
 	#
-	#	The error action in ERROR state
-	#	former rtc_error_do()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The reset action that is invoked resetting
+	#	# This is same but different the former rtc_init_entry()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onReset(self, ec_id):
-	#	"""
 	#
-	#	The reset action that is invoked resetting
-	#	This is same but different the former rtc_init_entry()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The state update action that is invoked after onExecute() action
+	#	# no corresponding operation exists in OpenRTm-aist-0.2.0
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onStateUpdate(self, ec_id):
-	#	"""
 	#
-	#	The state update action that is invoked after onExecute() action
-	#	no corresponding operation exists in OpenRTm-aist-0.2.0
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The action that is invoked when execution context's rate is changed
+	#	# no corresponding operation exists in OpenRTm-aist-0.2.0
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onRateChanged(self, ec_id):
-	#	"""
 	#
-	#	The action that is invoked when execution context's rate is changed
-	#	no corresponding operation exists in OpenRTm-aist-0.2.0
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
 def fooInit(manager):
@@ -231,10 +231,8 @@
     manager.registerFactory(profile,
                             foo,
                             OpenRTM_aist.Delete)
-
 def MyModuleInit(manager):
     fooInit(manager)
-
     # Create a component
     comp = manager.createComponent("foo")
 def main():

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/name2/Foo.py
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/name2/Foo.py	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/name2/Foo.py	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,9 +2,9 @@
 # -*- coding: utf-8 -*-
 # -*- Python -*-
 """
- \file Foo.py
- \brief MDesc
- \date $Date$
+ @file Foo.py
+ @brief MDesc
+ @date $Date$
 """
 import sys
 import time
@@ -32,18 +32,18 @@
 		 "lang_type",         "SCRIPT",
 		 ""]
 # </rtc-template>
+##
+# @class Foo
+# @brief MDesc
+# 
+# 
 class Foo(OpenRTM_aist.DataFlowComponentBase):
 	
-	"""
-	\class Foo
-	\brief MDesc
-	
-	"""
+	##
+	# @brief constructor
+	# @param manager Maneger Object
+	# 
 	def __init__(self, manager):
-		"""
-		\brief constructor
-		\param manager Maneger Object
-		"""
 		OpenRTM_aist.DataFlowComponentBase.__init__(self, manager)
 		
 		# initialize of configuration-data.
@@ -51,15 +51,15 @@
 		
 		# </rtc-template>
 		 
+	##
+	#
+	# The initialize action (on CREATED->ALIVE transition)
+	# formaer rtc_init_entry() 
+	# 
+	# @return RTC::ReturnCode_t
+	# 
+	#
 	def onInitialize(self):
-		"""
-		
-		The initialize action (on CREATED->ALIVE transition)
-		formaer rtc_init_entry() 
-		
-		\return RTC::ReturnCode_t
-		
-		"""
 		# Bind variables and configuration variable
 		
 		# Set InPort buffers
@@ -74,156 +74,156 @@
 		
 		return RTC.RTC_OK
 	
+	#	##
+	#	# 
+	#	# The finalize action (on ALIVE->END transition)
+	#	# formaer rtc_exiting_entry()
+	#	# 
+	#	# @return RTC::ReturnCode_t
+	#
+	#	# 
 	#def onFinalize(self, ec_id):
-	#	"""
 	#
-	#	The finalize action (on ALIVE->END transition)
-	#	formaer rtc_exiting_entry()
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The startup action when ExecutionContext startup
+	#	# former rtc_starting_entry()
+	#	# 
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onStartup(self, ec_id):
-	#	"""
 	#
-	#	The startup action when ExecutionContext startup
-	#	former rtc_starting_entry()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The shutdown action when ExecutionContext stop
+	#	# former rtc_stopping_entry()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onShutdown(self, ec_id):
-	#	"""
 	#
-	#	The shutdown action when ExecutionContext stop
-	#	former rtc_stopping_entry()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The activated action (Active state entry action)
+	#	# former rtc_active_entry()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	# 
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onActivated(self, ec_id):
-	#	"""
 	#
-	#	The activated action (Active state entry action)
-	#	former rtc_active_entry()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The deactivated action (Active state exit action)
+	#	# former rtc_active_exit()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onDeactivated(self, ec_id):
-	#	"""
 	#
-	#	The deactivated action (Active state exit action)
-	#	former rtc_active_exit()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The execution action that is invoked periodically
+	#	# former rtc_active_do()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onExecute(self, ec_id):
-	#	"""
 	#
-	#	The execution action that is invoked periodically
-	#	former rtc_active_do()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The aborting action when main logic error occurred.
+	#	# former rtc_aborting_entry()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onAborting(self, ec_id):
-	#	"""
 	#
-	#	The aborting action when main logic error occurred.
-	#	former rtc_aborting_entry()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The error action in ERROR state
+	#	# former rtc_error_do()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onError(self, ec_id):
-	#	"""
 	#
-	#	The error action in ERROR state
-	#	former rtc_error_do()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The reset action that is invoked resetting
+	#	# This is same but different the former rtc_init_entry()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onReset(self, ec_id):
-	#	"""
 	#
-	#	The reset action that is invoked resetting
-	#	This is same but different the former rtc_init_entry()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The state update action that is invoked after onExecute() action
+	#	# no corresponding operation exists in OpenRTm-aist-0.2.0
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onStateUpdate(self, ec_id):
-	#	"""
 	#
-	#	The state update action that is invoked after onExecute() action
-	#	no corresponding operation exists in OpenRTm-aist-0.2.0
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The action that is invoked when execution context's rate is changed
+	#	# no corresponding operation exists in OpenRTm-aist-0.2.0
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onRateChanged(self, ec_id):
-	#	"""
 	#
-	#	The action that is invoked when execution context's rate is changed
-	#	no corresponding operation exists in OpenRTm-aist-0.2.0
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
 def FooInit(manager):
@@ -231,10 +231,8 @@
     manager.registerFactory(profile,
                             Foo,
                             OpenRTM_aist.Delete)
-
 def MyModuleInit(manager):
     FooInit(manager)
-
     # Create a component
     comp = manager.createComponent("Foo")
 def main():

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/outport1/foo.py
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/outport1/foo.py	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/outport1/foo.py	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,32 +1,23 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # -*- Python -*-
-
 """
- \file foo.py
- \brief MDesc
- \date $Date$
-
-
+ @file foo.py
+ @brief MDesc
+ @date $Date$
 """
 import sys
 import time
 sys.path.append(".")
-
 # Import RTM module
 import RTC
 import OpenRTM_aist
-
 # Import Service implementation class
 # <rtc-template block="service_impl">
-
 # </rtc-template>
-
 # Import Service stub modules
 # <rtc-template block="consumer_import">
 # </rtc-template>
-
-
 # This module's spesification
 # <rtc-template block="module_spec">
 foo_spec = ["implementation_id", "foo", 
@@ -41,21 +32,19 @@
 		 "lang_type",         "SCRIPT",
 		 ""]
 # </rtc-template>
-
+##
+# @class foo
+# @brief MDesc
+# 
+# 
 class foo(OpenRTM_aist.DataFlowComponentBase):
 	
-	"""
-	\class foo
-	\brief MDesc
-	
-	"""
+	##
+	# @brief constructor
+	# @param manager Maneger Object
+	# 
 	def __init__(self, manager):
-		"""
-		\brief constructor
-		\param manager Maneger Object
-		"""
 		OpenRTM_aist.DataFlowComponentBase.__init__(self, manager)
-
 		self._d_InP1 = RTC.TimedShort(RTC.Time(0,0),0)
 		"""
 		"""
@@ -73,18 +62,16 @@
 		# <rtc-template block="init_conf_param">
 		
 		# </rtc-template>
-
-
 		 
+	##
+	#
+	# The initialize action (on CREATED->ALIVE transition)
+	# formaer rtc_init_entry() 
+	# 
+	# @return RTC::ReturnCode_t
+	# 
+	#
 	def onInitialize(self):
-		"""
-		
-		The initialize action (on CREATED->ALIVE transition)
-		formaer rtc_init_entry() 
-		
-		\return RTC::ReturnCode_t
-		
-		"""
 		# Bind variables and configuration variable
 		
 		# Set InPort buffers
@@ -101,183 +88,172 @@
 		# Set CORBA Service Ports
 		
 		return RTC.RTC_OK
-
 	
+	#	##
+	#	# 
+	#	# The finalize action (on ALIVE->END transition)
+	#	# formaer rtc_exiting_entry()
+	#	# 
+	#	# @return RTC::ReturnCode_t
+	#
+	#	# 
 	#def onFinalize(self, ec_id):
-	#	"""
 	#
-	#	The finalize action (on ALIVE->END transition)
-	#	formaer rtc_exiting_entry()
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The startup action when ExecutionContext startup
+	#	# former rtc_starting_entry()
+	#	# 
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onStartup(self, ec_id):
-	#	"""
 	#
-	#	The startup action when ExecutionContext startup
-	#	former rtc_starting_entry()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The shutdown action when ExecutionContext stop
+	#	# former rtc_stopping_entry()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onShutdown(self, ec_id):
-	#	"""
 	#
-	#	The shutdown action when ExecutionContext stop
-	#	former rtc_stopping_entry()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The activated action (Active state entry action)
+	#	# former rtc_active_entry()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	# 
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onActivated(self, ec_id):
-	#	"""
 	#
-	#	The activated action (Active state entry action)
-	#	former rtc_active_entry()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The deactivated action (Active state exit action)
+	#	# former rtc_active_exit()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onDeactivated(self, ec_id):
-	#	"""
 	#
-	#	The deactivated action (Active state exit action)
-	#	former rtc_active_exit()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The execution action that is invoked periodically
+	#	# former rtc_active_do()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onExecute(self, ec_id):
-	#	"""
 	#
-	#	The execution action that is invoked periodically
-	#	former rtc_active_do()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The aborting action when main logic error occurred.
+	#	# former rtc_aborting_entry()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onAborting(self, ec_id):
-	#	"""
 	#
-	#	The aborting action when main logic error occurred.
-	#	former rtc_aborting_entry()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The error action in ERROR state
+	#	# former rtc_error_do()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onError(self, ec_id):
-	#	"""
 	#
-	#	The error action in ERROR state
-	#	former rtc_error_do()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The reset action that is invoked resetting
+	#	# This is same but different the former rtc_init_entry()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onReset(self, ec_id):
-	#	"""
 	#
-	#	The reset action that is invoked resetting
-	#	This is same but different the former rtc_init_entry()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The state update action that is invoked after onExecute() action
+	#	# no corresponding operation exists in OpenRTm-aist-0.2.0
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onStateUpdate(self, ec_id):
-	#	"""
 	#
-	#	The state update action that is invoked after onExecute() action
-	#	no corresponding operation exists in OpenRTm-aist-0.2.0
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The action that is invoked when execution context's rate is changed
+	#	# no corresponding operation exists in OpenRTm-aist-0.2.0
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onRateChanged(self, ec_id):
-	#	"""
 	#
-	#	The action that is invoked when execution context's rate is changed
-	#	no corresponding operation exists in OpenRTm-aist-0.2.0
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
-
-
-
 def fooInit(manager):
     profile = OpenRTM_aist.Properties(defaults_str=foo_spec)
     manager.registerFactory(profile,
                             foo,
                             OpenRTM_aist.Delete)
-
 def MyModuleInit(manager):
     fooInit(manager)
-
     # Create a component
     comp = manager.createComponent("foo")
-
-
-
 def main():
 	mgr = OpenRTM_aist.Manager.init(sys.argv)
 	mgr.setModuleInitProc(MyModuleInit)
 	mgr.activateManager()
 	mgr.runManager()
-
 if __name__ == "__main__":
 	main()
-

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/outport2/foo.py
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/outport2/foo.py	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/outport2/foo.py	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,32 +1,23 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # -*- Python -*-
-
 """
- \file foo.py
- \brief MDesc
- \date $Date$
-
-
+ @file foo.py
+ @brief MDesc
+ @date $Date$
 """
 import sys
 import time
 sys.path.append(".")
-
 # Import RTM module
 import RTC
 import OpenRTM_aist
-
 # Import Service implementation class
 # <rtc-template block="service_impl">
-
 # </rtc-template>
-
 # Import Service stub modules
 # <rtc-template block="consumer_import">
 # </rtc-template>
-
-
 # This module's spesification
 # <rtc-template block="module_spec">
 foo_spec = ["implementation_id", "foo", 
@@ -41,21 +32,19 @@
 		 "lang_type",         "SCRIPT",
 		 ""]
 # </rtc-template>
-
+##
+# @class foo
+# @brief MDesc
+# 
+# 
 class foo(OpenRTM_aist.DataFlowComponentBase):
 	
-	"""
-	\class foo
-	\brief MDesc
-	
-	"""
+	##
+	# @brief constructor
+	# @param manager Maneger Object
+	# 
 	def __init__(self, manager):
-		"""
-		\brief constructor
-		\param manager Maneger Object
-		"""
 		OpenRTM_aist.DataFlowComponentBase.__init__(self, manager)
-
 		self._d_InP1 = RTC.TimedShort(RTC.Time(0,0),0)
 		"""
 		"""
@@ -73,23 +62,20 @@
 		"""
 		self._OutP2Out = OpenRTM_aist.OutPort("OutP2", self._d_OutP2)
 		
-
 		# initialize of configuration-data.
 		# <rtc-template block="init_conf_param">
 		
 		# </rtc-template>
-
-
 		 
+	##
+	#
+	# The initialize action (on CREATED->ALIVE transition)
+	# formaer rtc_init_entry() 
+	# 
+	# @return RTC::ReturnCode_t
+	# 
+	#
 	def onInitialize(self):
-		"""
-		
-		The initialize action (on CREATED->ALIVE transition)
-		formaer rtc_init_entry() 
-		
-		\return RTC::ReturnCode_t
-		
-		"""
 		# Bind variables and configuration variable
 		
 		# Set InPort buffers
@@ -107,183 +93,172 @@
 		# Set CORBA Service Ports
 		
 		return RTC.RTC_OK
-
 	
+	#	##
+	#	# 
+	#	# The finalize action (on ALIVE->END transition)
+	#	# formaer rtc_exiting_entry()
+	#	# 
+	#	# @return RTC::ReturnCode_t
+	#
+	#	# 
 	#def onFinalize(self, ec_id):
-	#	"""
 	#
-	#	The finalize action (on ALIVE->END transition)
-	#	formaer rtc_exiting_entry()
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The startup action when ExecutionContext startup
+	#	# former rtc_starting_entry()
+	#	# 
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onStartup(self, ec_id):
-	#	"""
 	#
-	#	The startup action when ExecutionContext startup
-	#	former rtc_starting_entry()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The shutdown action when ExecutionContext stop
+	#	# former rtc_stopping_entry()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onShutdown(self, ec_id):
-	#	"""
 	#
-	#	The shutdown action when ExecutionContext stop
-	#	former rtc_stopping_entry()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The activated action (Active state entry action)
+	#	# former rtc_active_entry()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	# 
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onActivated(self, ec_id):
-	#	"""
 	#
-	#	The activated action (Active state entry action)
-	#	former rtc_active_entry()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The deactivated action (Active state exit action)
+	#	# former rtc_active_exit()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onDeactivated(self, ec_id):
-	#	"""
 	#
-	#	The deactivated action (Active state exit action)
-	#	former rtc_active_exit()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The execution action that is invoked periodically
+	#	# former rtc_active_do()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onExecute(self, ec_id):
-	#	"""
 	#
-	#	The execution action that is invoked periodically
-	#	former rtc_active_do()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The aborting action when main logic error occurred.
+	#	# former rtc_aborting_entry()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onAborting(self, ec_id):
-	#	"""
 	#
-	#	The aborting action when main logic error occurred.
-	#	former rtc_aborting_entry()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The error action in ERROR state
+	#	# former rtc_error_do()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onError(self, ec_id):
-	#	"""
 	#
-	#	The error action in ERROR state
-	#	former rtc_error_do()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The reset action that is invoked resetting
+	#	# This is same but different the former rtc_init_entry()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onReset(self, ec_id):
-	#	"""
 	#
-	#	The reset action that is invoked resetting
-	#	This is same but different the former rtc_init_entry()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The state update action that is invoked after onExecute() action
+	#	# no corresponding operation exists in OpenRTm-aist-0.2.0
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onStateUpdate(self, ec_id):
-	#	"""
 	#
-	#	The state update action that is invoked after onExecute() action
-	#	no corresponding operation exists in OpenRTm-aist-0.2.0
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The action that is invoked when execution context's rate is changed
+	#	# no corresponding operation exists in OpenRTm-aist-0.2.0
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onRateChanged(self, ec_id):
-	#	"""
 	#
-	#	The action that is invoked when execution context's rate is changed
-	#	no corresponding operation exists in OpenRTm-aist-0.2.0
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
-
-
-
 def fooInit(manager):
     profile = OpenRTM_aist.Properties(defaults_str=foo_spec)
     manager.registerFactory(profile,
                             foo,
                             OpenRTM_aist.Delete)
-
 def MyModuleInit(manager):
     fooInit(manager)
-
     # Create a component
     comp = manager.createComponent("foo")
-
-
-
 def main():
 	mgr = OpenRTM_aist.Manager.init(sys.argv)
 	mgr.setModuleInitProc(MyModuleInit)
 	mgr.activateManager()
 	mgr.runManager()
-
 if __name__ == "__main__":
 	main()
-

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service1/MyService_idl_example.py
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service1/MyService_idl_example.py	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service1/MyService_idl_example.py	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,47 +1,35 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # -*- Python -*-
-
 """
- \file MyService_idl_examplefile.py
- \brief Python example implementations generated from MyService.idl
- \date $Date$
-
-
+ @file MyService_idl_examplefile.py
+ @brief Python example implementations generated from MyService.idl
+ @date $Date$
 """
-
 import omniORB
 from omniORB import CORBA, PortableServer
-
 import _GlobalIDL, _GlobalIDL__POA
-
-
 class MyService_i (_GlobalIDL__POA.MyService):
     """
-    \class MyService_i
+    @class MyService_i
     Example class implementing IDL interface MyService
     """
-
     def __init__(self):
         """
-        \brief standard constructor
+        @brief standard constructor
         Initialise member variables here
         """
         pass
-
     # void setGain(in float gain)
     def setGain(self, gain):
         raise CORBA.NO_IMPLEMENT(0, CORBA.COMPLETED_NO)
         # *** Implement me
         # Must return: None
-
     # float getGain()
     def getGain(self):
         raise CORBA.NO_IMPLEMENT(0, CORBA.COMPLETED_NO)
         # *** Implement me
         # Must return: result
-
-
 if __name__ == "__main__":
     import sys
     
@@ -50,22 +38,16 @@
     
     # As an example, we activate an object in the Root POA
     poa = orb.resolve_initial_references("RootPOA")
-
     # Create an instance of a servant class
     servant = MyService_i()
-
     # Activate it in the Root POA
     poa.activate_object(servant)
-
     # Get the object reference to the object
     objref = servant._this()
     
     # Print a stringified IOR for it
     print orb.object_to_string(objref)
-
     # Activate the Root POA's manager
     poa._get_the_POAManager().activate()
-
     # Run the ORB, blocking this thread
     orb.run()
-

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service1/foo.py
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service1/foo.py	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service1/foo.py	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,9 +2,9 @@
 # -*- coding: utf-8 -*-
 # -*- Python -*-
 """
- \file foo.py
- \brief MDesc
- \date $Date$
+ @file foo.py
+ @brief MDesc
+ @date $Date$
 """
 import sys
 import time
@@ -12,6 +12,7 @@
 # Import RTM module
 import RTC
 import OpenRTM_aist
+import MyService_idl
 # Import Service implementation class
 # <rtc-template block="service_impl">
 from MyService_idl_example import *
@@ -33,18 +34,18 @@
 		 "lang_type",         "SCRIPT",
 		 ""]
 # </rtc-template>
+##
+# @class foo
+# @brief MDesc
+# 
+# 
 class foo(OpenRTM_aist.DataFlowComponentBase):
 	
-	"""
-	\class foo
-	\brief MDesc
-	
-	"""
+	##
+	# @brief constructor
+	# @param manager Maneger Object
+	# 
 	def __init__(self, manager):
-		"""
-		\brief constructor
-		\param manager Maneger Object
-		"""
 		OpenRTM_aist.DataFlowComponentBase.__init__(self, manager)
 		self._d_InP1 = RTC.TimedShort(RTC.Time(0,0),0)
 		"""
@@ -74,15 +75,15 @@
 		
 		# </rtc-template>
 		 
+	##
+	#
+	# The initialize action (on CREATED->ALIVE transition)
+	# formaer rtc_init_entry() 
+	# 
+	# @return RTC::ReturnCode_t
+	# 
+	#
 	def onInitialize(self):
-		"""
-		
-		The initialize action (on CREATED->ALIVE transition)
-		formaer rtc_init_entry() 
-		
-		\return RTC::ReturnCode_t
-		
-		"""
 		# Bind variables and configuration variable
 		
 		# Set InPort buffers
@@ -103,156 +104,156 @@
 		
 		return RTC.RTC_OK
 	
+	#	##
+	#	# 
+	#	# The finalize action (on ALIVE->END transition)
+	#	# formaer rtc_exiting_entry()
+	#	# 
+	#	# @return RTC::ReturnCode_t
+	#
+	#	# 
 	#def onFinalize(self, ec_id):
-	#	"""
 	#
-	#	The finalize action (on ALIVE->END transition)
-	#	formaer rtc_exiting_entry()
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The startup action when ExecutionContext startup
+	#	# former rtc_starting_entry()
+	#	# 
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onStartup(self, ec_id):
-	#	"""
 	#
-	#	The startup action when ExecutionContext startup
-	#	former rtc_starting_entry()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The shutdown action when ExecutionContext stop
+	#	# former rtc_stopping_entry()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onShutdown(self, ec_id):
-	#	"""
 	#
-	#	The shutdown action when ExecutionContext stop
-	#	former rtc_stopping_entry()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The activated action (Active state entry action)
+	#	# former rtc_active_entry()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	# 
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onActivated(self, ec_id):
-	#	"""
 	#
-	#	The activated action (Active state entry action)
-	#	former rtc_active_entry()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The deactivated action (Active state exit action)
+	#	# former rtc_active_exit()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onDeactivated(self, ec_id):
-	#	"""
 	#
-	#	The deactivated action (Active state exit action)
-	#	former rtc_active_exit()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The execution action that is invoked periodically
+	#	# former rtc_active_do()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onExecute(self, ec_id):
-	#	"""
 	#
-	#	The execution action that is invoked periodically
-	#	former rtc_active_do()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The aborting action when main logic error occurred.
+	#	# former rtc_aborting_entry()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onAborting(self, ec_id):
-	#	"""
 	#
-	#	The aborting action when main logic error occurred.
-	#	former rtc_aborting_entry()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The error action in ERROR state
+	#	# former rtc_error_do()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onError(self, ec_id):
-	#	"""
 	#
-	#	The error action in ERROR state
-	#	former rtc_error_do()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The reset action that is invoked resetting
+	#	# This is same but different the former rtc_init_entry()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onReset(self, ec_id):
-	#	"""
 	#
-	#	The reset action that is invoked resetting
-	#	This is same but different the former rtc_init_entry()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The state update action that is invoked after onExecute() action
+	#	# no corresponding operation exists in OpenRTm-aist-0.2.0
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onStateUpdate(self, ec_id):
-	#	"""
 	#
-	#	The state update action that is invoked after onExecute() action
-	#	no corresponding operation exists in OpenRTm-aist-0.2.0
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The action that is invoked when execution context's rate is changed
+	#	# no corresponding operation exists in OpenRTm-aist-0.2.0
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onRateChanged(self, ec_id):
-	#	"""
 	#
-	#	The action that is invoked when execution context's rate is changed
-	#	no corresponding operation exists in OpenRTm-aist-0.2.0
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
 def fooInit(manager):
@@ -260,13 +261,10 @@
     manager.registerFactory(profile,
                             foo,
                             OpenRTM_aist.Delete)
-
 def MyModuleInit(manager):
     fooInit(manager)
-
     # Create a component
     comp = manager.createComponent("foo")
-
 def main():
 	mgr = OpenRTM_aist.Manager.init(sys.argv)
 	mgr.setModuleInitProc(MyModuleInit)

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service1/idlcompile.bat
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service1/idlcompile.bat	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service1/idlcompile.bat	2013-01-29 10:39:20 UTC (rev 394)
@@ -1 +1,10 @@
-omniidl.exe -bpython MyService.idl 
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% do (
+  %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl 
+) else do (
+  echo "python.exe" can not be found.
+  echo Please modify PATH environmental variable for python command.
+)
+endlocal

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service1/idlcompile.sh
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service1/idlcompile.sh	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service1/idlcompile.sh	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,2 +1,2 @@
 #!/bin/sh
-omniidl -bpython MyService.idl 
+omniidl -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service2/MyService_idl_example.py
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service2/MyService_idl_example.py	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service2/MyService_idl_example.py	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,47 +1,35 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # -*- Python -*-
-
 """
- \file MyService_idl_examplefile.py
- \brief Python example implementations generated from MyService.idl
- \date $Date$
-
-
+ @file MyService_idl_examplefile.py
+ @brief Python example implementations generated from MyService.idl
+ @date $Date$
 """
-
 import omniORB
 from omniORB import CORBA, PortableServer
-
 import _GlobalIDL, _GlobalIDL__POA
-
-
 class MyService_i (_GlobalIDL__POA.MyService):
     """
-    \class MyService_i
+    @class MyService_i
     Example class implementing IDL interface MyService
     """
-
     def __init__(self):
         """
-        \brief standard constructor
+        @brief standard constructor
         Initialise member variables here
         """
         pass
-
     # void setGain(in float gain)
     def setGain(self, gain):
         raise CORBA.NO_IMPLEMENT(0, CORBA.COMPLETED_NO)
         # *** Implement me
         # Must return: None
-
     # float getGain()
     def getGain(self):
         raise CORBA.NO_IMPLEMENT(0, CORBA.COMPLETED_NO)
         # *** Implement me
         # Must return: result
-
-
 if __name__ == "__main__":
     import sys
     
@@ -50,22 +38,16 @@
     
     # As an example, we activate an object in the Root POA
     poa = orb.resolve_initial_references("RootPOA")
-
     # Create an instance of a servant class
     servant = MyService_i()
-
     # Activate it in the Root POA
     poa.activate_object(servant)
-
     # Get the object reference to the object
     objref = servant._this()
     
     # Print a stringified IOR for it
     print orb.object_to_string(objref)
-
     # Activate the Root POA's manager
     poa._get_the_POAManager().activate()
-
     # Run the ORB, blocking this thread
     orb.run()
-

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service2/foo.py
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service2/foo.py	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service2/foo.py	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,9 +2,9 @@
 # -*- coding: utf-8 -*-
 # -*- Python -*-
 """
- \file foo.py
- \brief MDesc
- \date $Date$
+ @file foo.py
+ @brief MDesc
+ @date $Date$
 """
 import sys
 import time
@@ -12,6 +12,8 @@
 # Import RTM module
 import RTC
 import OpenRTM_aist
+import MyService_idl
+import DAQService_idl
 # Import Service implementation class
 # <rtc-template block="service_impl">
 from MyService_idl_example import *
@@ -34,18 +36,18 @@
 		 "lang_type",         "SCRIPT",
 		 ""]
 # </rtc-template>
+##
+# @class foo
+# @brief MDesc
+# 
+# 
 class foo(OpenRTM_aist.DataFlowComponentBase):
 	
-	"""
-	\class foo
-	\brief MDesc
-	
-	"""
+	##
+	# @brief constructor
+	# @param manager Maneger Object
+	# 
 	def __init__(self, manager):
-		"""
-		\brief constructor
-		\param manager Maneger Object
-		"""
 		OpenRTM_aist.DataFlowComponentBase.__init__(self, manager)
 		self._d_InP1 = RTC.TimedShort(RTC.Time(0,0),0)
 		"""
@@ -81,15 +83,15 @@
 		
 		# </rtc-template>
 		 
+	##
+	#
+	# The initialize action (on CREATED->ALIVE transition)
+	# formaer rtc_init_entry() 
+	# 
+	# @return RTC::ReturnCode_t
+	# 
+	#
 	def onInitialize(self):
-		"""
-		
-		The initialize action (on CREATED->ALIVE transition)
-		formaer rtc_init_entry() 
-		
-		\return RTC::ReturnCode_t
-		
-		"""
 		# Bind variables and configuration variable
 		
 		# Set InPort buffers
@@ -112,156 +114,156 @@
 		
 		return RTC.RTC_OK
 	
+	#	##
+	#	# 
+	#	# The finalize action (on ALIVE->END transition)
+	#	# formaer rtc_exiting_entry()
+	#	# 
+	#	# @return RTC::ReturnCode_t
+	#
+	#	# 
 	#def onFinalize(self, ec_id):
-	#	"""
 	#
-	#	The finalize action (on ALIVE->END transition)
-	#	formaer rtc_exiting_entry()
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The startup action when ExecutionContext startup
+	#	# former rtc_starting_entry()
+	#	# 
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onStartup(self, ec_id):
-	#	"""
 	#
-	#	The startup action when ExecutionContext startup
-	#	former rtc_starting_entry()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The shutdown action when ExecutionContext stop
+	#	# former rtc_stopping_entry()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onShutdown(self, ec_id):
-	#	"""
 	#
-	#	The shutdown action when ExecutionContext stop
-	#	former rtc_stopping_entry()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The activated action (Active state entry action)
+	#	# former rtc_active_entry()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	# 
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onActivated(self, ec_id):
-	#	"""
 	#
-	#	The activated action (Active state entry action)
-	#	former rtc_active_entry()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The deactivated action (Active state exit action)
+	#	# former rtc_active_exit()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onDeactivated(self, ec_id):
-	#	"""
 	#
-	#	The deactivated action (Active state exit action)
-	#	former rtc_active_exit()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The execution action that is invoked periodically
+	#	# former rtc_active_do()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onExecute(self, ec_id):
-	#	"""
 	#
-	#	The execution action that is invoked periodically
-	#	former rtc_active_do()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The aborting action when main logic error occurred.
+	#	# former rtc_aborting_entry()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onAborting(self, ec_id):
-	#	"""
 	#
-	#	The aborting action when main logic error occurred.
-	#	former rtc_aborting_entry()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The error action in ERROR state
+	#	# former rtc_error_do()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onError(self, ec_id):
-	#	"""
 	#
-	#	The error action in ERROR state
-	#	former rtc_error_do()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The reset action that is invoked resetting
+	#	# This is same but different the former rtc_init_entry()
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onReset(self, ec_id):
-	#	"""
 	#
-	#	The reset action that is invoked resetting
-	#	This is same but different the former rtc_init_entry()
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The state update action that is invoked after onExecute() action
+	#	# no corresponding operation exists in OpenRTm-aist-0.2.0
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onStateUpdate(self, ec_id):
-	#	"""
 	#
-	#	The state update action that is invoked after onExecute() action
-	#	no corresponding operation exists in OpenRTm-aist-0.2.0
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
+	#	##
+	#	#
+	#	# The action that is invoked when execution context's rate is changed
+	#	# no corresponding operation exists in OpenRTm-aist-0.2.0
+	#	#
+	#	# @param ec_id target ExecutionContext Id
+	#	#
+	#	# @return RTC::ReturnCode_t
+	#	#
+	#	#
 	#def onRateChanged(self, ec_id):
-	#	"""
 	#
-	#	The action that is invoked when execution context's rate is changed
-	#	no corresponding operation exists in OpenRTm-aist-0.2.0
-	#
-	#	\param ec_id target ExecutionContext Id
-	#
-	#	\return RTC::ReturnCode_t
-	#
-	#	"""
-	#
 	#	return RTC.RTC_OK
 	
 def fooInit(manager):
@@ -269,13 +271,10 @@
     manager.registerFactory(profile,
                             foo,
                             OpenRTM_aist.Delete)
-
 def MyModuleInit(manager):
     fooInit(manager)
-
     # Create a component
     comp = manager.createComponent("foo")
-
 def main():
 	mgr = OpenRTM_aist.Manager.init(sys.argv)
 	mgr.setModuleInitProc(MyModuleInit)

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service2/idlcompile.bat
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service2/idlcompile.bat	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service2/idlcompile.bat	2013-01-29 10:39:20 UTC (rev 394)
@@ -1 +1,10 @@
-omniidl.exe -bpython MyService.idl DAQService.idl 
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% do (
+  %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl idl/DAQService.idl 
+) else do (
+  echo "python.exe" can not be found.
+  echo Please modify PATH environmental variable for python command.
+)
+endlocal

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service2/idlcompile.sh
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service2/idlcompile.sh	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service2/idlcompile.sh	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,2 +1,2 @@
 #!/bin/sh
-omniidl -bpython MyService.idl DAQService.idl 
+omniidl -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl idl/DAQService.idl 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/build/cmake1/DAQService.idl
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/build/cmake1/DAQService.idl	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/build/cmake1/DAQService.idl	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,7 +1,7 @@
 // -*- IDL -*-
 /*!
  * @file RTCService.idl
- * @brief RTComponent ƒT[ƒrƒXƒCƒ“ƒ^[ƒtƒF[ƒX
+ * @brief RTComponent サービスインターフェース
  * @date $Date: 2007/03/14 12:14:35 $
  * @author Noriaki Ando <n-ando at aist.go.jp>
  *
@@ -20,7 +20,7 @@
 /*
  * $Log: DAQService.idl,v $
  * Revision 1.1  2007/03/14 12:14:35  tsakamoto
- * ‘®«¶¬”Å
+ * 属性生成版
  *
  * Revision 1.1  2005/09/07 05:06:13  n-ando
  * RTComponent's service management feature was added.

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/build/cmake1/foo.py
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/build/cmake1/foo.py	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/build/cmake1/foo.py	2013-01-29 10:39:20 UTC (rev 394)
@@ -12,6 +12,8 @@
 # Import RTM module
 import RTC
 import OpenRTM_aist
+import MyService_idl
+import DAQService_idl
 # Import Service implementation class
 # <rtc-template block="service_impl">
 from MyService_idl_example import *

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/build/cmake1/idlcompile.bat
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/build/cmake1/idlcompile.bat	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/build/cmake1/idlcompile.bat	2013-01-29 10:39:20 UTC (rev 394)
@@ -1 +1,10 @@
-omniidl.exe -bpython MyService.idl DAQService.idl 
\ No newline at end of file
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% do (
+  %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl idl/DAQService.idl 
+) else do (
+  echo "python.exe" can not be found.
+  echo Please modify PATH environmental variable for python command.
+)
+endlocal

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/build/cmake1/idlcompile.sh
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/build/cmake1/idlcompile.sh	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/build/cmake1/idlcompile.sh	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,2 +1,2 @@
 #!/bin/sh
-omniidl -bpython MyService.idl DAQService.idl 
+omniidl -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl idl/DAQService.idl 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/build/cmake2/foo.py
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/build/cmake2/foo.py	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/build/cmake2/foo.py	2013-01-29 10:39:20 UTC (rev 394)
@@ -12,6 +12,8 @@
 # Import RTM module
 import RTC
 import OpenRTM_aist
+import MyServiceChildMulti_idl
+import MyServiceChildWithType_idl
 # Import Service implementation class
 # <rtc-template block="service_impl">
 from MyServiceChildMulti_idl_example import *

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/build/cmake2/idlcompile.bat
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/build/cmake2/idlcompile.bat	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/build/cmake2/idlcompile.bat	2013-01-29 10:39:20 UTC (rev 394)
@@ -1 +1,10 @@
-omniidl.exe -bpython MyServiceChildMulti.idl MyServiceChildWithType.idl 
\ No newline at end of file
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% do (
+  %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" -I"D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.python\resource/100/build/cmake2" idl/MyServiceChildMulti.idl idl/MyServiceChildWithType.idl 
+) else do (
+  echo "python.exe" can not be found.
+  echo Please modify PATH environmental variable for python command.
+)
+endlocal

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/build/cmake2/idlcompile.sh
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/build/cmake2/idlcompile.sh	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/build/cmake2/idlcompile.sh	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,2 +1,2 @@
 #!/bin/sh
-omniidl -bpython MyServiceChildMulti.idl MyServiceChildWithType.idl 
+omniidl -bpython -I"%RTM_ROOT%rtm\idl" -I"D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.python\resource/100/build/cmake2" idl/MyServiceChildMulti.idl idl/MyServiceChildWithType.idl 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idlinherit/inherit1/foo.py
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idlinherit/inherit1/foo.py	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idlinherit/inherit1/foo.py	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,35 +1,26 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # -*- Python -*-
-
 """
  \file foo.py
  \brief test module
  \date $Date$
-
-
 """
 import sys
 import time
 sys.path.append(".")
-
 # Import RTM module
 import RTC
 import OpenRTM_aist
-
+import MyServiceChildMulti_idl
 # Import Service implementation class
 # <rtc-template block="service_impl">
 from MyServiceChildMulti_idl_example import *
-
 # </rtc-template>
-
 # Import Service stub modules
 # <rtc-template block="consumer_import">
 import _GlobalIDL, _GlobalIDL__POA
-
 # </rtc-template>
-
-
 # This module's spesification
 # <rtc-template block="module_spec">
 foo_spec = ["implementation_id", "foo", 
@@ -44,7 +35,6 @@
 		 "lang_type",         "SCRIPT",
 		 ""]
 # </rtc-template>
-
 class foo(OpenRTM_aist.DataFlowComponentBase):
 	
 	"""
@@ -58,30 +48,23 @@
 		\param manager Maneger Object
 		"""
 		OpenRTM_aist.DataFlowComponentBase.__init__(self, manager)
-
-
 		"""
 		"""
 		self._MyServiceProviderPort = OpenRTM_aist.CorbaPort("MyServiceProvider")
 		"""
 		"""
 		self._MyServiceRequirePort = OpenRTM_aist.CorbaPort("MyServiceRequire")
-
 		"""
 		"""
 		self._MyServiceProvider = MyServiceChild_i()
 		
-
 		"""
 		"""
 		self._MyServiceRequire = OpenRTM_aist.CorbaConsumer(interfaceType=_GlobalIDL.MyServiceChild)
-
 		# initialize of configuration-data.
 		# <rtc-template block="init_conf_param">
 		
 		# </rtc-template>
-
-
 		 
 	def onInitialize(self):
 		"""
@@ -262,29 +245,19 @@
 	#
 	#	return RTC.RTC_OK
 	
-
-
-
 def fooInit(manager):
     profile = OpenRTM_aist.Properties(defaults_str=foo_spec)
     manager.registerFactory(profile,
                             foo,
                             OpenRTM_aist.Delete)
-
 def MyModuleInit(manager):
     fooInit(manager)
-
     # Create a component
     comp = manager.createComponent("foo")
-
-
-
 def main():
 	mgr = OpenRTM_aist.Manager.init(sys.argv)
 	mgr.setModuleInitProc(MyModuleInit)
 	mgr.activateManager()
 	mgr.runManager()
-
 if __name__ == "__main__":
 	main()
-

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idlinherit/inherit1/idlcompile.bat
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idlinherit/inherit1/idlcompile.bat	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idlinherit/inherit1/idlcompile.bat	2013-01-29 10:39:20 UTC (rev 394)
@@ -1 +1,10 @@
-omniidl.exe -bpython MyServiceChildMulti.idl 
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% do (
+  %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" -I"D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.python\resource/100/idlinherit/inherit1" idl/MyServiceChildMulti.idl 
+) else do (
+  echo "python.exe" can not be found.
+  echo Please modify PATH environmental variable for python command.
+)
+endlocal

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idlinherit/inherit1/idlcompile.sh
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idlinherit/inherit1/idlcompile.sh	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idlinherit/inherit1/idlcompile.sh	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,2 +1,2 @@
 #!/bin/sh
-omniidl -bpython MyServiceChildMulti.idl 
+omniidl -bpython -I"%RTM_ROOT%rtm\idl" -I"D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.python\resource/100/idlinherit/inherit1" idl/MyServiceChildMulti.idl 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idlinherit/inherit2/foo.py
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idlinherit/inherit2/foo.py	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idlinherit/inherit2/foo.py	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,36 +1,28 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # -*- Python -*-
-
 """
  \file foo.py
  \brief test module
  \date $Date$
-
-
 """
 import sys
 import time
 sys.path.append(".")
-
 # Import RTM module
 import RTC
 import OpenRTM_aist
-
+import MyServiceChildMulti_idl
+import MyServiceChildWithType_idl
 # Import Service implementation class
 # <rtc-template block="service_impl">
 from MyServiceChildMulti_idl_example import *
 from MyServiceChildWithType_idl_example import *
-
 # </rtc-template>
-
 # Import Service stub modules
 # <rtc-template block="consumer_import">
 import _GlobalIDL, _GlobalIDL__POA
-
 # </rtc-template>
-
-
 # This module's spesification
 # <rtc-template block="module_spec">
 foo_spec = ["implementation_id", "foo", 
@@ -45,7 +37,6 @@
 		 "lang_type",         "SCRIPT",
 		 ""]
 # </rtc-template>
-
 class foo(OpenRTM_aist.DataFlowComponentBase):
 	
 	"""
@@ -59,15 +50,12 @@
 		\param manager Maneger Object
 		"""
 		OpenRTM_aist.DataFlowComponentBase.__init__(self, manager)
-
-
 		"""
 		"""
 		self._MyServiceProviderPort = OpenRTM_aist.CorbaPort("MyServiceProvider")
 		"""
 		"""
 		self._MyServiceRequirePort = OpenRTM_aist.CorbaPort("MyServiceRequire")
-
 		"""
 		"""
 		self._MyServiceProvider = MyServiceChild_i()
@@ -81,13 +69,10 @@
 		"""
 		"""
 		self._MyServiceRequire2 = OpenRTM_aist.CorbaConsumer(interfaceType=_GlobalIDL.MyServiceWithTypeChild)
-
 		# initialize of configuration-data.
 		# <rtc-template block="init_conf_param">
 		
 		# </rtc-template>
-
-
 		 
 	def onInitialize(self):
 		"""
@@ -270,29 +255,19 @@
 	#
 	#	return RTC.RTC_OK
 	
-
-
-
 def fooInit(manager):
     profile = OpenRTM_aist.Properties(defaults_str=foo_spec)
     manager.registerFactory(profile,
                             foo,
                             OpenRTM_aist.Delete)
-
 def MyModuleInit(manager):
     fooInit(manager)
-
     # Create a component
     comp = manager.createComponent("foo")
-
-
-
 def main():
 	mgr = OpenRTM_aist.Manager.init(sys.argv)
 	mgr.setModuleInitProc(MyModuleInit)
 	mgr.activateManager()
 	mgr.runManager()
-
 if __name__ == "__main__":
 	main()
-

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idlinherit/inherit2/idlcompile.bat
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idlinherit/inherit2/idlcompile.bat	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idlinherit/inherit2/idlcompile.bat	2013-01-29 10:39:20 UTC (rev 394)
@@ -1 +1,10 @@
-omniidl.exe -bpython MyServiceChildMulti.idl MyServiceChildWithType.idl 
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% do (
+  %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" -I"D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.python\resource/100/idlinherit/inherit2" idl/MyServiceChildMulti.idl idl/MyServiceChildWithType.idl 
+) else do (
+  echo "python.exe" can not be found.
+  echo Please modify PATH environmental variable for python command.
+)
+endlocal

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idlinherit/inherit2/idlcompile.sh
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idlinherit/inherit2/idlcompile.sh	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idlinherit/inherit2/idlcompile.sh	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,2 +1,2 @@
 #!/bin/sh
-omniidl -bpython MyServiceChildMulti.idl MyServiceChildWithType.idl 
+omniidl -bpython -I"%RTM_ROOT%rtm\idl" -I"D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.python\resource/100/idlinherit/inherit2" idl/MyServiceChildMulti.idl idl/MyServiceChildWithType.idl 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type1/ModuleName.py
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type1/ModuleName.py	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type1/ModuleName.py	2013-01-29 10:39:20 UTC (rev 394)
@@ -12,6 +12,7 @@
 # Import RTM module
 import RTC
 import OpenRTM_aist
+import TestIDL_idl
 # Import Service implementation class
 # <rtc-template block="service_impl">
 from TestIDL_idl_example import *

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type2/idlcompile.bat
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type2/idlcompile.bat	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type2/idlcompile.bat	2013-01-29 10:39:20 UTC (rev 394)
@@ -1 +1,10 @@
-omniidl.exe -bpython MyService.idl 
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% do (
+  %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl 
+) else do (
+  echo "python.exe" can not be found.
+  echo Please modify PATH environmental variable for python command.
+)
+endlocal

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type2/idlcompile.sh
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type2/idlcompile.sh	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type2/idlcompile.sh	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,2 +1,2 @@
 #!/bin/sh
-omniidl -bpython MyService.idl 
+omniidl -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type2/test.py
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type2/test.py	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type2/test.py	2013-01-29 10:39:20 UTC (rev 394)
@@ -12,6 +12,7 @@
 # Import RTM module
 import RTC
 import OpenRTM_aist
+import MyService_idl
 # Import Service implementation class
 # <rtc-template block="service_impl">
 from MyService_idl_example import *
@@ -240,13 +241,10 @@
     manager.registerFactory(profile,
                             test,
                             OpenRTM_aist.Delete)
-
 def MyModuleInit(manager):
     testInit(manager)
-
     # Create a component
     comp = manager.createComponent("test")
-
 def main():
 	mgr = OpenRTM_aist.Manager.init(sys.argv)
 	mgr.setModuleInitProc(MyModuleInit)

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type3/idlcompile.bat
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type3/idlcompile.bat	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type3/idlcompile.bat	2013-01-29 10:39:20 UTC (rev 394)
@@ -1 +1,10 @@
-omniidl.exe -bpython MyService.idl 
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% do (
+  %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl 
+) else do (
+  echo "python.exe" can not be found.
+  echo Please modify PATH environmental variable for python command.
+)
+endlocal

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type3/idlcompile.sh
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type3/idlcompile.sh	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type3/idlcompile.sh	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,2 +1,2 @@
 #!/bin/sh
-omniidl -bpython MyService.idl 
+omniidl -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type3/test.py
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type3/test.py	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type3/test.py	2013-01-29 10:39:20 UTC (rev 394)
@@ -12,6 +12,7 @@
 # Import RTM module
 import RTC
 import OpenRTM_aist
+import MyService_idl
 # Import Service implementation class
 # <rtc-template block="service_impl">
 from MyService_idl_example import *

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM/foo.py
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM/foo.py	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM/foo.py	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,33 +1,25 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # -*- Python -*-
-
 """
  \file foo.py
  \brief ModuleDescription
  \date $Date$
-
-
 """
 import sys
 import time
 sys.path.append(".")
-
 # Import RTM module
 import RTC
 import OpenRTM_aist
-
+import MyService_idl
 # Import Service implementation class
 # <rtc-template block="service_impl">
 from MyService_idl_example import *
-
 # </rtc-template>
-
 # Import Service stub modules
 # <rtc-template block="consumer_import">
 # </rtc-template>
-
-
 # This module's spesification
 # <rtc-template block="module_spec">
 foo_spec = ["implementation_id", "foo", 
@@ -42,7 +34,6 @@
 		 "lang_type",         "SCRIPT",
 		 ""]
 # </rtc-template>
-
 class foo(OpenRTM_aist.DataFlowComponentBase):
 	
 	"""
@@ -56,24 +47,17 @@
 		\param manager Maneger Object
 		"""
 		OpenRTM_aist.DataFlowComponentBase.__init__(self, manager)
-
-
 		"""
 		"""
 		self._sv_namePort = OpenRTM_aist.CorbaPort("sv_name")
-
 		"""
 		"""
 		self._if_name = MyService_i()
 		
-
-
 		# initialize of configuration-data.
 		# <rtc-template block="init_conf_param">
 		
 		# </rtc-template>
-
-
 		 
 	def onInitialize(self):
 		"""
@@ -252,29 +236,19 @@
 	#
 	#	return RTC.RTC_OK
 	
-
-
-
 def fooInit(manager):
     profile = OpenRTM_aist.Properties(defaults_str=foo_spec)
     manager.registerFactory(profile,
                             foo,
                             OpenRTM_aist.Delete)
-
 def MyModuleInit(manager):
     fooInit(manager)
-
     # Create a component
     comp = manager.createComponent("foo")
-
-
-
 def main():
 	mgr = OpenRTM_aist.Manager.init(sys.argv)
 	mgr.setModuleInitProc(MyModuleInit)
 	mgr.activateManager()
 	mgr.runManager()
-
 if __name__ == "__main__":
 	main()
-

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM/idlcompile.bat
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM/idlcompile.bat	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM/idlcompile.bat	2013-01-29 10:39:20 UTC (rev 394)
@@ -1 +1,10 @@
-omniidl.exe -bpython MyService.idl 
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% do (
+  %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl 
+) else do (
+  echo "python.exe" can not be found.
+  echo Please modify PATH environmental variable for python command.
+)
+endlocal

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM/idlcompile.sh
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM/idlcompile.sh	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM/idlcompile.sh	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,2 +1,2 @@
 #!/bin/sh
-omniidl -bpython MyService.idl 
+omniidl -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM2/foo.py
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM2/foo.py	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM2/foo.py	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,34 +1,27 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # -*- Python -*-
-
 """
  \file foo.py
  \brief ModuleDescription
  \date $Date$
-
-
 """
 import sys
 import time
 sys.path.append(".")
-
 # Import RTM module
 import RTC
 import OpenRTM_aist
-
+import MyService_idl
+import DAQService_idl
 # Import Service implementation class
 # <rtc-template block="service_impl">
 from MyService_idl_example import *
 from DAQService_idl_example import *
-
 # </rtc-template>
-
 # Import Service stub modules
 # <rtc-template block="consumer_import">
 # </rtc-template>
-
-
 # This module's spesification
 # <rtc-template block="module_spec">
 foo_spec = ["implementation_id", "foo", 
@@ -43,7 +36,6 @@
 		 "lang_type",         "SCRIPT",
 		 ""]
 # </rtc-template>
-
 class foo(OpenRTM_aist.DataFlowComponentBase):
 	
 	"""
@@ -57,12 +49,9 @@
 		\param manager Maneger Object
 		"""
 		OpenRTM_aist.DataFlowComponentBase.__init__(self, manager)
-
-
 		"""
 		"""
 		self._sv_namePort = OpenRTM_aist.CorbaPort("sv_name")
-
 		"""
 		"""
 		self._if_name1 = MyService_i()
@@ -70,14 +59,10 @@
 		"""
 		self._if_name2 = DAQService_i()
 		
-
-
 		# initialize of configuration-data.
 		# <rtc-template block="init_conf_param">
 		
 		# </rtc-template>
-
-
 		 
 	def onInitialize(self):
 		"""
@@ -257,29 +242,19 @@
 	#
 	#	return RTC.RTC_OK
 	
-
-
-
 def fooInit(manager):
     profile = OpenRTM_aist.Properties(defaults_str=foo_spec)
     manager.registerFactory(profile,
                             foo,
                             OpenRTM_aist.Delete)
-
 def MyModuleInit(manager):
     fooInit(manager)
-
     # Create a component
     comp = manager.createComponent("foo")
-
-
-
 def main():
 	mgr = OpenRTM_aist.Manager.init(sys.argv)
 	mgr.setModuleInitProc(MyModuleInit)
 	mgr.activateManager()
 	mgr.runManager()
-
 if __name__ == "__main__":
 	main()
-

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM2/idlcompile.bat
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM2/idlcompile.bat	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM2/idlcompile.bat	2013-01-29 10:39:20 UTC (rev 394)
@@ -1 +1,10 @@
-omniidl.exe -bpython MyService.idl DAQService.idl 
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% do (
+  %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl idl/DAQService.idl 
+) else do (
+  echo "python.exe" can not be found.
+  echo Please modify PATH environmental variable for python command.
+)
+endlocal

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM2/idlcompile.sh
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM2/idlcompile.sh	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM2/idlcompile.sh	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,2 +1,2 @@
 #!/bin/sh
-omniidl -bpython MyService.idl DAQService.idl 
+omniidl -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl idl/DAQService.idl 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceMC/foo.py
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceMC/foo.py	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceMC/foo.py	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,34 +1,25 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # -*- Python -*-
-
 """
  \file foo.py
  \brief ModuleDescription
  \date $Date$
-
-
 """
 import sys
 import time
 sys.path.append(".")
-
 # Import RTM module
 import RTC
 import OpenRTM_aist
-
+import MyService_idl
 # Import Service implementation class
 # <rtc-template block="service_impl">
-
 # </rtc-template>
-
 # Import Service stub modules
 # <rtc-template block="consumer_import">
 import SimpleService, SimpleService__POA
-
 # </rtc-template>
-
-
 # This module's spesification
 # <rtc-template block="module_spec">
 foo_spec = ["implementation_id", "foo", 
@@ -43,7 +34,6 @@
 		 "lang_type",         "SCRIPT",
 		 ""]
 # </rtc-template>
-
 class foo(OpenRTM_aist.DataFlowComponentBase):
 	
 	"""
@@ -57,24 +47,17 @@
 		\param manager Maneger Object
 		"""
 		OpenRTM_aist.DataFlowComponentBase.__init__(self, manager)
-
-
 		"""
 		"""
 		self._sv_namePort = OpenRTM_aist.CorbaPort("sv_name")
-
 		
-
 		"""
 		"""
 		self._if_name = OpenRTM_aist.CorbaConsumer(interfaceType=SimpleService.MyService)
-
 		# initialize of configuration-data.
 		# <rtc-template block="init_conf_param">
 		
 		# </rtc-template>
-
-
 		 
 	def onInitialize(self):
 		"""
@@ -253,29 +236,19 @@
 	#
 	#	return RTC.RTC_OK
 	
-
-
-
 def fooInit(manager):
     profile = OpenRTM_aist.Properties(defaults_str=foo_spec)
     manager.registerFactory(profile,
                             foo,
                             OpenRTM_aist.Delete)
-
 def MyModuleInit(manager):
     fooInit(manager)
-
     # Create a component
     comp = manager.createComponent("foo")
-
-
-
 def main():
 	mgr = OpenRTM_aist.Manager.init(sys.argv)
 	mgr.setModuleInitProc(MyModuleInit)
 	mgr.activateManager()
 	mgr.runManager()
-
 if __name__ == "__main__":
 	main()
-

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceMC2/foo.py
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceMC2/foo.py	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceMC2/foo.py	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,35 +1,27 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # -*- Python -*-
-
 """
  \file foo.py
  \brief ModuleDescription
  \date $Date$
-
-
 """
 import sys
 import time
 sys.path.append(".")
-
 # Import RTM module
 import RTC
 import OpenRTM_aist
-
+import MyService_idl
+import DAQService_idl
 # Import Service implementation class
 # <rtc-template block="service_impl">
-
 # </rtc-template>
-
 # Import Service stub modules
 # <rtc-template block="consumer_import">
 import SimpleService, SimpleService__POA
 import _GlobalIDL, _GlobalIDL__POA
-
 # </rtc-template>
-
-
 # This module's spesification
 # <rtc-template block="module_spec">
 foo_spec = ["implementation_id", "foo", 
@@ -44,7 +36,6 @@
 		 "lang_type",         "SCRIPT",
 		 ""]
 # </rtc-template>
-
 class foo(OpenRTM_aist.DataFlowComponentBase):
 	
 	"""
@@ -58,27 +49,20 @@
 		\param manager Maneger Object
 		"""
 		OpenRTM_aist.DataFlowComponentBase.__init__(self, manager)
-
-
 		"""
 		"""
 		self._sv_namePort = OpenRTM_aist.CorbaPort("sv_name")
-
 		
-
 		"""
 		"""
 		self._if_name1 = OpenRTM_aist.CorbaConsumer(interfaceType=SimpleService.MyService)
 		"""
 		"""
 		self._if_name2 = OpenRTM_aist.CorbaConsumer(interfaceType=_GlobalIDL.DAQService)
-
 		# initialize of configuration-data.
 		# <rtc-template block="init_conf_param">
 		
 		# </rtc-template>
-
-
 		 
 	def onInitialize(self):
 		"""
@@ -258,29 +242,19 @@
 	#
 	#	return RTC.RTC_OK
 	
-
-
-
 def fooInit(manager):
     profile = OpenRTM_aist.Properties(defaults_str=foo_spec)
     manager.registerFactory(profile,
                             foo,
                             OpenRTM_aist.Delete)
-
 def MyModuleInit(manager):
     fooInit(manager)
-
     # Create a component
     comp = manager.createComponent("foo")
-
-
-
 def main():
 	mgr = OpenRTM_aist.Manager.init(sys.argv)
 	mgr.setModuleInitProc(MyModuleInit)
 	mgr.activateManager()
 	mgr.runManager()
-
 if __name__ == "__main__":
 	main()
-

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/DAQService.idl
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/DAQService.idl	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/DAQService.idl	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,7 +1,7 @@
 // -*- IDL -*-
 /*!
  * @file RTCService.idl
- * @brief RTComponent ƒT[ƒrƒXƒCƒ“ƒ^[ƒtƒF[ƒX
+ * @brief RTComponent サービスインターフェース
  * @date $Date: 2007/12/25 05:43:04 $
  * @author Noriaki Ando <n-ando at aist.go.jp>
  *
@@ -23,7 +23,7 @@
  * *** empty log message ***
  *
  * Revision 1.1  2007/03/14 12:14:35  tsakamoto
- * ‘®«¶¬”Å
+ * 属性生成版
  *
  * Revision 1.1  2005/09/07 05:06:13  n-ando
  * RTComponent's service management feature was added.

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/PythonGenerateManager.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/PythonGenerateManager.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/PythonGenerateManager.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -75,10 +75,8 @@
 
 		// IDLファイル内に記述されているServiceClassParamを設定する
 		for (IdlFileParam idlFileParam : allIdlFileParams) {
-			for (ServiceClassParam serviceClassParam : rtcParam
-					.getServiceClassParams()) {
-				if (idlFileParam.getIdlPath().equals(
-						serviceClassParam.getIdlPath()))
+			for (ServiceClassParam serviceClassParam : rtcParam.getServiceClassParams()) {
+				if (idlFileParam.getIdlPath().equals(serviceClassParam.getIdlPath()))
 					idlFileParam.addServiceClassParams(serviceClassParam);
 			}
 		}
@@ -90,10 +88,8 @@
 		contextMap.put("tmpltHelperPy", new TemplateHelperPy());
 		contextMap.put("pyConv", new PythonConverter());
 		contextMap.put("allIdlFileParam", allIdlFileParams);
+		contextMap.put("idlPathes", rtcParam.getIdlPathes());
 
-		if (rtcParam.getRtmVersion().equals(RTM_VERSION_042)) {
-			return generateTemplateCode04(contextMap);
-		}
 		return generateTemplateCode10(contextMap);
 	}
 
@@ -110,7 +106,8 @@
 		gr = generatePythonSource(contextMap);
 		result.add(gr);
 
-		if (allIdlFileParams.size() > 0) {
+//		if ( 0<allIdlFileParams.size() || 0<rtcParam.getIdlPathes().size()) {
+		if ( 0<allIdlFileParams.size() ) {
 			gr = generateIDLCompileBat(contextMap);
 			result.add(gr);
 			gr = generateIDLCompileSh(contextMap);
@@ -126,41 +123,6 @@
 		return result;
 	}
 
-	// RTM 0.4ç³»
-	@SuppressWarnings("unchecked")
-	public List<GeneratedResult> generateTemplateCode04(
-			Map<String, Object> contextMap) {
-		List<GeneratedResult> result = new ArrayList<GeneratedResult>();
-		RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
-		List<IdlFileParam> allIdlFileParams = (List<IdlFileParam>) contextMap
-				.get("allIdlFileParam");
-
-		GeneratedResult gr;
-		gr = generatePythonSource_04(contextMap);
-		result.add(gr);
-
-		for (IdlFileParam idl : allIdlFileParams) {
-			contextMap.put("idlFileParam", idl);
-			gr = generateSVCIDLSource(contextMap);
-			result.add(gr);
-		}
-		if (allIdlFileParams.size() > 0) {
-			contextMap.put("idlFileParams", allIdlFileParams);
-			gr = generateGlobalInitSource_04(contextMap);
-			result.add(gr);
-			gr = generateGlobalPOAInitSource_04(contextMap);
-			result.add(gr);
-		}
-
-		for (IdlFileParam idl : rtcParam.getProviderIdlPathes()) {
-			contextMap.put("idlFileParam", idl);
-			gr = generateSVCIDLExampleSource_04(contextMap);
-			result.add(gr);
-		}
-
-		return result;
-	}
-
 	// 1.0ç³» (Python)
 
 	public GeneratedResult generatePythonSource(Map<String, Object> contextMap) {
@@ -186,38 +148,6 @@
 		return generate(infile, outfile, contextMap);
 	}
 
-	// 0.4ç³» (Python)
-
-	public GeneratedResult generatePythonSource_04(
-			Map<String, Object> contextMap) {
-		RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
-		String outfile = rtcParam.getName() + ".py";
-		String infile = "python_04/Py_RTC.py.vsl";
-		return generate(infile, outfile, contextMap);
-	}
-
-	public GeneratedResult generateSVCIDLExampleSource_04(
-			Map<String, Object> contextMap) {
-		IdlFileParam idlParam = (IdlFileParam) contextMap.get("idlFileParam");
-		String outfile = idlParam.getIdlFileNoExt() + "_idl_example.py";
-		String infile = "python_04/Py_SVC_idl_example.py.vsl";
-		return generate(infile, outfile, contextMap);
-	}
-
-	public GeneratedResult generateGlobalInitSource_04(
-			Map<String, Object> contextMap) {
-		String outfile = "_GlobalIDL/__init__.py";
-		String infile = "python_04/Py_Global__init__.py.vsl";
-		return generate(infile, outfile, contextMap);
-	}
-
-	public GeneratedResult generateGlobalPOAInitSource_04(
-			Map<String, Object> contextMap) {
-		String outfile = "_GlobalIDL__POA/__init__.py";
-		String infile = "python_04/Py_Global_POA__init__.py.vsl";
-		return generate(infile, outfile, contextMap);
-	}
-
 	// 1.0系 (ビルド環境)
 
 	public GeneratedResult generateIDLCompileBat(Map<String, Object> contextMap) {

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/TemplateHelperPy.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/TemplateHelperPy.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/TemplateHelperPy.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,6 +1,10 @@
 package jp.go.aist.rtm.rtcbuilder.python.manager;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import jp.go.aist.rtm.rtcbuilder.IRtcBuilderConstants;
+import jp.go.aist.rtm.rtcbuilder.generator.param.idl.IdlFileParam;
 import jp.go.aist.rtm.rtcbuilder.python.IRtcBuilderConstantsPython;
 import jp.go.aist.rtm.rtcbuilder.util.StringUtil;
 
@@ -86,4 +90,51 @@
 				IRtcBuilderConstantsPython.DOC_POSTSH_PREFIX_PY, IRtcBuilderConstantsPython.DOC_POST_OFFSET_PY);
 	}
 	//
+	public boolean hasDataPortType(List<IdlFileParam> targetFiles) {
+		for(IdlFileParam target : targetFiles) {
+			if(target.isDataPort()) return true;
+		}
+		return false;
+	}
+	
+	public List<String> getDataPortTypes(List<IdlFileParam> targetFiles) {
+		List<String> result = new ArrayList<String>();
+		List<String> check = new ArrayList<String>();
+		check.add("RTC");
+		check.add("OpenRTM_aist");
+		
+		for(IdlFileParam target : targetFiles) {
+			if(target.isDataPort()==false) continue;
+			String targetType = "";
+			for(String targetTypes : target.getTargetType()) {
+				if( targetTypes.contains("::") ) {
+					String[] types = targetTypes.split("::");
+					/////
+					targetType = types[0];
+					if(check.contains(targetType)==false) {
+						check.add(targetType);
+						result.add(targetType);
+					}
+//					StringBuilder builder = new StringBuilder();
+//					for(int index=0;index<types.length-1;index++) {
+//						if(index!=0) builder.append(".");
+//						builder.append(types[index]);
+//						targetType = builder.toString();
+//						if(check.contains(targetType)==false) {
+//							check.add(targetType);
+//							result.add(targetType);
+//						}
+//					}
+				
+				} else {
+					targetType = "_GlobalIDL";
+					if(check.contains(targetType)==false) {
+						check.add(targetType);
+						result.add(targetType);
+					}
+				}
+			}
+		}
+		return result;
+	}
 }

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/Py_RTC.py.vsl
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/Py_RTC.py.vsl	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/Py_RTC.py.vsl	2013-01-29 10:39:20 UTC (rev 394)
@@ -3,13 +3,13 @@
 # -*- Python -*-
 
 """
- \file ${rtcParam.name}.py
- \brief ${rtcParam.description}
+ @file ${rtcParam.name}.py
+ @brief ${rtcParam.description}
 #set( $Date$ = "dummy" )
- \date \$Date$
+ @date \$Date$
 
 #if( ${rtcParam.docCreator.length()} > 0 )
- \author ${tmpltHelperPy.convertAuthorDocPy(${rtcParam.docCreator})}
+ @author ${tmpltHelperPy.convertAuthorDocPy(${rtcParam.docCreator})}
 #end
 #if( ${rtcParam.docLicense.length()} > 0 )
 
@@ -25,6 +25,14 @@
 import RTC
 import OpenRTM_aist
 
+#foreach($IdlFile in ${allIdlFileParam})#if(!${IdlFile.dataPort})import ${tmpltHelper.getFilenameNoExt(${IdlFile.IdlFile})}_idl
+#end
+#end
+#if( ${tmpltHelperPy.hasDataPortType(${allIdlFileParam})})
+#foreach($idlTarget in ${tmpltHelperPy.getDataPortTypes(${allIdlFileParam})})import ${idlTarget}
+#end
+#end
+
 # Import Service implementation class
 # <rtc-template block="service_impl">
 #foreach($providerIdlFile in ${rtcParam.providerIdlPathes})
@@ -79,34 +87,34 @@
 		 ""]
 # </rtc-template>
 
-class ${rtcParam.name}(OpenRTM_aist.DataFlowComponentBase):
-	
-	"""
-	\class ${rtcParam.name}
-	\brief ${rtcParam.description}
+${sharp}${sharp}
+${sharp} @class ${rtcParam.name}
+${sharp} @brief ${rtcParam.description}
 #if( ${rtcParam.docDescription.length()} > 0 )
-	
-	${tmpltHelperPy.convertModuleDocPy(${rtcParam.docDescription})}
+${sharp} 
+${sharp} ${tmpltHelperPy.convertModuleDocPy(${rtcParam.docDescription})}
 #end
 #if( ${rtcParam.docInOut.length()} > 0 )
-	
-	${tmpltHelperPy.convertModuleDocPy(${rtcParam.docInOut})}
+${sharp} 
+${sharp} ${tmpltHelperPy.convertModuleDocPy(${rtcParam.docInOut})}
 #end
 #if( ${rtcParam.docAlgorithm.length()} > 0 )
-	
-	${tmpltHelperPy.convertModuleDocPy(${rtcParam.docAlgorithm})}
+${sharp} 
+${sharp} ${tmpltHelperPy.convertModuleDocPy(${rtcParam.docAlgorithm})}
 #end
 #if( ${rtcParam.docReference.length()} > 0 )
-	
-	${tmpltHelperPy.convertModuleDocPy(${rtcParam.docReference})}
+${sharp} 
+${sharp} ${tmpltHelperPy.convertModuleDocPy(${rtcParam.docReference})}
 #end
+${sharp} 
+${sharp} 
+class ${rtcParam.name}(OpenRTM_aist.DataFlowComponentBase):
 	
-	"""
+	${sharp}${sharp}
+	${sharp} @brief constructor
+	${sharp} @param manager Maneger Object
+	${sharp} 
 	def __init__(self, manager):
-		"""
-		\brief constructor
-		\param manager Maneger Object
-		"""
 		OpenRTM_aist.DataFlowComponentBase.__init__(self, manager)
 
 #foreach($port in ${rtcParam.inports})
@@ -228,21 +236,21 @@
 
 
 		 
-	def onInitialize(self):
-		"""
-#if(${rtcParam.getDocActionOverView(0).length()}>0)		${tmpltHelperPy.convertDescDocPy(${rtcParam.getDocActionOverView(0)})}
+	${sharp}${sharp}
+#if(${rtcParam.getDocActionOverView(0).length()}>0)	${sharp} ${tmpltHelperPy.convertDescDocPy(${rtcParam.getDocActionOverView(0)})}
 #end
-		
-		The initialize action (on CREATED->ALIVE transition)
-		formaer rtc_init_entry() 
-		
-		\return RTC::ReturnCode_t
-		
-#if(${rtcParam.getDocActionPreCondition(0).length()}>0)		\pre ${tmpltHelperPy.convertPreDocPy(${rtcParam.getDocActionPreCondition(0)})}
+	${sharp}
+	${sharp} The initialize action (on CREATED->ALIVE transition)
+	${sharp} formaer rtc_init_entry() 
+	${sharp} 
+	${sharp} @return RTC::ReturnCode_t
+	${sharp} 
+#if(${rtcParam.getDocActionPreCondition(0).length()}>0)	${sharp} @pre ${tmpltHelperPy.convertPreDocPy(${rtcParam.getDocActionPreCondition(0)})}
 #end
-#if(${rtcParam.getDocActionPostCondition(0).length()}>0)		\post ${tmpltHelperPy.convertPostDocPy(${rtcParam.getDocActionPostCondition(0)})}
+#if(${rtcParam.getDocActionPostCondition(0).length()}>0)	${sharp} @post ${tmpltHelperPy.convertPostDocPy(${rtcParam.getDocActionPostCondition(0)})}
 #end
-		"""
+	${sharp}
+	def onInitialize(self):
 		# Bind variables and configuration variable
 #foreach($configParam in ${rtcParam.configParams})
 		self.bindParameter("${configParam.name}", self._${configParam.tmplVarName}, "${configParam.defaultVal}")
@@ -282,278 +290,261 @@
 #if(${servicePort.servicePortInterfaces.size()}>0)
 		self.addPort(self._${servicePort.name}Port)
 #end#end#end
+#if(${tmpltHelper.checkDetailContent(0,${rtcParam})})		${rtcParam.getDetailContent(0)}
+#end
 		
 		return RTC.RTC_OK
 	
-	#if(${rtcParam.IsNotImplemented(1)})${sharp}#end${def} onFinalize(self, ec_id):
-	#if(${rtcParam.IsNotImplemented(1)})${sharp}#end	"""
-#if(${rtcParam.getDocActionOverView(1).length()}>0)	#if(${rtcParam.IsNotImplemented(1)})${sharp}#end	${tmpltHelperPy.convertActivityDocPy(${rtcParam.getDocActionOverView(1)})}
+	#if(${rtcParam.IsNotImplemented(1)})${sharp}#end	${sharp}${sharp}
+#if(${rtcParam.getDocActionOverView(1).length()}>0)	#if(${rtcParam.IsNotImplemented(1)})${sharp}#end	${sharp} ${tmpltHelperPy.convertActivityDocPy(${rtcParam.getDocActionOverView(1)})}
 #end
+	#if(${rtcParam.IsNotImplemented(1)})${sharp}#end	${sharp} 
+	#if(${rtcParam.IsNotImplemented(1)})${sharp}#end	${sharp} The finalize action (on ALIVE->END transition)
+	#if(${rtcParam.IsNotImplemented(1)})${sharp}#end	${sharp} formaer rtc_exiting_entry()
+	#if(${rtcParam.IsNotImplemented(1)})${sharp}#end	${sharp} 
+	#if(${rtcParam.IsNotImplemented(1)})${sharp}#end	${sharp} @return RTC::ReturnCode_t
 	#if(${rtcParam.IsNotImplemented(1)})${sharp}#end
 
-	#if(${rtcParam.IsNotImplemented(1)})${sharp}#end	The finalize action (on ALIVE->END transition)
-	#if(${rtcParam.IsNotImplemented(1)})${sharp}#end	formaer rtc_exiting_entry()
-	#if(${rtcParam.IsNotImplemented(1)})${sharp}#end
-
-	#if(${rtcParam.IsNotImplemented(1)})${sharp}#end	\return RTC::ReturnCode_t
-	#if(${rtcParam.IsNotImplemented(1)})${sharp}#end
-
-#if(${rtcParam.getDocActionPreCondition(1).length()}>0)	#if(${rtcParam.IsNotImplemented(1)})${sharp}#end	\pre ${tmpltHelperPy.convertPreShDocPy(${rtcParam.getDocActionPreCondition(1)})}
+#if(${rtcParam.getDocActionPreCondition(1).length()}>0)	#if(${rtcParam.IsNotImplemented(1)})${sharp}#end	${sharp} @pre ${tmpltHelperPy.convertPreShDocPy(${rtcParam.getDocActionPreCondition(1)})}
 #end
-#if(${rtcParam.getDocActionPostCondition(1).length()}>0)	#if(${rtcParam.IsNotImplemented(1)})${sharp}#end	\post ${tmpltHelperPy.convertPostShDocPy(${rtcParam.getDocActionPostCondition(1)})}
+#if(${rtcParam.getDocActionPostCondition(1).length()}>0)	#if(${rtcParam.IsNotImplemented(1)})${sharp}#end	${sharp} @post ${tmpltHelperPy.convertPostShDocPy(${rtcParam.getDocActionPostCondition(1)})}
 #end
-	#if(${rtcParam.IsNotImplemented(1)})${sharp}#end	"""
+	#if(${rtcParam.IsNotImplemented(1)})${sharp}#end	${sharp} 
+	#if(${rtcParam.IsNotImplemented(1)})${sharp}#end${def} onFinalize(self, ec_id):
 	#if(${rtcParam.IsNotImplemented(1)})${sharp}#end
+#if(${tmpltHelper.checkDetailContent(1,${rtcParam})})		${rtcParam.getDetailContent(1)}
+#end
 
 	#if(${rtcParam.IsNotImplemented(1)})${sharp}#end	return RTC.RTC_OK
 	
-	#if(${rtcParam.IsNotImplemented(2)})${sharp}#end${def} onStartup(self, ec_id):
-	#if(${rtcParam.IsNotImplemented(2)})${sharp}#end	"""
-#if(${rtcParam.getDocActionOverView(2).length()}>0)	#if(${rtcParam.IsNotImplemented(2)})${sharp}#end	${tmpltHelperPy.convertActivityDocPy(${rtcParam.getDocActionOverView(2)})}
+	#if(${rtcParam.IsNotImplemented(2)})${sharp}#end	${sharp}${sharp}
+#if(${rtcParam.getDocActionOverView(2).length()}>0)	#if(${rtcParam.IsNotImplemented(2)})${sharp}#end	${sharp} ${tmpltHelperPy.convertActivityDocPy(${rtcParam.getDocActionOverView(2)})}
 #end
-	#if(${rtcParam.IsNotImplemented(2)})${sharp}#end
-
-	#if(${rtcParam.IsNotImplemented(2)})${sharp}#end	The startup action when ExecutionContext startup
-	#if(${rtcParam.IsNotImplemented(2)})${sharp}#end	former rtc_starting_entry()
-	#if(${rtcParam.IsNotImplemented(2)})${sharp}#end
-
-	#if(${rtcParam.IsNotImplemented(2)})${sharp}#end	\param ec_id target ExecutionContext Id
-	#if(${rtcParam.IsNotImplemented(2)})${sharp}#end
-
-	#if(${rtcParam.IsNotImplemented(2)})${sharp}#end	\return RTC::ReturnCode_t
-	#if(${rtcParam.IsNotImplemented(2)})${sharp}#end
-
-#if(${rtcParam.getDocActionPreCondition(2).length()}>0)	#if(${rtcParam.IsNotImplemented(2)})${sharp}#end	\pre ${tmpltHelperPy.convertPreShDocPy(${rtcParam.getDocActionPreCondition(2)})}
+	#if(${rtcParam.IsNotImplemented(2)})${sharp}#end	${sharp}
+	#if(${rtcParam.IsNotImplemented(2)})${sharp}#end	${sharp} The startup action when ExecutionContext startup
+	#if(${rtcParam.IsNotImplemented(2)})${sharp}#end	${sharp} former rtc_starting_entry()
+	#if(${rtcParam.IsNotImplemented(2)})${sharp}#end	${sharp} 
+	#if(${rtcParam.IsNotImplemented(2)})${sharp}#end	${sharp} @param ec_id target ExecutionContext Id
+	#if(${rtcParam.IsNotImplemented(2)})${sharp}#end	${sharp}
+	#if(${rtcParam.IsNotImplemented(2)})${sharp}#end	${sharp} @return RTC::ReturnCode_t
+	#if(${rtcParam.IsNotImplemented(2)})${sharp}#end	${sharp}
+#if(${rtcParam.getDocActionPreCondition(2).length()}>0)	#if(${rtcParam.IsNotImplemented(2)})${sharp}#end	${sharp} @pre ${tmpltHelperPy.convertPreShDocPy(${rtcParam.getDocActionPreCondition(2)})}
 #end
-#if(${rtcParam.getDocActionPostCondition(2).length()}>0)	#if(${rtcParam.IsNotImplemented(2)})${sharp}#end	\post ${tmpltHelperPy.convertPostShDocPy(${rtcParam.getDocActionPostCondition(2)})}
+#if(${rtcParam.getDocActionPostCondition(2).length()}>0)	#if(${rtcParam.IsNotImplemented(2)})${sharp}#end	${sharp} @post ${tmpltHelperPy.convertPostShDocPy(${rtcParam.getDocActionPostCondition(2)})}
 #end
-	#if(${rtcParam.IsNotImplemented(2)})${sharp}#end	"""
+	#if(${rtcParam.IsNotImplemented(2)})${sharp}#end	${sharp}
+	#if(${rtcParam.IsNotImplemented(2)})${sharp}#end${def} onStartup(self, ec_id):
 	#if(${rtcParam.IsNotImplemented(2)})${sharp}#end
+#if(${tmpltHelper.checkDetailContent(2,${rtcParam})})		${rtcParam.getDetailContent(2)}
+#end
 
 	#if(${rtcParam.IsNotImplemented(2)})${sharp}#end	return RTC.RTC_OK
 	
-	#if(${rtcParam.IsNotImplemented(3)})${sharp}#end${def} onShutdown(self, ec_id):
-	#if(${rtcParam.IsNotImplemented(3)})${sharp}#end	"""
-#if(${rtcParam.getDocActionOverView(3).length()}>0)	#if(${rtcParam.IsNotImplemented(3)})${sharp}#end	${tmpltHelperPy.convertActivityDocPy(${rtcParam.getDocActionOverView(3)})}
+	#if(${rtcParam.IsNotImplemented(3)})${sharp}#end	${sharp}${sharp}
+#if(${rtcParam.getDocActionOverView(3).length()}>0)	#if(${rtcParam.IsNotImplemented(3)})${sharp}#end	${sharp} ${tmpltHelperPy.convertActivityDocPy(${rtcParam.getDocActionOverView(3)})}
 #end
-	#if(${rtcParam.IsNotImplemented(3)})${sharp}#end
-
-	#if(${rtcParam.IsNotImplemented(3)})${sharp}#end	The shutdown action when ExecutionContext stop
-	#if(${rtcParam.IsNotImplemented(3)})${sharp}#end	former rtc_stopping_entry()
-	#if(${rtcParam.IsNotImplemented(3)})${sharp}#end
-
-	#if(${rtcParam.IsNotImplemented(3)})${sharp}#end	\param ec_id target ExecutionContext Id
-	#if(${rtcParam.IsNotImplemented(3)})${sharp}#end
-
-	#if(${rtcParam.IsNotImplemented(3)})${sharp}#end	\return RTC::ReturnCode_t
-	#if(${rtcParam.IsNotImplemented(3)})${sharp}#end
-
-#if(${rtcParam.getDocActionPreCondition(3).length()}>0)	#if(${rtcParam.IsNotImplemented(3)})${sharp}#end	\pre ${tmpltHelperPy.convertPreShDocPy(${rtcParam.getDocActionPreCondition(3)})}
+	#if(${rtcParam.IsNotImplemented(3)})${sharp}#end	${sharp}
+	#if(${rtcParam.IsNotImplemented(3)})${sharp}#end	${sharp} The shutdown action when ExecutionContext stop
+	#if(${rtcParam.IsNotImplemented(3)})${sharp}#end	${sharp} former rtc_stopping_entry()
+	#if(${rtcParam.IsNotImplemented(3)})${sharp}#end	${sharp}
+	#if(${rtcParam.IsNotImplemented(3)})${sharp}#end	${sharp} @param ec_id target ExecutionContext Id
+	#if(${rtcParam.IsNotImplemented(3)})${sharp}#end	${sharp}
+	#if(${rtcParam.IsNotImplemented(3)})${sharp}#end	${sharp} @return RTC::ReturnCode_t
+	#if(${rtcParam.IsNotImplemented(3)})${sharp}#end	${sharp}
+#if(${rtcParam.getDocActionPreCondition(3).length()}>0)	#if(${rtcParam.IsNotImplemented(3)})${sharp}#end	${sharp} @pre ${tmpltHelperPy.convertPreShDocPy(${rtcParam.getDocActionPreCondition(3)})}
 #end
-#if(${rtcParam.getDocActionPostCondition(3).length()}>0)	#if(${rtcParam.IsNotImplemented(3)})${sharp}#end	\post ${tmpltHelperPy.convertPostShDocPy(${rtcParam.getDocActionPostCondition(3)})}
+#if(${rtcParam.getDocActionPostCondition(3).length()}>0)	#if(${rtcParam.IsNotImplemented(3)})${sharp}#end	${sharp} @post ${tmpltHelperPy.convertPostShDocPy(${rtcParam.getDocActionPostCondition(3)})}
 #end
-	#if(${rtcParam.IsNotImplemented(3)})${sharp}#end	"""
+	#if(${rtcParam.IsNotImplemented(3)})${sharp}#end	${sharp}
+	#if(${rtcParam.IsNotImplemented(3)})${sharp}#end${def} onShutdown(self, ec_id):
 	#if(${rtcParam.IsNotImplemented(3)})${sharp}#end
+#if(${tmpltHelper.checkDetailContent(3,${rtcParam})})		${rtcParam.getDetailContent(3)}
+#end
 
 	#if(${rtcParam.IsNotImplemented(3)})${sharp}#end	return RTC.RTC_OK
 	
-	#if(${rtcParam.IsNotImplemented(4)})${sharp}#end${def} onActivated(self, ec_id):
-	#if(${rtcParam.IsNotImplemented(4)})${sharp}#end	"""
-#if(${rtcParam.getDocActionOverView(4).length()}>0)	#if(${rtcParam.IsNotImplemented(4)})${sharp}#end	${tmpltHelperPy.convertActivityDocPy(${rtcParam.getDocActionOverView(4)})}
+	#if(${rtcParam.IsNotImplemented(4)})${sharp}#end	${sharp}${sharp}
+#if(${rtcParam.getDocActionOverView(4).length()}>0)	#if(${rtcParam.IsNotImplemented(4)})${sharp}#end	${sharp} ${tmpltHelperPy.convertActivityDocPy(${rtcParam.getDocActionOverView(4)})}
 #end
-	#if(${rtcParam.IsNotImplemented(4)})${sharp}#end
-
-	#if(${rtcParam.IsNotImplemented(4)})${sharp}#end	The activated action (Active state entry action)
-	#if(${rtcParam.IsNotImplemented(4)})${sharp}#end	former rtc_active_entry()
-	#if(${rtcParam.IsNotImplemented(4)})${sharp}#end
-
-	#if(${rtcParam.IsNotImplemented(4)})${sharp}#end	\param ec_id target ExecutionContext Id
-	#if(${rtcParam.IsNotImplemented(4)})${sharp}#end
-
-	#if(${rtcParam.IsNotImplemented(4)})${sharp}#end	\return RTC::ReturnCode_t
-	#if(${rtcParam.IsNotImplemented(4)})${sharp}#end
-
-#if(${rtcParam.getDocActionPreCondition(4).length()}>0)	#if(${rtcParam.IsNotImplemented(4)})${sharp}#end	\pre ${tmpltHelperPy.convertPreShDocPy(${rtcParam.getDocActionPreCondition(4)})}
+	#if(${rtcParam.IsNotImplemented(4)})${sharp}#end	${sharp}
+	#if(${rtcParam.IsNotImplemented(4)})${sharp}#end	${sharp} The activated action (Active state entry action)
+	#if(${rtcParam.IsNotImplemented(4)})${sharp}#end	${sharp} former rtc_active_entry()
+	#if(${rtcParam.IsNotImplemented(4)})${sharp}#end	${sharp}
+	#if(${rtcParam.IsNotImplemented(4)})${sharp}#end	${sharp} @param ec_id target ExecutionContext Id
+	#if(${rtcParam.IsNotImplemented(4)})${sharp}#end	${sharp} 
+	#if(${rtcParam.IsNotImplemented(4)})${sharp}#end	${sharp} @return RTC::ReturnCode_t
+	#if(${rtcParam.IsNotImplemented(4)})${sharp}#end	${sharp}
+#if(${rtcParam.getDocActionPreCondition(4).length()}>0)	#if(${rtcParam.IsNotImplemented(4)})${sharp}#end	${sharp} @pre ${tmpltHelperPy.convertPreShDocPy(${rtcParam.getDocActionPreCondition(4)})}
 #end
-#if(${rtcParam.getDocActionPostCondition(4).length()}>0)	#if(${rtcParam.IsNotImplemented(4)})${sharp}#end	\post ${tmpltHelperPy.convertPostShDocPy(${rtcParam.getDocActionPostCondition(4)})}
+#if(${rtcParam.getDocActionPostCondition(4).length()}>0)	#if(${rtcParam.IsNotImplemented(4)})${sharp}#end	${sharp} @post ${tmpltHelperPy.convertPostShDocPy(${rtcParam.getDocActionPostCondition(4)})}
 #end
-	#if(${rtcParam.IsNotImplemented(4)})${sharp}#end	"""
+	#if(${rtcParam.IsNotImplemented(4)})${sharp}#end	${sharp}
+	#if(${rtcParam.IsNotImplemented(4)})${sharp}#end${def} onActivated(self, ec_id):
 	#if(${rtcParam.IsNotImplemented(4)})${sharp}#end
+#if(${tmpltHelper.checkDetailContent(4,${rtcParam})})		${rtcParam.getDetailContent(4)}
+#end
 
 	#if(${rtcParam.IsNotImplemented(4)})${sharp}#end	return RTC.RTC_OK
 	
-	#if(${rtcParam.IsNotImplemented(5)})${sharp}#end${def} onDeactivated(self, ec_id):
-	#if(${rtcParam.IsNotImplemented(5)})${sharp}#end	"""
-#if(${rtcParam.getDocActionOverView(5).length()}>0)	#if(${rtcParam.IsNotImplemented(5)})${sharp}#end	${tmpltHelperPy.convertActivityDocPy(${rtcParam.getDocActionOverView(5)})}
+	#if(${rtcParam.IsNotImplemented(5)})${sharp}#end	${sharp}${sharp}
+#if(${rtcParam.getDocActionOverView(5).length()}>0)	#if(${rtcParam.IsNotImplemented(5)})${sharp}#end	${sharp} ${tmpltHelperPy.convertActivityDocPy(${rtcParam.getDocActionOverView(5)})}
 #end
-	#if(${rtcParam.IsNotImplemented(5)})${sharp}#end
-
-	#if(${rtcParam.IsNotImplemented(5)})${sharp}#end	The deactivated action (Active state exit action)
-	#if(${rtcParam.IsNotImplemented(5)})${sharp}#end	former rtc_active_exit()
-	#if(${rtcParam.IsNotImplemented(5)})${sharp}#end
-
-	#if(${rtcParam.IsNotImplemented(5)})${sharp}#end	\param ec_id target ExecutionContext Id
-	#if(${rtcParam.IsNotImplemented(5)})${sharp}#end
-
-	#if(${rtcParam.IsNotImplemented(5)})${sharp}#end	\return RTC::ReturnCode_t
-	#if(${rtcParam.IsNotImplemented(5)})${sharp}#end
-
-#if(${rtcParam.getDocActionPreCondition(5).length()}>0)	#if(${rtcParam.IsNotImplemented(5)})${sharp}#end	\pre ${tmpltHelperPy.convertPreShDocPy(${rtcParam.getDocActionPreCondition(5)})}
+	#if(${rtcParam.IsNotImplemented(5)})${sharp}#end	${sharp}
+	#if(${rtcParam.IsNotImplemented(5)})${sharp}#end	${sharp} The deactivated action (Active state exit action)
+	#if(${rtcParam.IsNotImplemented(5)})${sharp}#end	${sharp} former rtc_active_exit()
+	#if(${rtcParam.IsNotImplemented(5)})${sharp}#end	${sharp}
+	#if(${rtcParam.IsNotImplemented(5)})${sharp}#end	${sharp} @param ec_id target ExecutionContext Id
+	#if(${rtcParam.IsNotImplemented(5)})${sharp}#end	${sharp}
+	#if(${rtcParam.IsNotImplemented(5)})${sharp}#end	${sharp} @return RTC::ReturnCode_t
+	#if(${rtcParam.IsNotImplemented(5)})${sharp}#end	${sharp}
+#if(${rtcParam.getDocActionPreCondition(5).length()}>0)	#if(${rtcParam.IsNotImplemented(5)})${sharp}#end	${sharp} @pre ${tmpltHelperPy.convertPreShDocPy(${rtcParam.getDocActionPreCondition(5)})}
 #end
-#if(${rtcParam.getDocActionPostCondition(5).length()}>0)	#if(${rtcParam.IsNotImplemented(5)})${sharp}#end	\post ${tmpltHelperPy.convertPostShDocPy(${rtcParam.getDocActionPostCondition(5)})}
+#if(${rtcParam.getDocActionPostCondition(5).length()}>0)	#if(${rtcParam.IsNotImplemented(5)})${sharp}#end	${sharp} @post ${tmpltHelperPy.convertPostShDocPy(${rtcParam.getDocActionPostCondition(5)})}
 #end
-	#if(${rtcParam.IsNotImplemented(5)})${sharp}#end	"""
+	#if(${rtcParam.IsNotImplemented(5)})${sharp}#end	${sharp}
+	#if(${rtcParam.IsNotImplemented(5)})${sharp}#end${def} onDeactivated(self, ec_id):
 	#if(${rtcParam.IsNotImplemented(5)})${sharp}#end
+#if(${tmpltHelper.checkDetailContent(5,${rtcParam})})		${rtcParam.getDetailContent(5)}
+#end
 
 	#if(${rtcParam.IsNotImplemented(5)})${sharp}#end	return RTC.RTC_OK
 	
-	#if(${rtcParam.IsNotImplemented(9)})${sharp}#end${def} onExecute(self, ec_id):
-	#if(${rtcParam.IsNotImplemented(9)})${sharp}#end	"""
-#if(${rtcParam.getDocActionOverView(9).length()}>0)	#if(${rtcParam.IsNotImplemented(9)})${sharp}#end	${tmpltHelperPy.convertActivityDocPy(${rtcParam.getDocActionOverView(9)})}
+	#if(${rtcParam.IsNotImplemented(9)})${sharp}#end	${sharp}${sharp}
+#if(${rtcParam.getDocActionOverView(9).length()}>0)	#if(${rtcParam.IsNotImplemented(9)})${sharp}#end	${sharp} ${tmpltHelperPy.convertActivityDocPy(${rtcParam.getDocActionOverView(9)})}
 #end
-	#if(${rtcParam.IsNotImplemented(9)})${sharp}#end
-
-	#if(${rtcParam.IsNotImplemented(9)})${sharp}#end	The execution action that is invoked periodically
-	#if(${rtcParam.IsNotImplemented(9)})${sharp}#end	former rtc_active_do()
-	#if(${rtcParam.IsNotImplemented(9)})${sharp}#end
-
-	#if(${rtcParam.IsNotImplemented(9)})${sharp}#end	\param ec_id target ExecutionContext Id
-	#if(${rtcParam.IsNotImplemented(9)})${sharp}#end
-
-	#if(${rtcParam.IsNotImplemented(9)})${sharp}#end	\return RTC::ReturnCode_t
-	#if(${rtcParam.IsNotImplemented(9)})${sharp}#end
-
-#if(${rtcParam.getDocActionPreCondition(9).length()}>0)	#if(${rtcParam.IsNotImplemented(9)})${sharp}#end	\pre ${tmpltHelperPy.convertPreShDocPy(${rtcParam.getDocActionPreCondition(9)})}
+	#if(${rtcParam.IsNotImplemented(9)})${sharp}#end	${sharp}
+	#if(${rtcParam.IsNotImplemented(9)})${sharp}#end	${sharp} The execution action that is invoked periodically
+	#if(${rtcParam.IsNotImplemented(9)})${sharp}#end	${sharp} former rtc_active_do()
+	#if(${rtcParam.IsNotImplemented(9)})${sharp}#end	${sharp}
+	#if(${rtcParam.IsNotImplemented(9)})${sharp}#end	${sharp} @param ec_id target ExecutionContext Id
+	#if(${rtcParam.IsNotImplemented(9)})${sharp}#end	${sharp}
+	#if(${rtcParam.IsNotImplemented(9)})${sharp}#end	${sharp} @return RTC::ReturnCode_t
+	#if(${rtcParam.IsNotImplemented(9)})${sharp}#end	${sharp}
+#if(${rtcParam.getDocActionPreCondition(9).length()}>0)	#if(${rtcParam.IsNotImplemented(9)})${sharp}#end	${sharp} @pre ${tmpltHelperPy.convertPreShDocPy(${rtcParam.getDocActionPreCondition(9)})}
 #end
-#if(${rtcParam.getDocActionPostCondition(9).length()}>0)	#if(${rtcParam.IsNotImplemented(9)})${sharp}#end	\post ${tmpltHelperPy.convertPostShDocPy(${rtcParam.getDocActionPostCondition(9)})}
+#if(${rtcParam.getDocActionPostCondition(9).length()}>0)	#if(${rtcParam.IsNotImplemented(9)})${sharp}#end	${sharp} @post ${tmpltHelperPy.convertPostShDocPy(${rtcParam.getDocActionPostCondition(9)})}
 #end
-	#if(${rtcParam.IsNotImplemented(9)})${sharp}#end	"""
+	#if(${rtcParam.IsNotImplemented(9)})${sharp}#end	${sharp}
+	#if(${rtcParam.IsNotImplemented(9)})${sharp}#end${def} onExecute(self, ec_id):
 	#if(${rtcParam.IsNotImplemented(9)})${sharp}#end
+#if(${tmpltHelper.checkDetailContent(9,${rtcParam})})		${rtcParam.getDetailContent(9)}
+#end
 
 	#if(${rtcParam.IsNotImplemented(9)})${sharp}#end	return RTC.RTC_OK
 	
-	#if(${rtcParam.IsNotImplemented(6)})${sharp}#end${def} onAborting(self, ec_id):
-	#if(${rtcParam.IsNotImplemented(6)})${sharp}#end	"""
-#if(${rtcParam.getDocActionOverView(6).length()}>0)	#if(${rtcParam.IsNotImplemented(6)})${sharp}#end	${tmpltHelperPy.convertActivityDocPy(${rtcParam.getDocActionOverView(6)})}
+	#if(${rtcParam.IsNotImplemented(6)})${sharp}#end	${sharp}${sharp}
+#if(${rtcParam.getDocActionOverView(6).length()}>0)	#if(${rtcParam.IsNotImplemented(6)})${sharp}#end	${sharp} ${tmpltHelperPy.convertActivityDocPy(${rtcParam.getDocActionOverView(6)})}
 #end
-	#if(${rtcParam.IsNotImplemented(6)})${sharp}#end
-
-	#if(${rtcParam.IsNotImplemented(6)})${sharp}#end	The aborting action when main logic error occurred.
-	#if(${rtcParam.IsNotImplemented(6)})${sharp}#end	former rtc_aborting_entry()
-	#if(${rtcParam.IsNotImplemented(6)})${sharp}#end
-
-	#if(${rtcParam.IsNotImplemented(6)})${sharp}#end	\param ec_id target ExecutionContext Id
-	#if(${rtcParam.IsNotImplemented(6)})${sharp}#end
-
-	#if(${rtcParam.IsNotImplemented(6)})${sharp}#end	\return RTC::ReturnCode_t
-	#if(${rtcParam.IsNotImplemented(6)})${sharp}#end
-
-#if(${rtcParam.getDocActionPreCondition(6).length()}>0)	#if(${rtcParam.IsNotImplemented(6)})${sharp}#end	\pre ${tmpltHelperPy.convertPreShDocPy(${rtcParam.getDocActionPreCondition(6)})}
+	#if(${rtcParam.IsNotImplemented(6)})${sharp}#end	${sharp}
+	#if(${rtcParam.IsNotImplemented(6)})${sharp}#end	${sharp} The aborting action when main logic error occurred.
+	#if(${rtcParam.IsNotImplemented(6)})${sharp}#end	${sharp} former rtc_aborting_entry()
+	#if(${rtcParam.IsNotImplemented(6)})${sharp}#end	${sharp}
+	#if(${rtcParam.IsNotImplemented(6)})${sharp}#end	${sharp} @param ec_id target ExecutionContext Id
+	#if(${rtcParam.IsNotImplemented(6)})${sharp}#end	${sharp}
+	#if(${rtcParam.IsNotImplemented(6)})${sharp}#end	${sharp} @return RTC::ReturnCode_t
+	#if(${rtcParam.IsNotImplemented(6)})${sharp}#end	${sharp}
+#if(${rtcParam.getDocActionPreCondition(6).length()}>0)	#if(${rtcParam.IsNotImplemented(6)})${sharp}#end	${sharp} @pre ${tmpltHelperPy.convertPreShDocPy(${rtcParam.getDocActionPreCondition(6)})}
 #end
-#if(${rtcParam.getDocActionPostCondition(6).length()}>0)	#if(${rtcParam.IsNotImplemented(6)})${sharp}#end	\post ${tmpltHelperPy.convertPostShDocPy(${rtcParam.getDocActionPostCondition(6)})}
+#if(${rtcParam.getDocActionPostCondition(6).length()}>0)	#if(${rtcParam.IsNotImplemented(6)})${sharp}#end	${sharp} @post ${tmpltHelperPy.convertPostShDocPy(${rtcParam.getDocActionPostCondition(6)})}
 #end
-	#if(${rtcParam.IsNotImplemented(6)})${sharp}#end	"""
+	#if(${rtcParam.IsNotImplemented(6)})${sharp}#end	${sharp}
+	#if(${rtcParam.IsNotImplemented(6)})${sharp}#end${def} onAborting(self, ec_id):
 	#if(${rtcParam.IsNotImplemented(6)})${sharp}#end
+#if(${tmpltHelper.checkDetailContent(6,${rtcParam})})		${rtcParam.getDetailContent(6)}
+#end
 
 	#if(${rtcParam.IsNotImplemented(6)})${sharp}#end	return RTC.RTC_OK
 	
-	#if(${rtcParam.IsNotImplemented(7)})${sharp}#end${def} onError(self, ec_id):
-	#if(${rtcParam.IsNotImplemented(7)})${sharp}#end	"""
-#if(${rtcParam.getDocActionOverView(7).length()}>0)	#if(${rtcParam.IsNotImplemented(7)})${sharp}#end	${tmpltHelperPy.convertActivityDocPy(${rtcParam.getDocActionOverView(7)})}
+	#if(${rtcParam.IsNotImplemented(7)})${sharp}#end	${sharp}${sharp}
+#if(${rtcParam.getDocActionOverView(7).length()}>0)	#if(${rtcParam.IsNotImplemented(7)})${sharp}#end	${sharp} ${tmpltHelperPy.convertActivityDocPy(${rtcParam.getDocActionOverView(7)})}
 #end
-	#if(${rtcParam.IsNotImplemented(7)})${sharp}#end
-
-	#if(${rtcParam.IsNotImplemented(7)})${sharp}#end	The error action in ERROR state
-	#if(${rtcParam.IsNotImplemented(7)})${sharp}#end	former rtc_error_do()
-	#if(${rtcParam.IsNotImplemented(7)})${sharp}#end
-
-	#if(${rtcParam.IsNotImplemented(7)})${sharp}#end	\param ec_id target ExecutionContext Id
-	#if(${rtcParam.IsNotImplemented(7)})${sharp}#end
-
-	#if(${rtcParam.IsNotImplemented(7)})${sharp}#end	\return RTC::ReturnCode_t
-	#if(${rtcParam.IsNotImplemented(7)})${sharp}#end
-
-#if(${rtcParam.getDocActionPreCondition(7).length()}>0)	#if(${rtcParam.IsNotImplemented(7)})${sharp}#end	\pre ${tmpltHelperPy.convertPreShDocPy(${rtcParam.getDocActionPreCondition(7)})}
+	#if(${rtcParam.IsNotImplemented(7)})${sharp}#end	${sharp}
+	#if(${rtcParam.IsNotImplemented(7)})${sharp}#end	${sharp} The error action in ERROR state
+	#if(${rtcParam.IsNotImplemented(7)})${sharp}#end	${sharp} former rtc_error_do()
+	#if(${rtcParam.IsNotImplemented(7)})${sharp}#end	${sharp}
+	#if(${rtcParam.IsNotImplemented(7)})${sharp}#end	${sharp} @param ec_id target ExecutionContext Id
+	#if(${rtcParam.IsNotImplemented(7)})${sharp}#end	${sharp}
+	#if(${rtcParam.IsNotImplemented(7)})${sharp}#end	${sharp} @return RTC::ReturnCode_t
+	#if(${rtcParam.IsNotImplemented(7)})${sharp}#end	${sharp}
+#if(${rtcParam.getDocActionPreCondition(7).length()}>0)	#if(${rtcParam.IsNotImplemented(7)})${sharp}#end	${sharp} @pre ${tmpltHelperPy.convertPreShDocPy(${rtcParam.getDocActionPreCondition(7)})}
 #end
-#if(${rtcParam.getDocActionPostCondition(7).length()}>0)	#if(${rtcParam.IsNotImplemented(7)})${sharp}#end	\post ${tmpltHelperPy.convertPostShDocPy(${rtcParam.getDocActionPostCondition(7)})}
+#if(${rtcParam.getDocActionPostCondition(7).length()}>0)	#if(${rtcParam.IsNotImplemented(7)})${sharp}#end	${sharp} @post ${tmpltHelperPy.convertPostShDocPy(${rtcParam.getDocActionPostCondition(7)})}
 #end
-	#if(${rtcParam.IsNotImplemented(7)})${sharp}#end	"""
+	#if(${rtcParam.IsNotImplemented(7)})${sharp}#end	${sharp}
+	#if(${rtcParam.IsNotImplemented(7)})${sharp}#end${def} onError(self, ec_id):
 	#if(${rtcParam.IsNotImplemented(7)})${sharp}#end
+#if(${tmpltHelper.checkDetailContent(7,${rtcParam})})		${rtcParam.getDetailContent(7)}
+#end
 
 	#if(${rtcParam.IsNotImplemented(7)})${sharp}#end	return RTC.RTC_OK
 	
-	#if(${rtcParam.IsNotImplemented(8)})${sharp}#end${def} onReset(self, ec_id):
-	#if(${rtcParam.IsNotImplemented(8)})${sharp}#end	"""
-#if(${rtcParam.getDocActionOverView(8).length()}>0)	#if(${rtcParam.IsNotImplemented(8)})${sharp}#end	${tmpltHelperPy.convertActivityDocPy(${rtcParam.getDocActionOverView(8)})}
+	#if(${rtcParam.IsNotImplemented(8)})${sharp}#end	${sharp}${sharp}
+#if(${rtcParam.getDocActionOverView(8).length()}>0)	#if(${rtcParam.IsNotImplemented(8)})${sharp}#end	${sharp} ${tmpltHelperPy.convertActivityDocPy(${rtcParam.getDocActionOverView(8)})}
 #end
-	#if(${rtcParam.IsNotImplemented(8)})${sharp}#end
-
-	#if(${rtcParam.IsNotImplemented(8)})${sharp}#end	The reset action that is invoked resetting
-	#if(${rtcParam.IsNotImplemented(8)})${sharp}#end	This is same but different the former rtc_init_entry()
-	#if(${rtcParam.IsNotImplemented(8)})${sharp}#end
-
-	#if(${rtcParam.IsNotImplemented(8)})${sharp}#end	\param ec_id target ExecutionContext Id
-	#if(${rtcParam.IsNotImplemented(8)})${sharp}#end
-
-	#if(${rtcParam.IsNotImplemented(8)})${sharp}#end	\return RTC::ReturnCode_t
-	#if(${rtcParam.IsNotImplemented(8)})${sharp}#end
-
-#if(${rtcParam.getDocActionPreCondition(8).length()}>0)	#if(${rtcParam.IsNotImplemented(8)})${sharp}#end	\pre ${tmpltHelperPy.convertPreShDocPy(${rtcParam.getDocActionPreCondition(8)})}
+	#if(${rtcParam.IsNotImplemented(8)})${sharp}#end	${sharp}
+	#if(${rtcParam.IsNotImplemented(8)})${sharp}#end	${sharp} The reset action that is invoked resetting
+	#if(${rtcParam.IsNotImplemented(8)})${sharp}#end	${sharp} This is same but different the former rtc_init_entry()
+	#if(${rtcParam.IsNotImplemented(8)})${sharp}#end	${sharp}
+	#if(${rtcParam.IsNotImplemented(8)})${sharp}#end	${sharp} @param ec_id target ExecutionContext Id
+	#if(${rtcParam.IsNotImplemented(8)})${sharp}#end	${sharp}
+	#if(${rtcParam.IsNotImplemented(8)})${sharp}#end	${sharp} @return RTC::ReturnCode_t
+	#if(${rtcParam.IsNotImplemented(8)})${sharp}#end	${sharp}
+#if(${rtcParam.getDocActionPreCondition(8).length()}>0)	#if(${rtcParam.IsNotImplemented(8)})${sharp}#end	${sharp} @pre ${tmpltHelperPy.convertPreShDocPy(${rtcParam.getDocActionPreCondition(8)})}
 #end
-#if(${rtcParam.getDocActionPostCondition(8).length()}>0)	#if(${rtcParam.IsNotImplemented(8)})${sharp}#end	\post ${tmpltHelperPy.convertPostShDocPy(${rtcParam.getDocActionPostCondition(8)})}
+#if(${rtcParam.getDocActionPostCondition(8).length()}>0)	#if(${rtcParam.IsNotImplemented(8)})${sharp}#end	${sharp} @post ${tmpltHelperPy.convertPostShDocPy(${rtcParam.getDocActionPostCondition(8)})}
 #end
-	#if(${rtcParam.IsNotImplemented(8)})${sharp}#end	"""
+	#if(${rtcParam.IsNotImplemented(8)})${sharp}#end	${sharp}
+	#if(${rtcParam.IsNotImplemented(8)})${sharp}#end${def} onReset(self, ec_id):
 	#if(${rtcParam.IsNotImplemented(8)})${sharp}#end
+#if(${tmpltHelper.checkDetailContent(8,${rtcParam})})		${rtcParam.getDetailContent(8)}
+#end
 
 	#if(${rtcParam.IsNotImplemented(8)})${sharp}#end	return RTC.RTC_OK
 	
-	#if(${rtcParam.IsNotImplemented(10)})${sharp}#end${def} onStateUpdate(self, ec_id):
-	#if(${rtcParam.IsNotImplemented(10)})${sharp}#end	"""
-#if(${rtcParam.getDocActionOverView(10).length()}>0)	#if(${rtcParam.IsNotImplemented(10)})${sharp}#end	${tmpltHelperPy.convertActivityDocPy(${rtcParam.getDocActionOverView(10)})}
+	#if(${rtcParam.IsNotImplemented(10)})${sharp}#end	${sharp}${sharp}
+#if(${rtcParam.getDocActionOverView(10).length()}>0)	#if(${rtcParam.IsNotImplemented(10)})${sharp}#end	${sharp} ${tmpltHelperPy.convertActivityDocPy(${rtcParam.getDocActionOverView(10)})}
 #end
-	#if(${rtcParam.IsNotImplemented(10)})${sharp}#end
+	#if(${rtcParam.IsNotImplemented(10)})${sharp}#end	${sharp}
+	#if(${rtcParam.IsNotImplemented(10)})${sharp}#end	${sharp} The state update action that is invoked after onExecute() action
+	#if(${rtcParam.IsNotImplemented(10)})${sharp}#end	${sharp} no corresponding operation exists in OpenRTm-aist-0.2.0
+	#if(${rtcParam.IsNotImplemented(10)})${sharp}#end	${sharp}
+	#if(${rtcParam.IsNotImplemented(10)})${sharp}#end	${sharp} @param ec_id target ExecutionContext Id
+	#if(${rtcParam.IsNotImplemented(10)})${sharp}#end	${sharp}
+	#if(${rtcParam.IsNotImplemented(10)})${sharp}#end	${sharp} @return RTC::ReturnCode_t
+	#if(${rtcParam.IsNotImplemented(10)})${sharp}#end	${sharp}
 
-	#if(${rtcParam.IsNotImplemented(10)})${sharp}#end	The state update action that is invoked after onExecute() action
-	#if(${rtcParam.IsNotImplemented(10)})${sharp}#end	no corresponding operation exists in OpenRTm-aist-0.2.0
-	#if(${rtcParam.IsNotImplemented(10)})${sharp}#end
-
-	#if(${rtcParam.IsNotImplemented(10)})${sharp}#end	\param ec_id target ExecutionContext Id
-	#if(${rtcParam.IsNotImplemented(10)})${sharp}#end
-
-	#if(${rtcParam.IsNotImplemented(10)})${sharp}#end	\return RTC::ReturnCode_t
-	#if(${rtcParam.IsNotImplemented(10)})${sharp}#end
-
-#if(${rtcParam.getDocActionPreCondition(10).length()}>0)	#if(${rtcParam.IsNotImplemented(10)})${sharp}#end	\pre ${tmpltHelperPy.convertPreShDocPy(${rtcParam.getDocActionPreCondition(10)})}
+#if(${rtcParam.getDocActionPreCondition(10).length()}>0)	#if(${rtcParam.IsNotImplemented(10)})${sharp}#end	${sharp} @pre ${tmpltHelperPy.convertPreShDocPy(${rtcParam.getDocActionPreCondition(10)})}
 #end
-#if(${rtcParam.getDocActionPostCondition(10).length()}>0)	#if(${rtcParam.IsNotImplemented(10)})${sharp}#end	\post ${tmpltHelperPy.convertPostShDocPy(${rtcParam.getDocActionPostCondition(10)})}
+#if(${rtcParam.getDocActionPostCondition(10).length()}>0)	#if(${rtcParam.IsNotImplemented(10)})${sharp}#end	${sharp} @post ${tmpltHelperPy.convertPostShDocPy(${rtcParam.getDocActionPostCondition(10)})}
 #end
-	#if(${rtcParam.IsNotImplemented(10)})${sharp}#end	"""
+	#if(${rtcParam.IsNotImplemented(10)})${sharp}#end	${sharp}
+	#if(${rtcParam.IsNotImplemented(10)})${sharp}#end${def} onStateUpdate(self, ec_id):
 	#if(${rtcParam.IsNotImplemented(10)})${sharp}#end
+#if(${tmpltHelper.checkDetailContent(10,${rtcParam})})		${rtcParam.getDetailContent(10)}
+#end
 
 	#if(${rtcParam.IsNotImplemented(10)})${sharp}#end	return RTC.RTC_OK
 	
-	#if(${rtcParam.IsNotImplemented(11)})${sharp}#end${def} onRateChanged(self, ec_id):
-	#if(${rtcParam.IsNotImplemented(11)})${sharp}#end	"""
-#if(${rtcParam.getDocActionOverView(11).length()}>0)	#if(${rtcParam.IsNotImplemented(11)})${sharp}#end	${tmpltHelperPy.convertActivityDocPy(${rtcParam.getDocActionOverView(11)})}
+	#if(${rtcParam.IsNotImplemented(11)})${sharp}#end	${sharp}${sharp}
+#if(${rtcParam.getDocActionOverView(11).length()}>0)	#if(${rtcParam.IsNotImplemented(11)})${sharp}#end	${sharp} ${tmpltHelperPy.convertActivityDocPy(${rtcParam.getDocActionOverView(11)})}
 #end
-	#if(${rtcParam.IsNotImplemented(11)})${sharp}#end
-
-	#if(${rtcParam.IsNotImplemented(11)})${sharp}#end	The action that is invoked when execution context's rate is changed
-	#if(${rtcParam.IsNotImplemented(11)})${sharp}#end	no corresponding operation exists in OpenRTm-aist-0.2.0
-	#if(${rtcParam.IsNotImplemented(11)})${sharp}#end
-
-	#if(${rtcParam.IsNotImplemented(11)})${sharp}#end	\param ec_id target ExecutionContext Id
-	#if(${rtcParam.IsNotImplemented(11)})${sharp}#end
-
-	#if(${rtcParam.IsNotImplemented(11)})${sharp}#end	\return RTC::ReturnCode_t
-	#if(${rtcParam.IsNotImplemented(11)})${sharp}#end
-
-#if(${rtcParam.getDocActionPreCondition(11).length()}>0)	#if(${rtcParam.IsNotImplemented(11)})${sharp}#end	\pre ${tmpltHelperPy.convertPreShDocPy(${rtcParam.getDocActionPreCondition(11)})}
+	#if(${rtcParam.IsNotImplemented(11)})${sharp}#end	${sharp}
+	#if(${rtcParam.IsNotImplemented(11)})${sharp}#end	${sharp} The action that is invoked when execution context's rate is changed
+	#if(${rtcParam.IsNotImplemented(11)})${sharp}#end	${sharp} no corresponding operation exists in OpenRTm-aist-0.2.0
+	#if(${rtcParam.IsNotImplemented(11)})${sharp}#end	${sharp}
+	#if(${rtcParam.IsNotImplemented(11)})${sharp}#end	${sharp} @param ec_id target ExecutionContext Id
+	#if(${rtcParam.IsNotImplemented(11)})${sharp}#end	${sharp}
+	#if(${rtcParam.IsNotImplemented(11)})${sharp}#end	${sharp} @return RTC::ReturnCode_t
+	#if(${rtcParam.IsNotImplemented(11)})${sharp}#end	${sharp}
+#if(${rtcParam.getDocActionPreCondition(11).length()}>0)	#if(${rtcParam.IsNotImplemented(11)})${sharp}#end	${sharp} @pre ${tmpltHelperPy.convertPreShDocPy(${rtcParam.getDocActionPreCondition(11)})}
 #end
-#if(${rtcParam.getDocActionPostCondition(11).length()}>0)	#if(${rtcParam.IsNotImplemented(11)})${sharp}#end	\post ${tmpltHelperPy.convertPostShDocPy(${rtcParam.getDocActionPostCondition(11)})}
+#if(${rtcParam.getDocActionPostCondition(11).length()}>0)	#if(${rtcParam.IsNotImplemented(11)})${sharp}#end	${sharp} @post ${tmpltHelperPy.convertPostShDocPy(${rtcParam.getDocActionPostCondition(11)})}
 #end
-	#if(${rtcParam.IsNotImplemented(11)})${sharp}#end	"""
+	#if(${rtcParam.IsNotImplemented(11)})${sharp}#end	${sharp}
+	#if(${rtcParam.IsNotImplemented(11)})${sharp}#end${def} onRateChanged(self, ec_id):
 	#if(${rtcParam.IsNotImplemented(11)})${sharp}#end
+#if(${tmpltHelper.checkDetailContent(11,${rtcParam})})		${rtcParam.getDetailContent(11)}
+#end
 
 	#if(${rtcParam.IsNotImplemented(11)})${sharp}#end	return RTC.RTC_OK
 	

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/Py_SVC_idl_example.py.vsl
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/Py_SVC_idl_example.py.vsl	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/Py_SVC_idl_example.py.vsl	2013-01-29 10:39:20 UTC (rev 394)
@@ -3,13 +3,13 @@
 # -*- Python -*-
 
 """
- \file ${idlFileParam.idlFileNoExt}_idl_examplefile.py
- \brief Python example implementations generated from ${idlFileParam.idlFile}
+ @file ${idlFileParam.idlFileNoExt}_idl_examplefile.py
+ @brief Python example implementations generated from ${idlFileParam.idlFile}
 #set( $Date$ = "dummy" )
- \date \$Date$
+ @date \$Date$
 
 #if( ${rtcParam.docCreator.length()} > 0 )
- \author ${tmpltHelperPy.convertAuthorDocPy(${rtcParam.docCreator})}
+ @author ${tmpltHelperPy.convertAuthorDocPy(${rtcParam.docCreator})}
 #end
 #if( ${rtcParam.docLicense.length()} > 0 )
 
@@ -26,13 +26,13 @@
 
 class ${tmpltHelper.getBasename(${serviceClassParam.name})}_i (${pyConv.getModuleName(${serviceClassParam.name})}__POA.${tmpltHelper.getBasename(${serviceClassParam.name})}):
     """
-    \class ${tmpltHelper.getBasename(${serviceClassParam.name})}_i
+    @class ${tmpltHelper.getBasename(${serviceClassParam.name})}_i
     Example class implementing IDL interface ${tmpltHelper.convFormat(${serviceClassParam.name})}
     """
 
     def __init__(self):
         """
-        \brief standard constructor
+        @brief standard constructor
         Initialise member variables here
         """
         pass

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/idlcompile.bat.vsl
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/idlcompile.bat.vsl	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/idlcompile.bat.vsl	2013-01-29 10:39:20 UTC (rev 394)
@@ -1 +1,11 @@
-omniidl.exe -bpython #foreach($IdlFile in ${allIdlFileParam})${IdlFile.IdlFile} #end
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% do (
+  %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" #foreach($IdlPath in ${idlPathes})-I"${IdlPath}" #end#foreach($IdlFile in ${allIdlFileParam})idl/${IdlFile.IdlFile} #end
+
+) else do (
+  echo "python.exe" can not be found.
+  echo Please modify PATH environmental variable for python command.
+)
+endlocal

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/idlcompile.sh.vsl
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/idlcompile.sh.vsl	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/idlcompile.sh.vsl	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,2 +1,3 @@
 #!/bin/sh
-omniidl -bpython #foreach($IdlFile in ${allIdlFileParam})${IdlFile.IdlFile} #end
+omniidl -bpython -I"%RTM_ROOT%rtm\idl" #foreach($IdlPath in ${idlPathes})-I"${IdlPath}" #end#foreach($IdlFile in ${allIdlFileParam})idl/${IdlFile.IdlFile} #end
+

Deleted: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/AISTTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/AISTTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/AISTTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,369 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.python._test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import jp.go.aist.rtm.rtcbuilder.Generator;
-import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
-import jp.go.aist.rtm.rtcbuilder.generator.param.DataPortParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortInterfaceParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortParam;
-import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
-import jp.go.aist.rtm.rtcbuilder.python.IRtcBuilderConstantsPython;
-import jp.go.aist.rtm.rtcbuilder.python.manager.PythonGenerateManager;
-
-public class AISTTest extends TestBase {
-
-	protected void setUp() throws Exception {
-	}
-
-	public void testAIST6() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("test");
-		rtcParam.setDescription("test component");
-		rtcParam.setVersion("1.0.0");
-		rtcParam.setVender("S.Kurihara");
-		rtcParam.setCategory("sample");
-		rtcParam.setComponentType("STATIC");
-		rtcParam.setActivityType("PERIODIC");
-		rtcParam.setMaxInstance(1);
-		rtcParam.setRtmVersion("0.4.2");
-
-//		genParam.addProviderIDLPath(rootPath + "resource\\Python\\AIST6\\work\\MyService.idl");
-//		genParam.addProviderIDLPath(rootPath + "resource\\Python\\AIST6\\work\\MyServiceAIST.idl");
-//		genParam.getRtcParams().add(rtcParam);
-//		List<ServiceReferenceParam> srvproport = new ArrayList<ServiceReferenceParam>(); 
-//		srvproport.add(new ServiceReferenceParam("MySVPro0","myservice0","MyService", rtcParam));
-//		srvproport.add(new ServiceReferenceParam("MySVPro1","myservice","MyService2", rtcParam));
-//		rtcParam.setProviderReferences(srvproport);
-//		rtcParam.setOriginalConsumerIdls(new ArrayList<String>(genParam.getConsumerIDLPathParams()));
-//		rtcParam.setOriginalProviderIdls(new ArrayList<String>(genParam.getProviderIDLPathParams()));
-
-		ServicePortParam service1 = new ServicePortParam("MySVPro0",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "myservice0", "", "", 
-				rootPath + "resource\\Python\\AIST6\\work\\MyService.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-
-		ServicePortParam service2 = new ServicePortParam("MySVPro1",0);
-		List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service1, "myservice", "", "", 
-				rootPath + "resource\\Python\\AIST6\\work\\MyServiceAIST.idl", "MyService2", "", 0);
-		srvinterts2.add(int2);
-		service2.getServicePortInterfaces().addAll(srvinterts2);
-		srvports.add(service2);
-		rtcParam.getServicePorts().addAll(srvports);
-		genParam.getRtcParams().add(rtcParam);
-
-		Generator generator = new Generator();
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-		//
-		genParam = new GeneratorParam();
-//		rtcParam.getProviderReferences().clear();
-//		rtcParam.getConsumerReferences().clear();
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.getServicePorts().clear();
-		genParam.getRtcParams().add(rtcParam);
-		generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Python\\AIST6\\";
-
-		checkCode(result, resourceDir, "test.py");
-		checkCode(result, resourceDir, "README.test");
-	}
-
-	public void testAIST4() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("test");
-		rtcParam.setDescription("test component");
-		rtcParam.setVersion("1.0.0");
-		rtcParam.setVender("S.Kurihara");
-		rtcParam.setCategory("sample");
-		rtcParam.setComponentType("STATIC");
-		rtcParam.setActivityType("PERIODIC");
-		rtcParam.setMaxInstance(1);
-		rtcParam.setRtmVersion("0.4.2");
-
-		ServicePortParam service1 = new ServicePortParam("MySVPro0",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "myservice0", "", "", 
-				rootPath + "resource\\Python\\AIST4\\MyService.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-
-		ServicePortParam service2 = new ServicePortParam("MySVPro1",0);
-		List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service1, "myservice", "", "", 
-				rootPath + "resource\\Python\\AIST4\\MyService.idl", "MyService", "", 0);
-		srvinterts2.add(int2);
-		service2.getServicePortInterfaces().addAll(srvinterts2);
-		srvports.add(service2);
-		rtcParam.getServicePorts().addAll(srvports);
-		genParam.getRtcParams().add(rtcParam);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Python\\AIST4\\";
-
-		checkCode(result, resourceDir, "test.py");
-		checkCode(result, resourceDir, "_GlobalIDL/__init__.py");
-		checkCode(result, resourceDir, "_GlobalIDL__POA/__init__.py");
-		checkCode(result, resourceDir, "MyService_idl_example.py");
-		checkCode(result, resourceDir, "README.test");
-		checkCode(result, resourceDir, "MyService_idl.py");
-	}
-
-	public void testAIST3() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("test");
-		rtcParam.setDescription("test component");
-		rtcParam.setVersion("1.0.0");
-		rtcParam.setVender("S.Kurihara");
-		rtcParam.setCategory("example");
-		rtcParam.setComponentType("STATIC");
-		rtcParam.setActivityType("PERIODIC");
-		rtcParam.setMaxInstance(1);
-		rtcParam.setRtmVersion("0.4.2");
-
-		List<DataPortParam> dataport = new ArrayList<DataPortParam>(); 
-		dataport.add(new DataPortParam("in", "RTC::TimedFloatSeq", "", 0));
-		rtcParam.getInports().addAll(dataport);
-
-		List<DataPortParam> dataoutport = new ArrayList<DataPortParam>(); 
-		dataoutport.add(new DataPortParam("out", "RTC::TimedFloatSeq", "", 0));
-		rtcParam.getOutports().addAll(dataoutport);
-
-		ServicePortParam service1 = new ServicePortParam("MySVPro",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "myservice0", "", "", 
-				rootPath + "resource\\Python\\AIST3\\MyService.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-
-		ServicePortParam service2 = new ServicePortParam("MySVCon",0);
-		List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service1, "myservice1", "", "", 
-				rootPath + "resource\\Python\\AIST3\\MyService.idl", "MyService", "", 1);
-		srvinterts2.add(int2);
-		service2.getServicePortInterfaces().addAll(srvinterts2);
-		srvports.add(service2);
-		rtcParam.getServicePorts().addAll(srvports);
-		genParam.getRtcParams().add(rtcParam);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Python\\AIST3\\";
-
-		checkCode(result, resourceDir, "test.py");
-		checkCode(result, resourceDir, "_GlobalIDL/__init__.py");
-		checkCode(result, resourceDir, "_GlobalIDL__POA/__init__.py");
-		checkCode(result, resourceDir, "MyService_idl_example.py");
-		checkCode(result, resourceDir, "README.test");
-		checkCode(result, resourceDir, "MyService_idl.py");
-	}
-	
-	public void testAIST2() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("test");
-		rtcParam.setDescription("test component");
-		rtcParam.setVersion("1.0.0");
-		rtcParam.setVender("S.Kurihara");
-		rtcParam.setCategory("example");
-		rtcParam.setComponentType("STATIC");
-		rtcParam.setActivityType("PERIODIC");
-		rtcParam.setMaxInstance(1);
-		rtcParam.setRtmVersion("0.4.2");
-
-		List<DataPortParam> dataport = new ArrayList<DataPortParam>(); 
-		dataport.add(new DataPortParam("in", "RTC::TimedFloatSeq", "", 0));
-		rtcParam.getInports().addAll(dataport);
-
-		List<DataPortParam> dataoutport = new ArrayList<DataPortParam>(); 
-		dataoutport.add(new DataPortParam("out", "RTC::TimedFloatSeq", "", 0));
-		rtcParam.getOutports().addAll(dataoutport);
-
-		ServicePortParam service1 = new ServicePortParam("MySVCon",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "myservice", "", "", 
-				rootPath + "resource\\Python\\AIST2\\MyService.idl", "MyService", "", 1);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		rtcParam.getServicePorts().addAll(srvports);
-		genParam.getRtcParams().add(rtcParam);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Python\\AIST2\\";
-
-		checkCode(result, resourceDir, "test.py");
-		checkCode(result, resourceDir, "_GlobalIDL/__init__.py");
-		checkCode(result, resourceDir, "_GlobalIDL__POA/__init__.py");
-		checkCode(result, resourceDir, "README.test");
-		checkCode(result, resourceDir, "MyService_idl.py");
-	}
-
-	public void testType2() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("test");
-		rtcParam.setDescription("test component");
-		rtcParam.setVersion("1.0.0");
-		rtcParam.setVender("S.Kurihara");
-		rtcParam.setCategory("exmple");
-		rtcParam.setComponentType("STATIC");
-		rtcParam.setActivityType("PERIODIC");
-		rtcParam.setMaxInstance(1);
-		rtcParam.setRtmVersion("0.4.2");
-
-		ServicePortParam service1 = new ServicePortParam("MySVPro",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "myservice", "", "", 
-				rootPath + "resource\\Python\\type2\\MyService.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		rtcParam.getServicePorts().addAll(srvports);
-		genParam.getRtcParams().add(rtcParam);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Python\\type2\\";
-
-		checkCode(result, resourceDir, "test.py");
-		checkCode(result, resourceDir, "MyService_idl.py");
-		checkCode(result, resourceDir, "_GlobalIDL/__init__.py");
-		checkCode(result, resourceDir, "_GlobalIDL__POA/__init__.py");
-		checkCode(result, resourceDir, "MyService_idl_example.py");
-		checkCode(result, resourceDir, "README.test");
-	}
-
-	public void testType() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("test");
-		rtcParam.setDescription("test component");
-		rtcParam.setVersion("1.0.0");
-		rtcParam.setVender("S.Kurihara");
-		rtcParam.setCategory("exmple");
-		rtcParam.setComponentType("STATIC");
-		rtcParam.setActivityType("PERIODIC");
-		rtcParam.setMaxInstance(1);
-		rtcParam.setRtmVersion("0.4.2");
-
-		ServicePortParam service1 = new ServicePortParam("MySVPro",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "myservice", "", "", 
-				rootPath + "resource\\Python\\type\\MyService.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		rtcParam.getServicePorts().addAll(srvports);
-		genParam.getRtcParams().add(rtcParam);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Python\\type\\";
-
-		checkCode(result, resourceDir, "test.py");
-		checkCode(result, resourceDir, "MyService_idl.py");
-		checkCode(result, resourceDir, "_GlobalIDL/__init__.py");
-		checkCode(result, resourceDir, "_GlobalIDL__POA/__init__.py");
-		checkCode(result, resourceDir, "MyService_idl_example.py");
-		checkCode(result, resourceDir, "README.test");
-	}
-
-	public void testServicePort() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("test");
-		rtcParam.setDescription("test component");
-		rtcParam.setVersion("1.0.0");
-		rtcParam.setVender("S.Kurihara");
-		rtcParam.setCategory("exmple");
-		rtcParam.setComponentType("STATIC");
-		rtcParam.setActivityType("PERIODIC");
-		rtcParam.setMaxInstance(1);
-		rtcParam.setRtmVersion("0.4.2");
-
-		ServicePortParam service1 = new ServicePortParam("MySVPro",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "myservice", "", "", 
-				rootPath + "resource\\Python\\AIST1\\MyService.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		rtcParam.getServicePorts().addAll(srvports);
-		genParam.getRtcParams().add(rtcParam);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Python\\AIST1\\";
-
-		checkCode(result, resourceDir, "test.py");
-		checkCode(result, resourceDir, "_GlobalIDL/__init__.py");
-		checkCode(result, resourceDir, "_GlobalIDL__POA/__init__.py");
-		checkCode(result, resourceDir, "MyService_idl_example.py");
-		checkCode(result, resourceDir, "README.test");
-		checkCode(result, resourceDir, "MyService_idl.py");
-	}
-}

Deleted: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/AllTestsPy.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/AllTestsPy.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/AllTestsPy.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,31 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.python._test;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllTestsPy {
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite(
-				"Test for jp.go.aist.rtm.rtcbuilder._test");
-		//$JUnit-BEGIN$
-		suite.addTestSuite(ConfigSetTest.class);
-		suite.addTestSuite(DiffTest.class);
-		suite.addTestSuite(LuckTest.class);
-		suite.addTestSuite(AISTTest.class);
-		suite.addTestSuite(MultiTest.class);
-		suite.addTestSuite(BaseTest.class);
-		suite.addTestSuite(VarTest.class);
-		suite.addTestSuite(PyDocTest.class);
-		suite.addTestSuite(PyDocLongTest.class);
-		suite.addTestSuite(PyExCxtTest.class);
-		suite.addTestSuite(PySystemConfigTest.class);
-		suite.addTestSuite(PyImplTest.class);
-		suite.addTestSuite(PyVariableTest.class);
-		////
-		suite.addTestSuite(jp.go.aist.rtm.rtcbuilder.python._test._100.BaseTest.class);
-		//$JUnit-END$
-		return suite;
-	}
-
-}

Deleted: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/BaseTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/BaseTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/BaseTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,295 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.python._test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import jp.go.aist.rtm.rtcbuilder.Generator;
-import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
-import jp.go.aist.rtm.rtcbuilder.generator.param.DataPortParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortInterfaceParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortParam;
-import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
-import jp.go.aist.rtm.rtcbuilder.python.IRtcBuilderConstantsPython;
-import jp.go.aist.rtm.rtcbuilder.python.manager.PythonGenerateManager;
-
-public class BaseTest extends TestBase {
-
-	protected void setUp() throws Exception {
-	}
-
-	public void testServicePort2() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("MDesc");
-		rtcParam.setVersion("1.0.1");
-		rtcParam.setVender("TA");
-		rtcParam.setCategory("Manip");
-		rtcParam.setComponentType("STATIC2");
-		rtcParam.setActivityType("PERIODIC2");
-		rtcParam.setMaxInstance(5);
-		rtcParam.setRtmVersion("0.4.2");
-
-		genParam.getRtcParams().add(rtcParam);
-		List<DataPortParam> dataport = new ArrayList<DataPortParam>(); 
-		dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
-		dataport.add(new DataPortParam("InP2", "RTC::TimedLong", "", 0));
-		rtcParam.getInports().addAll(dataport);
-		List<DataPortParam> outport = new ArrayList<DataPortParam>(); 
-		outport.add(new DataPortParam("OutP1", "RTC::TimedLong", "", 0));
-		outport.add(new DataPortParam("OutP2", "RTC::TimedFloat", "", 0));
-		rtcParam.getOutports().addAll(outport);
-
-		ServicePortParam service1 = new ServicePortParam("svPort",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "acc", "", "", 
-				rootPath + "\\resource\\MyService.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		
-		ServicePortParam service2 = new ServicePortParam("cmPort",0);
-		List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service2, "rate", "", "", 
-				rootPath + "\\resource\\DAQService.idl", "DAQService", "", 1);
-		srvinterts2.add(int2);
-		service2.getServicePortInterfaces().addAll(srvinterts2);
-		srvports.add(service2);
-		
-		rtcParam.getServicePorts().addAll(srvports);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Python\\service2\\";
-
-		checkCode(result, resourceDir, "foo.py");
-		checkCode(result, resourceDir, "MyService_idl.py");
-		checkCode(result, resourceDir, "DAQService_idl.py");
-		checkCode(result, resourceDir, "_GlobalIDL/__init__.py");
-		checkCode(result, resourceDir, "_GlobalIDL__POA/__init__.py");
-		checkCode(result, resourceDir, "MyService_idl_example.py");
-		checkCode(result, resourceDir, "README.foo");
-	}
-
-	public void testServicePort1() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("MDesc");
-		rtcParam.setVersion("1.0.1");
-		rtcParam.setVender("TA");
-		rtcParam.setCategory("Manip");
-		rtcParam.setComponentType("STATIC2");
-		rtcParam.setActivityType("PERIODIC2");
-		rtcParam.setMaxInstance(5);
-		rtcParam.setRtmVersion("0.4.2");
-		genParam.getRtcParams().add(rtcParam);
-
-		List<DataPortParam> dataport = new ArrayList<DataPortParam>(); 
-		dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
-		dataport.add(new DataPortParam("InP2", "RTC::TimedLong", "", 0));
-		rtcParam.getInports().addAll(dataport);
-		List<DataPortParam> outport = new ArrayList<DataPortParam>(); 
-		outport.add(new DataPortParam("OutP1", "RTC::TimedLong", "", 0));
-		outport.add(new DataPortParam("OutP2", "RTC::TimedFloat", "", 0));
-		rtcParam.getOutports().addAll(outport);
-
-		ServicePortParam service1 = new ServicePortParam("svPort",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "acc", "", "", 
-				rootPath + "\\resource\\MyService.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		rtcParam.getServicePorts().addAll(srvports);
-		
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Python\\service1\\";
-
-		checkCode(result, resourceDir, "foo.py");
-		checkCode(result, resourceDir, "MyService_idl.py");
-		checkCode(result, resourceDir, "_GlobalIDL/__init__.py");
-		checkCode(result, resourceDir, "_GlobalIDL__POA/__init__.py");
-		checkCode(result, resourceDir, "MyService_idl_example.py");
-		checkCode(result, resourceDir, "README.foo");
-	}
-
-	public void testOutPort2() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("MDesc");
-		rtcParam.setVersion("1.0.1");
-		rtcParam.setVender("TA");
-		rtcParam.setCategory("Manip");
-		rtcParam.setComponentType("STATIC2");
-		rtcParam.setActivityType("PERIODIC2");
-		rtcParam.setMaxInstance(5);
-		rtcParam.setRtmVersion("0.4.2");
-		genParam.getRtcParams().add(rtcParam);
-		List<DataPortParam> dataport = new ArrayList<DataPortParam>(); 
-		dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
-		dataport.add(new DataPortParam("InP2", "RTC::TimedLong", "", 0));
-		rtcParam.getInports().addAll(dataport);
-		List<DataPortParam> outport = new ArrayList<DataPortParam>(); 
-		outport.add(new DataPortParam("OutP1", "RTC::TimedLong", "", 0));
-		outport.add(new DataPortParam("OutP2", "RTC::TimedFloat", "", 0));
-		rtcParam.getOutports().addAll(outport);
-		
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Python\\outport2\\";
-
-		checkCode(result, resourceDir, "foo.py");
-		checkCode(result, resourceDir, "README.foo");
-	}
-
-	public void testOutPort1() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("MDesc");
-		rtcParam.setVersion("1.0.1");
-		rtcParam.setVender("TA");
-		rtcParam.setCategory("Manip");
-		rtcParam.setComponentType("STATIC2");
-		rtcParam.setActivityType("PERIODIC2");
-		rtcParam.setRtmVersion("0.4.2");
-		rtcParam.setMaxInstance(5);
-		genParam.getRtcParams().add(rtcParam);
-		List<DataPortParam> dataport = new ArrayList<DataPortParam>(); 
-		dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
-		dataport.add(new DataPortParam("InP2", "RTC::TimedLong", "", 0));
-		rtcParam.getInports().addAll(dataport);
-		List<DataPortParam> outport = new ArrayList<DataPortParam>(); 
-		outport.add(new DataPortParam("OutP1", "RTC::TimedLong", "", 0));
-		rtcParam.getOutports().addAll(outport);
-		
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Python\\outport1\\";
-
-		checkCode(result, resourceDir, "foo.py");
-		checkCode(result, resourceDir, "README.foo");
-	}
-
-	public void testInPort2() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("MDesc");
-		rtcParam.setVersion("1.0.1");
-		rtcParam.setVender("TA");
-		rtcParam.setCategory("Manip");
-		rtcParam.setComponentType("STATIC2");
-		rtcParam.setActivityType("PERIODIC2");
-		rtcParam.setRtmVersion("0.4.2");
-		rtcParam.setMaxInstance(5);
-		genParam.getRtcParams().add(rtcParam);
-		List<DataPortParam> dataport = new ArrayList<DataPortParam>(); 
-		dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
-		dataport.add(new DataPortParam("InP2", "RTC::TimedLong", "", 0));
-		rtcParam.getInports().addAll(dataport);
-		
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Python\\inport2\\";
-
-		checkCode(result, resourceDir, "foo.py");
-		checkCode(result, resourceDir, "README.foo");
-	}
-
-	public void testInPort() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("MDesc");
-		rtcParam.setVersion("1.0.1");
-		rtcParam.setVender("TA");
-		rtcParam.setCategory("Manip");
-		rtcParam.setComponentType("STATIC2");
-		rtcParam.setActivityType("PERIODIC2");
-		rtcParam.setMaxInstance(5);
-		rtcParam.setRtmVersion("0.4.2");
-		genParam.getRtcParams().add(rtcParam);
-		List<DataPortParam> dataport = new ArrayList<DataPortParam>(); 
-		dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
-		rtcParam.getInports().addAll(dataport);
-		
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Python\\inport1\\";
-
-		checkCode(result, resourceDir, "foo.py");
-		checkCode(result, resourceDir, "README.foo");
-	}
-
-	public void testBasic() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("MDesc");
-		rtcParam.setVersion("1.0.1");
-		rtcParam.setVender("TA");
-		rtcParam.setCategory("Manip");
-		rtcParam.setComponentType("STATIC2");
-		rtcParam.setActivityType("PERIODIC2");
-		rtcParam.setMaxInstance(5);
-		rtcParam.setRtmVersion("0.4.2");
-		genParam.getRtcParams().add(rtcParam);
-		
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Python\\name\\";
-
-		checkCode(result, resourceDir, "foo.py");
-		checkCode(result, resourceDir, "README.foo");
-	}
-}

Deleted: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/ConfigSetTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/ConfigSetTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/ConfigSetTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,157 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.python._test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import jp.go.aist.rtm.rtcbuilder.Generator;
-import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ConfigSetParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
-import jp.go.aist.rtm.rtcbuilder.python.IRtcBuilderConstantsPython;
-import jp.go.aist.rtm.rtcbuilder.python.manager.PythonGenerateManager;
-
-public class ConfigSetTest extends TestBase {
-
-	protected void setUp() throws Exception {
-	}
-
-	public void testConfigSet() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("MDesc");
-		rtcParam.setVersion("1.0.3");
-		rtcParam.setVender("TA2");
-		rtcParam.setCategory("manip2");
-		rtcParam.setComponentType("STATIC2");
-		rtcParam.setActivityType("PERIODIC2");
-		rtcParam.setMaxInstance(3);
-		rtcParam.setRtmVersion("0.4.2");
-
-		genParam.getRtcParams().add(rtcParam);
-		List<ConfigSetParam> configset = new ArrayList<ConfigSetParam>(); 
-		configset.add(new ConfigSetParam("int_param0","int","","0"));
-		rtcParam.getConfigParams().addAll(configset);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Python\\ConfigSet\\configset1\\";
-
-		checkCode(result, resourceDir, "foo.py");
-		checkCode(result, resourceDir, "README.foo");
-	}
-
-	public void testConfigSet2() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("MDesc");
-		rtcParam.setVersion("1.0.3");
-		rtcParam.setVender("TA2");
-		rtcParam.setCategory("manip2");
-		rtcParam.setComponentType("STATIC2");
-		rtcParam.setActivityType("PERIODIC2");
-		rtcParam.setMaxInstance(3);
-		rtcParam.setRtmVersion("0.4.2");
-
-		genParam.getRtcParams().add(rtcParam);
-		List<ConfigSetParam> configset = new ArrayList<ConfigSetParam>(); 
-		configset.add(new ConfigSetParam("int_param0","int","","0"));
-		configset.add(new ConfigSetParam("int_param1","int","","1"));
-		rtcParam.getConfigParams().addAll(configset);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Python\\ConfigSet\\configset2\\";
-
-		checkCode(result, resourceDir, "foo.py");
-		checkCode(result, resourceDir, "README.foo");
-	}
-
-	public void testConfigSet3() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("MDesc");
-		rtcParam.setVersion("1.0.3");
-		rtcParam.setVender("TA2");
-		rtcParam.setCategory("manip2");
-		rtcParam.setComponentType("STATIC2");
-		rtcParam.setActivityType("PERIODIC2");
-		rtcParam.setMaxInstance(3);
-		rtcParam.setRtmVersion("0.4.2");
-
-		genParam.getRtcParams().add(rtcParam);
-		List<ConfigSetParam> configset = new ArrayList<ConfigSetParam>(); 
-		configset.add(new ConfigSetParam("int_param0","int","","0"));
-		configset.add(new ConfigSetParam("int_param1","int","","1"));
-		configset.add(new ConfigSetParam("double_param0","double","","0.11"));
-		configset.add(new ConfigSetParam("str_param0","String","","hoge"));
-		configset.add(new ConfigSetParam("str_param1","String","","dara"));
-		rtcParam.getConfigParams().addAll(configset);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Python\\ConfigSet\\configset3\\";
-
-		checkCode(result, resourceDir, "foo.py");
-		checkCode(result, resourceDir, "README.foo");
-	}
-
-	public void testConfigSet4() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("MDesc");
-		rtcParam.setVersion("1.0.3");
-		rtcParam.setVender("TA2");
-		rtcParam.setCategory("manip2");
-		rtcParam.setComponentType("STATIC2");
-		rtcParam.setActivityType("PERIODIC2");
-		rtcParam.setMaxInstance(3);
-		rtcParam.setRtmVersion("0.4.2");
-
-		genParam.getRtcParams().add(rtcParam);
-		List<ConfigSetParam> configset = new ArrayList<ConfigSetParam>(); 
-		configset.add(new ConfigSetParam("int_param0","int","","0"));
-		configset.add(new ConfigSetParam("int_param1","int","","1"));
-		configset.add(new ConfigSetParam("double_param0","double","","0.11"));
-		configset.add(new ConfigSetParam("str_param0","String","","hoge"));
-		configset.add(new ConfigSetParam("str_param1","String","","dara"));
-		configset.add(new ConfigSetParam("vector_param0","double","","0.0,1.0,2.0,3.0"));
-		rtcParam.getConfigParams().addAll(configset);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Python\\ConfigSet\\configset4\\";
-
-		checkCode(result, resourceDir, "foo.py");
-		checkCode(result, resourceDir, "README.foo");
-	}
-}

Deleted: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/DiffTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/DiffTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/DiffTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,106 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.python._test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import jp.go.aist.rtm.rtcbuilder.Generator;
-import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
-import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortInterfaceParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortParam;
-import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
-import jp.go.aist.rtm.rtcbuilder.python.IRtcBuilderConstantsPython;
-import jp.go.aist.rtm.rtcbuilder.python.manager.PythonGenerateManager;
-
-public class DiffTest extends TestBase {
-
-	protected void setUp() throws Exception {
-	}
-
-	public void testDiffName2() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("test");
-		rtcParam.setDescription("test component");
-		rtcParam.setVersion("1.0.0");
-		rtcParam.setVender("S.Kurihara");
-		rtcParam.setCategory("sample");
-		rtcParam.setComponentType("STATIC");
-		rtcParam.setActivityType("PERIODIC");
-		rtcParam.setMaxInstance(1);
-		rtcParam.setRtmVersion("0.4.2");
-
-		ServicePortParam service1 = new ServicePortParam("MySVPro0",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "myservice0", "", "", 
-				rootPath + "\\resource\\MyService3.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		rtcParam.getServicePorts().addAll(srvports);
-		genParam.getRtcParams().add(rtcParam);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Python\\diffname2\\";
-
-		checkCode(result, resourceDir, "test.py");
-		checkCode(result, resourceDir, "MyService3_idl.py");
-//		checkCode(result, resourceDir, "DAQService_idl.py");
-		checkCode(result, resourceDir, "_GlobalIDL/__init__.py");
-		checkCode(result, resourceDir, "_GlobalIDL__POA/__init__.py");
-		checkCode(result, resourceDir, "MyService3_idl_example.py");
-//		checkCode(result, resourceDir, "DAQService_idl_example.py");
-		checkCode(result, resourceDir, "README.test");
-	}
-
-	public void testDiffName() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("test");
-		rtcParam.setDescription("test component");
-		rtcParam.setVersion("1.0.0");
-		rtcParam.setVender("S.Kurihara");
-		rtcParam.setCategory("sample");
-		rtcParam.setComponentType("STATIC");
-		rtcParam.setActivityType("PERIODIC");
-		rtcParam.setMaxInstance(1);
-		rtcParam.setRtmVersion("0.4.2");
-
-		ServicePortParam service1 = new ServicePortParam("MySVPro0",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "myservice0", "", "", 
-				rootPath + "\\resource\\Python\\diffname\\MyService3.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		rtcParam.getServicePorts().addAll(srvports);
-		genParam.getRtcParams().add(rtcParam);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Python\\diffname\\";
-
-		checkCode(result, resourceDir, "test.py");
-		checkCode(result, resourceDir, "MyService3_idl.py");
-		checkCode(result, resourceDir, "_GlobalIDL/__init__.py");
-		checkCode(result, resourceDir, "_GlobalIDL__POA/__init__.py");
-		checkCode(result, resourceDir, "MyService3_idl_example.py");
-		checkCode(result, resourceDir, "README.test");
-	}
-}

Deleted: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/LuckTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/LuckTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/LuckTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,443 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.python._test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import jp.go.aist.rtm.rtcbuilder.Generator;
-import jp.go.aist.rtm.rtcbuilder.generator.param.DataPortParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortInterfaceParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortParam;
-import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
-import jp.go.aist.rtm.rtcbuilder.python.IRtcBuilderConstantsPython;
-import jp.go.aist.rtm.rtcbuilder.python.manager.PythonGenerateManager;
-
-public class LuckTest extends TestBase {
-
-	protected void setUp() throws Exception {
-	}
-
-	public void testConsumerNoType() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("test module");
-		rtcParam.setVersion("1.0.1");
-		rtcParam.setVender("TA");
-		rtcParam.setCategory("sample");
-		rtcParam.setComponentType("STATIC");
-		rtcParam.setActivityType("PERIODIC");
-		rtcParam.setMaxInstance(2);
-		genParam.getRtcParams().add(rtcParam);
-		
-		List<DataPortParam> dataInport = new ArrayList<DataPortParam>(); 
-		dataInport.add(new DataPortParam("in1", "RTC::TimedShort", "", 0));
-		rtcParam.getInports().addAll(dataInport);
-
-		List<DataPortParam> dataOutport = new ArrayList<DataPortParam>(); 
-		dataOutport.add(new DataPortParam("out1", "RTC::TimedLong", "", 0));
-		rtcParam.getOutports().addAll(dataOutport);
-
-		ServicePortParam service1 = new ServicePortParam("MySVPro",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "myservice0", "", "", 
-				rootPath + "\\resource\\Python\\Exception\\ConNoName\\MyService.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		
-		ServicePortParam service2 = new ServicePortParam("MyConPro",0);
-		List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service1, "myservice1", "", "", 
-				rootPath + "\\resource\\Python\\Exception\\ConNoName\\MyService.idl", "", "", 1);
-		srvinterts2.add(int2);
-		service2.getServicePortInterfaces().addAll(srvinterts2);
-		srvports.add(service2);
-
-		rtcParam.getServicePorts().addAll(srvports);
-		genParam.getRtcParams().add(rtcParam);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		try {
-			generator.generateTemplateCode(genParam);
-			fail();
-		} catch ( Exception ex ) {
-		}
-	}
-
-	public void testConsumerNoName() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("test module");
-		rtcParam.setVersion("1.0.1");
-		rtcParam.setVender("TA");
-		rtcParam.setCategory("sample");
-		rtcParam.setComponentType("STATIC");
-		rtcParam.setActivityType("PERIODIC");
-		rtcParam.setMaxInstance(2);
-		
-		List<DataPortParam> dataInport = new ArrayList<DataPortParam>(); 
-		dataInport.add(new DataPortParam("in1", "RTC::TimedShort", "", 0));
-		rtcParam.getInports().addAll(dataInport);
-
-		List<DataPortParam> dataOutport = new ArrayList<DataPortParam>(); 
-		dataOutport.add(new DataPortParam("out1", "RTC::TimedLong", "", 0));
-		rtcParam.getOutports().addAll(dataOutport);
-
-		ServicePortParam service1 = new ServicePortParam("MySVPro",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "myservice0", "", "", 
-				rootPath + "\\resource\\Python\\Exception\\ConNoName\\MyService.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		
-		ServicePortParam service2 = new ServicePortParam("MyConPro",0);
-		List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service1, "", "", "", 
-				rootPath + "\\resource\\Python\\Exception\\ConNoName\\MyService.idl", "MyService", "", 1);
-		srvinterts2.add(int2);
-		service2.getServicePortInterfaces().addAll(srvinterts2);
-		srvports.add(service2);
-
-		rtcParam.getServicePorts().addAll(srvports);
-		genParam.getRtcParams().add(rtcParam);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		try {
-			generator.generateTemplateCode(genParam);
-			fail();
-		} catch ( Exception ex ) {
-		}
-	}
-
-	public void testConsumerNoPortName() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("test module");
-		rtcParam.setVersion("1.0.1");
-		rtcParam.setVender("TA");
-		rtcParam.setCategory("sample");
-		rtcParam.setComponentType("STATIC");
-		rtcParam.setActivityType("PERIODIC");
-		rtcParam.setMaxInstance(2);
-		
-		List<DataPortParam> dataInport = new ArrayList<DataPortParam>(); 
-		dataInport.add(new DataPortParam("in1", "RTC::TimedShort", "", 0));
-		rtcParam.getInports().addAll(dataInport);
-
-		List<DataPortParam> dataOutport = new ArrayList<DataPortParam>(); 
-		dataOutport.add(new DataPortParam("out1", "RTC::TimedLong", "", 0));
-		rtcParam.getOutports().addAll(dataOutport);
-
-		ServicePortParam service1 = new ServicePortParam("MySVPro",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "myservice0", "", "", 
-				rootPath + "\\resource\\Python\\Exception\\ConNoPortName\\MyService.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		
-		ServicePortParam service2 = new ServicePortParam("",0);
-		List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service1, "myservice1", "", "", 
-				rootPath + "\\resource\\Python\\Exception\\ConNoPortName\\MyService.idl", "MyService", "", 1);
-		srvinterts2.add(int2);
-		service2.getServicePortInterfaces().addAll(srvinterts2);
-		srvports.add(service2);
-
-		rtcParam.getServicePorts().addAll(srvports);
-		genParam.getRtcParams().add(rtcParam);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		try {
-			generator.generateTemplateCode(genParam);
-			fail();
-		} catch ( Exception ex ) {
-		}
-	}
-
-	public void testProviderNoType() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("test module");
-		rtcParam.setVersion("1.0.1");
-		rtcParam.setVender("TA");
-		rtcParam.setCategory("sample");
-		rtcParam.setComponentType("STATIC");
-		rtcParam.setActivityType("PERIODIC");
-		rtcParam.setMaxInstance(2);
-		genParam.getRtcParams().add(rtcParam);
-		
-		List<DataPortParam> dataInport = new ArrayList<DataPortParam>(); 
-		dataInport.add(new DataPortParam("in1", "RTC::TimedShort", "", 0));
-		rtcParam.getInports().addAll(dataInport);
-
-		List<DataPortParam> dataOutport = new ArrayList<DataPortParam>(); 
-		dataOutport.add(new DataPortParam("out1", "RTC::TimedLong", "", 0));
-		rtcParam.getOutports().addAll(dataOutport);
-
-		ServicePortParam service1 = new ServicePortParam("MySVPro",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "myservice0", "", "", 
-				rootPath + "\\resource\\Python\\Exception\\ProNoType\\MyService.idl", "", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		rtcParam.getServicePorts().addAll(srvports);
-		genParam.getRtcParams().add(rtcParam);
-		
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		try {
-			generator.generateTemplateCode(genParam);
-			fail();
-		} catch ( Exception ex ) {
-		}
-
-	}
-
-	public void testProviderNoName() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("test component");
-		rtcParam.setVersion("1.0.1");
-		rtcParam.setVender("TA");
-		rtcParam.setCategory("sample");
-		rtcParam.setComponentType("STATIC");
-		rtcParam.setActivityType("PERIODIC");
-		rtcParam.setMaxInstance(2);
-		
-		List<DataPortParam> dataInport = new ArrayList<DataPortParam>(); 
-		dataInport.add(new DataPortParam("in1", "RTC::TimedShort", "", 0));
-		rtcParam.getInports().addAll(dataInport);
-
-		List<DataPortParam> dataOutport = new ArrayList<DataPortParam>(); 
-		dataOutport.add(new DataPortParam("out1", "RTC::TimedLong", "", 0));
-		rtcParam.getOutports().addAll(dataOutport);
-
-		ServicePortParam service1 = new ServicePortParam("MySVPro",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "", "", "", 
-				rootPath + "\\resource\\Python\\Exception\\ProNoName\\MyService.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		rtcParam.getServicePorts().addAll(srvports);
-		genParam.getRtcParams().add(rtcParam);
-		
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		try {
-			generator.generateTemplateCode(genParam);
-			fail();
-		} catch ( Exception ex ) {
-		}
-	}
-
-	public void testProviderNoPortName() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("test component");
-		rtcParam.setVersion("1.0.1");
-		rtcParam.setVender("TA");
-		rtcParam.setCategory("sample");
-		rtcParam.setComponentType("STATIC");
-		rtcParam.setActivityType("PERIODIC");
-		rtcParam.setMaxInstance(2);
-		
-		List<DataPortParam> dataInport = new ArrayList<DataPortParam>(); 
-		dataInport.add(new DataPortParam("in1", "RTC::TimedShort", "", 0));
-		rtcParam.getInports().addAll(dataInport);
-
-		List<DataPortParam> dataOutport = new ArrayList<DataPortParam>(); 
-		dataOutport.add(new DataPortParam("out1", "RTC::TimedLong", "", 0));
-		rtcParam.getOutports().addAll(dataOutport);
-
-		ServicePortParam service1 = new ServicePortParam("",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "myservice0", "", "", 
-				rootPath + "\\resource\\Python\\Exception\\ProNoPortName\\MyService.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		rtcParam.getServicePorts().addAll(srvports);
-		genParam.getRtcParams().add(rtcParam);
-		
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		try {
-			generator.generateTemplateCode(genParam);
-			fail();
-		} catch ( Exception ex ) {
-		}
-	}
-
-	public void testOutPortNoType() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("test component");
-		rtcParam.setVersion("1.0.1");
-		rtcParam.setVender("TA");
-		rtcParam.setCategory("sample");
-		rtcParam.setComponentType("STATIC");
-		rtcParam.setActivityType("PERIODIC");
-		rtcParam.setMaxInstance(2);
-		genParam.getRtcParams().add(rtcParam);
-		
-		List<DataPortParam> dataInport = new ArrayList<DataPortParam>(); 
-		dataInport.add(new DataPortParam("in1", "RTC::TimedShort", "", 0));
-		rtcParam.getInports().addAll(dataInport);
-
-		List<DataPortParam> dataOutport = new ArrayList<DataPortParam>(); 
-		dataOutport.add(new DataPortParam("out1", "", "", 0));
-		rtcParam.getOutports().addAll(dataOutport);
-		
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		try {
-			generator.generateTemplateCode(genParam);
-			fail();
-		} catch ( Exception ex ) {
-		}
-	}
-
-	public void testOutPortNoName() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("test component");
-		rtcParam.setVersion("1.0.1");
-		rtcParam.setVender("TA");
-		rtcParam.setCategory("sample");
-		rtcParam.setComponentType("STATIC");
-		rtcParam.setActivityType("PERIODIC");
-		rtcParam.setMaxInstance(2);
-		genParam.getRtcParams().add(rtcParam);
-		
-		List<DataPortParam> dataInport = new ArrayList<DataPortParam>(); 
-		dataInport.add(new DataPortParam("in1", "RTC::TimedShort", "", 0));
-		rtcParam.getInports().addAll(dataInport);
-
-		List<DataPortParam> dataOutport = new ArrayList<DataPortParam>(); 
-		dataOutport.add(new DataPortParam("", "RTC::TimedLong", "", 0));
-		rtcParam.getOutports().addAll(dataOutport);
-		
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		try {
-			generator.generateTemplateCode(genParam);
-			fail();
-		} catch ( Exception ex ) {
-		}
-	}
-
-	public void testInPortNoType() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("test component");
-		rtcParam.setVersion("1.0.1");
-		rtcParam.setVender("TA");
-		rtcParam.setCategory("sample");
-		rtcParam.setComponentType("STATIC");
-		rtcParam.setActivityType("PERIODIC");
-		rtcParam.setMaxInstance(2);
-		genParam.getRtcParams().add(rtcParam);
-		
-		List<DataPortParam> dataport = new ArrayList<DataPortParam>(); 
-		dataport.add(new DataPortParam("in1", "", "", 0));
-		rtcParam.getInports().addAll(dataport);
-		
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		try {
-			generator.generateTemplateCode(genParam);
-			fail();
-		} catch ( Exception ex ) {
-		}
-	}
-
-	public void testInPortNoName() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("test component");
-		rtcParam.setVersion("1.0.1");
-		rtcParam.setVender("TA");
-		rtcParam.setCategory("sample");
-		rtcParam.setComponentType("STATIC");
-		rtcParam.setActivityType("PERIODIC");
-		rtcParam.setMaxInstance(2);
-		genParam.getRtcParams().add(rtcParam);
-		
-		List<DataPortParam> dataport = new ArrayList<DataPortParam>(); 
-		dataport.add(new DataPortParam("", "RTC::TimedShort", "", 0));
-		rtcParam.getInports().addAll(dataport);
-		
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		try {
-			generator.generateTemplateCode(genParam);
-			fail();
-		} catch ( Exception ex ) {
-		}
-	}
-
-}

Deleted: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/MultiTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/MultiTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/MultiTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,216 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.python._test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import jp.go.aist.rtm.rtcbuilder.Generator;
-import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
-import jp.go.aist.rtm.rtcbuilder.generator.param.DataPortParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortInterfaceParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortParam;
-import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
-import jp.go.aist.rtm.rtcbuilder.python.IRtcBuilderConstantsPython;
-import jp.go.aist.rtm.rtcbuilder.python.manager.PythonGenerateManager;
-
-public class MultiTest extends TestBase {
-
-	protected void setUp() throws Exception {
-	}
-
-	public void testProConMulti() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("test module");
-		rtcParam.setVersion("1.0.1");
-		rtcParam.setVender("TA");
-		rtcParam.setCategory("sample");
-		rtcParam.setComponentType("STATIC");
-		rtcParam.setActivityType("PERIODIC");
-		rtcParam.setMaxInstance(2);
-		rtcParam.setRtmVersion("0.4.2");
-		
-		List<DataPortParam> dataInport = new ArrayList<DataPortParam>(); 
-		dataInport.add(new DataPortParam("in1", "RTC::TimedShort", "", 0));
-		rtcParam.getInports().addAll(dataInport);
-
-		List<DataPortParam> dataOutport = new ArrayList<DataPortParam>(); 
-		dataOutport.add(new DataPortParam("out1", "RTC::TimedLong", "", 0));
-		rtcParam.getOutports().addAll(dataOutport);
-
-		ServicePortParam service1 = new ServicePortParam("MySVPro",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "myserviceP1", "", "", 
-				rootPath + "resource\\Python\\Multi\\MyService.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-
-		ServicePortParam service2 = new ServicePortParam("MySVPro2",0);
-		List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service1, "myserviceP2", "", "", 
-				rootPath + "resource\\Python\\Multi\\MyService2.idl", "MyService2", "", 0);
-		srvinterts2.add(int2);
-		service2.getServicePortInterfaces().addAll(srvinterts2);
-		srvports.add(service2);
-
-		ServicePortParam service3 = new ServicePortParam("MyConPro",0);
-		List<ServicePortInterfaceParam> srvintert3 = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int3 = new ServicePortInterfaceParam(service1, "myservice0", "", "", 
-				rootPath + "resource\\Python\\Multi\\MyService.idl", "MyService", "", 1);
-		srvintert3.add(int3);
-		service3.getServicePortInterfaces().addAll(srvintert3);
-		srvports.add(service3);
-
-		ServicePortParam service4 = new ServicePortParam("MyConPro2",0);
-		List<ServicePortInterfaceParam> srvinterts4 = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int4 = new ServicePortInterfaceParam(service1, "myservice2", "", "", 
-				rootPath + "resource\\Python\\Multi\\DAQService.idl", "DAQService", "", 1);
-		srvinterts4.add(int4);
-		service4.getServicePortInterfaces().addAll(srvinterts4);
-		srvports.add(service4);
-		rtcParam.getServicePorts().addAll(srvports);
-		genParam.getRtcParams().add(rtcParam);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Python\\Multi\\ProConMulti\\";
-
-		checkCode(result, resourceDir, "foo.py");
-		checkCode(result, resourceDir, "MyService_idl.py");
-		checkCode(result, resourceDir, "MyService2_idl.py");
-		checkCode(result, resourceDir, "DAQService_idl.py");
-		checkCode(result, resourceDir, "_GlobalIDL/__init__.py");
-		checkCode(result, resourceDir, "_GlobalIDL__POA/__init__.py");
-		checkCode(result, resourceDir, "MyService_idl_example.py");
-		checkCode(result, resourceDir, "MyService2_idl_example.py");
-		checkCode(result, resourceDir, "README.foo");
-	}
-
-	public void testConsumerMulti() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("test module");
-		rtcParam.setVersion("1.0.1");
-		rtcParam.setVender("TA");
-		rtcParam.setCategory("sample");
-		rtcParam.setComponentType("STATIC");
-		rtcParam.setActivityType("PERIODIC");
-		rtcParam.setMaxInstance(2);
-		rtcParam.setRtmVersion("0.4.2");
-		
-		List<DataPortParam> dataInport = new ArrayList<DataPortParam>(); 
-		dataInport.add(new DataPortParam("in", "RTC::TimedShort", "", 0));
-		rtcParam.getInports().addAll(dataInport);
-
-		List<DataPortParam> dataOutport = new ArrayList<DataPortParam>(); 
-		dataOutport.add(new DataPortParam("out", "RTC::TimedLong", "", 0));
-		rtcParam.getOutports().addAll(dataOutport);
-
-		ServicePortParam service1 = new ServicePortParam("MyConPro",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "myservice0", "", "", 
-				rootPath + "resource\\Python\\Multi\\MyService.idl", "MyService", "", 1);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-
-		ServicePortParam service2 = new ServicePortParam("MyConPro2",0);
-		List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service1, "myservice2", "", "", 
-				rootPath + "resource\\Python\\Multi\\DAQService.idl", "DAQService", "", 1);
-		srvinterts2.add(int2);
-		service2.getServicePortInterfaces().addAll(srvinterts2);
-		srvports.add(service2);
-		rtcParam.getServicePorts().addAll(srvports);
-		genParam.getRtcParams().add(rtcParam);
-		
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Python\\Multi\\ConMulti\\";
-
-		checkCode(result, resourceDir, "foo.py");
-		checkCode(result, resourceDir, "MyService_idl.py");
-		checkCode(result, resourceDir, "DAQService_idl.py");
-		checkCode(result, resourceDir, "_GlobalIDL/__init__.py");
-		checkCode(result, resourceDir, "_GlobalIDL__POA/__init__.py");
-		checkCode(result, resourceDir, "README.foo");
-	}
-
-	public void testProviderMulti() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("test component");
-		rtcParam.setVersion("1.0.1");
-		rtcParam.setVender("TA");
-		rtcParam.setCategory("sample");
-		rtcParam.setComponentType("STATIC");
-		rtcParam.setActivityType("PERIODIC");
-		rtcParam.setMaxInstance(2);
-		rtcParam.setRtmVersion("0.4.2");
-		
-		List<DataPortParam> dataInport = new ArrayList<DataPortParam>(); 
-		dataInport.add(new DataPortParam("in1", "RTC::TimedShort", "", 0));
-		rtcParam.getInports().addAll(dataInport);
-
-		List<DataPortParam> dataOutport = new ArrayList<DataPortParam>(); 
-		dataOutport.add(new DataPortParam("out1", "RTC::TimedLong", "", 0));
-		rtcParam.getOutports().addAll(dataOutport);
-
-		ServicePortParam service1 = new ServicePortParam("MySVPro",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "myservice0", "", "", 
-				rootPath + "resource\\Python\\Multi\\MyService.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-
-		ServicePortParam service2 = new ServicePortParam("MySVPro2",0);
-		List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service1, "myservice2", "", "", 
-				rootPath + "resource\\Python\\Multi\\DAQService.idl", "DAQService", "", 0);
-		srvinterts2.add(int2);
-		service2.getServicePortInterfaces().addAll(srvinterts2);
-		srvports.add(service2);
-		rtcParam.getServicePorts().addAll(srvports);
-		genParam.getRtcParams().add(rtcParam);
-		
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Python\\Multi\\ProMulti\\";
-
-		checkCode(result, resourceDir, "foo.py");
-		checkCode(result, resourceDir, "MyService_idl.py");
-		checkCode(result, resourceDir, "DAQService_idl.py");
-		checkCode(result, resourceDir, "_GlobalIDL/__init__.py");
-		checkCode(result, resourceDir, "_GlobalIDL__POA/__init__.py");
-		checkCode(result, resourceDir, "MyService_idl_example.py");
-		checkCode(result, resourceDir, "DAQService_idl_example.py");
-		checkCode(result, resourceDir, "README.foo");
-	}
-}

Deleted: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/PyDocLongTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/PyDocLongTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/PyDocLongTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,238 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.python._test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import jp.go.aist.rtm.rtcbuilder.Generator;
-import jp.go.aist.rtm.rtcbuilder.IRtcBuilderConstants;
-import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ConfigSetParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.DataPortParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortInterfaceParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortParam;
-import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
-import jp.go.aist.rtm.rtcbuilder.python.IRtcBuilderConstantsPython;
-import jp.go.aist.rtm.rtcbuilder.python.manager.PythonGenerateManager;
-
-public class PyDocLongTest extends TestBase {
-
-	protected void setUp() throws Exception {
-	}
-
-	public void testDocAllLong() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("MDesc");
-		rtcParam.setVersion("1.0.1");
-		rtcParam.setVender("TA");
-		rtcParam.setCategory("Manip");
-		rtcParam.setComponentType("STATIC2");
-		rtcParam.setActivityType("PERIODIC2");
-		rtcParam.setMaxInstance(5);
-		rtcParam.setRtmVersion("0.4.2");
-		//
-		rtcParam.setDocCreator("Noriaki Ando <n-ando at aist.go.jp>34567894123456789512345678961234567897123456789812345");
-		rtcParam.setDocLicense("Copyright (C) 2006-2008 ライセンス12345678901234567890123456789012345678901234567890");
-		rtcParam.setDocDescription("本コンポーネントの概要説明1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocInOut("本コンポーネントの入出力1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocAlgorithm("本コンポーネントのアルゴリズムなど1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocReference("参考文献の情報1234567890123456789012345678901234567890123456789012345678901234567890");
-		//
-		rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_INITIALIZE, "on_initialize概要説明1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_INITIALIZE, "on_initialize事前条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_INITIALIZE, "on_initialize事後条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		//
-		rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_FINALIZE, "on_finalize概要説明1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_FINALIZE, "on_finalize事前条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_FINALIZE, "on_finalize事後条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		//
-		rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_STARTUP, "on_startup概要説明1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_STARTUP, "on_startup事前条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_STARTUP, "on_startup事後条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		//
-		rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_SHUTDOWN, "on_shutdown概要説明1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_SHUTDOWN, "on_shutdown事前条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_SHUTDOWN, "on_shutdown事後条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		//
-		rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_ACTIVATED, "on_activated概要説明1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_ACTIVATED, "on_activated事前条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_ACTIVATED, "on_activated事後条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		//
-		rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_DEACTIVATED, "on_deactivated概要説明1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_DEACTIVATED, "on_deactivated事前条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_DEACTIVATED, "on_deactivated事後条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		//
-		rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_EXECUTE, "on_execute概要説明1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_EXECUTE, "on_execute事前条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_EXECUTE, "on_execute事後条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		//
-		rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_ABORTING, "on_aborting概要説明1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_ABORTING, "on_aborting事前条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_ABORTING, "on_aborting事後条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		//
-		rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_ERROR, "on_error概要説明1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_ERROR, "on_error事前条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_ERROR, "on_error事後条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		//
-		rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_RESET, "on_reset概要説明1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_RESET, "on_reset事前条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_RESET, "on_reset事後条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		//
-		rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_STATE_UPDATE, "on_state_update概要説明1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_STATE_UPDATE, "on_state_update事前条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_STATE_UPDATE, "on_state_update事後条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		//
-		rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_RATE_CHANGED, "on_rate_changed概要説明1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_RATE_CHANGED, "on_rate_changed事前条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_RATE_CHANGED, "on_rate_changed事後条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		//
-		genParam.getRtcParams().add(rtcParam);
-		List<DataPortParam> dataport = new ArrayList<DataPortParam>(); 
-
-		DataPortParam datap1 = new DataPortParam("InP1", "RTC::TimedShort", "", 0);
-		datap1.setDocDescription("InPort1の概要1234567890123456789012345678901234567890123456789012345678901234567890");
-		datap1.setDocType("InPort1のデータの型1234567890123456789012345678901234567890123456789012345678901234567890");
-		datap1.setDocNum("InPort1のデータの数1234567890123456789012345678901234567890123456789012345678901234567890");
-		datap1.setDocSemantics("InPort1のデータの意味1234567890123456789012345678901234567890123456789012345678901234567890");
-		datap1.setDocUnit("InPort1のデータの単位1234567890123456789012345678901234567890123456789012345678901234567890");
-		datap1.setDocOccurrence("InPort1のデータの発生頻度1234567890123456789012345678901234567890123456789012345678901234567890");
-		datap1.setDocOperation("InPort1のデータの処理周期1234567890123456789012345678901234567890123456789012345678901234567890");
-		dataport.add(datap1);
-
-		DataPortParam datap2 = new DataPortParam("InP2", "RTC::TimedLong", "", 0);
-		datap2.setDocDescription("InPort2の概要1234567890123456789012345678901234567890123456789012345678901234567890");
-		datap2.setDocType("InPort2のデータの型1234567890123456789012345678901234567890123456789012345678901234567890");
-		datap2.setDocNum("InPort2のデータの数1234567890123456789012345678901234567890123456789012345678901234567890");
-		datap2.setDocSemantics("InPort2のデータの意味1234567890123456789012345678901234567890123456789012345678901234567890");
-		datap2.setDocUnit("InPort2のデータの単位1234567890123456789012345678901234567890123456789012345678901234567890");
-		datap2.setDocOccurrence("InPort2のデータの発生頻度1234567890123456789012345678901234567890123456789012345678901234567890");
-		datap2.setDocOperation("InPort2のデータの処理周期1234567890123456789012345678901234567890123456789012345678901234567890");
-		dataport.add(datap2);
-		
-		rtcParam.getInports().addAll(dataport);
-		//
-		List<DataPortParam> outport = new ArrayList<DataPortParam>(); 
-
-		DataPortParam datap3 = new DataPortParam("OutP1", "RTC::TimedLong", "", 0);
-		datap3.setDocDescription("OutPort1の概要1234567890123456789012345678901234567890123456789012345678901234567890");
-		datap3.setDocType("OutPort1のデータの型1234567890123456789012345678901234567890123456789012345678901234567890");
-		datap3.setDocNum("OutPort1のデータの数1234567890123456789012345678901234567890123456789012345678901234567890");
-		datap3.setDocSemantics("OutPort1のデータの意味1234567890123456789012345678901234567890123456789012345678901234567890");
-		datap3.setDocUnit("OutPort1のデータの単位1234567890123456789012345678901234567890123456789012345678901234567890");
-		datap3.setDocOccurrence("OutPort1のデータの発生頻度1234567890123456789012345678901234567890123456789012345678901234567890");
-		datap3.setDocOperation("OutPort1のデータの処理周期1234567890123456789012345678901234567890123456789012345678901234567890");
-		outport.add(datap3);
-
-		DataPortParam datap4 = new DataPortParam("OutP2", "RTC::TimedFloat", "", 0);
-		datap4.setDocDescription("OutPort2の概要1234567890123456789012345678901234567890123456789012345678901234567890");
-		datap4.setDocType("OutPort2のデータの型1234567890123456789012345678901234567890123456789012345678901234567890");
-		datap4.setDocNum("OutPort2のデータの数1234567890123456789012345678901234567890123456789012345678901234567890");
-		datap4.setDocSemantics("OutPort2のデータの意味1234567890123456789012345678901234567890123456789012345678901234567890");
-		datap4.setDocUnit("OutPort2のデータの単位1234567890123456789012345678901234567890123456789012345678901234567890");
-		datap4.setDocOccurrence("OutPort2のデータの発生頻度1234567890123456789012345678901234567890123456789012345678901234567890");
-		datap4.setDocOperation("OutPort2のデータの処理周期1234567890123456789012345678901234567890123456789012345678901234567890");
-		outport.add(datap4);
-
-		rtcParam.getOutports().addAll(outport);
-
-		ServicePortParam service1 = new ServicePortParam("svPort",0);
-		service1.setDocDescription("ServicePort1の概要1234567890123456789012345678901234567890123456789012345678901234567890");
-		service1.setDocIfDescription("ServicePort1のインターフェースの概要1234567890123456789012345678901234567890123456789012345678901234567890");
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "acc", "", "", 
-				rootPath + "\\resource\\MyService.idl", "MyService", "", 0);
-		int1.setDocDescription("ServiceIF1の概要説明1234567890123456789012345678901234567890123456789012345678901234567890");
-		int1.setDocArgument("ServiceIF1の引数1234567890123456789012345678901234567890123456789012345678901234567890");
-		int1.setDocReturn("ServiceIF1の返値1234567890123456789012345678901234567890123456789012345678901234567890");
-		int1.setDocException("ServiceIF1の例外1234567890123456789012345678901234567890123456789012345678901234567890");
-		int1.setDocPreCondition("ServiceIF1の事前条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		int1.setDocPostCondition("ServiceIF1の事後条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		
-		ServicePortParam service2 = new ServicePortParam("cmPort",0);
-		service2.setDocDescription("ServicePort2の概要1234567890123456789012345678901234567890123456789012345678901234567890");
-		service2.setDocIfDescription("ServicePort2のインターフェースの概要1234567890123456789012345678901234567890123456789012345678901234567890");
-		List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service2, "rate", "", "", 
-				rootPath + "\\resource\\DAQService.idl", "DAQService", "", 1);
-		int2.setDocDescription("ServiceIF2の概要説明1234567890123456789012345678901234567890123456789012345678901234567890");
-		int2.setDocArgument("ServiceIF2の引数1234567890123456789012345678901234567890123456789012345678901234567890");
-		int2.setDocReturn("ServiceIF2の返値1234567890123456789012345678901234567890123456789012345678901234567890");
-		int2.setDocException("ServiceIF2の例外1234567890123456789012345678901234567890123456789012345678901234567890");
-		int2.setDocPreCondition("ServiceIF2の事前条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		int2.setDocPostCondition("ServiceIF2の事後条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		srvinterts2.add(int2);
-		service2.getServicePortInterfaces().addAll(srvinterts2);
-		srvports.add(service2);
-		
-		List<ConfigSetParam> configset = new ArrayList<ConfigSetParam>(); 
-		ConfigSetParam config1 = new ConfigSetParam("int_param0","int","", "0");
-		config1.setDocDataName("Config1の名前");
-		config1.setDocDescription("Config1の概要1234567890123456789012345678901234567890123456789012345678901234567890");
-		config1.setDocDefaultVal("Config1のデフォルト値");
-		config1.setDocUnit("Config1の単位1234567890123456789012345678901234567890123456789012345678901234567890");
-		config1.setDocRange("Config1の範囲1234567890123456789012345678901234567890123456789012345678901234567890");
-		config1.setDocConstraint("Config1の制約条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		configset.add(config1);
-		ConfigSetParam config2 = new ConfigSetParam("int_param1","int","", "1");
-		config2.setDocDataName("Config2の名前");
-		config2.setDocDescription("Config2の概要1234567890123456789012345678901234567890123456789012345678901234567890");
-		config2.setDocDefaultVal("Config2のデフォルト値");
-		config2.setDocUnit("Config2の単位1234567890123456789012345678901234567890123456789012345678901234567890");
-		config2.setDocRange("Config2の範囲1234567890123456789012345678901234567890123456789012345678901234567890");
-		config2.setDocConstraint("Config2の制約条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		configset.add(config2);
-		ConfigSetParam config3 = new ConfigSetParam("double_param0","double","", "0.11");
-		config3.setDocDataName("Config3の名前");
-		config3.setDocDescription("Config3の概要1234567890123456789012345678901234567890123456789012345678901234567890");
-		config3.setDocDefaultVal("Config3のデフォルト値");
-		config3.setDocUnit("Config3の単位1234567890123456789012345678901234567890123456789012345678901234567890");
-		config3.setDocRange("Config3の範囲1234567890123456789012345678901234567890123456789012345678901234567890");
-		config3.setDocConstraint("Config3の制約条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		configset.add(config3);
-		ConfigSetParam config4 = new ConfigSetParam("str_param0","String","", "日本語");
-		config4.setDocDataName("Config4の名前");
-		config4.setDocDescription("Config4の概要1234567890123456789012345678901234567890123456789012345678901234567890");
-		config4.setDocDefaultVal("Config4のデフォルト値");
-		config4.setDocUnit("Config4の単位1234567890123456789012345678901234567890123456789012345678901234567890");
-		config4.setDocRange("Config4の範囲1234567890123456789012345678901234567890123456789012345678901234567890");
-		config4.setDocConstraint("Config4の制約条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		configset.add(config4);
-		ConfigSetParam config5 = new ConfigSetParam("str_param1","String","", "dara");
-		config5.setDocDataName("Config5の名前");
-		config5.setDocDescription("Config5の概要1234567890123456789012345678901234567890123456789012345678901234567890");
-		config5.setDocDefaultVal("Config5のデフォルト値");
-		config5.setDocUnit("Config5の単位1234567890123456789012345678901234567890123456789012345678901234567890");
-		config5.setDocRange("Config5の範囲1234567890123456789012345678901234567890123456789012345678901234567890");
-		config5.setDocConstraint("Config5の制約条件1234567890123456789012345678901234567890123456789012345678901234567890");
-		configset.add(config5);
-		rtcParam.getConfigParams().addAll(configset);
-
-		rtcParam.getServicePorts().addAll(srvports);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Python\\Doc\\fullLong\\";
-
-		checkCode(result, resourceDir, "foo.py");
-		checkCode(result, resourceDir, "MyService_idl.py");
-		checkCode(result, resourceDir, "DAQService_idl.py");
-		checkCode(result, resourceDir, "_GlobalIDL/__init__.py");
-		checkCode(result, resourceDir, "_GlobalIDL__POA/__init__.py");
-		checkCode(result, resourceDir, "MyService_idl_example.py");
-		checkCode(result, resourceDir, "README.foo");
-	}
-
-}

Deleted: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/PyDocTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/PyDocTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/PyDocTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,491 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.python._test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import jp.go.aist.rtm.rtcbuilder.Generator;
-import jp.go.aist.rtm.rtcbuilder.IRtcBuilderConstants;
-import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ConfigSetParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.DataPortParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortInterfaceParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortParam;
-import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
-import jp.go.aist.rtm.rtcbuilder.python.IRtcBuilderConstantsPython;
-import jp.go.aist.rtm.rtcbuilder.python.manager.PythonGenerateManager;
-
-public class PyDocTest extends TestBase {
-
-	protected void setUp() throws Exception {
-	}
-
-	public void testDocAll() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("MDesc");
-		rtcParam.setVersion("1.0.1");
-		rtcParam.setVender("TA");
-		rtcParam.setCategory("Manip");
-		rtcParam.setComponentType("STATIC2");
-		rtcParam.setActivityType("PERIODIC2");
-		rtcParam.setMaxInstance(5);
-		rtcParam.setRtmVersion("0.4.2");
-		//
-		rtcParam.setDocCreator("Noriaki Ando <n-ando at aist.go.jp>");
-		rtcParam.setDocLicense("Copyright (C) 2006-2008 ライセンス");
-		rtcParam.setDocDescription("本コンポーネントの概要説明");
-		rtcParam.setDocInOut("本コンポーネントの入出力");
-		rtcParam.setDocAlgorithm("本コンポーネントのアルゴリズムなど");
-		rtcParam.setDocReference("参考文献の情報");
-		//
-		rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_INITIALIZE, "on_initialize概要説明");
-		rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_INITIALIZE, "on_initialize事前条件");
-		rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_INITIALIZE, "on_initialize事後条件");
-		//
-		rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_FINALIZE, "on_finalize概要説明");
-		rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_FINALIZE, "on_finalize事前条件");
-		rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_FINALIZE, "on_finalize事後条件");
-		//
-		rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_STARTUP, "on_startup概要説明");
-		rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_STARTUP, "on_startup事前条件");
-		rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_STARTUP, "on_startup事後条件");
-		//
-		rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_SHUTDOWN, "on_shutdown概要説明");
-		rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_SHUTDOWN, "on_shutdown事前条件");
-		rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_SHUTDOWN, "on_shutdown事後条件");
-		//
-		rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_ACTIVATED, "on_activated概要説明");
-		rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_ACTIVATED, "on_activated事前条件");
-		rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_ACTIVATED, "on_activated事後条件");
-		//
-		rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_DEACTIVATED, "on_deactivated概要説明");
-		rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_DEACTIVATED, "on_deactivated事前条件");
-		rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_DEACTIVATED, "on_deactivated事後条件");
-		//
-		rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_EXECUTE, "on_execute概要説明");
-		rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_EXECUTE, "on_execute事前条件");
-		rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_EXECUTE, "on_execute事後条件");
-		//
-		rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_ABORTING, "on_aborting概要説明");
-		rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_ABORTING, "on_aborting事前条件");
-		rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_ABORTING, "on_aborting事後条件");
-		//
-		rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_ERROR, "on_error概要説明");
-		rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_ERROR, "on_error事前条件");
-		rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_ERROR, "on_error事後条件");
-		//
-		rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_RESET, "on_reset概要説明");
-		rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_RESET, "on_reset事前条件");
-		rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_RESET, "on_reset事後条件");
-		//
-		rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_STATE_UPDATE, "on_state_update概要説明");
-		rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_STATE_UPDATE, "on_state_update事前条件");
-		rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_STATE_UPDATE, "on_state_update事後条件");
-		//
-		rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_RATE_CHANGED, "on_rate_changed概要説明");
-		rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_RATE_CHANGED, "on_rate_changed事前条件");
-		rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_RATE_CHANGED, "on_rate_changed事後条件");
-		//
-		genParam.getRtcParams().add(rtcParam);
-		List<DataPortParam> dataport = new ArrayList<DataPortParam>(); 
-
-		DataPortParam datap1 = new DataPortParam("InP1", "RTC::TimedShort", "", 0);
-		datap1.setDocDescription("InPort1の概要");
-		datap1.setDocType("InPort1のデータの型");
-		datap1.setDocNum("InPort1のデータの数");
-		datap1.setDocSemantics("InPort1のデータの意味");
-		datap1.setDocUnit("InPort1のデータの単位");
-		datap1.setDocOccurrence("InPort1のデータの発生頻度");
-		datap1.setDocOperation("InPort1のデータの処理周期");
-		dataport.add(datap1);
-
-		DataPortParam datap2 = new DataPortParam("InP2", "RTC::TimedLong", "", 0);
-		datap2.setDocDescription("InPort2の概要");
-		datap2.setDocType("InPort2のデータの型");
-		datap2.setDocNum("InPort2のデータの数");
-		datap2.setDocSemantics("InPort2のデータの意味");
-		datap2.setDocUnit("InPort2のデータの単位");
-		datap2.setDocOccurrence("InPort2のデータの発生頻度");
-		datap2.setDocOperation("InPort2のデータの処理周期");
-		dataport.add(datap2);
-		
-		rtcParam.getInports().addAll(dataport);
-		//
-		List<DataPortParam> outport = new ArrayList<DataPortParam>(); 
-
-		DataPortParam datap3 = new DataPortParam("OutP1", "RTC::TimedLong", "", 0);
-		datap3.setDocDescription("OutPort1の概要");
-		datap3.setDocType("OutPort1のデータの型");
-		datap3.setDocNum("OutPort1のデータの数");
-		datap3.setDocSemantics("OutPort1のデータの意味");
-		datap3.setDocUnit("OutPort1のデータの単位");
-		datap3.setDocOccurrence("OutPort1のデータの発生頻度");
-		datap3.setDocOperation("OutPort1のデータの処理周期");
-		outport.add(datap3);
-
-		DataPortParam datap4 = new DataPortParam("OutP2", "RTC::TimedFloat", "", 0);
-		datap4.setDocDescription("OutPort2の概要");
-		datap4.setDocType("OutPort2のデータの型");
-		datap4.setDocNum("OutPort2のデータの数");
-		datap4.setDocSemantics("OutPort2のデータの意味");
-		datap4.setDocUnit("OutPort2のデータの単位");
-		datap4.setDocOccurrence("OutPort2のデータの発生頻度");
-		datap4.setDocOperation("OutPort2のデータの処理周期");
-		outport.add(datap4);
-
-		rtcParam.getOutports().addAll(outport);
-
-		ServicePortParam service1 = new ServicePortParam("svPort",0);
-		service1.setDocDescription("ServicePort1の概要");
-		service1.setDocIfDescription("ServicePort1のインターフェースの概要");
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "acc", "", "", 
-				rootPath + "\\resource\\MyService.idl", "MyService", "", 0);
-		int1.setDocDescription("ServiceIF1の概要説明");
-		int1.setDocArgument("ServiceIF1の引数");
-		int1.setDocReturn("ServiceIF1の返値");
-		int1.setDocException("ServiceIF1の例外");
-		int1.setDocPreCondition("ServiceIF1の事前条件");
-		int1.setDocPostCondition("ServiceIF1の事後条件");
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		
-		ServicePortParam service2 = new ServicePortParam("cmPort",0);
-		service2.setDocDescription("ServicePort2の概要");
-		service2.setDocIfDescription("ServicePort2のインターフェースの概要");
-		List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service2, "rate", "", "", 
-				rootPath + "\\resource\\DAQService.idl", "DAQService", "", 1);
-		int2.setDocDescription("ServiceIF2の概要説明");
-		int2.setDocArgument("ServiceIF2の引数");
-		int2.setDocReturn("ServiceIF2の返値");
-		int2.setDocException("ServiceIF2の例外");
-		int2.setDocPreCondition("ServiceIF2の事前条件");
-		int2.setDocPostCondition("ServiceIF2の事後条件");
-		srvinterts2.add(int2);
-		service2.getServicePortInterfaces().addAll(srvinterts2);
-		srvports.add(service2);
-		
-		List<ConfigSetParam> configset = new ArrayList<ConfigSetParam>(); 
-		ConfigSetParam config1 = new ConfigSetParam("int_param0","int","", "0");
-		config1.setDocDataName("Config1の名前");
-		config1.setDocDescription("Config1の概要");
-		config1.setDocDefaultVal("Config1のデフォルト値");
-		config1.setDocUnit("Config1の単位");
-		config1.setDocRange("Config1の範囲");
-		config1.setDocConstraint("Config1の制約条件");
-		configset.add(config1);
-		ConfigSetParam config2 = new ConfigSetParam("int_param1","int","", "1");
-		config2.setDocDataName("Config2の名前");
-		config2.setDocDescription("Config2の概要");
-		config2.setDocDefaultVal("Config2のデフォルト値");
-		config2.setDocUnit("Config2の単位");
-		config2.setDocRange("Config2の範囲");
-		config2.setDocConstraint("Config2の制約条件");
-		configset.add(config2);
-		ConfigSetParam config3 = new ConfigSetParam("double_param0","double","", "0.11");
-		config3.setDocDataName("Config3の名前");
-		config3.setDocDescription("Config3の概要");
-		config3.setDocDefaultVal("Config3のデフォルト値");
-		config3.setDocUnit("Config3の単位");
-		config3.setDocRange("Config3の範囲");
-		config3.setDocConstraint("Config3の制約条件");
-		configset.add(config3);
-		ConfigSetParam config4 = new ConfigSetParam("str_param0","String","", "hoge");
-		config4.setDocDataName("Config4の名前");
-		config4.setDocDescription("Config4の概要");
-		config4.setDocDefaultVal("Config4のデフォルト値");
-		config4.setDocUnit("Config4の単位");
-		config4.setDocRange("Config4の範囲");
-		config4.setDocConstraint("Config4の制約条件");
-		configset.add(config4);
-		ConfigSetParam config5 = new ConfigSetParam("str_param1","String","", "dara");
-		config5.setDocDataName("Config5の名前");
-		config5.setDocDescription("Config5の概要");
-		config5.setDocDefaultVal("Config5のデフォルト値");
-		config5.setDocUnit("Config5の単位");
-		config5.setDocRange("Config5の範囲");
-		config5.setDocConstraint("Config5の制約条件");
-		configset.add(config5);
-		rtcParam.getConfigParams().addAll(configset);
-
-		rtcParam.getServicePorts().addAll(srvports);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Python\\Doc\\full\\";
-
-		checkCode(result, resourceDir, "foo.py");
-		checkCode(result, resourceDir, "MyService_idl.py");
-		checkCode(result, resourceDir, "DAQService_idl.py");
-		checkCode(result, resourceDir, "_GlobalIDL/__init__.py");
-		checkCode(result, resourceDir, "_GlobalIDL__POA/__init__.py");
-		checkCode(result, resourceDir, "MyService_idl_example.py");
-		checkCode(result, resourceDir, "README.foo");
-	}
-
-	public void testDocRefer() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("MDesc");
-		rtcParam.setVersion("1.0.1");
-		rtcParam.setVender("TA");
-		rtcParam.setCategory("Manip");
-		rtcParam.setComponentType("STATIC2");
-		rtcParam.setActivityType("PERIODIC2");
-		rtcParam.setMaxInstance(5);
-		rtcParam.setRtmVersion("0.4.2");
-		//
-		rtcParam.setDocCreator("Noriaki Ando <n-ando at aist.go.jp>");
-		rtcParam.setDocLicense("Copyright (C) 2006-2008 ライセンス");
-		rtcParam.setDocDescription("本コンポーネントの概要説明");
-		rtcParam.setDocInOut("本コンポーネントの入出力");
-		rtcParam.setDocAlgorithm("本コンポーネントのアルゴリズムなど");
-		rtcParam.setDocReference("参考文献の情報");
-		//
-		genParam.getRtcParams().add(rtcParam);
-		List<DataPortParam> dataport = new ArrayList<DataPortParam>(); 
-		dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
-		dataport.add(new DataPortParam("InP2", "RTC::TimedLong", "", 0));
-		rtcParam.getInports().addAll(dataport);
-		List<DataPortParam> outport = new ArrayList<DataPortParam>(); 
-		outport.add(new DataPortParam("OutP1", "RTC::TimedLong", "", 0));
-		outport.add(new DataPortParam("OutP2", "RTC::TimedFloat", "", 0));
-		rtcParam.getOutports().addAll(outport);
-
-		ServicePortParam service1 = new ServicePortParam("svPort",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "acc", "", "", 
-				rootPath + "\\resource\\MyService.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		
-		ServicePortParam service2 = new ServicePortParam("cmPort",0);
-		List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service2, "rate", "", "", 
-				rootPath + "\\resource\\DAQService.idl", "DAQService", "", 1);
-		srvinterts2.add(int2);
-		service2.getServicePortInterfaces().addAll(srvinterts2);
-		srvports.add(service2);
-		
-		rtcParam.getServicePorts().addAll(srvports);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Python\\Doc\\refer\\";
-
-		checkCode(result, resourceDir, "foo.py");
-		checkCode(result, resourceDir, "MyService_idl.py");
-		checkCode(result, resourceDir, "DAQService_idl.py");
-		checkCode(result, resourceDir, "_GlobalIDL/__init__.py");
-		checkCode(result, resourceDir, "_GlobalIDL__POA/__init__.py");
-		checkCode(result, resourceDir, "MyService_idl_example.py");
-		checkCode(result, resourceDir, "README.foo");
-	}
-
-	public void testDocAuthorLong() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("MDesc");
-		rtcParam.setVersion("1.0.1");
-		rtcParam.setVender("TA");
-		rtcParam.setCategory("Manip");
-		rtcParam.setComponentType("STATIC2");
-		rtcParam.setActivityType("PERIODIC2");
-		rtcParam.setMaxInstance(5);
-		rtcParam.setRtmVersion("0.4.2");
-		//
-		rtcParam.setDocCreator("Noriaki Ando <n-ando at aist.go.jp>34567894123456789512345678961234567897123456789812345");
-		//
-		genParam.getRtcParams().add(rtcParam);
-		List<DataPortParam> dataport = new ArrayList<DataPortParam>(); 
-		dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
-		dataport.add(new DataPortParam("InP2", "RTC::TimedLong", "", 0));
-		rtcParam.getInports().addAll(dataport);
-		List<DataPortParam> outport = new ArrayList<DataPortParam>(); 
-		outport.add(new DataPortParam("OutP1", "RTC::TimedLong", "", 0));
-		outport.add(new DataPortParam("OutP2", "RTC::TimedFloat", "", 0));
-		rtcParam.getOutports().addAll(outport);
-
-		ServicePortParam service1 = new ServicePortParam("svPort",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "acc", "", "", 
-				rootPath + "\\resource\\MyService.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		
-		ServicePortParam service2 = new ServicePortParam("cmPort",0);
-		List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service2, "rate", "", "", 
-				rootPath + "\\resource\\DAQService.idl", "DAQService", "", 1);
-		srvinterts2.add(int2);
-		service2.getServicePortInterfaces().addAll(srvinterts2);
-		srvports.add(service2);
-		
-		rtcParam.getServicePorts().addAll(srvports);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Python\\Doc\\authorLong\\";
-
-		checkCode(result, resourceDir, "foo.py");
-		checkCode(result, resourceDir, "MyService_idl.py");
-		checkCode(result, resourceDir, "DAQService_idl.py");
-		checkCode(result, resourceDir, "_GlobalIDL/__init__.py");
-		checkCode(result, resourceDir, "_GlobalIDL__POA/__init__.py");
-		checkCode(result, resourceDir, "MyService_idl_example.py");
-		checkCode(result, resourceDir, "README.foo");
-	}
-
-	public void testDocAuthor() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("MDesc");
-		rtcParam.setVersion("1.0.1");
-		rtcParam.setVender("TA");
-		rtcParam.setCategory("Manip");
-		rtcParam.setComponentType("STATIC2");
-		rtcParam.setActivityType("PERIODIC2");
-		rtcParam.setMaxInstance(5);
-		rtcParam.setRtmVersion("0.4.2");
-		//
-		rtcParam.setDocCreator("Noriaki Ando <n-ando at aist.go.jp>");
-		//
-		genParam.getRtcParams().add(rtcParam);
-		List<DataPortParam> dataport = new ArrayList<DataPortParam>(); 
-		dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
-		dataport.add(new DataPortParam("InP2", "RTC::TimedLong", "", 0));
-		rtcParam.getInports().addAll(dataport);
-		List<DataPortParam> outport = new ArrayList<DataPortParam>(); 
-		outport.add(new DataPortParam("OutP1", "RTC::TimedLong", "", 0));
-		outport.add(new DataPortParam("OutP2", "RTC::TimedFloat", "", 0));
-		rtcParam.getOutports().addAll(outport);
-
-		ServicePortParam service1 = new ServicePortParam("svPort",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "acc", "", "", 
-				rootPath + "\\resource\\MyService.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		
-		ServicePortParam service2 = new ServicePortParam("cmPort",0);
-		List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service2, "rate", "", "", 
-				rootPath + "\\resource\\DAQService.idl", "DAQService", "", 1);
-		srvinterts2.add(int2);
-		service2.getServicePortInterfaces().addAll(srvinterts2);
-		srvports.add(service2);
-		
-		rtcParam.getServicePorts().addAll(srvports);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Python\\Doc\\author\\";
-
-		checkCode(result, resourceDir, "foo.py");
-		checkCode(result, resourceDir, "MyService_idl.py");
-		checkCode(result, resourceDir, "DAQService_idl.py");
-		checkCode(result, resourceDir, "_GlobalIDL/__init__.py");
-		checkCode(result, resourceDir, "_GlobalIDL__POA/__init__.py");
-		checkCode(result, resourceDir, "MyService_idl_example.py");
-		checkCode(result, resourceDir, "README.foo");
-	}
-
-	public void testOriginal() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("MDesc");
-		rtcParam.setVersion("1.0.1");
-		rtcParam.setVender("TA");
-		rtcParam.setCategory("Manip");
-		rtcParam.setComponentType("STATIC2");
-		rtcParam.setActivityType("PERIODIC2");
-		rtcParam.setMaxInstance(5);
-		rtcParam.setRtmVersion("0.4.2");
-		genParam.getRtcParams().add(rtcParam);
-		List<DataPortParam> dataport = new ArrayList<DataPortParam>(); 
-		dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
-		dataport.add(new DataPortParam("InP2", "RTC::TimedLong", "", 0));
-		rtcParam.getInports().addAll(dataport);
-		List<DataPortParam> outport = new ArrayList<DataPortParam>(); 
-		outport.add(new DataPortParam("OutP1", "RTC::TimedLong", "", 0));
-		outport.add(new DataPortParam("OutP2", "RTC::TimedFloat", "", 0));
-		rtcParam.getOutports().addAll(outport);
-
-		ServicePortParam service1 = new ServicePortParam("svPort",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "acc", "", "", 
-				rootPath + "\\resource\\MyService.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		
-		ServicePortParam service2 = new ServicePortParam("cmPort",0);
-		List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service2, "rate", "", "", 
-				rootPath + "\\resource\\DAQService.idl", "DAQService", "", 1);
-		srvinterts2.add(int2);
-		service2.getServicePortInterfaces().addAll(srvinterts2);
-		srvports.add(service2);
-		
-		rtcParam.getServicePorts().addAll(srvports);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Python\\service2\\";
-
-		checkCode(result, resourceDir, "foo.py");
-		checkCode(result, resourceDir, "MyService_idl.py");
-		checkCode(result, resourceDir, "DAQService_idl.py");
-		checkCode(result, resourceDir, "_GlobalIDL/__init__.py");
-		checkCode(result, resourceDir, "_GlobalIDL__POA/__init__.py");
-		checkCode(result, resourceDir, "MyService_idl_example.py");
-		checkCode(result, resourceDir, "README.foo");
-	}
-}

Deleted: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/PyExCxtTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/PyExCxtTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/PyExCxtTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,57 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.python._test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import jp.go.aist.rtm.rtcbuilder.Generator;
-import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ConfigSetParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
-import jp.go.aist.rtm.rtcbuilder.python.IRtcBuilderConstantsPython;
-import jp.go.aist.rtm.rtcbuilder.python.manager.PythonGenerateManager;
-
-public class PyExCxtTest extends TestBase {
-
-	protected void setUp() throws Exception {
-	}
-
-	public void testExecutionContext() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("MDesc");
-		rtcParam.setVersion("1.0.3");
-		rtcParam.setVender("TA2");
-		rtcParam.setCategory("manip2");
-		rtcParam.setComponentType("STATIC2");
-		rtcParam.setActivityType("PERIODIC2");
-		rtcParam.setMaxInstance(3);
-		rtcParam.setExecutionRate(5.0);
-		rtcParam.setRtmVersion("0.4.2");
-
-		genParam.getRtcParams().add(rtcParam);
-		List<ConfigSetParam> configset = new ArrayList<ConfigSetParam>(); 
-		configset.add(new ConfigSetParam("int_param0","int","","0"));
-		configset.add(new ConfigSetParam("int_param1","int","","1"));
-		configset.add(new ConfigSetParam("double_param0","double","","0.11"));
-		configset.add(new ConfigSetParam("str_param0","String","","hoge"));
-		configset.add(new ConfigSetParam("str_param1","String","","dara"));
-		rtcParam.getConfigParams().addAll(configset);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Python\\ExecutionCxt\\";
-
-		checkCode(result, resourceDir, "foo.py");
-		checkCode(result, resourceDir, "README.foo");
-		checkCode(result, resourceDir, "rtc.conf");
-	}
-}

Deleted: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/PyImplTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/PyImplTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/PyImplTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,149 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.python._test;
-
-import java.util.List;
-
-import jp.go.aist.rtm.rtcbuilder.Generator;
-import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
-import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
-import jp.go.aist.rtm.rtcbuilder.python.IRtcBuilderConstantsPython;
-import jp.go.aist.rtm.rtcbuilder.python.manager.PythonGenerateManager;
-
-public class PyImplTest extends TestBase {
-
-	protected void setUp() throws Exception {
-	}
-
-	public void testAll() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("MDesc");
-		rtcParam.setVersion("1.0.1");
-		rtcParam.setVender("TA");
-		rtcParam.setCategory("Manip");
-		rtcParam.setComponentType("STATIC2");
-		rtcParam.setActivityType("PERIODIC2");
-		rtcParam.setRtmVersion("0.4.2");
-		rtcParam.setMaxInstance(5);
-		rtcParam.setActionImplemented(0, true);
-		rtcParam.setActionImplemented(1, true);
-		rtcParam.setActionImplemented(2, true);
-		rtcParam.setActionImplemented(3, true);
-		rtcParam.setActionImplemented(4, true);
-		rtcParam.setActionImplemented(5, true);
-		rtcParam.setActionImplemented(6, true);
-		rtcParam.setActionImplemented(7, true);
-		rtcParam.setActionImplemented(8, true);
-		rtcParam.setActionImplemented(9, true);
-		rtcParam.setActionImplemented(10, true);
-		rtcParam.setActionImplemented(11, true);
-		genParam.getRtcParams().add(rtcParam);
-		
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Python\\impl\\all\\";
-
-		checkCode(result, resourceDir, "foo.py");
-		checkCode(result, resourceDir, "README.foo");
-	}
-
-	public void testExecute() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("MDesc");
-		rtcParam.setVersion("1.0.1");
-		rtcParam.setVender("TA");
-		rtcParam.setCategory("Manip");
-		rtcParam.setComponentType("STATIC2");
-		rtcParam.setActivityType("PERIODIC2");
-		rtcParam.setRtmVersion("0.4.2");
-		rtcParam.setMaxInstance(5);
-		rtcParam.setActionImplemented(0, true);
-		rtcParam.setActionImplemented(1, true);
-		rtcParam.setActionImplemented(3, true);
-		rtcParam.setActionImplemented(5, true);
-		rtcParam.setActionImplemented(9, true);
-		genParam.getRtcParams().add(rtcParam);
-		
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Python\\impl\\execute\\";
-
-		checkCode(result, resourceDir, "foo.py");
-		checkCode(result, resourceDir, "README.foo");
-	}
-
-	public void testFinalize() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("MDesc");
-		rtcParam.setVersion("1.0.1");
-		rtcParam.setVender("TA");
-		rtcParam.setCategory("Manip");
-		rtcParam.setComponentType("STATIC2");
-		rtcParam.setActivityType("PERIODIC2");
-		rtcParam.setRtmVersion("0.4.2");
-		rtcParam.setMaxInstance(5);
-		rtcParam.setActionImplemented(0, true);
-		rtcParam.setActionImplemented(1, true);
-		genParam.getRtcParams().add(rtcParam);
-		
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Python\\impl\\finalize\\";
-
-		checkCode(result, resourceDir, "foo.py");
-		checkCode(result, resourceDir, "README.foo");
-	}
-
-	public void testInitialize() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("MDesc");
-		rtcParam.setVersion("1.0.1");
-		rtcParam.setVender("TA");
-		rtcParam.setCategory("Manip");
-		rtcParam.setComponentType("STATIC2");
-		rtcParam.setActivityType("PERIODIC2");
-		rtcParam.setRtmVersion("0.4.2");
-		rtcParam.setMaxInstance(5);
-		rtcParam.setActionImplemented(0, true);
-		genParam.getRtcParams().add(rtcParam);
-		
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Python\\impl\\initialize\\";
-
-		checkCode(result, resourceDir, "foo.py");
-		checkCode(result, resourceDir, "README.foo");
-	}
-}

Deleted: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/PySystemConfigTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/PySystemConfigTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/PySystemConfigTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,63 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.python._test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import jp.go.aist.rtm.rtcbuilder.Generator;
-import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ConfigParameterParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ConfigSetParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
-import jp.go.aist.rtm.rtcbuilder.python.IRtcBuilderConstantsPython;
-import jp.go.aist.rtm.rtcbuilder.python.manager.PythonGenerateManager;
-
-public class PySystemConfigTest extends TestBase {
-
-	protected void setUp() throws Exception {
-	}
-
-	public void testExecutionContext() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("MDesc");
-		rtcParam.setVersion("1.0.3");
-		rtcParam.setVender("TA2");
-		rtcParam.setCategory("manip2");
-		rtcParam.setComponentType("STATIC2");
-		rtcParam.setActivityType("PERIODIC2");
-		rtcParam.setMaxInstance(3);
-		rtcParam.setExecutionRate(5.0);
-		rtcParam.setRtmVersion("0.4.2");
-
-		genParam.getRtcParams().add(rtcParam);
-		List<ConfigSetParam> configset = new ArrayList<ConfigSetParam>(); 
-		configset.add(new ConfigSetParam("int_param0","int","","0"));
-		configset.add(new ConfigSetParam("int_param1","int","","1"));
-		configset.add(new ConfigSetParam("double_param0","double","","0.11"));
-		configset.add(new ConfigSetParam("str_param0","String","","hoge"));
-		configset.add(new ConfigSetParam("str_param1","String","","dara"));
-		rtcParam.getConfigParams().addAll(configset);
-
-		List<ConfigParameterParam> configparam = new ArrayList<ConfigParameterParam>(); 
-		configparam.add(new ConfigParameterParam("timer.tick","0.1"));
-		configparam.add(new ConfigParameterParam("naming.update.interval","10.0"));
-		rtcParam.getConfigParameterParams().addAll(configparam);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Python\\SystemConfig\\";
-
-		checkCode(result, resourceDir, "foo.py");
-		checkCode(result, resourceDir, "README.foo");
-		checkCode(result, resourceDir, "rtc.conf");
-	}
-}

Deleted: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/PyVariableTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/PyVariableTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/PyVariableTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,178 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.python._test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import jp.go.aist.rtm.rtcbuilder.Generator;
-import jp.go.aist.rtm.rtcbuilder.IRtcBuilderConstants;
-import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
-import jp.go.aist.rtm.rtcbuilder.generator.param.DataPortParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortInterfaceParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortParam;
-import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
-import jp.go.aist.rtm.rtcbuilder.python.IRtcBuilderConstantsPython;
-import jp.go.aist.rtm.rtcbuilder.python.manager.PythonGenerateManager;
-
-public class PyVariableTest extends TestBase {
-
-	protected void setUp() throws Exception {
-	}
-
-	public void testServicePort2() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("MDesc");
-		rtcParam.setVersion("1.0.1");
-		rtcParam.setVender("TA");
-		rtcParam.setCategory("Manip");
-		rtcParam.setComponentType("STATIC2");
-		rtcParam.setActivityType("PERIODIC2");
-		rtcParam.setMaxInstance(5);
-		rtcParam.setRtmVersion(IRtcBuilderConstants.RTM_VERSION_042);
-		genParam.getRtcParams().add(rtcParam);
-		List<DataPortParam> dataport = new ArrayList<DataPortParam>(); 
-		dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
-		dataport.add(new DataPortParam("InP2", "RTC::TimedLong", "", 0));
-		rtcParam.getInports().addAll(dataport);
-		List<DataPortParam> outport = new ArrayList<DataPortParam>(); 
-		outport.add(new DataPortParam("OutP1", "RTC::TimedLong", "", 0));
-		outport.add(new DataPortParam("OutP2", "RTC::TimedFloat", "", 0));
-		rtcParam.getOutports().addAll(outport);
-
-		ServicePortParam service1 = new ServicePortParam("svPort",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "acc", "acinst", "acvaria", 
-				rootPath + "\\resource\\MyService.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		
-		ServicePortParam service2 = new ServicePortParam("cmPort",0);
-		List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service2, "rate", "rinst", "rvaria", 
-				rootPath + "\\resource\\DAQService.idl", "DAQService", "", 1);
-		srvinterts2.add(int2);
-		service2.getServicePortInterfaces().addAll(srvinterts2);
-		srvports.add(service2);
-		
-		rtcParam.getServicePorts().addAll(srvports);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Python\\Variable\\ServicePort2\\";
-
-		checkCode(result, resourceDir, "foo.py");
-		checkCode(result, resourceDir, "MyService_idl.py");
-		checkCode(result, resourceDir, "DAQService_idl.py");
-		checkCode(result, resourceDir, "_GlobalIDL/__init__.py");
-		checkCode(result, resourceDir, "_GlobalIDL__POA/__init__.py");
-		checkCode(result, resourceDir, "MyService_idl_example.py");
-		checkCode(result, resourceDir, "README.foo");
-	}
-
-	public void testServicePort1() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("MDesc");
-		rtcParam.setVersion("1.0.1");
-		rtcParam.setVender("TA");
-		rtcParam.setCategory("Manip");
-		rtcParam.setComponentType("STATIC2");
-		rtcParam.setActivityType("PERIODIC2");
-		rtcParam.setRtmVersion("0.4.2");
-		rtcParam.setMaxInstance(5);
-		genParam.getRtcParams().add(rtcParam);
-		List<DataPortParam> dataport = new ArrayList<DataPortParam>(); 
-		dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
-		dataport.add(new DataPortParam("InP2", "RTC::TimedLong", "", 0));
-		rtcParam.getInports().addAll(dataport);
-		List<DataPortParam> outport = new ArrayList<DataPortParam>(); 
-		outport.add(new DataPortParam("OutP1", "RTC::TimedLong", "", 0));
-		outport.add(new DataPortParam("OutP2", "RTC::TimedFloat", "", 0));
-		rtcParam.getOutports().addAll(outport);
-
-		ServicePortParam service1 = new ServicePortParam("svPort",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "acc", "acinst", "", 
-				rootPath + "\\resource\\MyService.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		
-		ServicePortParam service2 = new ServicePortParam("cmPort",0);
-		List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service2, "rate", "rinst", "", 
-				rootPath + "\\resource\\DAQService.idl", "DAQService", "", 1);
-		srvinterts2.add(int2);
-		service2.getServicePortInterfaces().addAll(srvinterts2);
-		srvports.add(service2);
-		
-		rtcParam.getServicePorts().addAll(srvports);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Python\\Variable\\ServicePort1\\";
-
-		checkCode(result, resourceDir, "foo.py");
-		checkCode(result, resourceDir, "MyService_idl.py");
-		checkCode(result, resourceDir, "DAQService_idl.py");
-		checkCode(result, resourceDir, "_GlobalIDL/__init__.py");
-		checkCode(result, resourceDir, "_GlobalIDL__POA/__init__.py");
-		checkCode(result, resourceDir, "MyService_idl_example.py");
-		checkCode(result, resourceDir, "README.foo");
-	}
-
-	public void testDataPort() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("MDesc");
-		rtcParam.setVersion("1.0.1");
-		rtcParam.setVender("TA");
-		rtcParam.setCategory("Manip");
-		rtcParam.setComponentType("STATIC2");
-		rtcParam.setActivityType("PERIODIC2");
-		rtcParam.setMaxInstance(5);
-		rtcParam.setRtmVersion("0.4.2");
-		genParam.getRtcParams().add(rtcParam);
-		List<DataPortParam> dataport = new ArrayList<DataPortParam>(); 
-		dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "VarInP1", 0));
-		dataport.add(new DataPortParam("InP2", "RTC::TimedLong", "", 0));
-		rtcParam.getInports().addAll(dataport);
-		List<DataPortParam> outport = new ArrayList<DataPortParam>(); 
-		outport.add(new DataPortParam("OutP1", "RTC::TimedLong", "", 0));
-		outport.add(new DataPortParam("OutP2", "RTC::TimedFloat", "VarOutP2", 0));
-		rtcParam.getOutports().addAll(outport);
-		
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Python\\Variable\\DataPort\\";
-
-		checkCode(result, resourceDir, "foo.py");
-		checkCode(result, resourceDir, "README.foo");
-	}
-}

Deleted: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/VarTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/VarTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/VarTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,214 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.python._test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import jp.go.aist.rtm.rtcbuilder.Generator;
-import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ConfigSetParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.DataPortParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortInterfaceParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortParam;
-import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
-import jp.go.aist.rtm.rtcbuilder.python.IRtcBuilderConstantsPython;
-import jp.go.aist.rtm.rtcbuilder.python.manager.PythonGenerateManager;
-
-public class VarTest extends TestBase {
-
-	protected void setUp() throws Exception {
-	}
-
-	public void testConfigSetVar() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("MDesc");
-		rtcParam.setVersion("1.0.3");
-		rtcParam.setVender("TA2");
-		rtcParam.setCategory("manip2");
-		rtcParam.setComponentType("STATIC2");
-		rtcParam.setActivityType("PERIODIC2");
-		rtcParam.setMaxInstance(3);
-		rtcParam.setRtmVersion("0.4.2");
-
-		genParam.getRtcParams().add(rtcParam);
-		List<ConfigSetParam> configset = new ArrayList<ConfigSetParam>(); 
-		configset.add(new ConfigSetParam("int_param0","int","varname1","0"));
-		configset.add(new ConfigSetParam("int_param1","int","","1"));
-		configset.add(new ConfigSetParam("double_param0","double","varname2","0.11"));
-		configset.add(new ConfigSetParam("str_param0","String","","hoge"));
-		configset.add(new ConfigSetParam("str_param1","String","varname3","dara"));
-		rtcParam.getConfigParams().addAll(configset);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Python\\ConfigSet\\ConfigVar\\";
-
-		checkCode(result, resourceDir, "foo.py");
-		checkCode(result, resourceDir, "README.foo");
-	}
-
-	public void testConfigSetOriginal() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("MDesc");
-		rtcParam.setVersion("1.0.3");
-		rtcParam.setVender("TA2");
-		rtcParam.setCategory("manip2");
-		rtcParam.setComponentType("STATIC2");
-		rtcParam.setActivityType("PERIODIC2");
-		rtcParam.setMaxInstance(3);
-		rtcParam.setRtmVersion("0.4.2");
-
-		genParam.getRtcParams().add(rtcParam);
-		List<ConfigSetParam> configset = new ArrayList<ConfigSetParam>(); 
-		configset.add(new ConfigSetParam("int_param0","int","","0"));
-		configset.add(new ConfigSetParam("int_param1","int","","1"));
-		configset.add(new ConfigSetParam("double_param0","double","","0.11"));
-		configset.add(new ConfigSetParam("str_param0","String","","hoge"));
-		configset.add(new ConfigSetParam("str_param1","String","","dara"));
-		rtcParam.getConfigParams().addAll(configset);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Python\\ConfigSet\\configset3\\";
-
-		checkCode(result, resourceDir, "foo.py");
-		checkCode(result, resourceDir, "README.foo");
-	}
-
-	public void testDataPortVar() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("MDesc");
-		rtcParam.setVersion("1.0.1");
-		rtcParam.setVender("TA");
-		rtcParam.setCategory("Manip");
-		rtcParam.setComponentType("STATIC2");
-		rtcParam.setActivityType("PERIODIC2");
-		rtcParam.setRtmVersion("0.4.2");
-		rtcParam.setMaxInstance(5);
-		genParam.getRtcParams().add(rtcParam);
-		List<DataPortParam> dataport = new ArrayList<DataPortParam>(); 
-		dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "InName1", 0));
-		dataport.add(new DataPortParam("InP2", "RTC::TimedLong", "InNm2", 0));
-		rtcParam.getInports().addAll(dataport);
-		List<DataPortParam> outport = new ArrayList<DataPortParam>(); 
-		outport.add(new DataPortParam("OutP1", "RTC::TimedLong", "OutName1", 0));
-		outport.add(new DataPortParam("OutP2", "RTC::TimedFloat", "OutNme2", 0));
-		rtcParam.getOutports().addAll(outport);
-
-		ServicePortParam service1 = new ServicePortParam("svPort",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "acc", "", "", 
-				rootPath + "\\resource\\MyService.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		
-		ServicePortParam service2 = new ServicePortParam("cmPort",0);
-		List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service2, "rate", "", "", 
-				rootPath + "\\resource\\DAQService.idl", "DAQService", "", 1);
-		srvinterts2.add(int2);
-		service2.getServicePortInterfaces().addAll(srvinterts2);
-		srvports.add(service2);
-		
-		rtcParam.getServicePorts().addAll(srvports);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Python\\PortVar\\";
-
-		checkCode(result, resourceDir, "foo.py");
-		checkCode(result, resourceDir, "MyService_idl.py");
-		checkCode(result, resourceDir, "DAQService_idl.py");
-		checkCode(result, resourceDir, "_GlobalIDL/__init__.py");
-		checkCode(result, resourceDir, "_GlobalIDL__POA/__init__.py");
-		checkCode(result, resourceDir, "MyService_idl_example.py");
-		checkCode(result, resourceDir, "README.foo");
-	}
-	
-	public void testOriginalPort() throws Exception{
-		GeneratorParam genParam = new GeneratorParam();
-		RtcParam rtcParam = new RtcParam(genParam, true);
-		rtcParam.setOutputProject(rootPath + "\\resource\\work");
-		rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
-		rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
-		rtcParam.setName("foo");
-		rtcParam.setDescription("MDesc");
-		rtcParam.setVersion("1.0.1");
-		rtcParam.setVender("TA");
-		rtcParam.setCategory("Manip");
-		rtcParam.setComponentType("STATIC2");
-		rtcParam.setActivityType("PERIODIC2");
-		rtcParam.setRtmVersion("0.4.2");
-		rtcParam.setMaxInstance(5);
-		genParam.getRtcParams().add(rtcParam);
-		List<DataPortParam> dataport = new ArrayList<DataPortParam>(); 
-		dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
-		dataport.add(new DataPortParam("InP2", "RTC::TimedLong", "", 0));
-		rtcParam.getInports().addAll(dataport);
-		List<DataPortParam> outport = new ArrayList<DataPortParam>(); 
-		outport.add(new DataPortParam("OutP1", "RTC::TimedLong", "", 0));
-		outport.add(new DataPortParam("OutP2", "RTC::TimedFloat", "", 0));
-		rtcParam.getOutports().addAll(outport);
-
-		ServicePortParam service1 = new ServicePortParam("svPort",0);
-		List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "acc", "", "", 
-				rootPath + "\\resource\\MyService.idl", "MyService", "", 0);
-		srvinterts.add(int1);
-		service1.getServicePortInterfaces().addAll(srvinterts);
-		List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
-		srvports.add(service1);
-		
-		ServicePortParam service2 = new ServicePortParam("cmPort",0);
-		List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>(); 
-		ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service2, "rate", "", "", 
-				rootPath + "\\resource\\DAQService.idl", "DAQService", "", 1);
-		srvinterts2.add(int2);
-		service2.getServicePortInterfaces().addAll(srvinterts2);
-		srvports.add(service2);
-		
-		rtcParam.getServicePorts().addAll(srvports);
-
-		Generator generator = new Generator();
-		GenerateManager manager = new PythonGenerateManager();
-		generator.addGenerateManager(manager);
-		List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
-		String resourceDir = rootPath +  "\\resource\\Python\\service2\\";
-
-		checkCode(result, resourceDir, "foo.py");
-		checkCode(result, resourceDir, "MyService_idl.py");
-		checkCode(result, resourceDir, "DAQService_idl.py");
-		checkCode(result, resourceDir, "_GlobalIDL/__init__.py");
-		checkCode(result, resourceDir, "_GlobalIDL__POA/__init__.py");
-		checkCode(result, resourceDir, "MyService_idl_example.py");
-		checkCode(result, resourceDir, "README.foo");
-	}
-}

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/AISTTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/AISTTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/AISTTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -78,7 +78,7 @@
 
 		String resourceDir = rootPath + "/resource/100/aist/AIST6/";
 
-		assertEquals(11, result.size());
+		assertEquals(26, result.size());
 		checkCode(result, resourceDir, "test.py");
 	}
 
@@ -119,7 +119,7 @@
 
 		String resourceDir = rootPath + "/resource/100/aist/AIST4/";
 
-		assertEquals(14, result.size());
+		assertEquals(29, result.size());
 		checkCode(result, resourceDir, "test.py");
 		checkCode(result, resourceDir, "MyService_idl_example.py");
 		checkCode(result, resourceDir, "idlcompile.bat");
@@ -171,7 +171,7 @@
 
 		String resourceDir = rootPath + "/resource/100/aist/AIST3/";
 
-		assertEquals(14, result.size());
+		assertEquals(29, result.size());
 		checkCode(result, resourceDir, "test.py");
 		checkCode(result, resourceDir, "MyService_idl_example.py");
 		checkCode(result, resourceDir, "idlcompile.bat");
@@ -213,7 +213,7 @@
 
 		String resourceDir = rootPath + "/resource/100/aist/AIST2/";
 
-		assertEquals(13, result.size());
+		assertEquals(28, result.size());
 		checkCode(result, resourceDir, "test.py");
 		checkCode(result, resourceDir, "idlcompile.bat");
 		checkCode(result, resourceDir, "idlcompile.sh");
@@ -246,7 +246,7 @@
 
 		String resourceDir = rootPath + "/resource/100/aist/AIST1/";
 
-		assertEquals(14, result.size());
+		assertEquals(29, result.size());
 		checkCode(result, resourceDir, "test.py");
 		checkCode(result, resourceDir, "MyService_idl_example.py");
 		checkCode(result, resourceDir, "idlcompile.bat");

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/BaseTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/BaseTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/BaseTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -83,7 +83,7 @@
 
 		String resourceDir = rootPath + "/resource/100/base/service2/";
 
-		assertEquals(14, result.size());
+		assertEquals(29, result.size());
 		checkCode(result, resourceDir, "foo.py");
 		checkCode(result, resourceDir, "MyService_idl_example.py");
 		checkCode(result, resourceDir, "idlcompile.bat");
@@ -125,7 +125,7 @@
 
 		String resourceDir = rootPath + "/resource/100/base/service1/";
 
-		assertEquals(14, result.size());
+		assertEquals(29, result.size());
 		checkCode(result, resourceDir, "foo.py");
 		checkCode(result, resourceDir, "MyService_idl_example.py");
 		checkCode(result, resourceDir, "idlcompile.bat");
@@ -156,7 +156,7 @@
 
 		String resourceDir = rootPath + "/resource/100/base/outport2/";
 
-		assertEquals(11, result.size());
+		assertEquals(26, result.size());
 		checkCode(result, resourceDir, "foo.py");
 	}
 
@@ -183,7 +183,7 @@
 
 		String resourceDir = rootPath + "/resource/100/base/outport1/";
 
-		assertEquals(11, result.size());
+		assertEquals(26, result.size());
 		checkCode(result, resourceDir, "foo.py");
 	}
 
@@ -207,7 +207,7 @@
 
 		String resourceDir = rootPath + "/resource/100/base/inport2/";
 
-		assertEquals(11, result.size());
+		assertEquals(26, result.size());
 		checkCode(result, resourceDir, "foo.py");
 	}
 
@@ -230,7 +230,7 @@
 
 		String resourceDir = rootPath + "/resource/100/base/inport1/";
 
-		assertEquals(11, result.size());
+		assertEquals(26, result.size());
 		checkCode(result, resourceDir, "foo.py");
 	}
 
@@ -249,7 +249,7 @@
 
 		String resourceDir = rootPath + "/resource/100/base/name2/";
 
-		assertEquals(11, result.size());
+		assertEquals(26, result.size());
 		checkCode(result, resourceDir, "Foo.py");
 	}
 
@@ -271,7 +271,7 @@
 
 		String resourceDir = rootPath + "/resource/100/base/name/";
 
-		assertEquals(2, result.size());
+		assertEquals(4, result.size());
 		checkCode(result, resourceDir, "foo.py");
 	}
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/BuildTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/BuildTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/BuildTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -89,21 +89,21 @@
 
 		String resourceDir = fixturePath(name) + "/";
 
-		assertEquals(14, result.size());
+		assertEquals(29, result.size());
 		checkCode(result, resourceDir, "foo.py");
 		checkCode(result, resourceDir, "MyService_idl_example.py");
 		checkCode(result, resourceDir, "idlcompile.bat");
 		checkCode(result, resourceDir, "idlcompile.sh");
 		//
-		checkCode(result, resourceDir, "CMakeLists.txt");
-		checkCode(result, resourceDir, "Doxyfile.in");
-		checkCode(result, resourceDir, "cmake_modules/cmake_uninstall.cmake.in");
-		checkCode(result, resourceDir, "cmake_modules/CPackWIX.cmake");
-		checkCode(result, resourceDir, "cmake_modules/FindOpenRTMPython.cmake");
-		checkCode(result, resourceDir, "cpack_resources/Description.txt");
-		checkCode(result, resourceDir, "cpack_resources/License.txt");
-		checkCode(result, resourceDir, "cpack_resources/License.rtf");
-		checkCode(result, resourceDir, "cpack_resources/wix.xsl.in");
+//		checkCode(result, resourceDir, "CMakeLists.txt");
+//		checkCode(result, resourceDir, "Doxyfile.in");
+//		checkCode(result, resourceDir, "cmake_modules/cmake_uninstall.cmake.in");
+//		checkCode(result, resourceDir, "cmake_modules/CPackWIX.cmake");
+//		checkCode(result, resourceDir, "cmake_modules/FindOpenRTMPython.cmake");
+//		checkCode(result, resourceDir, "cpack_resources/Description.txt");
+//		checkCode(result, resourceDir, "cpack_resources/License.txt");
+//		checkCode(result, resourceDir, "cpack_resources/License.rtf");
+//		checkCode(result, resourceDir, "cpack_resources/wix.xsl.in");
 	}
 
 	public void testCMake2() throws Exception {
@@ -157,22 +157,22 @@
 
 		String resourceDir = fixturePath(name) + "/";
 
-		assertEquals(15, result.size());
+		assertEquals(30, result.size());
 		checkCode(result, resourceDir, "foo.py");
 		checkCode(result, resourceDir, "MyServiceChildMulti_idl_example.py");
 		checkCode(result, resourceDir, "MyServiceChildWithType_idl_example.py");
 		checkCode(result, resourceDir, "idlcompile.bat");
 		checkCode(result, resourceDir, "idlcompile.sh");
 		//
-		checkCode(result, resourceDir, "CMakeLists.txt");
-		checkCode(result, resourceDir, "Doxyfile.in");
-		checkCode(result, resourceDir, "cmake_modules/cmake_uninstall.cmake.in");
-		checkCode(result, resourceDir, "cmake_modules/CPackWIX.cmake");
-		checkCode(result, resourceDir, "cmake_modules/FindOpenRTMPython.cmake");
-		checkCode(result, resourceDir, "cpack_resources/Description.txt");
-		checkCode(result, resourceDir, "cpack_resources/License.txt");
-		checkCode(result, resourceDir, "cpack_resources/License.rtf");
-		checkCode(result, resourceDir, "cpack_resources/wix.xsl.in");
+//		checkCode(result, resourceDir, "CMakeLists.txt");
+//		checkCode(result, resourceDir, "Doxyfile.in");
+//		checkCode(result, resourceDir, "cmake_modules/cmake_uninstall.cmake.in");
+//		checkCode(result, resourceDir, "cmake_modules/CPackWIX.cmake");
+//		checkCode(result, resourceDir, "cmake_modules/FindOpenRTMPython.cmake");
+//		checkCode(result, resourceDir, "cpack_resources/Description.txt");
+//		checkCode(result, resourceDir, "cpack_resources/License.txt");
+//		checkCode(result, resourceDir, "cpack_resources/License.rtf");
+//		checkCode(result, resourceDir, "cpack_resources/wix.xsl.in");
 	}
 
 }

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/ConfigSetTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/ConfigSetTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/ConfigSetTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -54,7 +54,7 @@
 
 		String resourceDir = rootPath + "/resource/100/ConfigSet/configset1/";
 
-		assertEquals(11, result.size());
+		assertEquals(26, result.size());
 		checkCode(result, resourceDir, "foo.py");
 	}
 
@@ -78,7 +78,7 @@
 
 		String resourceDir = rootPath + "/resource/100/ConfigSet/configset2/";
 
-		assertEquals(11, result.size());
+		assertEquals(26, result.size());
 		checkCode(result, resourceDir, "foo.py");
 	}
 
@@ -106,7 +106,7 @@
 
 		String resourceDir = rootPath + "/resource/100/ConfigSet/configset3/";
 
-		assertEquals(11, result.size());
+		assertEquals(26, result.size());
 		checkCode(result, resourceDir, "foo.py");
 	}
 
@@ -136,7 +136,7 @@
 
 		String resourceDir = rootPath + "/resource/100/ConfigSet/configset4/";
 
-		assertEquals(11, result.size());
+		assertEquals(26, result.size());
 		checkCode(result, resourceDir, "foo.py");
 	}
 
@@ -165,7 +165,7 @@
 		String resourceDir = rootPath
 				+ "/resource/100/ConfigSet/ConfigSetType/";
 
-		assertEquals(11, result.size());
+		assertEquals(26, result.size());
 		checkCode(result, resourceDir, "foo.py");
 	}
 }

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyDocTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyDocTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyDocTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -262,7 +262,7 @@
 
 		String resourceDir = rootPath + "/resource/100/Doc/full/";
 
-		assertEquals(14, result.size());
+		assertEquals(29, result.size());
 		checkCode(result, resourceDir, "foo.py");
 		checkCode(result, resourceDir, "MyService_idl_example.py");
 		checkCode(result, resourceDir, "idlcompile.bat");
@@ -321,7 +321,7 @@
 
 		String resourceDir = rootPath + "/resource/100/Doc/refer/";
 
-		assertEquals(14, result.size());
+		assertEquals(29, result.size());
 		checkCode(result, resourceDir, "foo.py");
 		checkCode(result, resourceDir, "MyService_idl_example.py");
 		checkCode(result, resourceDir, "idlcompile.bat");
@@ -376,7 +376,7 @@
 
 		String resourceDir = rootPath + "/resource/100/Doc/authorLong/";
 
-		assertEquals(14, result.size());
+		assertEquals(29, result.size());
 		checkCode(result, resourceDir, "foo.py");
 		checkCode(result, resourceDir, "MyService_idl_example.py");
 		checkCode(result, resourceDir, "idlcompile.bat");
@@ -430,7 +430,7 @@
 
 		String resourceDir = rootPath + "/resource/100/Doc/author/";
 
-		assertEquals(14, result.size());
+		assertEquals(29, result.size());
 		checkCode(result, resourceDir, "foo.py");
 		checkCode(result, resourceDir, "MyService_idl_example.py");
 		checkCode(result, resourceDir, "idlcompile.bat");

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyIDLInheritTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyIDLInheritTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyIDLInheritTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -81,7 +81,7 @@
 
 		String resourceDir = fixturePath(name) + "/";
 
-		assertEquals(14, result.size());
+		assertEquals(29, result.size());
 		checkCode(result, resourceDir, "foo.py");
 		checkCode(result, resourceDir, "MyServiceChildMulti_idl_example.py");
 		checkCode(result, resourceDir, "idlcompile.bat");
@@ -129,7 +129,7 @@
 
 		String resourceDir = fixturePath(name) + "/";
 
-		assertEquals(15, result.size());
+		assertEquals(30, result.size());
 		checkCode(result, resourceDir, "foo.py");
 		checkCode(result, resourceDir, "MyServiceChildMulti_idl_example.py");
 		checkCode(result, resourceDir, "MyServiceChildWithType_idl_example.py");

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyIDLType.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyIDLType.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyIDLType.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -96,7 +96,7 @@
 
 		String resourceDir = rootPath + "/resource/100/idltype/type2/";
 
-		assertEquals(14, result.size());
+		assertEquals(29, result.size());
 		checkCode(result, resourceDir, "test.py");
 		checkCode(result, resourceDir, "MyService_idl_example.py");
 		checkCode(result, resourceDir, "idlcompile.bat");
@@ -130,7 +130,7 @@
 
 		String resourceDir = rootPath + "/resource/100/idltype/type3/";
 
-		assertEquals(14, result.size());
+		assertEquals(29, result.size());
 		checkCode(result, resourceDir, "test.py");
 		checkCode(result, resourceDir, "MyService_idl_example.py");
 		checkCode(result, resourceDir, "idlcompile.bat");

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyImplTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyImplTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyImplTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -61,7 +61,7 @@
 
 		String resourceDir = rootPath + "/resource/100/impl/all/";
 
-		assertEquals(11, result.size());
+		assertEquals(26, result.size());
 		checkCode(result, resourceDir, "foo.py");
 	}
 
@@ -86,7 +86,7 @@
 
 		String resourceDir = rootPath + "/resource/100/impl/execute/";
 
-		assertEquals(11, result.size());
+		assertEquals(26, result.size());
 		checkCode(result, resourceDir, "foo.py");
 	}
 
@@ -108,7 +108,7 @@
 
 		String resourceDir = rootPath + "/resource/100/impl/finalize/";
 
-		assertEquals(11, result.size());
+		assertEquals(26, result.size());
 		checkCode(result, resourceDir, "foo.py");
 	}
 
@@ -129,7 +129,7 @@
 
 		String resourceDir = rootPath + "/resource/100/impl/initialize/";
 
-		assertEquals(11, result.size());
+		assertEquals(26, result.size());
 		checkCode(result, resourceDir, "foo.py");
 	}
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyModuleTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyModuleTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyModuleTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -64,7 +64,7 @@
 
 		String resourceDir = rootPath + "/resource/100/module/serviceM/";
 
-		assertEquals(14, result.size());
+		assertEquals(29, result.size());
 		checkCode(result, resourceDir, "foo.py");
 		checkCode(result, resourceDir, "MyService_idl_example.py");
 		checkCode(result, resourceDir, "idlcompile.bat");
@@ -104,7 +104,7 @@
 
 		String resourceDir = rootPath + "/resource/100/module/serviceM2/";
 
-		assertEquals(15, result.size());
+		assertEquals(30, result.size());
 		checkCode(result, resourceDir, "foo.py");
 		checkCode(result, resourceDir, "MyService_idl_example.py");
 		checkCode(result, resourceDir, "DAQService_idl_example.py");
@@ -140,7 +140,7 @@
 
 		String resourceDir = rootPath + "/resource/100/module/serviceMC/";
 
-		assertEquals(13, result.size());
+		assertEquals(28, result.size());
 		checkCode(result, resourceDir, "foo.py");
 	}
 
@@ -177,7 +177,7 @@
 
 		String resourceDir = rootPath + "/resource/100/module/serviceMC2/";
 
-		assertEquals(13, result.size());
+		assertEquals(28, result.size());
 		checkCode(result, resourceDir, "foo.py");
 	}
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/META-INF/MANIFEST.MF
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/META-INF/MANIFEST.MF	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/META-INF/MANIFEST.MF	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,40 +1,33 @@
 Manifest-Version: 1.0
+Ant-Version: Apache Ant 1.7.1
+Created-By: 20.0-b12 (Sun Microsystems Inc.)
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: jp.go.aist.rtm.systemeditor;singleton:=true
-Bundle-Version: 1.1.0.v20110411
+Bundle-Version: 1.1.0.rc4v20130124
 Bundle-Activator: jp.go.aist.rtm.systemeditor.RTSystemEditorPlugin
 Bundle-Localization: plugin
-Require-Bundle: 
- org.eclipse.gef;visibility:=reexport,
- jp.go.aist.rtm.toolscommon,
- jp.go.aist.rtm.nameserviceview,
- jp.go.aist.rtm.toolscommon.profiles,
- jp.go.aist.rtm.repositoryView
+Require-Bundle: org.eclipse.gef;visibility:=reexport,jp.go.aist.rtm.to
+ olscommon,jp.go.aist.rtm.nameserviceview,jp.go.aist.rtm.toolscommon.p
+ rofiles,jp.go.aist.rtm.repositoryView
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
-Export-Package: jp.go.aist.rtm.systemeditor,
- jp.go.aist.rtm.systemeditor._debug,
- jp.go.aist.rtm.systemeditor._test,
- jp.go.aist.rtm.systemeditor.adapterfactory,
- jp.go.aist.rtm.systemeditor.extension,
- jp.go.aist.rtm.systemeditor.factory,
- jp.go.aist.rtm.systemeditor.manager,
- jp.go.aist.rtm.systemeditor.nl,
- jp.go.aist.rtm.systemeditor.ui.action,
- jp.go.aist.rtm.systemeditor.ui.dialog,
- jp.go.aist.rtm.systemeditor.ui.editor,
- jp.go.aist.rtm.systemeditor.ui.editor.action,
- jp.go.aist.rtm.systemeditor.ui.editor.command,
- jp.go.aist.rtm.systemeditor.ui.editor.dnd,
- jp.go.aist.rtm.systemeditor.ui.editor.editpart,
- jp.go.aist.rtm.systemeditor.ui.editor.editpart.factory,
- jp.go.aist.rtm.systemeditor.ui.editor.editpart.router,
- jp.go.aist.rtm.systemeditor.ui.editor.editpolicy,
- jp.go.aist.rtm.systemeditor.ui.editor.figure,
- jp.go.aist.rtm.systemeditor.ui.preference,
- jp.go.aist.rtm.systemeditor.ui.util,
- jp.go.aist.rtm.systemeditor.ui.workbenchadapter,
- jp.go.aist.rtm.systemeditor.extension
+Export-Package: jp.go.aist.rtm.systemeditor,jp.go.aist.rtm.systemedito
+ r._debug,jp.go.aist.rtm.systemeditor._test,jp.go.aist.rtm.systemedito
+ r.adapterfactory,jp.go.aist.rtm.systemeditor.extension,jp.go.aist.rtm
+ .systemeditor.factory,jp.go.aist.rtm.systemeditor.manager,jp.go.aist.
+ rtm.systemeditor.nl,jp.go.aist.rtm.systemeditor.ui.action,jp.go.aist.
+ rtm.systemeditor.ui.dialog,jp.go.aist.rtm.systemeditor.ui.editor,jp.g
+ o.aist.rtm.systemeditor.ui.editor.action,jp.go.aist.rtm.systemeditor.
+ ui.editor.command,jp.go.aist.rtm.systemeditor.ui.editor.dnd,jp.go.ais
+ t.rtm.systemeditor.ui.editor.editpart,jp.go.aist.rtm.systemeditor.ui.
+ editor.editpart.factory,jp.go.aist.rtm.systemeditor.ui.editor.editpar
+ t.router,jp.go.aist.rtm.systemeditor.ui.editor.editpolicy,jp.go.aist.
+ rtm.systemeditor.ui.editor.figure,jp.go.aist.rtm.systemeditor.ui.pref
+ erence,jp.go.aist.rtm.systemeditor.ui.util,jp.go.aist.rtm.systemedito
+ r.ui.workbenchadapter,jp.go.aist.rtm.systemeditor.extension
 Bundle-Vendor: %providerName
 Eclipse-BuddyPolicy: registered
+Built-By: n-ando
+Built-Date: 2013/01/25 00:47:28
+

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/build.xml
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/build.xml	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/build.xml	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,9 +1,9 @@
-<project name="jp.go.aist.rtm.systemeditor_1.0.0" default="jar">
-	<property name="target.name" value="jp.go.aist.rtm.systemeditor_1.0.0"/>
+<project name="jp.go.aist.rtm.systemeditor" default="jar">
+	<property name="target.name" value="jp.go.aist.rtm.systemeditor" />
 
+	<taskdef name="manifesttask" classname="aist.ManifestTask" />
+
 	<property name="source" value="src"/>
-	<property name="source.sdo" value="src/_SDOPackage"/>
-	<property name="source.rtc" value="src/RTC"/>
 
 	<property name="dist.dir" value="jar" />
 	<property name="build.dir" value="bin"/>
@@ -13,62 +13,61 @@
 	<property environment="env"/>
 	<property name="eclipse.home" value="${env.ECLIPSE_HOME}"/>
 
-	<property name="idl.path" value="idl" />
-	<property name="idl.SDOPackage" value="${idl.path}/SDOPackage11.idl" />
-	<property name="idl.RTC" value="${idl.path}/RTC10.idl" />
-	<property name="idl.OpenRTM" value="${idl.path}/OpenRTM.idl" />
-	<property name="idl.BasicDataType" value="${idl.path}/BasicDataType.idl" />
-	<property name="idl.DataPort" value="${idl.path}/DataPort.idl" />
-	<property name="idl.Manager" value="${idl.path}/Manager.idl" />
-
-	
-	
 	<taskdef resource="net/sf/ant4eclipse/antlib.xml" />
 	<property name="targetPlatformLocation" value="${eclipse.home}" />
 	<property name="workspace" value="${basedir}/.." />
 	<property name="project.name" value="jp.go.aist.rtm.systemeditor" />
+	<tstamp>
+		<format property="built.date" pattern="yyyy/MM/dd HH:mm:ss" />
+	</tstamp>
 
 	<target name="buildAll">
-		<antcall target="idlCompile" />
 		<antcall target="clean" />
 		<antcall target="compile" />
 		<antcall target="jar" />
 	</target>
 
-	<target name="idlCompile" description="IDLファイルをコンパイルします">
-		<delete dir="${source.sdo}" />
-		<delete dir="${source.rtc}" />
-		<exec executable="${java.home}\..\bin\idlj">
-			<arg line="-fall -td ${source} -i ${idl.path} -emitAll ${idl.SDOPackage}"/>
-		</exec>
-		<exec executable="${java.home}\..\bin\idlj">
-			<arg line="-fall -td ${source} -i ${idl.path} -emitAll ${idl.RTC}"/>
-		</exec>
-		<exec executable="${java.home}\..\bin\idlj">
-			<arg line="-fall -td ${source} -i ${idl.path} -emitAll ${idl.Manager}"/>
-		</exec>
-	</target>
-
 	<target name="clean" description="ビルドで生成されたファイルを削除します">
-		<delete includeEmptyDirs="true">
+		<delete includeEmptyDirs="true" quiet="true">
 			<fileset dir="${build.dir}" includes="**/*.class" />
+			<fileset dir="." includes="**/*.log" />
 		</delete>
+		<delete dir="${build.dir}/jp" quiet="true"/>
+		<delete dir="${build.dir}/_SDOPackage" quiet="true"/>
+		<delete dir="${dist.dir}" quiet="true"/>
 	</target>
 
 	<target name="compile" description="ソースをコンパイルします">
 		<getEclipseClasspath pathid="build.classpath" targetplatformlocation="${targetPlatformLocation}"
 					workspace="${workspace}" projectname="${project.name}"/>
 		<javac srcdir="${source}" destdir="${build.dir}"
-			classpathref="build.classpath" classpath="lib/commons-lang-2.2.jar" encoding="Shift_JIS" />
+			classpathref="build.classpath" classpath="lib/commons-lang-2.2.jar" encoding="UTF-8" />
 	</target>
 
 	<target name="jar" description="jarファイルを作成します">
 		<copy file="${source}/MAPPING_RULES" todir="${build.dir}/jp/go/aist/rtm/systemeditor/restoration" />
 		<copy file="${source}/jp/go/aist/rtm/systemeditor/nl/messages.properties" todir="${build.dir}/jp/go/aist/rtm/systemeditor/nl" />
 		<mkdir dir="${dist.dir}" />
-		<delete file="${dist.dir}/${target.name}.jar" />
-
-		<jar destfile="${dist.dir}/${target.name}.jar" manifest="META-INF/MANIFEST.MF">
+		<delete>
+			<fileset dir="${dist.dir}" includes="${target.name}_*.jar" />
+		</delete>
+		<!-- Version settings -->
+		<manifesttask file="META-INF/MANIFEST.MF" key="Bundle-Version" property="manifest.project.version" />
+		<condition property="project.version"
+                   value="${env.PROJECT_VERSION}"
+                   else="${manifest.project.version}">
+			<isset property="env.PROJECT_VERSION" />
+		</condition>
+		<property name="jar.version" value="_${project.version}"/>
+		<property name="jar.name" value="${target.name}${jar.version}"/>
+		<!-- Updating MANIFEST.MF -->
+		<manifest file="META-INF/MANIFEST.MF" mode="update">
+			<attribute name="Bundle-Version" value="${project.version}"/>
+			<attribute name="Built-By" value="${user.name}"/>
+			<attribute name="Built-Date" value="${built.date}"/>
+		</manifest>
+		<!-- Creating a jar file -->
+		<jar destfile="${dist.dir}/${jar.name}.jar" manifest="META-INF/MANIFEST.MF">
 			<fileset dir="${build.dir}" />
 			<fileset dir=".">
 				<include name="icons/**.**" />
@@ -82,4 +81,5 @@
 			</fileset>
 		</jar>
 	</target>
+
 </project>

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/plugin.properties
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/plugin.properties	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/plugin.properties	2013-01-29 10:39:20 UTC (rev 394)
@@ -38,6 +38,7 @@
 # preferencePages
 Connection =Connection 
 DisplayColor =Display Color 
+IconPreference.name =Icon
 OfflineEditor =Offline Editor 
 OnlineEditor =Online Editor 
 
@@ -67,6 +68,13 @@
 Create_Composite_Component =Create Composite Component
 Decompose_Composite_Component =Decompose Composite Component
 Open_With_System_Diagram_Editor =Open With System Diagram Editor
+StartLogging.label =Start Logging
+ConnectPort.label =Connect
+DisconnectPort.label =Disconnect
+Set_Deploy_Info =Set Deploy Info.
+Deploy_System =Deploy System
+Deploy_Save =Save Deploy Info.
+Deploy_Load =Load Deploy Info.
 
 All_Disconnect =All Disconnect
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/plugin.xml
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/plugin.xml	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/plugin.xml	2013-01-29 10:39:20 UTC (rev 394)
@@ -88,8 +88,8 @@
 			name="%RT_Log_View"
 			icon="icons/RT_icon.png"
 			category="rtse"
-			class="org.eclipse.ui.internal.console.ConsoleView"
-			id="jp.go.aist.rtm.systemeditor.ui.views.RTLogView">
+			class="jp.go.aist.rtm.systemeditor.ui.views.logview.LogView"
+			id="jp.go.aist.rtm.systemeditor.ui.views.logview.LogView">
 		</view>
 	</extension>
 	
@@ -201,10 +201,32 @@
 			</visibility>
 			<action id="jp.go.aist.rtm.systemeditor.ui.action.CombineActionDelegate"
 				label="%Create_Composite_Component"
-				menubarPath="additions"
+				menubarPath="composite"
 				class="jp.go.aist.rtm.systemeditor.ui.action.CombineActionDelegate">
 			</action>
 		</viewerContribution>
+  <viewerContribution
+        id="jp.go.aist.rtm.systemeditor.ui.editor.OfflineSystemDiagramEditor.deploy"
+        targetID="jp.go.aist.rtm.systemeditor.ui.editor.OfflineSystemDiagramEditor">
+     <action
+           class="jp.go.aist.rtm.systemeditor.ui.action.DeployLoadActionDelegate"
+           id="jp.go.aist.rtm.systemeditor.ui.action.DeployLoadActionDelegate"
+           label="%Deploy_Load"
+           menubarPath="deploy">
+     </action>
+     <action
+           class="jp.go.aist.rtm.systemeditor.ui.action.DeploySaveActionDelegate"
+           id="jp.go.aist.rtm.systemeditor.ui.action.DeploySaveActionDelegate"
+           label="%Deploy_Save"
+           menubarPath="deploy">
+     </action>
+     <action
+           class="jp.go.aist.rtm.systemeditor.ui.action.DeployActionDelegate"
+           id="jp.go.aist.rtm.systemeditor.ui.action.DeployActionDelegate"
+           label="%Deploy_System"
+           menubarPath="deploy">
+     </action>
+  </viewerContribution>
 		<viewerContribution
 			id="jp.go.aist.rtm.systemeditor.ui.editor.OfflineSystemDiagramEditor.combine" 
 			targetID="jp.go.aist.rtm.systemeditor.ui.editor.OfflineSystemDiagramEditor">
@@ -213,9 +235,15 @@
 			</visibility>
 			<action id="jp.go.aist.rtm.systemeditor.ui.action.CombineActionDelegate"
 				label="%Create_Composite_Component"
-				menubarPath="additions"
+				menubarPath="composite"
 				class="jp.go.aist.rtm.systemeditor.ui.action.CombineActionDelegate">
 			</action>
+		   <action
+		         class="jp.go.aist.rtm.systemeditor.ui.action.DeploySettingActionDelegate"
+		         id="jp.go.aist.rtm.systemeditor.ui.action.DeploySettingActionDelegate"
+		         label="%Set_Deploy_Info"
+		         menubarPath="deploy">
+		   </action>
 		</viewerContribution>
 		<!--
 		<viewerContribution
@@ -229,6 +257,7 @@
 			</action>
 		</viewerContribution>
 		-->
+	  
  		<objectContribution
 			id="jp.go.aist.rtm.systemeditor.ui.objectContribution.Component"
         	objectClass="jp.go.aist.rtm.toolscommon.model.component.Component"
@@ -276,7 +305,7 @@
 			<action id="jp.go.aist.rtm.systemeditor.ui.action.DecomposeComponentAction"
 				label="%Decompose_Composite_Component"
 				enablesFor="1"
-				menubarPath="additions"
+				menubarPath="composite"
 				class="jp.go.aist.rtm.systemeditor.ui.action.DecomposeComponentFormPopupMenuActionDelegate">
 			</action>
 		</objectContribution>
@@ -287,7 +316,7 @@
 			<action id="jp.go.aist.rtm.systemeditor.ui.action.OpenCompositeComponentAction"
 				label="%Open_With_System_Diagram_Editor"
 				enablesFor="1"
-				menubarPath="additions"
+				menubarPath="composite"
 				class="jp.go.aist.rtm.systemeditor.ui.action.OpenCompositeComponentFormPopupMenuActionDelegate">
 			</action>
 		</objectContribution>
@@ -311,6 +340,33 @@
 		           label="%Export">
 		     </action>
 		  </objectContribution>
+		<objectContribution
+			adaptable="true"
+			id="jp.go.aist.rtm.systemeditor.ui.objectContribution.Component"
+			objectClass="jp.go.aist.rtm.systemeditor.ui.editor.editpart.ComponentEditPart">
+			<action
+				class="jp.go.aist.rtm.systemeditor.ui.action.StartLoggingActionDelegate"
+				id="jp.go.aist.rtm.systemeditor.ui.action.StartLoggingAction"
+				label="%StartLogging.label"
+				enablesFor="1"
+				menubarPath="additions">
+			</action>
+		</objectContribution>
+		<objectContribution
+			adaptable="true"
+			id="jp.go.aist.rtm.systemeditor.ui.objectContribution.Component"
+			objectClass="jp.go.aist.rtm.systemeditor.ui.editor.editpart.PortEditPart">
+			<action
+				class="jp.go.aist.rtm.systemeditor.ui.action.ConnectPortActionDelegate"
+				id="jp.go.aist.rtm.systemeditor.ui.action.ConnectPortActionDelegate.Disconnect"
+				label="%DisconnectPort.label">
+			</action>
+			<action
+				class="jp.go.aist.rtm.systemeditor.ui.action.ConnectPortActionDelegate"
+				id="jp.go.aist.rtm.systemeditor.ui.action.ConnectPortActionDelegate.Connect"
+				label="%ConnectPort.label">
+			</action>
+		</objectContribution>
 	</extension>
 
 	<extension point = "org.eclipse.ui.actionSets"> 
@@ -438,7 +494,7 @@
 				relative="jp.go.aist.rtm.systemeditor.ui.views.configurationview.ConfigurationView">
 			</view>
 			<view
-				id="jp.go.aist.rtm.systemeditor.ui.views.RTLogView"
+				id="jp.go.aist.rtm.systemeditor.ui.views.logview.LogView"
 				relationship="stack"
 				relative="jp.go.aist.rtm.systemeditor.ui.views.configurationview.ConfigurationView">
 			</view>
@@ -447,7 +503,7 @@
 			<viewShortcut id="jp.go.aist.rtm.systemeditor.ui.views.managercontrolview.ManagerControlView"/>
 			<viewShortcut id="jp.go.aist.rtm.systemeditor.ui.views.compositecomponentview.CompositeComponentView"/>
 			<viewShortcut id="jp.go.aist.rtm.systemeditor.ui.views.executioncontextview.ExecutionContextView"/>
-			<viewShortcut id="jp.go.aist.rtm.systemeditor.ui.views.RTLogView"/>
+			<viewShortcut id="jp.go.aist.rtm.systemeditor.ui.views.logview.LogView"/>
 		</perspectiveExtension>
 	</extension>
 	
@@ -471,6 +527,12 @@
 			category="jp.go.aist.rtm.systemeditor.ui.preference.MainPreferencePage">
 		</page>
 		<page
+			id="jp.go.aist.rtm.systemeditor.ui.preference.IconPreferencePage"
+			class="jp.go.aist.rtm.systemeditor.ui.preference.IconPreferencePage"
+			name="%IconPreference.name"
+			category="jp.go.aist.rtm.systemeditor.ui.preference.MainPreferencePage">
+		</page>
+		<page
 			id="jp.go.aist.rtm.systemeditor.ui.preference.OfflineEditorPreferencePage"
 			class="jp.go.aist.rtm.systemeditor.ui.preference.OfflineEditorPreferencePage"
 			name="%OfflineEditor"

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/RTSELogHandler.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/RTSELogHandler.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/RTSELogHandler.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -28,7 +28,7 @@
 			propLevel = logManager.getProperty(".level");
 		}
 		//
-		String pattern = "systemeditor%u.log";
+		String pattern = "%h/workspace/systemeditor%u.log";
 		if (propPattern != null) {
 			pattern = propPattern;
 		}
@@ -67,7 +67,7 @@
 	}
 
 	public void stop() {
-		for (Logger logger : loggers) {
+		for (Logger logger : new ArrayList<Logger>(loggers)) {
 			removeLogger(logger);
 		}
 		loggers.clear();

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/_debug/AbstractPolygon.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/_debug/AbstractPolygon.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/_debug/AbstractPolygon.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -8,7 +8,7 @@
 import org.eclipse.draw2d.geometry.PointList;
 
 /**
- * Œ»Ý‚Í–¢Žg—p
+ * 現在は未使用
  *
  */
 public class AbstractPolygon extends Shape {

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/_debug/Main.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/_debug/Main.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/_debug/Main.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -44,9 +44,9 @@
 	private static void printTree(String indent, NameComponent component,
 			Object obj) throws NotFound, CannotProceed, InvalidName {
 		if (obj._is_a(NamingContextExtHelper.id())) {
-			System.out.print(indent + " ");
+			System.out.print(indent + "â–¡");
 		} else {
-			System.out.print(indent + "¡");
+			System.out.print(indent + "â– ");
 		}
 
 		if (component != null) {

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/_test/ServiceConnectorCreaterDialogTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/_test/ServiceConnectorCreaterDialogTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/_test/ServiceConnectorCreaterDialogTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -9,7 +9,7 @@
 //import RTC.PortInterfaceProfile;
 //
 ///**
-// * ƒeƒXƒgŒã‚́AServiceConnectorCreaterDialog‚ɃRƒs[‚·‚é
+// * テスト後は、ServiceConnectorCreaterDialogにコピーする
 // */
 //public class ServiceConnectorCreaterDialogTest extends TestCase {
 //	public void testname() throws Exception {
@@ -101,7 +101,7 @@
 //	}
 //
 //	/**
-//	 * PortInterfaceProfile‚̃}ƒbƒ`”‚𐔂¦‚é
+//	 * PortInterfaceProfileのマッチ数を数える
 //	 * 
 //	 * @param profile1
 //	 * @param profile2
@@ -128,11 +128,11 @@
 //	}
 //
 //	/**
-//	 * PortInterfaceProfile‚ªƒ}ƒbƒ`‚·‚é‚©‚Ç‚¤‚©
+//	 * PortInterfaceProfileがマッチするかどうか
 //	 * 
 //	 * @param profile
 //	 * @param profile2
-//	 * @return ƒ}ƒbƒ`‚·‚é‚©‚Ç‚¤‚©
+//	 * @return マッチするかどうか
 //	 */
 //	private static boolean isMatch(PortInterfaceProfile profile1,
 //			PortInterfaceProfile profile2) {

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/extension/RTSELoadComponentExtension.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/extension/RTSELoadComponentExtension.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/extension/RTSELoadComponentExtension.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,11 +2,23 @@
 
 import static jp.go.aist.rtm.toolscommon.model.component.Component.COMPOSITETYPE_NONE;
 
+import java.io.File;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.List;
+
 import jp.go.aist.rtm.repositoryView.RepositoryAccessor;
+import jp.go.aist.rtm.repositoryView.model.LocalRVRootItem;
+import jp.go.aist.rtm.repositoryView.model.RepositoryViewFactory;
+import jp.go.aist.rtm.repositoryView.model.RepositoryViewItem;
+import jp.go.aist.rtm.repositoryView.model.RepositoryViewLeafItem;
+import jp.go.aist.rtm.repositoryView.ui.views.RepositoryView;
 import jp.go.aist.rtm.toolscommon.extension.LoadComponentExtension;
 import jp.go.aist.rtm.toolscommon.model.component.Component;
 import jp.go.aist.rtm.toolscommon.model.component.ComponentFactory;
+import jp.go.aist.rtm.toolscommon.model.component.ComponentSpecification;
 import jp.go.aist.rtm.toolscommon.profiles.util.IDUtil;
+import jp.go.aist.rtm.toolscommon.util.RtcProfileHandler;
 
 public class RTSELoadComponentExtension extends LoadComponentExtension {
 
@@ -29,9 +41,42 @@
 				Component spec = RepositoryAccessor.eINSTANCE.findComponent(
 						componentid, pathId);
 				if (spec == null) {
-					throw new IllegalStateException("Target Component["
-							+ componentid + "](" + pathId
-							+ ") does not exist in RepositoryView.");
+					//リポジトリビューに登録されていない場合には，Profileを読み込み
+//					throw new IllegalStateException("Target Component["
+//							+ componentid + "](" + pathId
+//							+ ") does not exist in RepositoryView.");
+					ComponentSpecification module = null;
+			    	RtcProfileHandler handler = new RtcProfileHandler();
+			    	String targetFileName = null;
+					try {
+				    	URI uri = new URI(target.getPathUri());
+				    	targetFileName = uri.getPath();
+						module = handler.createComponent(targetFileName);
+					} catch (URISyntaxException e) {
+						throw new IllegalStateException("Target Component["
+						+ componentid + "](" + pathId
+						+ ") does not exist in RepositoryView.");
+					} catch (Exception e) {
+						throw new IllegalStateException("Target Component["
+								+ componentid + "](" + pathId
+								+ ") does not exist in RepositoryView.");
+					}
+					String fileName = targetFileName.substring(targetFileName.lastIndexOf(File.separator) + 1);
+					module.setAliasName(module.getInstanceNameL() + "(" + fileName + ")"); //$NON-NLS-1$ //$NON-NLS-2$
+					module.setPathId(target.getPathUri());
+					//
+					RepositoryView viewer = RepositoryAccessor.eINSTANCE.getView();
+			    	RepositoryViewItem rootItem = new RepositoryViewItem("root", 0); //$NON-NLS-1$
+			    	rootItem.setChildren((List<RepositoryViewItem>)viewer.getViewer().getInput());
+
+			 		RepositoryViewItem itemFirst = rootItem.getChild(module.getPathId());
+			 		if( itemFirst==null ) {
+			    		itemFirst = new LocalRVRootItem(module.getPathId());
+						rootItem.addChild(itemFirst);
+			 		}
+					RepositoryViewFactory.buildTree(itemFirst, module, RepositoryViewLeafItem.RTC_LEAF);
+					viewer.getViewer().refresh();
+					spec = RepositoryAccessor.eINSTANCE.findComponent(componentid, pathId);
 				}
 				return spec.copy();
 			}

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/factory/ComponentCommandCreator.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/factory/ComponentCommandCreator.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/factory/ComponentCommandCreator.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -15,6 +15,7 @@
 import jp.go.aist.rtm.toolscommon.model.component.Component;
 import jp.go.aist.rtm.toolscommon.model.component.ComponentSpecification;
 import jp.go.aist.rtm.toolscommon.model.component.SystemDiagram;
+import static jp.go.aist.rtm.toolscommon.util.ComponentUtil.*;
 
 public class ComponentCommandCreator {
 
@@ -38,8 +39,51 @@
 		return this.message;
 	}
 
-	public CommandPair getCreateCommand(CreateRequest request,
+	public MultiCreateCommand getCreateCommand(CreateRequest request,
 			SystemDiagram diagram) {
+		MultiCreateCommand result = new MultiCreateCommand();
+
+		if (!List.class.isAssignableFrom((Class<?>) request.getNewObjectType())) {
+			return result;
+		}
+
+		List<?> components = (List<?>) request.getNewObject();
+		List<Component> childComponents = new ArrayList<Component>();
+		for (Object o : components) {
+			Component c = (Component) o;
+			if (c.isCompositeComponent()) {
+				childComponents.addAll(c.getAllComponents());
+			}
+		}
+
+		for (Object o : components) {
+			final Component c = (Component) o;
+			if (find(c, childComponents) != null) {
+				continue;
+			}
+			CreateRequest req = new CreateRequest() {
+				Component component = c;
+
+				@Override
+				public Object getNewObject() {
+					return component;
+				}
+
+				@Override
+				public Object getNewObjectType() {
+					return component.getClass();
+				}
+			};
+			CommandPair pair = createCommandPair(req, diagram);
+			if (pair != null) {
+				result.getCommandPairs().add(pair);
+			}
+		}
+		return result;
+	}
+	
+	public CommandPair createCommandPair(CreateRequest request,
+			SystemDiagram diagram) {
 		CommandPair result = new CommandPair();
 		for (CreateComponentCommandExtension ext : creators) {
 			ext.setRequest(request);
@@ -125,4 +169,33 @@
 		creators.add(ext);
 	}
 
+	public static class MultiCreateCommand extends Command {
+		List<CommandPair> commandPairs;
+
+		public MultiCreateCommand() {
+			commandPairs = new ArrayList<CommandPair>();
+		}
+
+		public List<CommandPair> getCommandPairs() {
+			return commandPairs;
+		}
+
+		@Override
+		public boolean canExecute() {
+			for (CommandPair cp : commandPairs) {
+				if (!cp.command.canExecute()) {
+					return false;
+				}
+			}
+			return true;
+		}
+
+		@Override
+		public void execute() {
+			for (CommandPair cp : commandPairs) {
+				cp.command.execute();
+			}
+		}
+	}
+	
 }

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/factory/CompositeComponentCreator.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/factory/CompositeComponentCreator.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/factory/CompositeComponentCreator.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -20,7 +20,6 @@
 import jp.go.aist.rtm.toolscommon.manager.ToolsCommonPreferenceManager;
 import jp.go.aist.rtm.toolscommon.model.component.Component;
 import jp.go.aist.rtm.toolscommon.model.component.ComponentFactory;
-import jp.go.aist.rtm.toolscommon.model.component.ComponentPackage;
 import jp.go.aist.rtm.toolscommon.model.component.ConfigurationSet;
 import jp.go.aist.rtm.toolscommon.model.component.CorbaComponent;
 import jp.go.aist.rtm.toolscommon.model.component.ExecutionContext;
@@ -255,7 +254,7 @@
 					return false;
 				}
 				if (base.editor != null && base.editor.isOnline()
-						&& base.manager == null) {
+						&& (base.compositeType.equals(Component.COMPOSITETYPE_GROUPING)==false && base.manager == null) ) {
 					return false;
 				}
 				return true;
@@ -320,13 +319,9 @@
 				SystemEditorWrapperFactory.getInstance()
 						.getSynchronizationManager()
 						.assignSynchonizationSupport(comp);
-				if (comp instanceof CorbaComponent) {
-					// 同期(SDOOrganization)
-					comp.synchronizeLocalAttribute(ComponentPackage.eINSTANCE
-							.getCorbaComponent_SDOOrganization());
-				}
 				comp.setComponentsR(base.components);
 				// 同期
+				comp.synchronizeRemoteAttribute(null);
 				comp.synchronizeLocalAttribute(null);
 				comp.synchronizeLocalReference();
 				// Constraintを設定する

Copied: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/manager/ComponentIconStore.java (from rev 393, trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/manager/ComponentIconStore.java)
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/manager/ComponentIconStore.java	                        (rev 0)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/manager/ComponentIconStore.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -0,0 +1,431 @@
+package jp.go.aist.rtm.systemeditor.manager;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.swt.graphics.Image;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import jp.go.aist.rtm.toolscommon.model.component.Component;
+
+public class ComponentIconStore {
+
+	public static ComponentIconStore eINSTANCE;
+
+	static {
+		eINSTANCE = new ComponentIconStore();
+		SystemEditorPreferenceManager.getInstance().loadComponentIconStore(
+				eINSTANCE);
+	}
+
+	Map<String, ImageDescriptor> path2DescripterMap;
+	Map<String, String> type2PathMap;
+	Map<String, String> category2PathMap;
+
+	ComponentIconStore() {
+		path2DescripterMap = new HashMap<String, ImageDescriptor>();
+		type2PathMap = new HashMap<String, String>();
+		category2PathMap = new HashMap<String, String>();
+	}
+
+	/** コンポーネントタイプに対するアイコンパスを登録 */
+	public void registTypeImage(String type, String path) {
+		if (type == null || type.isEmpty()) {
+			return;
+		}
+		File file = new File(path);
+		if (!file.exists()) {
+			return;
+		}
+		String absPath = file.getAbsolutePath();
+		if (path2DescripterMap.get(absPath) == null) {
+			ImageDescriptor desc = createDescriptorByFile(file);
+			if (desc == null) {
+				return;
+			}
+			path2DescripterMap.put(absPath, desc);
+		}
+		type2PathMap.put(type, absPath);
+	}
+
+	/** コンポーネントカテゴリに対するアイコンパスを登録 */
+	public void registCategoryImage(String category, String path) {
+		if (category == null || category.isEmpty()) {
+			return;
+		}
+		File file = new File(path);
+		if (!file.exists()) {
+			return;
+		}
+		String absPath = file.getAbsolutePath();
+		if (path2DescripterMap.get(absPath) == null) {
+			ImageDescriptor desc = createDescriptorByFile(file);
+			if (desc == null) {
+				return;
+			}
+			path2DescripterMap.put(absPath, desc);
+		}
+		category2PathMap.put(category, absPath);
+	}
+
+	ImageDescriptor createDescriptorByFile(File file) {
+		try {
+			URL url = file.toURI().toURL();
+			return ImageDescriptor.createFromURL(url);
+		} catch (Exception e) {
+			return null;
+		}
+	}
+
+	/** コンポーネントに対するアイコンを検索 */
+	public Image findImageByComp(Component comp) {
+		String type = comp.getTypeNameL();
+		String category = comp.getCategoryL();
+		String path = null;
+		for (String p : type2PathMap.keySet()) {
+			if (type != null && type.indexOf(p) != -1) {
+				path = type2PathMap.get(p);
+				break;
+			}
+		}
+		if (path != null) {
+			ImageDescriptor desc = path2DescripterMap.get(path);
+			return (desc == null) ? null : desc.createImage();
+		}
+		for (String p : category2PathMap.keySet()) {
+			if (category != null && category.indexOf(p) != -1) {
+				path = category2PathMap.get(p);
+				break;
+			}
+		}
+		if (path != null) {
+			ImageDescriptor desc = path2DescripterMap.get(path);
+			return (desc == null) ? null : desc.createImage();
+		}
+		return null;
+	}
+
+	/** アイコン設定リストとして取得 */
+	public List<Entry> toEntries() {
+		List<Entry> result = new ArrayList<Entry>();
+		for (String p : type2PathMap.keySet()) {
+			String path = type2PathMap.get(p);
+			ImageDescriptor desc = path2DescripterMap.get(path);
+			if (path == null || desc == null) {
+				continue;
+			}
+			Entry e = Entry.createType(p, path, desc);
+			result.add(e);
+		}
+		for (String p : category2PathMap.keySet()) {
+			String path = category2PathMap.get(p);
+			ImageDescriptor desc = path2DescripterMap.get(path);
+			if (path == null || desc == null) {
+				continue;
+			}
+			Entry e = Entry.createCategory(p, path, desc);
+			result.add(e);
+		}
+		return result;
+	}
+
+	/** アイコン設定リストから変換 */
+	public static ComponentIconStore getByEntries(List<Entry> entries) {
+		ComponentIconStore result = new ComponentIconStore();
+		for (ComponentIconStore.Entry entry : entries) {
+			if (entry.isType()) {
+				String type = entry.getType();
+				result.registTypeImage(type, entry.getPath());
+			} else {
+				String category = entry.getCategory();
+				result.registCategoryImage(category, entry.getPath());
+			}
+		}
+		return result;
+	}
+
+	/** アイコン設定リストをクリア */
+	public void clearAllImages() {
+		type2PathMap.clear();
+		category2PathMap.clear();
+		path2DescripterMap.clear();
+	}
+
+	/** アイコン設定をプロファイル(XML)へ保存 */
+	public void saveProfile(String fileName) throws Exception {
+		IconProfileHandler handler = new IconProfileHandler();
+		String xml = handler.save(this);
+		IPath path = new Path(fileName);
+		if (!path.toFile().exists()) {
+			path.toFile().createNewFile();
+		}
+		String xmlSplit[] = xml.split("\n");
+		BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(
+				new FileOutputStream(path.toOSString()), "UTF-8"));
+		for (String s : xmlSplit) {
+			writer.write(s);
+			writer.newLine();
+		}
+		writer.close();
+	}
+
+	/** アイコン設定をプロファイル(XML)から読込 */
+	public static ComponentIconStore loadProfile(String fileName)
+			throws Exception {
+		IPath path = new Path(fileName);
+		if (!path.toFile().exists()) {
+			return null;
+		}
+		BufferedReader reader = new BufferedReader(new InputStreamReader(
+				new FileInputStream(path.toOSString()), "UTF-8"));
+		String xmlString = "";
+		while (true) {
+			String s = reader.readLine();
+			if (s == null) {
+				break;
+			}
+			xmlString += s;
+		}
+		IconProfileHandler handler = new IconProfileHandler();
+		ComponentIconStore result = handler.parse(xmlString);
+		return result;
+	}
+
+	public void parsePreference(String pref) {
+		if (pref == null) {
+			return;
+		}
+		clearAllImages();
+		for (String s : pref.split("\\|")) {
+			if (s == null || s.isEmpty()) {
+				continue;
+			}
+			String[] ss = s.split(";");
+			if (ss.length != 3) {
+				continue;
+			}
+			if (Entry.KIND_TYPE.equals(ss[0])) {
+				registTypeImage(ss[1], ss[2]);
+			} else if (Entry.KIND_CATEGORY.equals(ss[0])) {
+				registCategoryImage(ss[1], ss[2]);
+			}
+		}
+	}
+
+	public String toPreference() {
+		String result = "";
+		for (String s : type2PathMap.keySet()) {
+			if (!result.isEmpty()) {
+				result += "|";
+			}
+			result += Entry.KIND_TYPE + ";" + s + ";" + type2PathMap.get(s);
+		}
+		for (String s : category2PathMap.keySet()) {
+			if (!result.isEmpty()) {
+				result += "|";
+			}
+			result += Entry.KIND_CATEGORY + ";" + s + ";"
+					+ category2PathMap.get(s);
+		}
+		return result;
+	}
+
+	/** アイコン設定のエントリを表す */
+	public static class Entry {
+		public static final String KIND_TYPE = "type";
+		public static final String KIND_CATEGORY = "category";
+		public static List<String> KINDS;
+
+		static {
+			KINDS = new ArrayList<String>();
+			KINDS.add(KIND_TYPE);
+			KINDS.add(KIND_CATEGORY);
+		}
+
+		String type;
+		String category;
+		String path;
+		ImageDescriptor desc;
+
+		public static Entry createType(String type, String path,
+				ImageDescriptor desc) {
+			Entry entry = new Entry();
+			entry.type = type;
+			entry.path = path;
+			entry.desc = desc;
+			return entry;
+		}
+
+		public static Entry createCategory(String category, String path,
+				ImageDescriptor desc) {
+			Entry entry = new Entry();
+			entry.category = category;
+			entry.path = path;
+			entry.desc = desc;
+			return entry;
+		}
+
+		Entry() {
+		}
+
+		public void setType(String type) {
+			this.type = type;
+			this.category = null;
+		}
+
+		public void setCategory(String category) {
+			this.type = null;
+			this.category = category;
+		}
+
+		public void setPath(String path) {
+			this.path = path;
+		}
+
+		public void setImageDescriptor(ImageDescriptor desc) {
+			this.desc = desc;
+		}
+
+		public String getKind() {
+			return (isType()) ? KIND_TYPE : KIND_CATEGORY;
+		}
+
+		public String getType() {
+			return type;
+		}
+
+		public String getCategory() {
+			return category;
+		}
+
+		public boolean isType() {
+			return type != null;
+		}
+
+		public boolean isCategory() {
+			return category != null;
+		}
+
+		public String getPath() {
+			return path;
+		}
+
+		public ImageDescriptor getImageDescriptor() {
+			return desc;
+		}
+	}
+
+	/** アイコン設定プロファイルの読み書きを実施 */
+	public static class IconProfileHandler {
+
+		/** アイコン設定(XML)の読込 */
+		public ComponentIconStore parse(String xmlString) throws Exception {
+			ComponentIconStore result = new ComponentIconStore();
+			DocumentBuilderFactory factory = DocumentBuilderFactory
+					.newInstance();
+			DocumentBuilder builder = factory.newDocumentBuilder();
+			InputStream in = new ByteArrayInputStream(xmlString.getBytes());
+			Document dc = builder.parse(in);
+			NodeList prefs = dc.getElementsByTagName("iconPreference");
+			Node attr = null;
+			for (int i = 0; i < prefs.getLength(); i++) {
+				Node n = prefs.item(i);
+				for (Node img : findByName(n.getChildNodes(), "image")) {
+					attr = img.getAttributes().getNamedItem("path");
+					if (attr == null) {
+						continue;
+					}
+					// 画像ファイルをURI形式、もしくはパスから読込
+					String pathUri = attr.getTextContent();
+					String path = null;
+					try {
+						URI uri = new URI(pathUri);
+						path = uri.getPath();
+					} catch (URISyntaxException e) {
+						File f = new File(pathUri);
+						path = f.getAbsolutePath();
+					}
+					for (Node pat : findByName(img.getChildNodes(), "pattern")) {
+						attr = pat.getAttributes().getNamedItem("kind");
+						if (attr == null) {
+							continue;
+						}
+						String kind = attr.getTextContent();
+						String pattern = pat.getTextContent();
+						//
+						if (kind != null && kind.equals("type")) {
+							result.registTypeImage(pattern, path);
+						} else if (kind != null && kind.equals("category")) {
+							result.registCategoryImage(pattern, path);
+						}
+					}
+				}
+			}
+			return result;
+		}
+
+		/** アイコン設定(XML)の保存 */
+		public String save(ComponentIconStore store) {
+			String result = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
+			result += "<iconPreference>\n";
+			for (String path : store.path2DescripterMap.keySet()) {
+				File f = new File(path);
+				// 画像ファイルをURI形式で保存
+				result += "  <image path=\"" + f.toURI() + "\">\n";
+				for (String key : store.type2PathMap.keySet()) {
+					String value = store.type2PathMap.get(key);
+					if (value == null || !value.equals(path)) {
+						continue;
+					}
+					result += "    <pattern kind=\"type\">";
+					result += key + "</pattern>\n";
+				}
+				for (String key : store.category2PathMap.keySet()) {
+					String value = store.category2PathMap.get(key);
+					if (value == null || !value.equals(path)) {
+						continue;
+					}
+					result += "    <pattern kind=\"category\">";
+					result += key + "</pattern>\n";
+				}
+				result += "  </image>\n";
+			}
+			result += "</iconPreference>";
+			return result;
+		}
+
+		List<Node> findByName(NodeList list, String name) {
+			List<Node> result = new ArrayList<Node>();
+			for (int i = 0; i < list.getLength(); i++) {
+				Node n = list.item(i);
+				if (n.getNodeName().equals(name)) {
+					result.add(n);
+				}
+			}
+			return result;
+		}
+	}
+
+}

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/manager/SystemEditorPreferenceManager.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/manager/SystemEditorPreferenceManager.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/manager/SystemEditorPreferenceManager.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -161,6 +161,12 @@
 			.getName()
 			+ ".CONFIRM_COMPONENT_ACTION";
 
+	// アイコン
+	/** コンポーネントアイコン設定 */
+	public static final String COMPONENT_ICONS = SystemEditorPreferenceManager.class
+			.getName()
+			+ ".COMPONENT_ICONS";
+
 	/**
 	 * デフォルトの色を管理するマップ
 	 */
@@ -543,4 +549,40 @@
 		}
 		return result;
 	}
+
+	/** コンポーネントアイコンの設定を読込 */
+	public ComponentIconStore loadComponentIconStore(
+			ComponentIconStore iconStore) {
+		if (iconStore == null) {
+			return null;
+		}
+		store.setDefault(COMPONENT_ICONS, "");
+		String value = store.getString(COMPONENT_ICONS);
+		iconStore.parsePreference(value);
+		return iconStore;
+
+	}
+
+	public ComponentIconStore loadComponentIconStore() {
+		return loadComponentIconStore(ComponentIconStore.eINSTANCE);
+	}
+
+	/** コンポーネントアイコンの設定を保存 */
+	public void saveComponentIconStore(ComponentIconStore iconStore) {
+		if (iconStore == null) {
+			return;
+		}
+		String value = iconStore.toPreference();
+		store.setValue(COMPONENT_ICONS, value);
+	}
+
+	public void saveComponentIconStore() {
+		saveComponentIconStore(ComponentIconStore.eINSTANCE);
+	}
+
+	/** コンポーネントアイコンの設定をリセット */
+	public void resetComponentIconStore() {
+		store.setValue(COMPONENT_ICONS, "");
+	}
+
 }

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/nl/messages.properties
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/nl/messages.properties	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/nl/messages.properties	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,5 +1,11 @@
 Common.dialog.confirm_title=Confirm
 Common.dialog.error_title=Error
+Common.button.add=Add
+Common.button.delete=Delete
+Common.button.edit=Edit
+Common.button.import=Import
+Common.button.export=Export
+Common.button.browse=Browse..
 
 Restoration.0=Failed to restore RTC configuration:[
 Restoration.4=Failed to Activate RTC. [
@@ -33,7 +39,8 @@
 AllComponentActionDelegate.12=Sent the request to the component.
 AllComponentActionDelegate.13=Error
 AllComponentActionDelegate.14=An error has occurred while sending the request:\r\n
-DataConnectorCreaterDialog.1=Please enter ConnectorProfile.
+ConnectorCreaterDialogBase.0=\u30d7\u30ed\u30d1\u30c6\u30a3\u540d\u304c\u91cd\u8907\u3057\u3066\u3044\u307e\u3059\u3002
+DataConnectorCreaterDialog.1=Property Name is duplicated.
 DataConnectorCreaterDialog.2=Name : 
 DataConnectorCreaterDialog.3=Data Type : 
 DataConnectorCreaterDialog.4=*Any input
@@ -73,6 +80,8 @@
 ProfileInformationDialog.16=Required :
 ProfileInformationDialog.17=&Select All
 ProfileInformationDialog.18=&Deselect All
+DeploymentInformationDialog.0=Deployment Information
+Deployment.0=Deployment Information is Incomplete. Do you continue processing?
 NewCompositeComponentDialog.2=Manager : 
 NewCompositeComponentDialog.3=Name : 
 NewCompositeComponentDialog.4=Type : 
@@ -106,6 +115,8 @@
 ServiceConnectorCreaterDialog.10=Delete
 ServiceConnectorCreaterDialog.11=detail...
 ServiceConnectorCreaterDialog.12=unknown
+ServiceConnectorCreaterDialog.13=Unmatch interface type consumer={0} provider={1}
+ServiceConnectorCreaterDialog.14=Unmatch interface instance_name consumer={0} provider={1}
 ConfigurationDialog.3=Apply
 ConfigurationDialog.4=ConfigurationSet : 
 ConfigurationDialog.6=Constraint [
@@ -320,3 +331,18 @@
 ExecutionContextView.12=Detach
 ExecutionContextView.13=Attach
 SelectAttachComponentDialog.1=Please select component attached to Context.
+StartLoggingActionDelegate.start=Start Logging
+StartLoggingActionDelegate.stop=Stop Logging
+DeployActionDelegate.0=XML Format
+ConnectPortActionDelegate.connect=Connect
+ConnectPortActionDelegate.disconnect=Disconnect
+ConnectPortActionDelegate.error.1=Port can not be disconnect.
+ConnectPortActionDelegate.error.2=Disconnect failure. [{0}]
+DisconnectDialog.title=Disconnect Profile
+DisconnectDialog.explain=Select the connection for disconnect, apply with OK.
+IconPreferenceDialog.title=Icon Preference
+IconPreferenceDialog.label.pattern=Pattern: 
+IconPreferenceDialog.label.path=Icon path: 
+IconPreferenceDialog.filter.name=Icon image
+IconPreferencePage.error.import=Icon profile import failure.
+IconPreferencePage.error.export=Icon profile export failure.

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/restoration/Restoration.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/restoration/Restoration.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/restoration/Restoration.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -47,9 +47,8 @@
 	public static void processAllRestoreConfigurationSet(Result result,
 			SystemDiagram systemDiagram) {
 
-		List<CorbaConfigurationSet> remoteConfigurationSets = new ArrayList<CorbaConfigurationSet>();
-
 		for (Component c : systemDiagram.getRegisteredComponents()) {
+			List<CorbaConfigurationSet> remoteConfigurationSets = new ArrayList<CorbaConfigurationSet>();
 			if (!(c instanceof CorbaComponent)) {
 				continue;
 			}

Copied: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/ConnectPortActionDelegate.java (from rev 393, trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/ConnectPortActionDelegate.java)
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/ConnectPortActionDelegate.java	                        (rev 0)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/ConnectPortActionDelegate.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -0,0 +1,133 @@
+package jp.go.aist.rtm.systemeditor.ui.action;
+
+import java.util.List;
+
+import jp.go.aist.rtm.systemeditor.ui.dialog.DisconnectDialog;
+import jp.go.aist.rtm.systemeditor.ui.editor.AbstractSystemDiagramEditor;
+import jp.go.aist.rtm.systemeditor.ui.editor.editpart.PortEditPart;
+import jp.go.aist.rtm.systemeditor.ui.editor.editpolicy.GraphicalConnectorCreateManager;
+import jp.go.aist.rtm.toolscommon.model.component.ConnectorProfile;
+import jp.go.aist.rtm.toolscommon.model.component.Port;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.IObjectActionDelegate;
+import org.eclipse.ui.IWorkbenchPart;
+
+import static jp.go.aist.rtm.systemeditor.nl.Messages.*;
+import static jp.go.aist.rtm.systemeditor.ui.util.RTMixin.*;
+
+public class ConnectPortActionDelegate implements IObjectActionDelegate {
+
+	static final String ACTION_CONNECT_ID = ConnectPortActionDelegate.class
+			.getName()
+			+ ".Connect";
+	static final String ACTION_DISCONNECT_ID = ConnectPortActionDelegate.class
+			.getName()
+			+ ".Disconnect";
+
+	static final String LABEL_CONNECT_PORT = getString("ConnectPortActionDelegate.connect");
+	static final String LABEL_DISCONNECT_PORT = getString("ConnectPortActionDelegate.disconnect");
+
+	static final String ERROR_CANNOT_DISCONNECT = getString("ConnectPortActionDelegate.error.1");
+	static final String ERROR_DISCONNECT_FAILURE = getString("ConnectPortActionDelegate.error.2");
+
+	AbstractSystemDiagramEditor editor;
+	Port port;
+
+	@Override
+	public void run(IAction action) {
+		if (isConnectAction(action)) {
+			runConnect();
+		} else {
+			runDisconnect();
+		}
+	}
+
+	public void runConnect() {
+		GraphicalConnectorCreateManager manager = new GraphicalConnectorCreateManager(
+				editor.getSite().getShell());
+		manager.setFirst(port);
+		if (!manager.validateSingle()) {
+			return;
+		}
+		manager.createProfileAndConnector();
+	}
+
+	public void runDisconnect() {
+		DisconnectDialog dialog = new DisconnectDialog(editor.getSite()
+				.getShell());
+		dialog.setPort(port);
+		int open = dialog.open();
+		if (open != IDialogConstants.OK_ID) {
+			return;
+		}
+		List<ConnectorProfile> deleteProfiles = dialog
+				.getDeleteConnectorProfiles();
+		if (port.getSynchronizer() == null) {
+			openError(ERROR_CANNOT_DISCONNECT);
+		}
+		String failIds = "";
+		for (ConnectorProfile prof : deleteProfiles) {
+			boolean ret = port.getSynchronizer().disconnect(
+					prof.getConnectorId());
+			if (!ret) {
+				if (!failIds.isEmpty()) {
+					failIds += ",";
+				}
+				failIds += prof.getConnectorId();
+			}
+		}
+		if (!failIds.isEmpty()) {
+			openError(form(ERROR_DISCONNECT_FAILURE, failIds));
+		}
+	}
+
+	@Override
+	public void selectionChanged(IAction action, ISelection selection) {
+		port = null;
+		if (selection instanceof IStructuredSelection) {
+			Object part = ((IStructuredSelection) selection).getFirstElement();
+			if (part instanceof PortEditPart) {
+				Port model = ((PortEditPart) part).getModel();
+				if (model instanceof Port) {
+					port = (Port) model;
+				}
+			}
+		}
+		action.setText((isConnectAction(action)) ? LABEL_CONNECT_PORT
+				: LABEL_DISCONNECT_PORT);
+		action.setEnabled(canExecution(action));
+	}
+
+	@Override
+	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
+		if (targetPart instanceof AbstractSystemDiagramEditor) {
+			editor = (AbstractSystemDiagramEditor) targetPart;
+		}
+		action.setEnabled(canExecution(action));
+	}
+
+	boolean canExecution(IAction action) {
+		if (editor == null || port == null) {
+			return false;
+		}
+		if (isConnectAction(action)) {
+			return true;
+		} else {
+			return !port.getConnectorProfiles().isEmpty();
+		}
+	}
+
+	boolean isConnectAction(IAction action) {
+		return ACTION_CONNECT_ID.equals(action.getId());
+	}
+
+	void openError(String message) {
+		MessageDialog.openError(editor.getSite().getShell(), "Error", message);
+	}
+
+}

Copied: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/DeployActionDelegate.java (from rev 393, trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/DeployActionDelegate.java)
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/DeployActionDelegate.java	                        (rev 0)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/DeployActionDelegate.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -0,0 +1,604 @@
+package jp.go.aist.rtm.systemeditor.ui.action;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.xml.datatype.DatatypeConstants;
+import javax.xml.datatype.XMLGregorianCalendar;
+
+import jp.go.aist.rtm.nameserviceview.model.manager.NameServerManager;
+import jp.go.aist.rtm.nameserviceview.model.manager.impl.NameServerManagerImpl;
+import jp.go.aist.rtm.systemeditor.factory.Rehabilitation;
+import jp.go.aist.rtm.systemeditor.factory.SystemEditorWrapperFactory;
+import jp.go.aist.rtm.systemeditor.manager.SystemEditorPreferenceManager;
+import jp.go.aist.rtm.systemeditor.nl.Messages;
+import jp.go.aist.rtm.systemeditor.ui.dialog.DeploymentSettingDialog;
+import jp.go.aist.rtm.systemeditor.ui.editor.AbstractSystemDiagramEditor;
+import jp.go.aist.rtm.systemeditor.ui.editor.NullEditorInput;
+import jp.go.aist.rtm.systemeditor.ui.editor.SystemDiagramEditor;
+import jp.go.aist.rtm.systemeditor.ui.editor.editpart.SystemDiagramEditPart;
+import jp.go.aist.rtm.systemeditor.ui.util.DeployUtil;
+import jp.go.aist.rtm.toolscommon.model.component.Component;
+import jp.go.aist.rtm.toolscommon.model.component.ComponentFactory;
+import jp.go.aist.rtm.toolscommon.model.component.CorbaComponent;
+import jp.go.aist.rtm.toolscommon.model.component.SystemDiagram;
+import jp.go.aist.rtm.toolscommon.model.component.SystemDiagramKind;
+import jp.go.aist.rtm.toolscommon.model.manager.RTCManager;
+import jp.go.aist.rtm.toolscommon.util.RtsProfileHandler;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.IEditorActionDelegate;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.openrtp.namespaces.rts.version02.ComponentExt;
+import org.openrtp.namespaces.rts.version02.ConfigurationSet;
+import org.openrtp.namespaces.rts.version02.DataportConnector;
+import org.openrtp.namespaces.rts.version02.ExecutionContext;
+import org.openrtp.namespaces.rts.version02.ObjectFactory;
+import org.openrtp.namespaces.rts.version02.Participants;
+import org.openrtp.namespaces.rts.version02.Property;
+import org.openrtp.namespaces.rts.version02.RtsProfileExt;
+import org.openrtp.namespaces.rts.version02.ServiceportConnector;
+import org.openrtp.namespaces.rts.version02.TargetComponent;
+import org.openrtp.namespaces.rts.version02.TargetComponentExt;
+import org.openrtp.namespaces.rts.version02.TargetPort;
+import org.openrtp.namespaces.rts.version02.TargetPortExt;
+
+import com.sun.org.apache.xerces.internal.jaxp.datatype.XMLGregorianCalendarImpl;
+
+public class DeployActionDelegate implements IEditorActionDelegate {
+	private ISelection selection;
+	private AbstractSystemDiagramEditor targetEditor;
+
+	/**
+	* アクションのメインの実行メソッド
+	* 
+	*/
+	public void run(final IAction action) {
+		//一旦オフラインプロファイルの形式に変換
+		SystemDiagram diagram = targetEditor.getSystemDiagram();
+		XMLGregorianCalendar calendar = new XMLGregorianCalendarImpl(new GregorianCalendar());
+		calendar.setMillisecond(DatatypeConstants.FIELD_UNDEFINED);
+		diagram.setCreationDate(calendar.toString());
+		diagram.setUpdateDate(calendar.toString());
+		RtsProfileHandler handler = new RtsProfileHandler();
+		RtsProfileExt profile = handler.save(diagram);
+		
+		//プロファイル情報の書き換え
+		ObjectFactory factory = new ObjectFactory();
+		//事前処理
+		prepareProfile(profile, factory);
+		//候補コンポーネントの取得
+		NameServerManager ns = NameServerManagerImpl.getInstance();
+		EList nscomps = ns.getNodes();
+		List<CorbaComponent> componentCandidates = new ArrayList<CorbaComponent>(); 
+		componentCandidates = DeployUtil.searchComponentList(nscomps, componentCandidates);
+		
+		EList<Component> comps = targetEditor.getSystemDiagram().getComponents();
+		Map<String, CorbaComponent> replaced = new HashMap<String, CorbaComponent>();
+		//プロファイル情報の書き換え(複合RTC以外)
+		modifyComponents(profile, ns, componentCandidates, factory, comps, replaced);
+		List<org.openrtp.namespaces.rts.version02.Component> removed = new ArrayList<org.openrtp.namespaces.rts.version02.Component>();
+		//デプロイ情報の整合性の確認
+		if( checkDeployInfo(profile, replaced)==false ) {
+			return;
+		}
+		 
+		//プロファイル情報の書き換え
+		for(org.openrtp.namespaces.rts.version02.Component target : profile.getComponents()) {
+			CorbaComponent source = replaced.get(target.getId().trim() + target.getInstanceName().trim());
+			if( source==null ) {
+				removed.add(target);
+				continue;
+			}
+			if( target.getCompositeType()==null || target.getCompositeType().equals("None") ) {
+				target.setPathUri(source.getPathId());
+				target.setInstanceName(source.getInstanceNameL());
+				for(ExecutionContext ec : target.getExecutionContexts() ) {
+					if( ec.getId().equals("default") ) ec.setId("0");
+				}
+				Property prop = factory.createProperty();
+				prop.setName("IOR");
+				prop.setValue(source.getIor());
+				((ComponentExt)target).getProperties().add(prop);
+				
+			} else {
+				for(Participants parts : target.getParticipants()) {
+					TargetComponent part = parts.getParticipant();
+					Component sourcePart = replaced.get(part.getComponentId().trim() + part.getInstanceName().trim());
+					part.setInstanceName(sourcePart.getInstanceNameL());
+					//
+					boolean isHit = false;
+					for( Property dpp : ((TargetComponentExt)part).getProperties()) {
+						if( dpp.getName().equals("COMPONENT_PATH_ID") ) {
+							dpp.setValue(sourcePart.getPathId());
+							isHit = true;
+							break;
+						}
+					}
+					if( !isHit ) {
+						Property path = factory.createProperty();
+						path.setName("COMPONENT_PATH_ID");
+						path.setValue(sourcePart.getPathId());
+						((TargetComponentExt)part).getProperties().add(path);
+					}
+				}
+			}
+			for( DataportConnector dpc : profile.getDataPortConnectors() ) {
+				modifyTargetComponent(factory, target.getId(), source, dpc.getSourceDataPort());
+				modifyTargetComponent(factory, target.getId(), source, dpc.getTargetDataPort());
+			}
+			for( ServiceportConnector svc : profile.getServicePortConnectors() ) {
+				modifyTargetComponent(factory, target.getId(), source, svc.getSourceServicePort());
+				modifyTargetComponent(factory, target.getId(), source, svc.getTargetServicePort());
+			}
+			modifyConfigurationSet(factory, target);
+		}
+		//デプロイ情報がない要素の削除
+		removeImComplete(profile, removed);
+		//新規オンラインエディタの生成
+		createNewOnlineEditor(profile);
+	}
+
+	private void removeImComplete(RtsProfileExt profile,
+			List<org.openrtp.namespaces.rts.version02.Component> removed) {
+		profile.getComponents().removeAll(removed);
+		if( 0<removed.size()) {
+			List<ServiceportConnector> removedSrv = new ArrayList<ServiceportConnector>();
+			for(ServiceportConnector source : profile.getServicePortConnectors() ) {
+				for(org.openrtp.namespaces.rts.version02.Component target : removed) {
+					if( source.getSourceServicePort().getComponentId().equals(target.getId())
+							&& source.getSourceServicePort().getInstanceName().equals(target.getInstanceName()) ) {
+						removedSrv.add(source);
+						break;
+					}
+					if( source.getTargetServicePort().getComponentId().equals(target.getId())
+							&& source.getTargetServicePort().getInstanceName().equals(target.getInstanceName()) ) {
+						removedSrv.add(source);
+						break;
+					}
+				}
+			}
+			profile.getServicePortConnectors().removeAll(removedSrv);
+			//
+			List<DataportConnector> removedData = new ArrayList<DataportConnector>();
+			for(DataportConnector source : profile.getDataPortConnectors() ) {
+				for(org.openrtp.namespaces.rts.version02.Component target : removed) {
+					if( source.getSourceDataPort().getComponentId().equals(target.getId())
+							&& source.getSourceDataPort().getInstanceName().equals(target.getInstanceName()) ) {
+						removedData.add(source);
+						break;
+					}
+					if( source.getTargetDataPort().getComponentId().equals(target.getId())
+							&& source.getTargetDataPort().getInstanceName().equals(target.getInstanceName()) ) {
+						removedData.add(source);
+						break;
+					}
+				}
+			}
+			profile.getDataPortConnectors().removeAll(removedData);
+		}
+	}
+
+	private boolean checkDeployInfo(RtsProfileExt profile, Map<String, CorbaComponent> replaced) {
+		boolean isImcomp = false;
+		 for(org.openrtp.namespaces.rts.version02.Component target : profile.getComponents()) {
+			 if( replaced.get(target.getId().trim() + target.getInstanceName().trim())==null ) {
+				 isImcomp = true;
+				break;
+			 }
+		 }
+		 if(isImcomp) {
+			 if(MessageDialog.openConfirm(PlatformUI.getWorkbench()
+						.getActiveWorkbenchWindow().getShell(), "Deploy", Messages.getString("Deployment.0"))==false ) {
+				 return false;
+			 }
+		 }
+		 return true;
+	}
+
+	private void createNewOnlineEditor(RtsProfileExt profile) {
+		//新規オンラインエディタの生成
+		IWorkbenchWindow window = targetEditor.getSite().getWorkbenchWindow();
+		IEditorPart newWindow = null;
+		try {
+			newWindow = window.getActivePage().openEditor(new NullEditorInput(),
+					SystemDiagramEditor.SYSTEM_DIAGRAM_EDITOR_ID);
+		} catch (PartInitException e) {
+			e.printStackTrace();
+		}
+		SystemDiagramEditor editor = (SystemDiagramEditor)newWindow;
+		try {
+			loadFromOffline(editor, profile);
+		} catch (PartInitException e) {
+			e.printStackTrace();
+		}
+	}
+
+	private void prepareProfile(RtsProfileExt profile, ObjectFactory factory) {
+		org.openrtp.namespaces.rts.version02.Component baseComp = null;
+		for(org.openrtp.namespaces.rts.version02.Component target : profile.getComponents()) {
+			if( target.getCompositeType()==null || target.getCompositeType().equals("None") ) {
+				baseComp = target;
+				//デフォルトフィギュレーションセットの設定
+				if( target.getConfigurationSets().size()==0 ) {
+					ConfigurationSet config = factory.createConfigurationSet();
+					config.setId("default");
+					target.getConfigurationSets().add(config);
+					target.setActiveConfigurationSet("default");
+				}
+			}
+		}
+		//
+		String baseIds[] = baseComp.getId().split(":");
+		String baseCategory = baseIds[1];
+		for(org.openrtp.namespaces.rts.version02.Component target : profile.getComponents()) {
+			if( !(target.getCompositeType()==null || target.getCompositeType().equals("None")) ) {
+				//複合RTCのID情報の書き換え
+				String strId = target.getId();
+				String strIds[] = strId.split(":");
+				if(strIds[1]==null || strIds[1].length()<=0) {
+					strIds[1] = baseCategory;
+				}
+				String newId;
+				if(strIds.length<5) {
+					newId = strIds[0] + ":" + strIds[1] + ":" + strIds[2] + ":" + strIds[3] + ":0.1";
+				} else {
+					newId = strIds[0] + ":" + strIds[1] + ":" + strIds[2] + ":" + strIds[3] + ":" + strIds[4];
+				}
+				target.setId(newId);
+			}
+		}
+	}
+
+	private boolean modifyComponents(RtsProfileExt profile,
+			NameServerManager ns, List<CorbaComponent> componentCandidates,
+			ObjectFactory factory, EList<Component> comps, Map<String, CorbaComponent> replaced) {
+		for(Component target : comps) {
+			if( target.isCompositeComponent() == false ) {
+				String type = target.getProperty(DeploymentSettingDialog.KEY_DEPLOY_TYPE);
+				if( type==null || type.length()==0 ) continue;
+				//Profile中のコンポーネント情報の探索
+				org.openrtp.namespaces.rts.version02.Component propTarget = searchProfileComp(profile, target);
+				if(propTarget==null) return false;
+				
+				//実コンポーネント中から対象コンポーネントの探索
+				CorbaComponent actTarget = null;
+				if( type.equals(DeploymentSettingDialog.KEY_DEPLOY_TYPE_COMPONENT)) {
+					actTarget = searchActiveComp(componentCandidates, target);
+				} else if( type.equals(DeploymentSettingDialog.KEY_DEPLOY_TYPE_MANAGER)) {
+					actTarget = searchActiveCompByManager(ns, factory, target, propTarget);
+				}
+				if(actTarget==null) return false;
+				replaced.put(propTarget.getId().trim() + propTarget.getInstanceName().trim(), actTarget);
+				
+			} else {
+				org.openrtp.namespaces.rts.version02.ComponentExt propTarget = searchProfileComp(profile, target);
+				propTarget.setPathUri(target.getProperty(DeploymentSettingDialog.KEY_DEPLOY_TARGET));
+				propTarget.setInstanceName(target.getInstanceNameL());
+				EList<Component> subComps = target.getComponents();
+				if(modifyComponents(profile, ns, componentCandidates, factory, subComps, replaced)==false) {
+					return false;
+				}
+				//
+			}
+		}
+		return true;
+	}
+
+	private CorbaComponent searchActiveCompByManager(NameServerManager ns, ObjectFactory factory,
+			Component target, org.openrtp.namespaces.rts.version02.Component propTarget) {
+		CorbaComponent result = null;
+		EList nscomps;
+		//設定したManager情報を検索
+		java.util.List<RTCManager> managerCandidates = DeployUtil.searchManager(target);
+		String refId = target.getProperty(DeploymentSettingDialog.KEY_DEPLOY_TARGET);
+		RTCManager actManager = null;
+		for(int index=0;index<managerCandidates.size();index++) {
+			RTCManager manager = managerCandidates.get(index);
+			if( manager.getPathId().equals(refId) ) {
+				actManager = manager;
+				break;
+			}
+		}
+		if(propTarget==null ) return result;
+		//
+		EList createds = actManager.getComponentInstanceNamesR();
+		jp.go.aist.rtm.toolscommon.model.component.Component created = null;
+		Property prop = factory.createProperty();
+		for(int index=0;index<createds.size();index++) {
+			if( ((String)createds.get(index)).equals(propTarget.getInstanceName()) ) {
+				created = ComponentFactory.eINSTANCE.createCorbaComponent();
+				prop.setName("IOR");
+				prop.setValue( actManager.getComponentsR().get(index).toString());
+				break;
+			}
+		}
+		if( created==null ) {
+			created = actManager.createComponentR(createParam(propTarget));
+			//パラメータフル指定でRTCを生成できなかった場合には型のみ指定して試す
+			if( created==null ) {
+				created = actManager.createComponentR(createParamAlt(propTarget));
+			}
+			prop.setName("IOR");
+			prop.setValue(((CorbaComponent)created).getCorbaObject().toString());
+		}
+		//
+		((ComponentExt)propTarget).getProperties().add(prop);
+		for(ExecutionContext ec : propTarget.getExecutionContexts() ) {
+			if( ec.getId().equals("default") ) ec.setId("0");
+		}
+		if( propTarget.getConfigurationSets().size()==0 ) {
+			ConfigurationSet configSet = factory.createConfigurationSet();
+			configSet.setId("default");
+			propTarget.getConfigurationSets().add(configSet);
+			
+		}
+		((NameServerManagerImpl)ns).refreshAll();
+		nscomps = ns.getNodes();
+		for( Property property : ((ComponentExt)propTarget).getProperties() ) {
+			if( !property.getName().equals("IOR")) continue;
+			CorbaComponent corbaComp = DeployUtil.searchComponent(property.getValue(), nscomps);
+			if( corbaComp!=null ) {
+				propTarget.setPathUri(corbaComp.getPathId());
+				corbaComp.setComponentId(propTarget.getId());
+				corbaComp.setIor(prop.getValue());
+				result = corbaComp;
+				break;
+			}
+		}
+		return result;
+	}
+
+	private CorbaComponent searchActiveComp(List<CorbaComponent> componentCandidates, Component target) {
+		String ior = target.getProperty(DeploymentSettingDialog.KEY_DEPLOY_IOR);
+		String refId = target.getProperty(DeploymentSettingDialog.KEY_DEPLOY_TARGET);
+		CorbaComponent actTarget = null;
+		for(Component actComp : componentCandidates) {
+			if( ((CorbaComponent)actComp).getIor().equals(ior) ) {
+				actTarget = (CorbaComponent)actComp;
+				return actTarget;
+			}
+		}
+		//IORでは見つからなかった場合
+		for(Component actComp : componentCandidates) {
+			if( ((CorbaComponent)actComp).getPathId().equals(refId) ) {
+				actTarget = (CorbaComponent)actComp;
+				return actTarget;
+			}
+		}
+		return null;
+	}
+
+	private org.openrtp.namespaces.rts.version02.ComponentExt searchProfileComp(RtsProfileExt profile, Component target) {
+		org.openrtp.namespaces.rts.version02.ComponentExt propTarget = null;
+		for(org.openrtp.namespaces.rts.version02.Component proComp: profile.getComponents() ) {
+			if(proComp.getPathUri().equals(target.getPathId()) && proComp.getInstanceName().equals(target.getInstanceNameL())) {
+				propTarget = (org.openrtp.namespaces.rts.version02.ComponentExt)proComp;
+				break;
+			}
+		}
+		return propTarget;
+	}
+
+	protected void loadFromOffline(final SystemDiagramEditor editor, final RtsProfileExt profile) throws PartInitException {
+		try {
+			if (editor.getSystemDiagram() != null) {
+				editor.getSystemDiagram().setSynchronizeInterval(0);
+			}
+
+			ProgressMonitorDialog dialog = new ProgressMonitorDialog(editor.getEditorSite().getShell());
+			IRunnableWithProgress runable = new IRunnableWithProgress() {
+				public void run(IProgressMonitor monitor)
+						throws InvocationTargetException,
+						InterruptedException {
+
+					monitor.beginTask(Messages.getString("SystemDiagramEditor.3"), 100); //$NON-NLS-1$
+					monitor.subTask(Messages.getString("SystemDiagramEditor.4")); //$NON-NLS-1$
+					monitor.internalWorked(20);
+
+					try {
+						SystemDiagram diagram = (SystemDiagram)loadContentFromResource(profile);
+						editor.setSystemDiagram(diagram);
+					} catch (Exception e) {	 
+						monitor.done();
+						throw new InvocationTargetException(e,
+								Messages.getString("SystemDiagramEditor.6")  + "\r\n" + e.getMessage()); //$NON-NLS-1$
+					}
+					monitor.internalWorked(35);
+
+					monitor.subTask(Messages.getString("SystemDiagramEditor.7")); //$NON-NLS-1$
+					try{
+						RtsProfileHandler handler = new RtsProfileHandler();
+						handler.restoreConnection(editor.getSystemDiagram());
+						handler.restoreConfigSet(editor.getSystemDiagram());
+						handler.restoreExecutionContext(editor.getSystemDiagram());
+						editor.doReplace(editor.getSystemDiagram(), editor.getEditorSite());
+					} catch (Exception e) {
+						e.printStackTrace();
+						throw new InvocationTargetException(e, Messages.getString("SystemDiagramEditor.8")); //$NON-NLS-1$
+					}
+					//
+					monitor.done();
+				}
+			};
+			dialog.run(false, false, runable);
+		} catch (Exception e) {
+			throw new PartInitException(Messages.getString("SystemDiagramEditor.9"), e); //$NON-NLS-1$
+		}
+
+		editor.getSystemDiagram()
+				.setSynchronizeInterval(SystemEditorPreferenceManager.getInstance().getInterval(SystemEditorPreferenceManager.SYNC_SYSTEMEDITOR_INTERVAL));
+
+		editor.postLoad();
+		editor.setDirty();
+	}
+	
+	private EObject loadContentFromResource(RtsProfileExt profile) throws Exception {
+		RtsProfileHandler handler = new RtsProfileHandler();
+		SystemDiagram diagram = handler.load(profile, SystemDiagramKind.ONLINE_LITERAL);
+		SystemEditorWrapperFactory.getInstance().getSynchronizationManager()
+								.assignSynchonizationSupportToDiagram(diagram);
+		Rehabilitation.rehabilitation(diagram);
+
+		// 読み込み時に明示的に状態の同期を実行
+		List<Component> eComps = new ArrayList<Component>(diagram.getComponents());
+		diagram.getComponents().clear();
+		for (Component c : eComps) {
+			c.synchronizeManually();
+			diagram.addComponent(c);
+		}
+		handler.restoreCompositeComponentPort(diagram);
+		
+		return SystemEditorWrapperFactory.getInstance().postLoad(handler, diagram);
+	}
+	
+	private void modifyTargetComponent(ObjectFactory factory, String id, CorbaComponent result, TargetPort target) {
+		if( id.equals(target.getComponentId() )) {
+			target.setInstanceName(result.getInstanceNameL());
+			boolean isHit = false;
+			for( Property dpp : ((TargetPortExt)target).getProperties()) {
+				if( dpp.getName().equals("COMPONENT_PATH_ID") ) {
+					dpp.setValue(result.getPathId());
+					isHit = true;
+					break;
+				}
+			}
+			if( !isHit ) {
+				Property path = factory.createProperty();
+				path.setName("COMPONENT_PATH_ID");
+				path.setValue(result.getPathId());
+				((TargetPortExt)target).getProperties().add(path);
+			}
+		}
+	}
+	
+	private void modifyConfigurationSet(ObjectFactory factory, org.openrtp.namespaces.rts.version02.Component comp) {
+		if(comp.getConfigurationSets().size() == 0 ) {
+			ConfigurationSet config = factory.createConfigurationSet();
+			config.setId("default");
+			comp.getConfigurationSets().add(config);
+		}
+	}
+	
+	private String createParam(org.openrtp.namespaces.rts.version02.Component comp) {
+		StringBuffer buf = new StringBuffer();
+
+		String[] params = comp.getId().split(":");
+
+		if( params.length < 5 ) {
+
+			
+			if( params.length < 2) return "";
+			String[] items = params[1].split("\\.");
+			StringBuffer vendor = new StringBuffer();
+			for(int index=0;index<items.length-2;index++) {
+				vendor.append(items[index]);
+			}
+			StringBuffer newId = new StringBuffer();
+			newId.append(params[0]);
+			newId.append(":");
+			newId.append(vendor.toString());
+			newId.append(":");
+			newId.append(items[items.length-2]);
+			newId.append(":");
+			newId.append(items[items.length-1]);
+			newId.append(":");
+			newId.append(params[2]);
+			          
+			buf.append(newId.toString());
+			buf.append("?instance_name=");
+			buf.append(comp.getInstanceName());
+			buf.append("&vendor=");
+			buf.append(vendor);
+			buf.append("&version=");
+			buf.append(params[2]);
+			buf.append("&category=");
+			buf.append(items[items.length-2]);
+			
+		} else {
+			buf.append(comp.getId());
+			buf.append("?instance_name=");
+			buf.append(comp.getInstanceName());
+			buf.append("&vendor=");
+			buf.append(params[1]);
+			buf.append("&version=");
+			buf.append(params[params.length-1]);
+			buf.append("&category=");
+			buf.append(params[2]);
+		}
+		
+		return buf.toString();
+	}
+
+	private String createParamAlt(org.openrtp.namespaces.rts.version02.Component comp) {
+		StringBuffer buf = new StringBuffer();
+
+		String[] params = comp.getId().split(":");
+
+		if( params.length < 5 ) {
+			if( params.length < 2) return "";
+			String[] items = params[1].split("\\.");
+			StringBuffer vendor = new StringBuffer();
+			for(int index=0;index<items.length-2;index++) {
+				vendor.append(items[index]);
+			}
+			buf.append(items[items.length-1]);
+			buf.append("?instance_name=");
+			buf.append(comp.getInstanceName());
+			buf.append("&vendor=");
+			buf.append(vendor);
+			buf.append("&version=");
+			buf.append(params[2]);
+			buf.append("&category=");
+			buf.append(items[items.length-2]);
+		} else {
+			buf.append(params[3]);
+			buf.append("?instance_name=");
+			buf.append(comp.getInstanceName());
+			buf.append("&vendor=");
+			buf.append(params[1]);
+			buf.append("&version=");
+			buf.append(params[params.length-1]);
+			buf.append("&category=");
+			buf.append(params[2]);
+		}
+		
+		return buf.toString();
+	}
+	
+	@Override
+	public void setActiveEditor(IAction action, IEditorPart targetEditor) {
+		this.targetEditor = (AbstractSystemDiagramEditor) targetEditor;
+	}
+	
+	@Override
+	public void selectionChanged(IAction action, ISelection selection) {
+		this.selection = selection;
+		action.setEnabled(isEnable());
+	}
+	
+	@SuppressWarnings("unchecked")
+	private boolean isEnable() {
+		if (selection instanceof IStructuredSelection) {
+			if( ((IStructuredSelection) selection).getFirstElement() instanceof SystemDiagramEditPart) {
+				return true;
+			}
+		}
+		return false;
+	}
+}

Copied: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/DeployLoadActionDelegate.java (from rev 393, trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/DeployLoadActionDelegate.java)
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/DeployLoadActionDelegate.java	                        (rev 0)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/DeployLoadActionDelegate.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -0,0 +1,84 @@
+package jp.go.aist.rtm.systemeditor.ui.action;
+
+import jp.go.aist.rtm.systemeditor.nl.Messages;
+import jp.go.aist.rtm.systemeditor.ui.editor.AbstractSystemDiagramEditor;
+import jp.go.aist.rtm.systemeditor.ui.editor.editpart.SystemDiagramEditPart;
+import jp.go.aist.rtm.toolscommon.model.component.SystemDiagram;
+import jp.go.aist.rtm.toolscommon.profiles.util.XmlHandler;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.FileDialog;
+import org.eclipse.ui.IEditorActionDelegate;
+import org.eclipse.ui.IEditorPart;
+import org.openrtp.namespaces.deploy.Component;
+import org.openrtp.namespaces.deploy.DeployProfile;
+
+public class DeployLoadActionDelegate implements IEditorActionDelegate {
+	private ISelection selection;
+	private AbstractSystemDiagramEditor targetEditor;
+
+	@Override
+	public void setActiveEditor(IAction action, IEditorPart targetEditor) {
+		this.targetEditor = (AbstractSystemDiagramEditor) targetEditor;
+	}
+
+	@Override
+	public void run(IAction action) {
+		FileDialog dialog = new FileDialog(targetEditor.getSite().getShell(),SWT.SAVE);
+        dialog.setText("Load Deploy Info.");
+		dialog.setFilterNames(new String[] {Messages.getString("DeployActionDelegate.0")}); //$NON-NLS-1$
+		dialog.setFilterExtensions(new String[] { "*.xml" });
+		String selectedFileName = dialog.open();
+		if( selectedFileName==null ) return;
+		//
+		XmlHandler loader = new XmlHandler();
+		DeployProfile profile = null;
+		try {
+			profile = loader.loadXmlDeploy(selectedFileName);
+		} catch(Exception ex) {
+			ex.printStackTrace();
+		}
+		//
+		SystemDiagram diagram = targetEditor.getSystemDiagram();
+		for(Component target : profile.getComponents()) {
+			EList<jp.go.aist.rtm.toolscommon.model.component.Component> compList = diagram.getComponents();
+			loadDeployInfo(target, compList);
+		}
+	}
+
+	private void loadDeployInfo(Component target,
+			EList<jp.go.aist.rtm.toolscommon.model.component.Component> compList) {
+		for(jp.go.aist.rtm.toolscommon.model.component.Component comp : compList) {
+			if(target.getId().trim().equals(comp.getComponentId())
+					&& target.getInstanceName().trim().equals(comp.getInstanceNameL().trim())) {
+				comp.setProperty("DeployType", target.getDeployType());
+				comp.setProperty("DeployTarget", target.getTarget());
+				comp.setProperty("DeployIOR", target.getIor());
+			} else {
+				if( comp.isCompositeComponent() ) {
+					loadDeployInfo(target, comp.getComponents());
+				}
+			}
+		}
+	}
+
+	@Override
+	public void selectionChanged(IAction action, ISelection selection) {
+		this.selection = selection;
+		action.setEnabled(isEnable());
+	}
+	
+	@SuppressWarnings("unchecked")
+	private boolean isEnable() {
+		if (selection instanceof IStructuredSelection) {
+			if( ((IStructuredSelection) selection).getFirstElement() instanceof SystemDiagramEditPart) {
+				return true;
+			}
+		}
+		return false;
+	}
+}

Copied: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/DeploySaveActionDelegate.java (from rev 393, trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/DeploySaveActionDelegate.java)
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/DeploySaveActionDelegate.java	                        (rev 0)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/DeploySaveActionDelegate.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -0,0 +1,80 @@
+package jp.go.aist.rtm.systemeditor.ui.action;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.GregorianCalendar;
+
+import javax.xml.datatype.DatatypeConstants;
+import javax.xml.datatype.XMLGregorianCalendar;
+
+import jp.go.aist.rtm.systemeditor.nl.Messages;
+import jp.go.aist.rtm.systemeditor.ui.editor.AbstractSystemDiagramEditor;
+import jp.go.aist.rtm.systemeditor.ui.editor.editpart.SystemDiagramEditPart;
+import jp.go.aist.rtm.toolscommon.model.component.SystemDiagram;
+import jp.go.aist.rtm.toolscommon.profiles.util.XmlHandler;
+import jp.go.aist.rtm.toolscommon.util.DeployProfileHandler;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.FileDialog;
+import org.eclipse.ui.IEditorActionDelegate;
+import org.eclipse.ui.IEditorPart;
+import org.openrtp.namespaces.deploy.DeployProfile;
+
+import com.sun.org.apache.xerces.internal.jaxp.datatype.XMLGregorianCalendarImpl;
+
+public class DeploySaveActionDelegate implements IEditorActionDelegate {
+	private ISelection selection;
+	private AbstractSystemDiagramEditor targetEditor;
+
+	@Override
+	public void setActiveEditor(IAction action, IEditorPart targetEditor) {
+		this.targetEditor = (AbstractSystemDiagramEditor) targetEditor;
+	}
+
+	@Override
+	public void run(IAction action) {
+		FileDialog dialog = new FileDialog(targetEditor.getSite().getShell(),SWT.SAVE);
+        dialog.setText("Save Deploy Info.");
+		dialog.setFilterNames(new String[] {Messages.getString("DeployActionDelegate.0")}); //$NON-NLS-1$
+		dialog.setFilterExtensions(new String[] { "*.xml" });
+		String selectedFileName = dialog.open();
+		if( selectedFileName==null ) return;
+
+		SystemDiagram diagram = targetEditor.getSystemDiagram();
+		XMLGregorianCalendar calendar = new XMLGregorianCalendarImpl(new GregorianCalendar());
+		calendar.setMillisecond(DatatypeConstants.FIELD_UNDEFINED);
+		diagram.setCreationDate(calendar.toString());
+		diagram.setUpdateDate(calendar.toString());
+		//
+		DeployProfileHandler handler = new DeployProfileHandler();
+		DeployProfile profile = handler.save(diagram);
+		//
+		XmlHandler saver = new XmlHandler();
+		try {
+			saver.saveXmlDeploy(profile, URLDecoder.decode(selectedFileName,"UTF-8"));
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	@Override
+	public void selectionChanged(IAction action, ISelection selection) {
+		this.selection = selection;
+		action.setEnabled(isEnable());
+	}
+	
+	@SuppressWarnings("unchecked")
+	private boolean isEnable() {
+		if (selection instanceof IStructuredSelection) {
+			if( ((IStructuredSelection) selection).getFirstElement() instanceof SystemDiagramEditPart) {
+				return true;
+			}
+		}
+		return false;
+	}
+}

Copied: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/DeploySettingActionDelegate.java (from rev 393, trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/DeploySettingActionDelegate.java)
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/DeploySettingActionDelegate.java	                        (rev 0)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/DeploySettingActionDelegate.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -0,0 +1,73 @@
+package jp.go.aist.rtm.systemeditor.ui.action;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import jp.go.aist.rtm.systemeditor.nl.Messages;
+import jp.go.aist.rtm.systemeditor.ui.dialog.DeploymentSettingDialog;
+import jp.go.aist.rtm.systemeditor.ui.editor.AbstractSystemDiagramEditor;
+import jp.go.aist.rtm.systemeditor.ui.editor.editpart.ComponentEditPart;
+import jp.go.aist.rtm.toolscommon.model.component.Component;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IEditorActionDelegate;
+import org.eclipse.ui.IEditorPart;
+
+public class DeploySettingActionDelegate implements IEditorActionDelegate {
+
+	static final String DIALOG_TITLE_ERROR = Messages.getString("Common.dialog.error_title");
+
+	private ISelection selection;
+	private AbstractSystemDiagramEditor targetEditor;
+	private List<Component> selectedComponents;
+
+	/**
+	* アクションのメインの実行メソッド
+	* 
+	*/
+	public void run(final IAction action) {
+		if (selectedComponents.size() != 1) {
+			return;
+		}
+		Shell shell = targetEditor.getSite().getShell();
+		
+		DeploymentSettingDialog dialog = new DeploymentSettingDialog(shell, selectedComponents.get(0));
+		int open = dialog.open();
+		if (open != IDialogConstants.OK_ID) {
+			return;
+		}
+	}
+	
+	public void setActiveEditor(IAction action, IEditorPart targetEditor) {
+		this.targetEditor = (AbstractSystemDiagramEditor) targetEditor;
+	}
+	
+	public void selectionChanged(IAction action, ISelection selection) {
+		this.selection = selection;
+		action.setEnabled(isEnable());
+	}
+	
+	@SuppressWarnings("unchecked")
+	private boolean isEnable() {
+		selectedComponents = new ArrayList<Component>();
+		if (selection instanceof IStructuredSelection) {
+			for (Iterator iterator = ((IStructuredSelection) selection)
+					.iterator(); iterator.hasNext();) {
+				Object part = iterator.next();
+				if (part instanceof ComponentEditPart) {
+					selectedComponents.add(((ComponentEditPart) part)
+							.getModel());
+				}
+			}
+		}
+		if (selectedComponents.isEmpty()) {
+			return false;
+		}
+		return true;
+	}
+}

Copied: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/StartLoggingActionDelegate.java (from rev 393, trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/StartLoggingActionDelegate.java)
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/StartLoggingActionDelegate.java	                        (rev 0)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/StartLoggingActionDelegate.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -0,0 +1,86 @@
+package jp.go.aist.rtm.systemeditor.ui.action;
+
+import jp.go.aist.rtm.systemeditor.nl.Messages;
+import jp.go.aist.rtm.systemeditor.ui.editor.AbstractSystemDiagramEditor;
+import jp.go.aist.rtm.systemeditor.ui.editor.editpart.ComponentEditPart;
+import jp.go.aist.rtm.toolscommon.model.component.Component;
+import jp.go.aist.rtm.toolscommon.model.component.ComponentFactory;
+import jp.go.aist.rtm.toolscommon.model.component.CorbaComponent;
+import jp.go.aist.rtm.toolscommon.model.component.CorbaLogObserver;
+import jp.go.aist.rtm.toolscommon.model.component.SystemDiagram;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.IObjectActionDelegate;
+import org.eclipse.ui.IWorkbenchPart;
+
+public class StartLoggingActionDelegate implements IObjectActionDelegate {
+
+	static final String ACTION_START_LOGGING = Messages
+			.getString("StartLoggingActionDelegate.start");
+	static final String ACTION_STOP_LOGGING = Messages
+			.getString("StartLoggingActionDelegate.stop");
+
+	SystemDiagram diagram;
+	CorbaComponent component;
+
+	@Override
+	public void run(IAction action) {
+		if (component == null) {
+			return;
+		}
+		//
+		if (component.getLogObserver() != null) {
+			component.getLogObserver().finish();
+		} else {
+			CorbaLogObserver obs = ComponentFactory.eINSTANCE
+					.createCorbaLogObserver();
+			obs.attachComponent(component);
+		}
+	}
+
+	@Override
+	public void selectionChanged(IAction action, ISelection selection) {
+		component = null;
+		if (selection instanceof IStructuredSelection) {
+			Object part = ((IStructuredSelection) selection).getFirstElement();
+			if (part instanceof ComponentEditPart) {
+				Component model = ((ComponentEditPart) part).getModel();
+				if (model instanceof CorbaComponent) {
+					component = (CorbaComponent) model;
+				}
+			}
+		}
+		//
+		if (component == null || !component.supportedCorbaObserver()) {
+			action.setText(ACTION_START_LOGGING);
+			action.setEnabled(false);
+			return;
+		}
+		//
+		String actionName = ACTION_START_LOGGING;
+		if (component.getLogObserver() != null) {
+			actionName = ACTION_STOP_LOGGING;
+		}
+		action.setText(actionName);
+		action.setEnabled(canExecution());
+	}
+
+	@Override
+	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
+		diagram = null;
+		if (targetPart instanceof AbstractSystemDiagramEditor) {
+			AbstractSystemDiagramEditor editor = (AbstractSystemDiagramEditor) targetPart;
+			if (editor.isOnline()) {
+				diagram = editor.getSystemDiagram();
+			}
+		}
+		action.setEnabled(canExecution());
+	}
+
+	boolean canExecution() {
+		return (diagram != null && component != null);
+	}
+
+}

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/ConfigurationDialog.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/ConfigurationDialog.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/ConfigurationDialog.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -15,6 +15,12 @@
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
 import org.eclipse.jface.resource.ColorRegistry;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.ScrolledComposite;
 import org.eclipse.swt.events.FocusEvent;
@@ -468,6 +474,14 @@
 				}
 			}
 
+		} else if (widget != null && widget.isCheckbox()) {
+			// widget種別がcheckboxの場合
+			Checkbox.create(parent, key, this, widget);
+
+		} else if (widget != null && widget.isOrderedList()) {
+			// widget種別がordered_listの場合
+			OrderedList.create(parent, this, widget);
+
 		} else {
 			createKeyLabel(key, parent);
 
@@ -486,6 +500,347 @@
 		}
 	}
 
+	/**
+	 * チェックボックスのコントロール
+	 */
+	public static class Checkbox {
+
+		List<Button> checkButtons;
+
+		String keyLabel;
+		ConfigurationDialog dialog;
+		ConfigurationWidget widget;
+
+		public static Checkbox create(Composite parent, String keyLabel,
+				ConfigurationDialog dialog, ConfigurationWidget widget) {
+			Checkbox cb = new Checkbox(keyLabel, dialog, widget);
+			cb.createComposite(parent);
+			//
+			cb.refreshCheck();
+			return cb;
+		}
+
+		Checkbox(String keyLabel, ConfigurationDialog dialog,
+				ConfigurationWidget widget) {
+			this.keyLabel = keyLabel;
+			this.dialog = dialog;
+			this.widget = widget;
+		}
+
+		void createComposite(Composite parent) {
+			GridLayout gl;
+			GridData gd;
+
+			Group group = new Group(parent, SWT.NONE);
+			gl = new GridLayout(3, false);
+			gl.marginHeight = 1;
+			gd = new GridData();
+			gd.horizontalAlignment = GridData.FILL;
+			gd.grabExcessHorizontalSpace = true;
+			group.setLayout(gl);
+			group.setLayoutData(gd);
+
+			if (keyLabel != null) {
+				// ハッシュキーのある場合
+				group.setText(keyLabel);
+			}
+
+			// 列挙型制約条件から選択リスト作成
+			List<String> enumList = widget.getCondition().getEnumList();
+			checkButtons = new ArrayList<Button>();
+			for (String s : enumList) {
+				Button vb = new Button(group, SWT.CHECK);
+				gd = new GridData();
+				gd.horizontalAlignment = GridData.FILL;
+				gd.grabExcessHorizontalSpace = true;
+				vb.setLayoutData(gd);
+				vb.setText(s);
+				vb.addSelectionListener(new SelectionListener() {
+					ConfigurationWidget wd = widget;
+
+					@Override
+					public void widgetDefaultSelected(SelectionEvent e) {
+					}
+
+					@Override
+					public void widgetSelected(SelectionEvent e) {
+						List<String> values = new ArrayList<String>();
+						for (Button b : checkButtons) {
+							if (b.getSelection()) {
+								values.add(b.getText());
+							}
+						}
+						wd.setValueByArray(values.toArray(new String[0]));
+						doModify();
+					}
+				});
+				checkButtons.add(vb);
+			}
+		}
+
+		void doModify() {
+			if (dialog != null) {
+				dialog.doModify(null);
+			}
+		}
+
+		public void refreshCheck() {
+			for (Button vb : checkButtons) {
+				for (String v : widget.getValueAsArray()) {
+					if (vb.getText().equals(v)) {
+						vb.setSelection(true);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * 順序付きリストのコントロール
+	 */
+	public static class OrderedList {
+
+		TableViewer enumViewer;
+		TableViewer valueViewer;
+		Button addButton;
+		Button deleteButton;
+		Button upButton;
+		Button downButton;
+
+		String selectedEnum;
+		int selectedValueIndex = -1;
+
+		ConfigurationDialog dialog;
+		ConfigurationWidget widget;
+		List<String> valueList;
+
+		public static OrderedList create(Composite parent,
+				ConfigurationDialog dialog, ConfigurationWidget widget) {
+			OrderedList ol = new OrderedList(dialog, widget);
+			ol.createComposite(parent);
+			//
+			ol.refreshEnumList();
+			ol.refreshValueList();
+			ol.refreshButton();
+			return ol;
+		}
+
+		OrderedList(ConfigurationDialog dialog, ConfigurationWidget widget) {
+			this.dialog = dialog;
+			this.widget = widget;
+			this.valueList = new ArrayList<String>();
+		}
+
+		void createComposite(Composite parent) {
+			GridLayout gl;
+			GridData gd;
+
+			Composite composite = new Composite(parent, SWT.NONE);
+			gl = new GridLayout(4, false);
+			gd = new GridData();
+			gd.verticalAlignment = SWT.FILL;
+			gd.horizontalAlignment = SWT.FILL;
+			gd.grabExcessVerticalSpace = true;
+			gd.grabExcessHorizontalSpace = true;
+
+			composite.setLayout(gl);
+			composite.setLayoutData(gd);
+
+			enumViewer = new TableViewer(composite, SWT.BORDER);
+			gl = new GridLayout(1, false);
+			gd = new GridData();
+			gd.verticalAlignment = SWT.FILL;
+			gd.horizontalAlignment = SWT.FILL;
+			gd.grabExcessVerticalSpace = true;
+			gd.grabExcessHorizontalSpace = true;
+			enumViewer.getTable().setLayout(gl);
+			enumViewer.getTable().setLayoutData(gd);
+			enumViewer.setContentProvider(new ArrayContentProvider());
+			enumViewer.setLabelProvider(new LabelProvider());
+			enumViewer
+					.addSelectionChangedListener(new ISelectionChangedListener() {
+						@Override
+						public void selectionChanged(SelectionChangedEvent event) {
+							selectedEnum = null;
+							selectedValueIndex = -1;
+							StructuredSelection s = (StructuredSelection) event
+									.getSelection();
+							selectedEnum = (String) s.getFirstElement();
+							refreshButton();
+						}
+					});
+
+			Composite bc1 = new Composite(composite, SWT.NONE);
+			gl = new GridLayout(1, false);
+			gd = new GridData();
+			gd.horizontalAlignment = GridData.CENTER;
+			gd.verticalAlignment = GridData.CENTER;
+			gd.grabExcessVerticalSpace = false;
+			gd.grabExcessHorizontalSpace = false;
+			bc1.setLayout(gl);
+			bc1.setLayoutData(gd);
+
+			addButton = new Button(bc1, SWT.ARROW | SWT.RIGHT);
+			gd = new GridData();
+			gd.widthHint = 30;
+			addButton.setLayoutData(gd);
+			addButton.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (selectedEnum == null || widget == null) {
+						return;
+					}
+					valueList.add(selectedEnum);
+					widget.setValueByArray(valueList.toArray(new String[0]));
+					doModify();
+					refreshValueList();
+				}
+			});
+
+			deleteButton = new Button(bc1, SWT.ARROW | SWT.LEFT);
+			gd = new GridData();
+			gd.widthHint = 30;
+			deleteButton.setLayoutData(gd);
+			deleteButton.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (selectedValueIndex == -1 || widget == null) {
+						return;
+					}
+					valueList.remove(selectedValueIndex);
+					widget.setValueByArray(valueList.toArray(new String[0]));
+					doModify();
+					refreshValueList();
+				}
+			});
+
+			valueViewer = new TableViewer(composite, SWT.BORDER);
+			gl = new GridLayout(1, false);
+			gd = new GridData();
+			gd.verticalAlignment = SWT.FILL;
+			gd.horizontalAlignment = SWT.FILL;
+			gd.grabExcessVerticalSpace = true;
+			gd.grabExcessHorizontalSpace = true;
+			valueViewer.getTable().setLayout(gl);
+			valueViewer.getTable().setLayoutData(gd);
+			valueViewer.setContentProvider(new ArrayContentProvider());
+			valueViewer.setLabelProvider(new LabelProvider());
+			valueViewer
+					.addSelectionChangedListener(new ISelectionChangedListener() {
+						@Override
+						public void selectionChanged(SelectionChangedEvent event) {
+							selectedEnum = null;
+							selectedValueIndex = valueViewer.getTable()
+									.getSelectionIndex();
+							refreshButton();
+						}
+					});
+
+			Composite bc2 = new Composite(composite, SWT.NONE);
+			gl = new GridLayout(1, false);
+			gd = new GridData();
+			gd.horizontalAlignment = GridData.CENTER;
+			gd.verticalAlignment = GridData.CENTER;
+			gd.grabExcessVerticalSpace = false;
+			gd.grabExcessHorizontalSpace = false;
+			bc2.setLayout(gl);
+			bc2.setLayoutData(gd);
+
+			upButton = new Button(bc2, SWT.ARROW | SWT.UP);
+			gd = new GridData();
+			gd.widthHint = 30;
+			upButton.setLayoutData(gd);
+			upButton.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					int index = selectedValueIndex;
+					String s = valueList.remove(index);
+					valueList.add(index - 1, s);
+					selectedValueIndex = index - 1;
+					//
+					widget.setValueByArray(valueList.toArray(new String[0]));
+					doModify();
+					refreshValueList();
+					refreshButton();
+				}
+			});
+
+			downButton = new Button(bc2, SWT.ARROW | SWT.DOWN);
+			gd = new GridData();
+			gd.widthHint = 30;
+			downButton.setLayoutData(gd);
+			downButton.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					int index = selectedValueIndex;
+					String s = valueList.remove(index);
+					valueList.add(index + 1, s);
+					selectedValueIndex = index + 1;
+					//
+					widget.setValueByArray(valueList.toArray(new String[0]));
+					doModify();
+					refreshValueList();
+					refreshButton();
+				}
+			});
+		}
+
+		void doModify() {
+			if (dialog != null) {
+				dialog.doModify(null);
+			}
+		}
+
+		public void refreshEnumList() {
+			if (widget == null) {
+				return;
+			}
+			enumViewer.setInput(widget.getCondition().getEnumList());
+		}
+
+		public void refreshValueList() {
+			valueList.clear();
+			valueViewer.getTable().setBackground(
+					colorRegistry.get(NORMAL_COLOR));
+			if (widget != null) {
+				for (String v : widget.getValueAsArray()) {
+					if (widget.getCondition().getEnumList().contains(v)) {
+						valueList.add(v);
+					}
+				}
+				if (widget.isValueModified()) {
+					valueViewer.getTable().setBackground(
+							colorRegistry.get(MODIFY_COLOR));
+				}
+			}
+			valueViewer.setInput(valueList);
+			valueViewer.refresh();
+			if (selectedValueIndex != -1) {
+				valueViewer.getTable().setSelection(selectedValueIndex);
+			}
+		}
+
+		public void refreshButton() {
+			addButton.setEnabled(false);
+			deleteButton.setEnabled(false);
+			upButton.setEnabled(false);
+			downButton.setEnabled(false);
+			if (selectedEnum != null) {
+				addButton.setEnabled(true);
+			}
+			if (selectedValueIndex != -1) {
+				deleteButton.setEnabled(true);
+			}
+			if (selectedValueIndex > 0 && selectedValueIndex < valueList.size()) {
+				upButton.setEnabled(true);
+			}
+			if (selectedValueIndex >= 0
+					&& selectedValueIndex < valueList.size() - 1) {
+				downButton.setEnabled(true);
+			}
+		}
+	}
+
 	private FocusListener createFocusListner(final Text valueText) {
 		return new FocusListener(){
 			public void focusGained(FocusEvent e) {
@@ -522,7 +877,7 @@
 	}
 
 	/** Applyが押されていたら即時更新する */
-	private void doModify(Control control) {
+	void doModify(Control control) {
 		if (control != null)
 			control.setBackground(colorRegistry.get(MODIFY_COLOR));
 		isValueModified = true;
@@ -801,9 +1156,17 @@
 	// Configurationダイアログで保存時の制約条件チェックによるエラーメッセージで、  パラメータ名、制約条件、エラーになった値を表示したい　2008.12.18
 	private void validateParam(List<String> validateErrors, ConfigurationWidget wd, String paramName) {
 		ConfigurationCondition cc = wd.getCondition();
-		String value = wd.getValue();
-		if (!cc.validate(value)) {
-			validateErrors.add(paramName + "(" + cc + ":" + value + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		if (wd.isCheckbox() || wd.isOrderedList()) {
+			for (String value : wd.getValueAsArray()) {
+				if (!cc.validate(value)) {
+					validateErrors.add(paramName + "(" + cc + ":" + value + ")");
+				}
+			}
+		} else {
+			String value = wd.getValue();
+			if (!cc.validate(value)) {
+				validateErrors.add(paramName + "(" + cc + ":" + value + ")");
+			}
 		}
 	}
 

Copied: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/ConnectorDialogBase.java (from rev 393, trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/ConnectorDialogBase.java)
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/ConnectorDialogBase.java	                        (rev 0)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/ConnectorDialogBase.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -0,0 +1,258 @@
+package jp.go.aist.rtm.systemeditor.ui.dialog;
+
+import static jp.go.aist.rtm.systemeditor.nl.Messages.getString;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import jp.go.aist.rtm.systemeditor.nl.Messages;
+
+import org.eclipse.jface.dialogs.IMessageProvider;
+import org.eclipse.jface.dialogs.TitleAreaDialog;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.CellEditor;
+import org.eclipse.jface.viewers.ColumnViewer;
+import org.eclipse.jface.viewers.EditingSupport;
+import org.eclipse.jface.viewers.ITableLabelProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.jface.viewers.TextCellEditor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Table;
+
+public class ConnectorDialogBase extends TitleAreaDialog {
+
+	static final int PROPERTY_NAME = 0;
+	static final int PROPERTY_VALUE = 1;
+	static final int EXEC_BUTTON_WIDTH = 70;
+	static protected final String MSG_ERROR_PROPERTY_DUPLICATE = Messages.getString("ConnectorCreaterDialogBase.0");
+	
+	private List<AdditionalEntry> additional;
+	
+	public ConnectorDialogBase(Shell parentShell) {
+		super(parentShell);
+		setShellStyle(getShellStyle() | SWT.CENTER | SWT.RESIZE);
+		additional = new ArrayList<AdditionalEntry>();
+	}
+
+	protected TableViewer createAdditionalTableViewer(Composite parent) {
+		Composite baseComposite = new Composite(parent, SWT.NONE);
+		GridLayout gl = new GridLayout(2, false);
+		gl.numColumns = 2;
+		GridData gd = new GridData();
+		gd.verticalAlignment = SWT.FILL;
+		gd.horizontalAlignment = SWT.FILL;
+		gd.grabExcessVerticalSpace = true;
+		gd.grabExcessHorizontalSpace = true;
+		gd.horizontalSpan = 2;
+		baseComposite.setLayout(gl);
+		baseComposite.setLayoutData(gd);
+		
+		final TableViewer additionalTableViewer = new TableViewer(baseComposite, SWT.FULL_SELECTION | SWT.SINGLE | SWT.BORDER);
+		additionalTableViewer.setContentProvider(new ArrayContentProvider());
+		Table additionalTable = additionalTableViewer.getTable();
+		
+		gl = new GridLayout(1, false);
+		gl.numColumns = 1;
+		gd = new GridData();
+		gd.verticalAlignment = SWT.FILL;
+		gd.horizontalAlignment = SWT.FILL;
+		gd.grabExcessVerticalSpace = true;
+		gd.grabExcessHorizontalSpace = true;
+		gd.heightHint = 120;
+		additionalTable.setLayout(gl);
+		additionalTable.setLayoutData(gd);
+		additionalTable.setLinesVisible(true);
+		additionalTable.setHeaderVisible(true);
+		
+		TableViewerColumn col = null;
+		col = createColumn(additionalTableViewer, "Name", 200);
+		col.setEditingSupport(new AdditionalTableEdittingSupport(
+				additionalTableViewer, PROPERTY_NAME));
+		col = createColumn(additionalTableViewer, "Value", 200);
+		col.setEditingSupport(new AdditionalTableEdittingSupport(
+				additionalTableViewer, PROPERTY_VALUE));
+
+		additionalTableViewer
+				.setLabelProvider(new AdditionalEntryLabelProvider());
+		additionalTableViewer.setInput(additional);
+		
+		Composite buttonComposite = new Composite(baseComposite, SWT.NONE);
+		gl = new GridLayout();
+		gd = new GridData(GridData.FILL_VERTICAL);
+		buttonComposite.setLayout(gl);
+		buttonComposite.setLayoutData(gd);
+
+		Button addButton = new Button(buttonComposite, SWT.TOP);
+		addButton.setText(getString("ServiceConnectorCreaterDialog.9"));
+		gd = new GridData();
+		gd.widthHint = EXEC_BUTTON_WIDTH;
+		addButton.setLayoutData(gd);
+		addButton.setEnabled(true);
+		addButton.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				AdditionalEntry entry = new AdditionalEntry();
+				additional.add(entry);
+				additionalTableViewer.refresh();
+			}
+		});
+
+		Button deleteButton = new Button(buttonComposite, SWT.TOP);
+		deleteButton.setText(getString("ServiceConnectorCreaterDialog.10"));
+		gd = new GridData();
+		gd.widthHint = EXEC_BUTTON_WIDTH;
+		deleteButton.setLayoutData(gd);
+		deleteButton.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				int selectionIndex = additionalTableViewer.getTable().getSelectionIndex();
+				if (selectionIndex >= 0
+						&& ((List) additionalTableViewer.getInput()).size() >= selectionIndex + 1) {
+						((List) additionalTableViewer.getInput()).remove(selectionIndex);
+				additionalTableViewer.refresh();
+				}
+			}
+		});
+		
+		return additionalTableViewer;
+	}
+	
+	protected TableViewerColumn createColumn(TableViewer tv, String title, int width) {
+		TableViewerColumn col = new TableViewerColumn(tv, SWT.NONE);
+		col.getColumn().setText(title);
+		col.getColumn().setWidth(width);
+		col.getColumn().setResizable(true);
+		col.getColumn().setMoveable(false);
+		return col;
+	}
+	
+	protected boolean checkProperties(List<AdditionalEntry> additional) {
+		//重複チェック
+		List<String> listAdd = new ArrayList<String>();
+		for(AdditionalEntry target : additional) {
+			if(listAdd.contains(target.getName().trim())==false) {
+				listAdd.add(target.getName().trim());
+			} else {
+				setMessage(MSG_ERROR_PROPERTY_DUPLICATE,
+						IMessageProvider.ERROR);
+				return false;
+			}
+		}
+		return true;
+	}
+	
+	public class AdditionalEntry {
+		private String name;
+		private String value;
+		
+		public AdditionalEntry() {
+			name = "NewName";
+			value = "NewValue";
+		}
+		
+		public String getName() {
+			return name;
+		}
+		public void setName(String name) {
+			this.name = name;
+		}
+		
+		public String getValue() {
+			return value;
+		}
+		public void setValue(String value) {
+			this.value = value;
+		}
+	}
+	
+	protected class AdditionalEntryLabelProvider extends LabelProvider implements
+			ITableLabelProvider {
+		@Override
+		public Image getColumnImage(Object element, int columnIndex) {
+			return null;
+		}
+
+		@Override
+		public String getColumnText(Object element, int columnIndex) {
+			if( (element instanceof AdditionalEntry) == false ) return "";
+			AdditionalEntry entry = (AdditionalEntry) element;
+			if (columnIndex == PROPERTY_NAME) {
+				return entry.getName();
+			} else if (columnIndex == PROPERTY_VALUE) {
+				return entry.getValue();
+			}
+			return null;
+		}
+	}
+
+	protected class AdditionalTableEdittingSupport extends EditingSupport {
+		CellEditor editor;
+		int column;
+
+		public AdditionalTableEdittingSupport(ColumnViewer viewer, int column) {
+			super(viewer);
+
+			// Create the correct editor based on the column index
+			this.column = column;
+			switch (this.column) {
+			case PROPERTY_NAME:
+			case PROPERTY_VALUE:
+				editor = new TextCellEditor(((TableViewer) viewer).getTable());
+				break;
+			default:
+				break;
+			}
+		}
+
+		@Override
+		protected boolean canEdit(Object element) {
+			return true;
+		}
+
+		@Override
+		protected CellEditor getCellEditor(Object element) {
+			return editor;
+		}
+
+		@Override
+		protected Object getValue(Object element) {
+			AdditionalEntry entry = (AdditionalEntry) element;
+			//
+			String label = null;
+			if (column == PROPERTY_NAME) {
+				label = entry.getName();
+			} else if (column == PROPERTY_VALUE) {
+				label = entry.getValue();
+			}
+			if (label == null) {
+				return null;
+			}
+			return label;
+		}
+
+		@Override
+		protected void setValue(Object element, Object value) {
+			if (!(element instanceof AdditionalEntry)) {
+				return;
+			}
+			AdditionalEntry entry = (AdditionalEntry) element;
+			//
+			if (column == PROPERTY_NAME) {
+				entry.setName( (String) value);
+			} else if (column == PROPERTY_VALUE) {
+				entry.setValue( (String) value);
+			}
+			getViewer().update(element, null);
+		}
+	}
+}

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/DataConnectorCreaterDialog.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/DataConnectorCreaterDialog.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/DataConnectorCreaterDialog.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -14,7 +14,7 @@
 
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.jface.dialogs.TitleAreaDialog;
+import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
@@ -42,7 +42,7 @@
  * サブスクリプションタイプは、データフロータイプが「Push」の時のみ表示される。<br>
  * PushRateは、サブスクリプションタイプが「Periodic」であり、かつデータフロータイプが「Push」の時のみ表示される<br>
  */
-public class DataConnectorCreaterDialog extends TitleAreaDialog {
+public class DataConnectorCreaterDialog extends ConnectorDialogBase {
 
 	static final String LABEL_PUSH_POLICY = Messages.getString("DataConnectorCreaterDialog.20");
 	static final String LABEL_SKIP_COUNT = Messages.getString("DataConnectorCreaterDialog.21");
@@ -67,37 +67,24 @@
 	static final String MSG_ERROR_INPORT_READ_TIMEOUT_NOT_NUMERIC = Messages.getString("DataConnectorCreaterDialog.36");
 
 	private Text nameText;
-
 	private Combo dataTypeCombo;
-
 	private Combo interfaceTypeCombo;
-
 	private Combo dataflowTypeCombo;
-
 	private Combo subscriptionTypeCombo;
-
 	private Text pushRateText;
-
 	private Combo pushPolicyCombo;
-
 	private Text skipCountText;
 
 	Composite detailComposite;
-
 	Point defaultDialogSize;
-
 	private ConnectorProfile connectorProfile;
-
 	private ConnectorProfile dialogResult;
-
 	private OutPort outport;
-
 	private InPort inport;
-
 	BufferPackage ob;
-
 	BufferPackage ib;
 
+	TableViewer additionalTableViewer;
 	boolean disableNotify;
 
 	static class BufferPackage {
@@ -106,11 +93,15 @@
 		Text writeTimeoutText;
 		Combo emptyPolicyCombo;
 		Text readTimeoutText;
+		boolean enable;
+
+		public BufferPackage() {
+			this.enable = true;
+		}
 	}
 
 	public DataConnectorCreaterDialog(Shell parentShell) {
 		super(parentShell);
-		setShellStyle(getShellStyle() | SWT.CENTER | SWT.RESIZE);
 	}
 
 	/**
@@ -122,8 +113,11 @@
 		this.outport = outport;
 		this.inport = inport;
 
+		String outName = (outport != null) ? outport.getNameL() : "none";
+		String inName = (inport != null) ? inport.getNameL() : "none";
+
 		connectorProfile = ComponentFactory.eINSTANCE.createConnectorProfile();
-		connectorProfile.setName(outport.getNameL() + "_" + inport.getNameL());
+		connectorProfile.setName(outName + "_" + inName);
 
 		setShellStyle(this.getShellStyle() | SWT.RESIZE);
 		open();
@@ -420,7 +414,9 @@
 
 		ib = new BufferPackage();
 		createBufferComposite(detailComposite, LABEL_INPORT_BUFFER, ib);
-
+		
+		additionalTableViewer = createAdditionalTableViewer(detailComposite);
+		
 		loadDetailData();
 
 		defaultDialogSize = getShell().getSize();
@@ -579,6 +575,15 @@
 		return l;
 	}
 
+	boolean isOffline() {
+		if (inport != null) {
+			return inport.eContainer() instanceof ComponentSpecification;
+		} else if (outport != null) {
+			return outport.eContainer() instanceof ComponentSpecification;
+		}
+		return false;
+	}
+
 	/**
 	 * モデル情報にアクセスし、表示に設定する
 	 */
@@ -592,13 +597,11 @@
 				.getDataType(), isAllowAny);
 		connectorProfile.setDataType(value);
 
-		boolean isOffline = inport.eContainer() instanceof ComponentSpecification;
-
 		SystemEditorPreferenceManager preference = SystemEditorPreferenceManager
 				.getInstance();
 
 		//
-		if (!isOffline) {
+		if (!isOffline()) {
 			types = ConnectorUtil.getAllowInterfaceTypes(outport, inport);
 			isAllowAny = ConnectorUtil.isAllowAnyInterfaceType(outport, inport);
 		} else {
@@ -609,7 +612,7 @@
 				.getInterfaceType(), isAllowAny);
 		connectorProfile.setInterfaceType(value);
 		//
-		if (!isOffline) {
+		if (!isOffline()) {
 			types = ConnectorUtil.getAllowDataflowTypes(outport, inport);
 			isAllowAny = ConnectorUtil.isAllowAnyDataflowType(outport, inport);
 		} else {
@@ -620,7 +623,7 @@
 				.getDataflowType(), isAllowAny);
 		connectorProfile.setDataflowType(value);
 		//
-		if (!isOffline) {
+		if (!isOffline()) {
 			types = ConnectorUtil.getAllowSubscriptionTypes(outport, inport);
 			isAllowAny = ConnectorUtil.isAllowAnySubscriptionType(outport,
 					inport);
@@ -632,7 +635,7 @@
 				.getSubscriptionType(), isAllowAny);
 		connectorProfile.setSubscriptionType(value);
 		//
-		if (!isOffline) {
+		if (!isOffline()) {
 			types = Arrays.asList(ConnectorProfile.PUSH_POLICY_TYPES);
 		} else {
 			types = Arrays.asList(preference.getPushPolicies());
@@ -654,12 +657,10 @@
 		String value;
 		boolean isAllowAny = false;
 
-		boolean isOffline = inport.eContainer() instanceof ComponentSpecification;
-
 		SystemEditorPreferenceManager preference = SystemEditorPreferenceManager
 				.getInstance();
 
-		if (!isOffline) {
+		if (!isOffline()) {
 			fullTypes = Arrays
 					.asList(ConnectorProfile.BUFFER_FULL_POLICY_TYPES);
 			emptyTypes = Arrays
@@ -669,7 +670,7 @@
 			emptyTypes = Arrays.asList(preference.getBufferEmptyPolicies());
 		}
 
-		if (ob != null) {
+		if (ob != null && ob.enable) {
 			//
 			value = loadCombo(ob.fullPolicyCombo, fullTypes, connectorProfile
 					.getOutportBufferFullPolicy(), isAllowAny);
@@ -680,7 +681,7 @@
 			connectorProfile.setOutportBufferEmptyPolicy(value);
 			//
 			if (connectorProfile.getOutportBufferLength() == null) {
-				connectorProfile.setOutportBufferLength(0);
+				connectorProfile.setOutportBufferLength(8);
 			}
 			value = connectorProfile.getOutportBufferLength().toString();
 			ob.lengthText.setText(value);
@@ -698,7 +699,7 @@
 			ob.readTimeoutText.setText(value);
 		}
 		//
-		if (ib != null) {
+		if (ib != null && ib.enable) {
 			//
 			value = loadCombo(ib.fullPolicyCombo, fullTypes, connectorProfile
 					.getInportBufferFullPolicy(), isAllowAny);
@@ -709,7 +710,7 @@
 			connectorProfile.setInportBufferEmptyPolicy(value);
 			//
 			if (connectorProfile.getInportBufferLength() == null) {
-				connectorProfile.setInportBufferLength(0);
+				connectorProfile.setInportBufferLength(8);
 			}
 			value = connectorProfile.getInportBufferLength().toString();
 			ib.lengthText.setText(value);
@@ -733,9 +734,11 @@
 		combo.setItems(types.toArray(new String[0]));
 		String def = getDefaultValue(types, value, isAllowAny);
 		int index = types.indexOf(def);
-		index = (index == -1) ? 0 : index;
-		combo.select(index);
-		return types.get(index);
+		if (index != -1) {
+			combo.select(index);
+			return types.get(index);
+		}
+		return null;
 	}
 
 	/**
@@ -766,38 +769,41 @@
 	}
 
 	@Override
-	/**
-	 * {@inheritDoc}
-	 */
 	protected void configureShell(Shell shell) {
 		super.configureShell(shell);
 		shell.setText(Messages.getString("DataConnectorCreaterDialog.16")); //$NON-NLS-1$
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
-	/**
-	 * {@inheritDoc}
-	 */
 	protected void okPressed() {
+		if (additionalTableViewer != null) {
+			List<AdditionalEntry> additional = (List<AdditionalEntry>) additionalTableViewer
+					.getInput();
+			// 重複チェック
+			if (checkProperties(additional) == false) {
+				return;
+			}
+			for (AdditionalEntry target : additional) {
+				connectorProfile.setProperty(target.getName(), target
+						.getValue());
+			}
+		}
 		dialogResult = connectorProfile;
 		super.okPressed();
 	}
 
 	@Override
 	/**
-	 * {@inheritDoc}
-	 * <p>
 	 * メッセージを設定する。 メッセージとしてはエラーメッセージを想定しており、
 	 * エラーメッセージが存在するか空文字かどうかにより、OKボタンのEnableの制御も行うように、オーバーライドした。
 	 */
 	public void setMessage(String newMessage, int newType) {
 		super.setMessage(newMessage, newType);
-
 		boolean isOkEnable = false;
 		if (newMessage.length() == 0) {
 			isOkEnable = true;
 		}
-
 		getButton(IDialogConstants.OK_ID).setEnabled(isOkEnable);
 	}
 
@@ -850,7 +856,7 @@
 			}
 		}
 
-		if (ob != null) {
+		if (ob != null && ob.enable) {
 			boolean isInt = false;
 			try {
 				int i = Integer.parseInt(ob.lengthText.getText());
@@ -894,7 +900,7 @@
 			}
 		}
 
-		if (ib != null) {
+		if (ib != null && ib.enable) {
 			boolean isInt = false;
 			try {
 				int i = Integer.parseInt(ib.lengthText.getText());

Copied: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/DeploymentSettingDialog.java (from rev 393, trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/DeploymentSettingDialog.java)
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/DeploymentSettingDialog.java	                        (rev 0)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/DeploymentSettingDialog.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -0,0 +1,156 @@
+package jp.go.aist.rtm.systemeditor.ui.dialog;
+
+import java.util.ArrayList;
+
+import jp.go.aist.rtm.nameserviceview.model.manager.NameServerManager;
+import jp.go.aist.rtm.nameserviceview.model.manager.impl.NameServerManagerImpl;
+import jp.go.aist.rtm.systemeditor.nl.Messages;
+import jp.go.aist.rtm.systemeditor.ui.util.DeployUtil;
+import jp.go.aist.rtm.toolscommon.model.component.Component;
+import jp.go.aist.rtm.toolscommon.model.component.CorbaComponent;
+import jp.go.aist.rtm.toolscommon.model.manager.RTCManager;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.List;
+import org.eclipse.swt.widgets.Shell;
+
+public class DeploymentSettingDialog extends Dialog {
+	
+	final static public String KEY_DEPLOY_TYPE = "DeployType";
+	final static public String KEY_DEPLOY_TARGET = "DeployTarget";
+	final static public String KEY_DEPLOY_IOR = "DeployIOR";
+	
+	final static public String KEY_DEPLOY_TYPE_COMPONENT = "Component";
+	final static public String KEY_DEPLOY_TYPE_MANAGER = "Manager";
+	
+	private Component targetComponent;
+	private java.util.List<CorbaComponent> componentCandidates;
+	private java.util.List<RTCManager> managerCandidates;
+	
+	private CTabFolder tabFolder;
+	private List listComp;
+	private List listManager;
+
+	public DeploymentSettingDialog(Shell shell, Component target) {
+		super(shell);
+		this.setShellStyle(this.getShellStyle() | SWT.RESIZE  );
+		this.targetComponent = target;
+	}
+	
+	@Override
+	protected Control createDialogArea(Composite parent) {
+		GridLayout gridLayout = new GridLayout(1, false);
+
+		Composite mainComposite = (Composite) super.createDialogArea(parent);
+		mainComposite.setLayout(gridLayout);
+		mainComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
+		//
+		tabFolder = new CTabFolder(mainComposite,SWT.NONE);
+		GridData gd = new GridData(GridData.FILL_BOTH);
+		gd.grabExcessHorizontalSpace = true;
+		gd.grabExcessVerticalSpace = true;
+		gd.widthHint = 400;
+		gd.heightHint = 200;
+		tabFolder.setSimple(false);
+		tabFolder.setLayoutData(gd);
+		componentCandidates = new ArrayList<CorbaComponent>(); 
+		if( targetComponent.isCompositeComponent()==false ) {
+			CTabItem tabComponent = new CTabItem(tabFolder,SWT.NONE);
+			tabComponent.setText("Component");
+			//
+			NameServerManager ns = NameServerManagerImpl.getInstance();
+			EList nscomps = ns.getNodes();
+			componentCandidates = DeployUtil.searchComponentList(nscomps, componentCandidates);
+			listComp = new List(tabFolder,SWT.SINGLE|SWT.BORDER|SWT.V_SCROLL);
+			for(int index=0;index<componentCandidates.size();index++) {
+				CorbaComponent comp = componentCandidates.get(index);
+				listComp.add(comp.getPathId());
+			}
+			tabComponent.setControl(listComp);
+		}
+		CTabItem tabManager = new CTabItem(tabFolder,SWT.NONE);
+		tabManager.setText("Manager");
+		//
+		managerCandidates = DeployUtil.searchManager(targetComponent);
+		listManager = new List(tabFolder,SWT.SINGLE|SWT.BORDER|SWT.V_SCROLL);
+		for(int index=0;index<managerCandidates.size();index++) {
+			RTCManager manager = managerCandidates.get(index);
+			listManager.add(manager.getPathId());
+		}
+		tabManager.setControl(listManager);
+		
+		load();
+		
+		return mainComposite;
+	}
+	
+	private void load() {
+		String type = targetComponent.getProperty(KEY_DEPLOY_TYPE);
+		String target = targetComponent.getProperty(KEY_DEPLOY_TARGET);
+		if( type==null || type.length()==0 ) return;
+		if( type.equals(KEY_DEPLOY_TYPE_COMPONENT) ) {
+			tabFolder.setSelection(0);
+			if( target==null || target.length()==0 ) return;
+			for(int index=0;index<listComp.getItemCount();index++) {
+				if(target.equals(listComp.getItem(index).trim())) {
+					listComp.setSelection(index);
+					return;
+				}
+			}
+			
+		} else if(type.equals(KEY_DEPLOY_TYPE_MANAGER) ) {
+			if( targetComponent.isCompositeComponent() ) {
+				tabFolder.setSelection(0);
+			} else {
+				tabFolder.setSelection(1);
+			}
+			if( target==null || target.length()==0 ) return;
+			for(int index=0;index<listManager.getItemCount();index++) {
+				if(target.equals(listManager.getItem(index).trim())) {
+					listManager.setSelection(index);
+					return;
+				}
+			}
+		}
+	}
+	
+	@Override
+	protected void configureShell(Shell shell) {
+		super.configureShell(shell);
+		shell.setText(Messages.getString("DeploymentInformationDialog.0")); //$NON-NLS-1$
+	}
+	
+	@Override
+	protected void okPressed() {
+		int tabSelection = tabFolder.getSelectionIndex();
+		if(tabSelection==0) {
+			if( targetComponent.isCompositeComponent() ) {
+				targetComponent.setProperty(KEY_DEPLOY_TYPE, KEY_DEPLOY_TYPE_MANAGER);
+				int listSelection = listManager.getSelectionIndex();
+				targetComponent.setProperty(KEY_DEPLOY_TARGET, managerCandidates.get(listSelection).getPathId());
+				targetComponent.setProperty(KEY_DEPLOY_IOR, "");
+			} else {
+				targetComponent.setProperty(KEY_DEPLOY_TYPE, KEY_DEPLOY_TYPE_COMPONENT);
+				int listSelection = listComp.getSelectionIndex();
+				targetComponent.setProperty(KEY_DEPLOY_TARGET, componentCandidates.get(listSelection).getPathId());
+				targetComponent.setProperty(KEY_DEPLOY_IOR, componentCandidates.get(listSelection).getIor());
+				
+			}
+		} else {
+			targetComponent.setProperty(KEY_DEPLOY_TYPE, KEY_DEPLOY_TYPE_MANAGER);
+			int listSelection = listManager.getSelectionIndex();
+			targetComponent.setProperty(KEY_DEPLOY_TARGET, managerCandidates.get(listSelection).getPathId());
+			targetComponent.setProperty(KEY_DEPLOY_IOR, "");
+		}
+		
+		super.okPressed();
+	}
+}

Copied: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/DisconnectDialog.java (from rev 393, trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/DisconnectDialog.java)
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/DisconnectDialog.java	                        (rev 0)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/DisconnectDialog.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -0,0 +1,221 @@
+package jp.go.aist.rtm.systemeditor.ui.dialog;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import jp.go.aist.rtm.toolscommon.model.component.ConnectorProfile;
+import jp.go.aist.rtm.toolscommon.model.component.Port;
+
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.TitleAreaDialog;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ITableLabelProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+
+import static jp.go.aist.rtm.systemeditor.nl.Messages.*;
+
+public class DisconnectDialog extends TitleAreaDialog {
+
+	static final String DIALOG_TITLE = getString("DisconnectDialog.title");
+	static final String DIALOG_EXPLAN = getString("DisconnectDialog.explain");
+
+	static final String PROPERTY_CONN_ID = "PROPERTY_CONN_ID";
+	static final String PROPERTY_CONN_NAME = "PROPERTY_CONN_NAME";
+
+	static final String COLUMN_LABEL_CONN_ID = "Connector Id";
+	static final String COLUMN_LABEL_CONN_NAME = "Connector name";
+
+	static final String BUTTON_LABEL_DELETE = getString("Common.button.delete");
+
+	static final int EXEC_BUTTON_WIDTH = 70;
+
+	TableViewer tableViewer;
+	Table table;
+	Button deleteButton;
+
+	Port port;
+	List<ConnectorProfile> profiles;
+	List<ConnectorProfile> deleteProfiles;
+	ConnectorProfile selectedConnectorProfile;
+
+	public DisconnectDialog(Shell parentShell) {
+		super(parentShell);
+		setHelpAvailable(false);
+		setShellStyle(getShellStyle() | SWT.CENTER | SWT.RESIZE);
+	}
+
+	/** コネクション切断対象のポートを設定 */
+	public void setPort(Port port) {
+		this.port = port;
+	}
+
+	/** 切断するコネクタプロファイルのリストを取得 */
+	public List<ConnectorProfile> getDeleteConnectorProfiles() {
+		return this.deleteProfiles;
+	}
+
+	@Override
+	protected Control createDialogArea(Composite parent) {
+		GridLayout gl;
+		GridData gd;
+
+		setTitle(DIALOG_EXPLAN);
+
+		Composite mainComposite = new Composite((Composite) super
+				.createDialogArea(parent), SWT.NONE);
+		gl = new GridLayout(2, false);
+		gd = new GridData(GridData.FILL_BOTH);
+		mainComposite.setLayout(gl);
+		mainComposite.setLayoutData(gd);
+		mainComposite.setFont(parent.getFont());
+
+		Label label = new Label(mainComposite, SWT.NONE);
+		label.setText(port.getNameL());
+		gd = new GridData();
+		gd.horizontalAlignment = SWT.FILL;
+		gd.horizontalSpan = 2;
+		label.setLayoutData(gd);
+
+		tableViewer = new TableViewer(mainComposite, SWT.FULL_SELECTION
+				| SWT.SINGLE | SWT.BORDER);
+		tableViewer.setContentProvider(new ArrayContentProvider());
+		tableViewer.setColumnProperties(new String[] { PROPERTY_CONN_ID,
+				PROPERTY_CONN_NAME });
+		tableViewer.setLabelProvider(new ConnectorLabelProvider());
+		tableViewer
+				.addSelectionChangedListener(new ISelectionChangedListener() {
+					public void selectionChanged(SelectionChangedEvent event) {
+						StructuredSelection selection = (StructuredSelection) event
+								.getSelection();
+						selectedConnectorProfile = (ConnectorProfile) selection
+								.getFirstElement();
+						notifyModified();
+					}
+				});
+
+		table = tableViewer.getTable();
+		gl = new GridLayout(1, false);
+		gd = new GridData();
+		gd.verticalAlignment = SWT.FILL;
+		gd.horizontalAlignment = SWT.FILL;
+		gd.grabExcessVerticalSpace = true;
+		gd.grabExcessHorizontalSpace = true;
+		gd.heightHint = 150;
+		table.setLayout(gl);
+		table.setLayoutData(gd);
+		table.setLinesVisible(true);
+		table.setHeaderVisible(true);
+
+		TableColumn col = new TableColumn(table, SWT.NONE);
+		col.setText(COLUMN_LABEL_CONN_ID);
+		col.setWidth(300);
+		col = new TableColumn(table, SWT.NONE);
+		col.setText(COLUMN_LABEL_CONN_NAME);
+		col.setWidth(200);
+
+		Composite buttonComposite = new Composite(mainComposite, SWT.NONE);
+		gl = new GridLayout(1, false);
+		gd = new GridData();
+		gd.verticalAlignment = SWT.FILL;
+		buttonComposite.setLayout(gl);
+		buttonComposite.setLayoutData(gd);
+
+		deleteButton = new Button(buttonComposite, SWT.PUSH);
+		deleteButton.setText(BUTTON_LABEL_DELETE);
+		gd = new GridData();
+		gd.widthHint = EXEC_BUTTON_WIDTH;
+		deleteButton.setLayoutData(gd);
+		deleteButton.setEnabled(false);
+		deleteButton.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if (selectedConnectorProfile != null) {
+					profiles.remove(selectedConnectorProfile);
+					deleteProfiles.add(selectedConnectorProfile);
+					selectedConnectorProfile = null;
+					tableViewer.refresh();
+				}
+				notifyModified();
+			}
+		});
+
+		buildData();
+
+		return mainComposite;
+	}
+
+	@Override
+	protected Control createButtonBar(Composite parent) {
+		Control composite = super.createButtonBar(parent);
+		notifyModified();
+		return composite;
+	}
+
+	@Override
+	protected void configureShell(Shell shell) {
+		super.configureShell(shell);
+		shell.setText(DIALOG_TITLE);
+	}
+
+	/** 表示内容を構築 */
+	void buildData() {
+		if (profiles == null) {
+			profiles = new ArrayList<ConnectorProfile>();
+			deleteProfiles = new ArrayList<ConnectorProfile>();
+		}
+		profiles.addAll(port.getConnectorProfiles());
+		tableViewer.setInput(profiles);
+	}
+
+	/** 変更を通知します */
+	void notifyModified() {
+		if (selectedConnectorProfile != null) {
+			deleteButton.setEnabled(true);
+		} else {
+			deleteButton.setEnabled(false);
+		}
+		if (deleteProfiles.isEmpty()) {
+			getButton(IDialogConstants.OK_ID).setEnabled(false);
+		} else {
+			getButton(IDialogConstants.OK_ID).setEnabled(true);
+		}
+	}
+
+	/** ラベルプロバイダ(コンポーネント) */
+	public class ConnectorLabelProvider extends LabelProvider implements
+			ITableLabelProvider {
+
+		@Override
+		public Image getColumnImage(Object element, int columnIndex) {
+			return null;
+		}
+
+		@Override
+		public String getColumnText(Object element, int columnIndex) {
+			ConnectorProfile entry = (ConnectorProfile) element;
+			if (columnIndex == 0) {
+				return entry.getConnectorId();
+			} else if (columnIndex == 1) {
+				return entry.getName();
+			}
+			return null;
+		}
+	}
+}

Copied: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/IconPreferenceDialog.java (from rev 393, trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/IconPreferenceDialog.java)
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/IconPreferenceDialog.java	                        (rev 0)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/IconPreferenceDialog.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -0,0 +1,278 @@
+package jp.go.aist.rtm.systemeditor.ui.dialog;
+
+import java.io.File;
+import java.net.URL;
+import java.util.List;
+
+import jp.go.aist.rtm.systemeditor.manager.ComponentIconStore;
+
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.TitleAreaDialog;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.FocusEvent;
+import org.eclipse.swt.events.FocusListener;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.FileDialog;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+
+import static jp.go.aist.rtm.systemeditor.nl.Messages.*;
+
+public class IconPreferenceDialog extends TitleAreaDialog {
+
+	static final int EXEC_BUTTON_WIDTH = 70;
+
+	static final String DIALOG_TITLE = getString("IconPreferenceDialog.title");
+
+	static final String LABEL_PATTERN = getString("IconPreferenceDialog.label.pattern");
+	static final String LABEL_ICON_PATH = getString("IconPreferenceDialog.label.path");
+
+	static final String BUTTON_LABEL_BROWSE = getString("Common.button.browse");
+
+	static final String ICON_EXTENSION = "*.ico;*.bmp;*.png;*.gif;*.jpg";
+	static final String FILTER_EXTENSIONS[] = new String[] { ICON_EXTENSION };
+	static final String FILTER_NAMES[] = new String[] { getString("IconPreferenceDialog.filter.name")
+			+ " (" + ICON_EXTENSION + ")" };
+
+	Combo kindCombo;
+	Text patternText;
+	Text pathText;
+	Button browseButton;
+	Label imageLabel;
+
+	boolean isType = true;
+	String pattern = "";
+	String path = "";
+	ImageDescriptor desc;
+	ComponentIconStore.Entry iconEntry;
+
+	public IconPreferenceDialog(Shell parentShell) {
+		super(parentShell);
+		setHelpAvailable(false);
+		setShellStyle(getShellStyle() | SWT.CENTER | SWT.RESIZE);
+	}
+
+	public void setIconEntry(ComponentIconStore.Entry iconEntry) {
+		this.iconEntry = iconEntry;
+	}
+
+	public ComponentIconStore.Entry getIconEntry() {
+		return iconEntry;
+	}
+
+	@Override
+	protected Control createDialogArea(Composite parent) {
+		GridLayout gl;
+		GridData gd;
+
+		Composite mainComposite = new Composite((Composite) super
+				.createDialogArea(parent), SWT.NONE);
+		gl = new GridLayout(4, false);
+		gd = new GridData(GridData.FILL_BOTH);
+		mainComposite.setLayout(gl);
+		mainComposite.setLayoutData(gd);
+		mainComposite.setFont(parent.getFont());
+
+		Label label = new Label(mainComposite, SWT.NONE);
+		label.setText(LABEL_PATTERN);
+		gd = new GridData();
+		label.setLayoutData(gd);
+
+		kindCombo = new Combo(mainComposite, SWT.READ_ONLY);
+		gd = new GridData();
+		kindCombo.setLayoutData(gd);
+		List<String> kinds = ComponentIconStore.Entry.KINDS;
+		kindCombo.setItems(kinds.toArray(new String[0]));
+		kindCombo.addModifyListener(new ModifyListener() {
+			@Override
+			public void modifyText(ModifyEvent e) {
+				isType = ComponentIconStore.Entry.KIND_TYPE.equals(kindCombo
+						.getText());
+				notifyModified();
+			}
+		});
+
+		patternText = new Text(mainComposite, SWT.SINGLE | SWT.BORDER);
+		gd = new GridData();
+		gd.horizontalSpan = 2;
+		gd.horizontalAlignment = GridData.FILL;
+		gd.grabExcessHorizontalSpace = true;
+		patternText.setLayoutData(gd);
+		patternText.addModifyListener(new ModifyListener() {
+			@Override
+			public void modifyText(ModifyEvent e) {
+				pattern = (patternText.getText() == null) ? "" : patternText
+						.getText();
+				notifyModified();
+			}
+		});
+
+		label = new Label(mainComposite, SWT.NONE);
+		label.setText(LABEL_ICON_PATH);
+		gd = new GridData();
+		label.setLayoutData(gd);
+
+		pathText = new Text(mainComposite, SWT.SINGLE | SWT.BORDER);
+		gd = new GridData();
+		gd.horizontalSpan = 2;
+		gd.horizontalAlignment = GridData.FILL;
+		gd.grabExcessHorizontalSpace = true;
+		pathText.setLayoutData(gd);
+		pathText.setEditable(false);
+		pathText.addFocusListener(new FocusListener() {
+			@Override
+			public void focusGained(FocusEvent e) {
+			}
+
+			@Override
+			public void focusLost(FocusEvent e) {
+				updateImage();
+			}
+		});
+
+		browseButton = new Button(mainComposite, SWT.NONE);
+		browseButton.setText(BUTTON_LABEL_BROWSE);
+		gd = new GridData();
+		gd.widthHint = EXEC_BUTTON_WIDTH;
+		browseButton.setLayoutData(gd);
+		browseButton.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				FileDialog dialog = new FileDialog(getShell());
+				dialog.setFilterExtensions(FILTER_EXTENSIONS);
+				dialog.setFilterNames(FILTER_NAMES);
+				if (path != null && !path.isEmpty()) {
+					dialog.setFileName(path);
+				}
+				String s = dialog.open();
+				if (s != null) {
+					pathText.setFocus();
+					pathText.setText(s);
+					updateImage();
+					browseButton.setFocus();
+				}
+			}
+		});
+
+		label = new Label(mainComposite, SWT.NONE);
+
+		imageLabel = new Label(mainComposite, SWT.BORDER);
+		gd = new GridData();
+		gd.horizontalSpan = 3;
+		gd.heightHint = 64;
+		gd.widthHint = 64;
+		imageLabel.setLayoutData(gd);
+
+		buildData();
+
+		return mainComposite;
+	}
+
+	private void updateImage() {
+		imageLabel.setBackgroundImage(null);
+		if (pathText.getText() == null) {
+			path = "";
+			desc = null;
+			notifyModified();
+			return;
+		}
+		try {
+			path = pathText.getText();
+			File file = new File(path);
+			path = file.getAbsolutePath();
+			URL url = file.toURI().toURL();
+			desc = ImageDescriptor.createFromURL(url);
+			if (desc != null) {
+				imageLabel.setImage(desc.createImage());
+			}
+		} catch (Exception exp) {
+			path = "";
+			desc = null;
+		}
+		notifyModified();
+	}
+	
+	@Override
+	protected Control createButtonBar(Composite parent) {
+		Control composite = super.createButtonBar(parent);
+		notifyModified();
+		return composite;
+	}
+
+	@Override
+	protected void configureShell(Shell shell) {
+		super.configureShell(shell);
+		shell.setText(DIALOG_TITLE);
+	}
+
+	/** 表示内容を構築 */
+	void buildData() {
+		List<String> kinds = ComponentIconStore.Entry.KINDS;
+		if (iconEntry != null) {
+			int index = kinds.indexOf(iconEntry.getKind());
+			if (index != -1) {
+				kindCombo.select(index);
+			}
+			if (iconEntry.isType() && iconEntry.getType() != null) {
+				patternText.setText(iconEntry.getType());
+			} else if (iconEntry.isCategory()
+					&& iconEntry.getCategory() != null) {
+				patternText.setText(iconEntry.getCategory());
+			}
+			if (iconEntry.getPath() != null) {
+				path = iconEntry.getPath();
+				pathText.setText(path);
+			}
+			if (iconEntry.getImageDescriptor() != null) {
+				desc = iconEntry.getImageDescriptor();
+				imageLabel.setImage(desc.createImage());
+			}
+		}
+	}
+
+	/** 変更を通知します */
+	void notifyModified() {
+		Button okButton = getButton(IDialogConstants.OK_ID);
+		if (okButton != null) {
+			okButton.setEnabled(false);
+			if (kindCombo.getText() != null && !kindCombo.getText().isEmpty()
+					&& !pattern.isEmpty() && !path.isEmpty() && desc != null) {
+				okButton.setEnabled(true);
+			}
+		}
+	}
+
+	@Override
+	protected void okPressed() {
+		if (iconEntry != null) {
+			if (isType) {
+				iconEntry.setType(pattern);
+			} else {
+				iconEntry.setCategory(pattern);
+			}
+			iconEntry.setPath(path);
+			iconEntry.setImageDescriptor(desc);
+		} else {
+			if (isType) {
+				iconEntry = ComponentIconStore.Entry.createType(pattern, path,
+						desc);
+			} else {
+				iconEntry = ComponentIconStore.Entry.createCategory(pattern,
+						path, desc);
+			}
+		}
+		super.okPressed();
+	}
+
+}

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/ProfileInformationDialog.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/ProfileInformationDialog.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/ProfileInformationDialog.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -101,51 +101,14 @@
 		if (inputId != null) txtVersion.setText(inputId.version);
 		txtVersion.addKeyListener(listener);
 		//
-		GridData gd;
-		Label label = new Label(mainComposite, SWT.NULL);
-		label.setText(Messages.getString("ProfileInformationDialog.3")); //$NON-NLS-1$
-		final Text txtPathLocal = new Text(mainComposite, SWT.SINGLE | SWT.BORDER | SWT.LEFT);
-		txtPath = txtPathLocal;
-		if(inputPath!=null) txtPath.setText(inputPath);
-		txtPath.addKeyListener(listener);
-		txtPath.addModifyListener(new ModifyListener() {
-			@Override
-			public void modifyText(ModifyEvent e) {
-				doValidate();
-			}
-		});
-		gd = new GridData();
-		gd.horizontalAlignment = SWT.FILL;
-		gd.grabExcessHorizontalSpace = true;
-		txtPath.setLayoutData(gd);
-		if( isOverWrite ) txtPath.setEnabled(false);
+		txtPath = createLabelAndTextAndButton(mainComposite, Messages.getString("ProfileInformationDialog.3"),
+						inputPath, isOverWrite); //$NON-NLS-1$
 		//
-		Button checkButton = new Button(mainComposite, SWT.PUSH);
-		checkButton.setText(Messages.getString("ProfileInformationDialog.4") ); //$NON-NLS-1$
-		gd = new GridData(GridData.HORIZONTAL_ALIGN_END);
-		gd.horizontalAlignment = SWT.FILL;
-		checkButton.setLayoutData(gd);
-		checkButton.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				FileDialog dialog = new FileDialog(getShell());
-				dialog.setFilterExtensions(new String[] { "*.xml" }); //$NON-NLS-1$
-				if (txtPath.getText().length() > 0)
-					dialog.setFileName(txtPath.getText());
-				String newPath = dialog.open();
-				if (newPath != null) {
-					if( !newPath.endsWith(".xml") ) newPath += ".xml"; //$NON-NLS-1$ //$NON-NLS-2$
-					txtPath.setText(newPath);
-				}
-			}
-		});
-		if( isOverWrite ) checkButton.setEnabled(false);
-		//
-		label = new Label(mainComposite, SWT.LEFT);
+		Label label = new Label(mainComposite, SWT.LEFT);
 		label.setText(Messages.getString("ProfileInformationDialog.8")); //$NON-NLS-1$
 		txtUpdateLog = new Text(mainComposite, SWT.MULTI | SWT.BORDER | SWT.LEFT);
 		txtUpdateLog.addKeyListener(listener);
-		gd = new GridData();
+		GridData gd = new GridData();
 		gd.horizontalAlignment = SWT.FILL;
 		gd.grabExcessHorizontalSpace = true;
 		gd.horizontalSpan = 2;
@@ -179,16 +142,63 @@
 		return mainComposite;
 	}
 
+	private Text createLabelAndTextAndButton(Composite mainComposite,
+			String labelString, String inputPath, boolean isOverWrite) {
+		GridData gd;
+		Label label = new Label(mainComposite, SWT.NULL);
+		label.setText(labelString);
+		final Text txtPathLocal = new Text(mainComposite, SWT.SINGLE | SWT.BORDER | SWT.LEFT);
+		if(inputPath!=null) txtPathLocal.setText(inputPath);
+		KeyListener listener = new KeyListener() {
+			@Override
+			public void keyReleased(KeyEvent e) {
+				doValidate();
+			}
+
+			@Override
+			public void keyPressed(KeyEvent e) {
+			}
+		};
+		txtPathLocal.addKeyListener(listener);
+		txtPathLocal.addModifyListener(new ModifyListener() {
+			@Override
+			public void modifyText(ModifyEvent e) {
+				doValidate();
+			}
+		});
+		gd = new GridData();
+		gd.horizontalAlignment = SWT.FILL;
+		gd.grabExcessHorizontalSpace = true;
+		txtPathLocal.setLayoutData(gd);
+		if( isOverWrite ) txtPathLocal.setEnabled(false);
+		//
+		Button checkButton = new Button(mainComposite, SWT.PUSH);
+		checkButton.setText(Messages.getString("ProfileInformationDialog.4") ); //$NON-NLS-1$
+		gd = new GridData(GridData.HORIZONTAL_ALIGN_END);
+		gd.horizontalAlignment = SWT.FILL;
+		checkButton.setLayoutData(gd);
+		checkButton.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				FileDialog dialog = new FileDialog(getShell());
+				dialog.setFilterExtensions(new String[] { "*.xml" }); //$NON-NLS-1$
+				if (txtPathLocal.getText().length() > 0)
+					dialog.setFileName(txtPathLocal.getText());
+				String newPath = dialog.open();
+				if (newPath != null) {
+					if( !newPath.endsWith(".xml") ) newPath += ".xml"; //$NON-NLS-1$ //$NON-NLS-2$
+					txtPathLocal.setText(newPath);
+				}
+			}
+		});
+		if( isOverWrite ) checkButton.setEnabled(false);
+		return txtPathLocal;
+	}
+
 	@Override
 	protected void configureShell(Shell shell) {
 		super.configureShell(shell);
 		shell.setText(Messages.getString("ProfileInformationDialog.9")); //$NON-NLS-1$
-		int x = 550;
-		int y = 400;
-
-		shell.setBounds(shell.getDisplay().getBounds().width / 2 - x / 2, shell
-				.getDisplay().getBounds().height
-				/ 2 - y / 2, x, y);
 	}
 
 	@Override
@@ -361,6 +371,7 @@
 		gd.grabExcessVerticalSpace = true;
 		gd.grabExcessHorizontalSpace = true;
 		gd.minimumWidth = 320;
+		gd.heightHint = 100;
 		viewer.getTable().setLayoutData(gd);
 		setViewerInput();
 		

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/ServiceConnectorCreaterDialog.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/ServiceConnectorCreaterDialog.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/ServiceConnectorCreaterDialog.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,12 +1,14 @@
 package jp.go.aist.rtm.systemeditor.ui.dialog;
 
+import static jp.go.aist.rtm.systemeditor.nl.Messages.getString;
+import static jp.go.aist.rtm.systemeditor.ui.util.RTMixin.form;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import jp.go.aist.rtm.systemeditor.nl.Messages;
 import jp.go.aist.rtm.toolscommon.model.component.Component;
 import jp.go.aist.rtm.toolscommon.model.component.ComponentFactory;
 import jp.go.aist.rtm.toolscommon.model.component.ConnectorProfile;
@@ -14,17 +16,18 @@
 import jp.go.aist.rtm.toolscommon.model.component.ServicePort;
 
 import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.jface.dialogs.TitleAreaDialog;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.CellEditor;
+import org.eclipse.jface.viewers.ColumnViewer;
 import org.eclipse.jface.viewers.ComboBoxCellEditor;
-import org.eclipse.jface.viewers.ICellModifier;
+import org.eclipse.jface.viewers.EditingSupport;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
@@ -37,41 +40,62 @@
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Item;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.swt.widgets.Text;
 
 /**
  * サービスポート間の接続のコネクタプロファイルの選択ダイアログ
  * <P>
  * ポート名を入力する 接続しようとしているServicePort間でマッチングを行い、必要に応じて警告を表示する。
- * ここでいうマッチングは、「PortInterfaceProfile.type」が同じで、「PortInterfaceProfile.polarity」がPROVIDEDとREQUIREDで対応することをいう。
- * ・完全一致した場合 → 警告なし ・一部一致した場合 → 警告 「Port interfaces do not match completely.」
- * ・完全不一致した場合 → 警告 「No corresponding port interface.」
  * 
+ * ここでいうマッチングは、PortInterfaceProfile の type、および instance_name」が同じで polarity が
+ * PROVIDED と REQUIRED で対応することをいう。
+ * <ul>
+ * <li>完全一致した場合 → 警告なし</li>
+ * <li>一部一致した場合 → 警告「Port interfaces do not match completely.」</li>
+ * <li>完全不一致した場合 → 警告「No corresponding port interface.」</li>
+ * </ul>
+ * 
+ * また、対応するインスタンスをコネクタプロファイルのプロパティに設定する場合は以下のチェックを行います。
+ * <ul>
+ * <li>type が不一致 → エラー「Unmatch interface type consumer={0} provider={1}」</li>
+ * <li>instance_name が不一致 → 警告「Unmatch interface instance consumer={0}
+ * provider={1}」</li>
+ * </ul>
  */
-public class ServiceConnectorCreaterDialog extends TitleAreaDialog {
+public class ServiceConnectorCreaterDialog extends ConnectorDialogBase {
 
 	static final int EXEC_BUTTON_WIDTH = 70;
 
-	static final String LABEL_PROPERTY_CONSUMER = Messages.getString("ServiceConnectorCreaterDialog.7");
-	static final String LABEL_PROPERTY_PROVIDER = Messages.getString("ServiceConnectorCreaterDialog.8");
+	static final String MSG_ERROR = getString("ServiceConnectorCreaterDialog.2");
+	static final String MSG_NOMATCH_INTERFACE = getString("ServiceConnectorCreaterDialog.3");
+	static final String MSG_UNMATCH_INTERFACE = getString("ServiceConnectorCreaterDialog.4");
 
-	static final String LABEL_BUTTON_ADD = Messages.getString("ServiceConnectorCreaterDialog.9");
-	static final String LABEL_BUTTON_DELETE = Messages.getString("ServiceConnectorCreaterDialog.10");
+	static final String MSG_UNMATCH_INTERFACE_TYPE = getString("ServiceConnectorCreaterDialog.13");
+	static final String MSG_UNMATCH_INTERFACE_INSTANCE = getString("ServiceConnectorCreaterDialog.14");
 
-	static final String LABEL_DETAIL = Messages.getString("ServiceConnectorCreaterDialog.11");
+	static final String DIALOG_TITLE = getString("ServiceConnectorCreaterDialog.6");
 
-	static final String LABEL_UNKNOWN = Messages.getString("ServiceConnectorCreaterDialog.12");
+	static final String LABEL_ENTER_PROFILE = getString("ServiceConnectorCreaterDialog.1");
+	static final String LABEL_NAME = getString("ServiceConnectorCreaterDialog.5");
 
-	static final String PROPERTY_CONSUMER = "PROPERTY_CONSUMER";
-	static final String PROPERTY_PROVIDER = "PROPERTY_PROVIDER";
+	static final String LABEL_PROPERTY_CONSUMER = getString("ServiceConnectorCreaterDialog.7");
+	static final String LABEL_PROPERTY_PROVIDER = getString("ServiceConnectorCreaterDialog.8");
 
-	private Text nameText;
+	static final String LABEL_BUTTON_ADD = getString("ServiceConnectorCreaterDialog.9");
+	static final String LABEL_BUTTON_DELETE = getString("ServiceConnectorCreaterDialog.10");
 
+	static final String LABEL_DETAIL = getString("ServiceConnectorCreaterDialog.11");
+
+	static final String LABEL_UNKNOWN = getString("ServiceConnectorCreaterDialog.12");
+
+	static final int PROPERTY_CONSUMER = 0;
+	static final int PROPERTY_PROVIDER = 1;
+
+	Text nameText;
+
 	Composite detailComposite;
 
 	TableViewer interfaceTableViewer;
@@ -82,13 +106,12 @@
 
 	Point defaultDialogSize;
 
-	private ConnectorProfile connectorProfile;
-	private ConnectorProfile dialogResult;
+	ConnectorProfile connectorProfile;
+	ConnectorProfile dialogResult;
 
-	private ServicePort first;
+	ServicePort first;
+	ServicePort second;
 
-	private ServicePort second;
-
 	List<InterfaceEntry> interfaceList;
 	InterfaceEntry selectedEntry;
 
@@ -98,9 +121,11 @@
 	Map<String, ConnectorProfile.InterfaceId> providerMap;
 	List<String> providerLabels;
 
+	String baseMessage;
+	TableViewer additionalTableViewer;
+
 	public ServiceConnectorCreaterDialog(Shell parentShell) {
 		super(parentShell);
-		setShellStyle(getShellStyle() | SWT.CENTER | SWT.RESIZE);
 	}
 
 	/**
@@ -117,14 +142,20 @@
 		consumerLabels = new ArrayList<String>();
 		providerMap = new HashMap<String, ConnectorProfile.InterfaceId>();
 		providerLabels = new ArrayList<String>();
-		registInterfaceMap(first);
-		registInterfaceMap(second);
+		if (first != null) {
+			registInterfaceMap(first);
+		}
+		if (second != null) {
+			registInterfaceMap(second);
+		}
 
-		this.connectorProfile = ComponentFactory.eINSTANCE
-				.createConnectorProfile();
-		this.connectorProfile.setName(first.getNameL() + "_" //$NON-NLS-1$
-				+ second.getNameL());
+		String firstName = (first != null) ? first.getNameL() : "none";
+		String secondName = (second != null) ? second.getNameL() : "none";
 
+  		connectorProfile = ComponentFactory.eINSTANCE.createConnectorProfile();
+		connectorProfile.setName(firstName + "_" + secondName);
+		this.connectorProfile.setProperty("port.connection.strictness", "strict");
+
 		open();
 
 		return dialogResult;
@@ -181,7 +212,7 @@
 		mainComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
 
 		Label label = new Label(mainComposite, SWT.NONE);
-		label.setText(Messages.getString("ServiceConnectorCreaterDialog.1")); //$NON-NLS-1$
+		label.setText(LABEL_ENTER_PROFILE);
 		GridData labelLayloutData = new GridData(
 				GridData.HORIZONTAL_ALIGN_BEGINNING);
 		label.setLayoutData(labelLayloutData);
@@ -189,26 +220,27 @@
 
 		createConnectorProfileComposite(mainComposite);
 
-		String message = Messages.getString("ServiceConnectorCreaterDialog.2"); //$NON-NLS-1$
+		baseMessage = MSG_ERROR;
 		try {
-			List<PortInterfaceProfile> interfaces1 = first.getInterfaces();
-			List<PortInterfaceProfile> interfaces2 = second.getInterfaces();
-
+			List<PortInterfaceProfile> interfaces1 = (first != null) ? first
+					.getInterfaces() : new ArrayList<PortInterfaceProfile>();
+			List<PortInterfaceProfile> interfaces2 = (second != null) ? second
+					.getInterfaces() : new ArrayList<PortInterfaceProfile>();
 			int countMatch = countMatch(interfaces1, interfaces2);
-			if (countMatch > 0 && countMatch == countTotal(interfaces1, interfaces2)) {
-				message = null;
+			if (countMatch > 0
+					&& countMatch == countTotal(interfaces1, interfaces2)) {
+				baseMessage = null;
 			} else {
 				if (countMatch == 0) {
-					message = Messages.getString("ServiceConnectorCreaterDialog.3"); //$NON-NLS-1$
+					baseMessage = MSG_NOMATCH_INTERFACE;
 				} else {
-					message = Messages.getString("ServiceConnectorCreaterDialog.4"); //$NON-NLS-1$
+					baseMessage = MSG_UNMATCH_INTERFACE;
 				}
 			}
-
 		} catch (Exception e) {
 		}
-		if (message != null) {
-			setMessage(message, IMessageProvider.WARNING);
+		if (baseMessage != null) {
+			setMessage(baseMessage, IMessageProvider.WARNING);
 		}
 
 		return mainComposite;
@@ -236,7 +268,7 @@
 		portProfileEditComposite.setLayoutData(gd);
 
 		Label name = new Label(portProfileEditComposite, SWT.NONE);
-		name.setText(Messages.getString("ServiceConnectorCreaterDialog.5")); //$NON-NLS-1$
+		name.setText(LABEL_NAME);
 		nameText = new Text(portProfileEditComposite, SWT.SINGLE | SWT.BORDER);
 		gd = new GridData();
 		gd.horizontalAlignment = GridData.FILL;
@@ -296,19 +328,7 @@
 		interfaceTableViewer = new TableViewer(detailComposite,
 				SWT.FULL_SELECTION | SWT.SINGLE | SWT.BORDER);
 		interfaceTableViewer.setContentProvider(new ArrayContentProvider());
-		interfaceTableViewer.setColumnProperties(new String[] {
-				PROPERTY_CONSUMER, PROPERTY_PROVIDER });
 		interfaceTableViewer
-				.setLabelProvider(new InterfaceEntryLabelProvider());
-		interfaceTableViewer.setCellModifier(new InterfaceTableCellModifier(
-				interfaceTableViewer));
-		CellEditor[] editors = new CellEditor[2];
-		editors[0] = new ComboBoxCellEditor(interfaceTableViewer.getTable(),
-				consumerLabels.toArray(new String[0]), SWT.READ_ONLY);
-		editors[1] = new ComboBoxCellEditor(interfaceTableViewer.getTable(),
-				providerLabels.toArray(new String[0]), SWT.READ_ONLY);
-		interfaceTableViewer.setCellEditors(editors);
-		interfaceTableViewer
 				.addSelectionChangedListener(new ISelectionChangedListener() {
 					public void selectionChanged(SelectionChangedEvent event) {
 						StructuredSelection selection = (StructuredSelection) event
@@ -333,13 +353,16 @@
 		interfaceTable.setLinesVisible(true);
 		interfaceTable.setHeaderVisible(true);
 
-		TableColumn col = new TableColumn(interfaceTable, SWT.NONE);
-		col.setText(LABEL_PROPERTY_CONSUMER);
-		col.setWidth(300);
+		TableViewerColumn col = null;
+		col = createColumn(interfaceTableViewer, LABEL_PROPERTY_CONSUMER, 300);
+		col.setEditingSupport(new InterfaceTableEdittingSupport(
+				interfaceTableViewer, PROPERTY_CONSUMER));
+		col = createColumn(interfaceTableViewer, LABEL_PROPERTY_PROVIDER, 300);
+		col.setEditingSupport(new InterfaceTableEdittingSupport(
+				interfaceTableViewer, PROPERTY_PROVIDER));
 
-		col = new TableColumn(interfaceTable, SWT.NONE);
-		col.setText(LABEL_PROPERTY_PROVIDER);
-		col.setWidth(300);
+		interfaceTableViewer
+				.setLabelProvider(new InterfaceEntryLabelProvider());
 
 		Composite buttonComposite = new Composite(detailComposite, SWT.NONE);
 		gl = new GridLayout();
@@ -358,7 +381,8 @@
 			public void widgetSelected(SelectionEvent e) {
 				InterfaceEntry entry = newEntry();
 				interfaceList.add(entry);
-				interfaceTableViewer.setInput(interfaceList);
+				interfaceTableViewer.refresh();
+				validateEntry();
 			}
 		});
 
@@ -375,11 +399,14 @@
 					return;
 				}
 				interfaceList.remove(selectedEntry);
-				interfaceTableViewer.setInput(interfaceList);
+				interfaceTableViewer.refresh();
 				deleteButton.setEnabled(false);
+				validateEntry();
 			}
 		});
 
+		additionalTableViewer = createAdditionalTableViewer(detailComposite);
+		
 		loadDetailData();
 
 		defaultDialogSize = getShell().getSize();
@@ -450,16 +477,61 @@
 			String provider = e.provider.toString();
 			connectorProfile.setProperty(consumer, provider);
 		}
+		
+		if (additionalTableViewer != null) {
+			List<?> additional = (List<?>) additionalTableViewer.getInput();
+			for (Object o : additional) {
+				AdditionalEntry target = (AdditionalEntry) o;
+				connectorProfile.setProperty(target.getName(), target
+						.getValue());
+			}
+		}
 	}
 
+	/** Consumer/Providerのエントリの整合性チェック */
+	void validateEntry() {
+		if (interfaceList == null) {
+			return;
+		}
+		String message = baseMessage;
+		int level = IMessageProvider.WARNING;
+		for (InterfaceEntry entry : interfaceList) {
+			if (entry.validate()) {
+				continue;
+			}
+			if (message == null) {
+				message = "";
+			}
+			if (!message.isEmpty()) {
+				message += "\n";
+			}
+			if (entry.getErrorMessage() != null) {
+				message += entry.getErrorMessage();
+				level = IMessageProvider.ERROR;
+			}
+			if (entry.getWarningMessage() != null) {
+				message += entry.getWarningMessage();
+			}
+		}
+		setMessage(message, level);
+	}
+
 	@Override
 	protected void configureShell(Shell shell) {
 		super.configureShell(shell);
-		shell.setText(Messages.getString("ServiceConnectorCreaterDialog.6")); //$NON-NLS-1$
+		shell.setText(DIALOG_TITLE);
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
 	protected void okPressed() {
+		if (additionalTableViewer != null) {
+			// 重複チェック
+			if (!checkProperties((List<AdditionalEntry>) additionalTableViewer
+					.getInput())) {
+				return;
+			}
+		}
 		applyEntry();
 		dialogResult = connectorProfile;
 		super.okPressed();
@@ -471,12 +543,10 @@
 		super.cancelPressed();
 	}
 
-	@Override
 	/**
-	 * {@inheritDoc}
-	 * <p>
 	 * メッセージを設定する。
 	 */
+	@Override
 	public void setMessage(String newMessage, int newType) {
 		super.setMessage(newMessage, newType);
 	}
@@ -545,11 +615,14 @@
 	 */
 	private boolean isMatch(PortInterfaceProfile profile1,
 			PortInterfaceProfile profile2) {
-		
-		if (!profile1.getTypeName().equals(profile2.getTypeName())) return false;
-		if (profile1.isProvidedPolarity()) return profile2.isRequiredPolarity();
-		if (profile1.isRequiredPolarity()) return profile2.isProvidedPolarity();
-		
+		if (!profile1.getTypeName().equals(profile2.getTypeName()))
+			return false;
+		if (!profile1.getInstanceName().equals(profile2.getInstanceName()))
+			return false;
+		if (profile1.isProvidedPolarity())
+			return profile2.isRequiredPolarity();
+		if (profile1.isRequiredPolarity())
+			return profile2.isProvidedPolarity();
 		return false;
 	}
 
@@ -562,6 +635,8 @@
 	public static class InterfaceEntry {
 		ConnectorProfile.InterfaceId consumer;
 		ConnectorProfile.InterfaceId provider;
+		String errorMessage = null;
+		String warningMessage = null;
 
 		public String getConsumerLabel() {
 			return toLabelString(consumer);
@@ -574,6 +649,32 @@
 		public static String toLabelString(ConnectorProfile.InterfaceId id) {
 			return id.rtc_name + ":" + id.if_tname + ":" + id.if_iname;
 		}
+
+		public String getErrorMessage() {
+			return errorMessage;
+		}
+
+		public String getWarningMessage() {
+			return warningMessage;
+		}
+
+		public boolean validate() {
+			errorMessage = null;
+			warningMessage = null;
+			if (consumer.if_tname != null
+					&& !consumer.if_tname.equals(provider.if_tname)) {
+				errorMessage = form(MSG_UNMATCH_INTERFACE_TYPE,
+						consumer.if_tname, provider.if_tname);
+				return false;
+			}
+			if (consumer.if_iname != null
+					&& !consumer.if_iname.equals(provider.if_iname)) {
+				warningMessage = form(MSG_UNMATCH_INTERFACE_INSTANCE,
+						consumer.if_iname, provider.if_iname);
+				return false;
+			}
+			return true;
+		}
 	}
 
 	/** ポート一覧表示のLabelProvider */
@@ -596,58 +697,99 @@
 		}
 	}
 
-	/** インターフェース一覧のCellModifier */
-	public class InterfaceTableCellModifier implements ICellModifier {
-		private TableViewer viewer;
+	/** インターフェース一覧のEditingSupport */
+	public class InterfaceTableEdittingSupport extends EditingSupport {
+		CellEditor editor;
+		int column;
 
-		public InterfaceTableCellModifier(TableViewer viewer) {
-			this.viewer = viewer;
+		public InterfaceTableEdittingSupport(ColumnViewer viewer, int column) {
+			super(viewer);
+
+			// Create the correct editor based on the column index
+			this.column = column;
+			switch (this.column) {
+			case PROPERTY_CONSUMER:
+			case PROPERTY_PROVIDER:
+				editor = new ComboBoxCellEditor(((TableViewer) viewer)
+						.getTable(), itemLabels().toArray(new String[0]),
+						SWT.READ_ONLY);
+				break;
+			default:
+				break;
+			}
 		}
 
 		@Override
-		public boolean canModify(Object element, String property) {
+		protected boolean canEdit(Object element) {
 			return true;
 		}
 
 		@Override
-		public Object getValue(Object element, String property) {
-			Object result = null;
+		protected CellEditor getCellEditor(Object element) {
+			return editor;
+		}
+
+		@Override
+		protected Object getValue(Object element) {
 			InterfaceEntry entry = (InterfaceEntry) element;
-			if (PROPERTY_CONSUMER.equals(property)) {
-				String label = entry.getConsumerLabel();
-				int index = consumerLabels.indexOf(label);
-				result = new Integer(index);
-			} else if (PROPERTY_PROVIDER.equals(property)) {
-				String label = entry.getProviderLabel();
-				int index = providerLabels.indexOf(label);
-				result = new Integer(index);
+			//
+			String label = null;
+			if (column == PROPERTY_CONSUMER) {
+				label = entry.getConsumerLabel();
+			} else if (column == PROPERTY_PROVIDER) {
+				label = entry.getProviderLabel();
 			}
-			return result;
+			if (label == null) {
+				return null;
+			}
+			int index = itemLabels().indexOf(label);
+			return new Integer(index);
 		}
 
 		@Override
-		public void modify(Object element, String property, Object value) {
-			if (element instanceof Item) {
-				element = ((Item) element).getData();
+		protected void setValue(Object element, Object value) {
+			if (!(element instanceof InterfaceEntry)) {
+				return;
 			}
 			InterfaceEntry entry = (InterfaceEntry) element;
-			if (PROPERTY_CONSUMER.equals(property)) {
+			//
+			if (column == PROPERTY_CONSUMER) {
 				Integer index = (Integer) value;
-				if (index >= 0 && index < consumerLabels.size()) {
-					ConnectorProfile.InterfaceId id = consumerMap
-							.get(consumerLabels.get(index));
+				if (index >= 0 && index < itemLabels().size()) {
+					ConnectorProfile.InterfaceId id = itemMap().get(
+							itemLabels().get(index));
 					entry.consumer = id.clone();
 				}
-			} else if (PROPERTY_PROVIDER.equals(property)) {
+			} else if (column == PROPERTY_PROVIDER) {
 				Integer index = (Integer) value;
-				if (index >= 0 && index < providerLabels.size()) {
-					ConnectorProfile.InterfaceId id = providerMap
-							.get(providerLabels.get(index));
+				if (index >= 0 && index < itemLabels().size()) {
+					ConnectorProfile.InterfaceId id = itemMap().get(
+							itemLabels().get(index));
 					entry.provider = id.clone();
 				}
 			}
-			viewer.update(element, null);
+			validateEntry();
+			getViewer().update(element, null);
 		}
+
+		Map<String, ConnectorProfile.InterfaceId> itemMap() {
+			if (column == PROPERTY_CONSUMER) {
+				return consumerMap;
+			} else if (column == PROPERTY_PROVIDER) {
+				return providerMap;
+			}
+			return new HashMap<String, ConnectorProfile.InterfaceId>();
+		}
+
+		List<String> itemLabels() {
+			if (column == PROPERTY_CONSUMER) {
+				return consumerLabels;
+			} else if (column == PROPERTY_PROVIDER) {
+				return providerLabels;
+			}
+			return new ArrayList<String>();
+		}
+
 	}
 
 }

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/AbstractSystemDiagramContextMenuProvider.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/AbstractSystemDiagramContextMenuProvider.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/AbstractSystemDiagramContextMenuProvider.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -34,6 +34,9 @@
 		menuManager.add(new Separator("executionContext_before"));
 		menuManager.add(new Separator("executionContext"));
 		menuManager.add(new Separator("executionContext_after"));
+		menuManager.add(new Separator("composite_before"));
+		menuManager.add(new Separator("composite"));
+		menuManager.add(new Separator("composite_after"));
 		menuManager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS
 				+ "_before"));
 		menuManager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/AbstractSystemDiagramEditor.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/AbstractSystemDiagramEditor.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/AbstractSystemDiagramEditor.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -15,7 +15,8 @@
 import java.util.Iterator;
 import java.util.List;
 
-import javax.xml.datatype.DatatypeFactory;
+import javax.xml.datatype.DatatypeConstants;
+import javax.xml.datatype.XMLGregorianCalendar;
 
 import jp.go.aist.rtm.systemeditor.RTSystemEditorPlugin;
 import jp.go.aist.rtm.systemeditor.extension.SaveProfileExtension;
@@ -97,7 +98,7 @@
 import org.eclipse.ui.views.properties.IPropertySheetPage;
 import org.openrtp.namespaces.rts.version02.RtsProfileExt;
 
-import com.sun.org.apache.xerces.internal.jaxp.datatype.DatatypeFactoryImpl;
+import com.sun.org.apache.xerces.internal.jaxp.datatype.XMLGregorianCalendarImpl;
 
 public abstract class AbstractSystemDiagramEditor extends GraphicalEditor {
 
@@ -359,10 +360,9 @@
 		}
 
 		getSystemDiagram().setSystemId(dialog.getSystemId());
-		DatatypeFactory dateFactory = new DatatypeFactoryImpl();
-		getSystemDiagram().setUpdateDate(
-				dateFactory.newXMLGregorianCalendar(new GregorianCalendar())
-						.toString());
+		XMLGregorianCalendar calendar = new XMLGregorianCalendarImpl(new GregorianCalendar());
+		calendar.setMillisecond(DatatypeConstants.FIELD_UNDEFINED);
+		getSystemDiagram().setUpdateDate(calendar.toString());
 
 		// TODO バージョンアップログへの対応
 
@@ -405,13 +405,10 @@
 		}
 
 		getSystemDiagram().setSystemId(dialog.getSystemId());
-		DatatypeFactory dateFactory = new DatatypeFactoryImpl();
-		getSystemDiagram().setCreationDate(
-				dateFactory.newXMLGregorianCalendar(new GregorianCalendar())
-						.toString());
-		getSystemDiagram().setUpdateDate(
-				dateFactory.newXMLGregorianCalendar(new GregorianCalendar())
-						.toString());
+		XMLGregorianCalendar calendar = new XMLGregorianCalendarImpl(new GregorianCalendar());
+		calendar.setMillisecond(DatatypeConstants.FIELD_UNDEFINED);
+		getSystemDiagram().setCreationDate(calendar.toString());
+		getSystemDiagram().setUpdateDate(calendar.toString());
 
 		// TODO バージョンアップログへの対応
 
@@ -848,12 +845,13 @@
 		// 複合RTCエディタが開かれていたら閉じる
 		if (getSystemDiagram() == null)
 			return;
-		if (getSystemDiagram().getComponents() == null)
-			return;
-		for (Component ac : getSystemDiagram().getComponents()) {
-			ComponentUtil.closeCompositeComponent(ac);
+		if (getSystemDiagram().getComponents() != null) {
+			for (Component ac : getSystemDiagram().getComponents()) {
+				ComponentUtil.closeCompositeComponent(ac);
+			}
 		}
 		getSystemDiagram().clearComponents();
+		getSystemDiagram().dispose();
 		systemDiagram = null;
 	}
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/command/DirectEditNameCommand.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/command/DirectEditNameCommand.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/command/DirectEditNameCommand.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -13,7 +13,6 @@
 public class DirectEditNameCommand extends Command {
 
 	Object model;
-
 	String text, oldText;
 
 	@Override
@@ -22,10 +21,12 @@
 			Component c = (Component) model;
 			oldText = c.getInstanceNameL();
 			c.setInstanceNameL(text);
-			// 設定されたインスタンス名を元にポート名を正規化
-			trimPortNames(c);
-			// ポート名の変更をコネクタプロファイルへ反映
-			trimConnectorProfiles(c);
+			if (!c.isCompositeComponent()) {
+				// 設定されたインスタンス名を元にポート名を正規化
+				trimPortNames(c);
+				// ポート名の変更をコネクタプロファイルへ反映
+				trimConnectorProfiles(c);
+			}
 		}
 	}
 
@@ -34,10 +35,12 @@
 		if (model instanceof Component) {
 			Component c = (Component) model;
 			c.setInstanceNameL(oldText);
-			// 設定されたインスタンス名を元にポート名を正規化
-			trimPortNames(c);
-			// ポート名の変更をコネクタプロファイルへ反映
-			trimConnectorProfiles(c);
+			if (!c.isCompositeComponent()) {
+				// 設定されたインスタンス名を元にポート名を正規化
+				trimPortNames(c);
+				// ポート名の変更をコネクタプロファイルへ反映
+				trimConnectorProfiles(c);
+			}
 		}
 		oldText = null;
 	}

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/dnd/ComponentFactory.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/dnd/ComponentFactory.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/dnd/ComponentFactory.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,5 +1,8 @@
 package jp.go.aist.rtm.systemeditor.ui.editor.dnd;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import jp.go.aist.rtm.toolscommon.model.component.Component;
 
 import org.eclipse.gef.requests.CreationFactory;
@@ -8,41 +11,31 @@
  * ドラッグ＆ドロップ時、コンポーネントを作成するファクトリ
  */
 public class ComponentFactory implements CreationFactory {
-	private Component component;
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public Object getObjectType() {
-		return component.getClass();
+	List<Component> components;
+
+	public ComponentFactory() {
+		components = new ArrayList<Component>();
 	}
 
-	/**
-	 * コンポーネントのリモートオブジェクトを設定する
-	 * 
-	 * @param remoteObject
-	 *            コンポーネントのリモートオブジェクト
-	 */
-	public void setComponent(Component component) {
-		this.component = component;
+	public void addComponent(Component component) {
+		if (!components.contains(component)) {
+			components.add(component);
+		}
 	}
-	
-	/**
-	 * コンポーネントのリモートオブジェクトを設定する
-	 * 
-	 * @param remoteObject
-	 *            コンポーネントのリモートオブジェクト
-	 */
-	protected Component getComponent() {
-		return this.component;
+
+	@Override
+	public Object getObjectType() {
+		return components.getClass();
 	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@SuppressWarnings("unchecked")
+
+	@Override
 	public Object getNewObject() {
-		if (getComponent() != null) return getComponent().copy();
-		return null;
+		List<Component> result = new ArrayList<Component>();
+		for (Component c : components) {
+			result.add(c.copy());
+		}
+		return (result.isEmpty()) ? null : result;
 	}
+
 }

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/dnd/SystemDiagramDropTargetListener.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/dnd/SystemDiagramDropTargetListener.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/dnd/SystemDiagramDropTargetListener.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,5 +1,9 @@
 package jp.go.aist.rtm.systemeditor.ui.editor.dnd;
 
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
 import jp.go.aist.rtm.nameserviceview.model.nameservice.NamingObjectNode;
 import jp.go.aist.rtm.repositoryView.model.RTCRVLeafItem;
 import jp.go.aist.rtm.toolscommon.model.component.Component;
@@ -21,6 +25,8 @@
 public class SystemDiagramDropTargetListener extends
 		AbstractTransferDropTargetListener {
 
+	Boolean online = null;
+
 	/**
 	 * コンストラクタ
 	 * 
@@ -31,6 +37,20 @@
 		super(viewer, LocalSelectionTransfer.getInstance());
 	}
 
+	public boolean isOnline() {
+		if (online == null) {
+			online = false;
+			if (getViewer().getRootEditPart().getContents().getModel() instanceof SystemDiagram) {
+				SystemDiagram sd = (SystemDiagram) getViewer().getRootEditPart()
+						.getContents().getModel();
+				if (SystemDiagramKind.ONLINE_LITERAL.equals(sd.getKind())) {
+					online = true;
+				}
+			}
+		}
+		return online;
+	}
+
 	@Override
 	protected void updateTargetRequest() {
 		((CreateRequest) getTargetRequest()).setLocation(getDropLocation());
@@ -39,28 +59,43 @@
 	@Override
 	protected Request createTargetRequest() {
 		ComponentFactory factory = new ComponentFactory();
-		Component component = getComponent();
-		setComponent(factory, component);
+		List<Component> components = getComponents();
+		setComponents(factory, components);
 
 		CreateRequest result = new CreateRequest(); // nullObjectとして返す。
 		result.setFactory(factory);
 		return result;
 	}
 
-	private void setComponent(ComponentFactory factory, Component component) {
-		if (component == null) return;
-		factory.setComponent(component);
+	void setComponents(ComponentFactory factory, List<Component> components) {
+		if (components == null || components.isEmpty()) {
+			return;
+		}
+		for (Component c : components) {
+			factory.addComponent(c);
+		}
 	}
 
-	private Component getComponent() {
+	List<Component> getComponents() {
+		List<Component> result = new ArrayList<Component>();
 		if (getCurrentEvent().data instanceof IStructuredSelection) {
 			IStructuredSelection selection = (IStructuredSelection) getCurrentEvent().data;
-			Object firstElement = selection.getFirstElement();
-
-			return (Component) AdapterUtil.getAdapter(firstElement,
-					Component.class);
+			Iterator<?> iter = selection.iterator();
+			while (iter.hasNext()) {
+				Object obj = iter.next();
+				Component comp = (Component) AdapterUtil.getAdapter(obj,
+						Component.class);
+				if (comp == null) {
+					continue;
+				}
+				if (isOnline() && obj instanceof NamingObjectNode) {
+					result.add(comp);
+				} else if (!isOnline() && obj instanceof RTCRVLeafItem) {
+					result.add(comp);
+				}
+			}
 		}
-		return null;
+		return result;
 	}
 
 	@Override
@@ -78,21 +113,16 @@
 		}
 		// オンラインエディタへは NameServiceViewから DnD可能
 		// オフラインエディタへは RepositoryViewから DnD可能
-		boolean online = false;
-		if (getViewer().getRootEditPart().getContents().getModel() instanceof SystemDiagram) {
-			SystemDiagram sd = (SystemDiagram) getViewer().getRootEditPart()
-					.getContents().getModel();
-			if (SystemDiagramKind.ONLINE_LITERAL.equals(sd.getKind())) {
-				online = true;
-			}
-		}
 		IStructuredSelection selection = (IStructuredSelection) LocalSelectionTransfer
 				.getInstance().getSelection();
-		if (online && selection.getFirstElement() instanceof NamingObjectNode) {
-			return true;
-		} else if (!online
-				&& selection.getFirstElement() instanceof RTCRVLeafItem) {
-			return true;
+		Iterator<?> iter = selection.iterator();
+		while (iter.hasNext()) {
+			Object obj = iter.next();
+			if (isOnline() && obj instanceof NamingObjectNode) {
+				return true;
+			} else if (!isOnline() && obj instanceof RTCRVLeafItem) {
+				return true;
+			}
 		}
 		return false;
 	}

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/editpart/AbstractEditPart.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/editpart/AbstractEditPart.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/editpart/AbstractEditPart.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -3,6 +3,8 @@
 import jp.go.aist.rtm.toolscommon.model.core.ModelElement;
 import jp.go.aist.rtm.toolscommon.util.AdapterUtil;
 
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.Label;
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
 import org.eclipse.emf.common.notify.impl.AdapterImpl;
@@ -28,23 +30,17 @@
 		this.actionRegistry = actionRegistry;
 	}
 	
-	/**
-	 * {@inheritDoc}
-	 */
+	@Override
 	public Notifier getTarget() {
 		return defaultAdapterDelegate.getTarget();
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
+	@Override
 	public boolean isAdapterForType(Object type) {
 		return defaultAdapterDelegate.isAdapterForType(type);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
+	@Override
 	public void setTarget(Notifier newTarget) {
 		defaultAdapterDelegate.setTarget(newTarget);
 	}
@@ -59,30 +55,22 @@
 	}
 
 	@Override
-	/**
-	 * {@inheritDoc}
-	 */
 	public void activate() {
 		super.activate();
 		((ModelElement) getModel()).eAdapters().add(this);
 	}
 
 	@Override
-	/**
-	 * {@inheritDoc}
-	 */
 	public void deactivate() {
 		super.deactivate();
 		((ModelElement) getModel()).eAdapters().remove(this);
 	}
 
-	@SuppressWarnings("unchecked")
-	@Override
 	/**
-	 * {@inheritDoc}
-	 * <p>
 	 * モデルのオブジェクトに委譲している
 	 */
+	@SuppressWarnings("unchecked")
+	@Override
 	public Object getAdapter(Class key) {
 		Object result = AdapterUtil.getAdapter(getModel(), key);
 		if (result == null) {
@@ -91,4 +79,37 @@
 
 		return result;
 	}
+	
+	/**
+	 * 図に付与されるラベル
+	 */
+	public static class FloatingLabel extends Label {
+
+		public FloatingLabel(IFigure parentFigure) {
+			setParent(parentFigure);
+			parentFigure.add(this);
+		}
+
+		/**
+		 * 削除する場合に呼び出されることを意図する
+		 */
+		public void deactivate() {
+			getParent().remove(this);
+		}
+
+		@Override
+		public boolean isFocusTraversable() {
+			return false;
+		}
+
+		@Override
+		public boolean isRequestFocusEnabled() {
+			return false;
+		}
+
+		@Override
+		protected boolean isMouseEventTarget() {
+			return false;
+		}
+	}
 }

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/editpart/ComponentEditPart.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/editpart/ComponentEditPart.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/editpart/ComponentEditPart.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -11,6 +11,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import jp.go.aist.rtm.systemeditor.manager.ComponentIconStore;
 import jp.go.aist.rtm.systemeditor.manager.SystemEditorPreferenceManager;
 import jp.go.aist.rtm.systemeditor.ui.action.OpenCompositeComponentAction;
 import jp.go.aist.rtm.systemeditor.ui.editor.AbstractSystemDiagramEditor;
@@ -37,7 +38,6 @@
 import org.eclipse.draw2d.Figure;
 import org.eclipse.draw2d.Graphics;
 import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
 import org.eclipse.draw2d.MouseEvent;
 import org.eclipse.draw2d.MouseListener;
 import org.eclipse.draw2d.Panel;
@@ -53,6 +53,7 @@
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.TextCellEditor;
 import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.PlatformUI;
 
 /**
@@ -69,13 +70,18 @@
 	/** コンポーネントの周りとコンポーネントのボディまでのスペース(ポートなし) */
 	public static final int NONE_SPACE = 7;
 
+	/** コンポーネントアイコンのサイズ */
+	public static final int ICON_SIZE = 16;
+
 	private final PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport(
 			this);
 
-	private ComponentFloatingLabel componentLabel;
+	FloatingLabel componentLabel;
 
 	NameDirectEditManager directManager = null;
 
+	Image iconImage;
+
 	/**
 	 * コンストラクタ
 	 * 
@@ -87,26 +93,20 @@
 	}
 
 	@Override
-	/**
-	 * {@inheritDoc}
-	 */
 	protected IFigure createFigure() {
+		iconImage = ComponentIconStore.eINSTANCE.findImageByComp(getModel());
+
 		Figure result = new Panel() {
 
 			@Override
-			/**
-			 * {@inheritDoc}
-			 */
 			protected boolean useLocalCoordinates() {
 				return true;
 			}
 
-			@Override
 			/**
-			 * {@inheritDoc}
-			 * <p>
 			 * コンポーネントの外にポートが出ているように見せるために、コンポーネントのボディのドローイングの範囲を狭めている
 			 */
+			@Override
 			protected void paintFigure(Graphics graphics) {
 				if (isOpaque()) {
 					ComponentLayout cl = (ComponentLayout)this.getLayoutManager();
@@ -121,26 +121,33 @@
 					Color saveForegroundColor = graphics.getForegroundColor();
 					graphics.drawRectangle(bound);
 					graphics.setForegroundColor(saveForegroundColor);
+
+					if (iconImage != null) {
+						org.eclipse.swt.graphics.Rectangle ir = iconImage
+								.getBounds();
+						Rectangle sr = new Rectangle(ir.x, ir.y, ir.width,
+								ir.height);
+						Rectangle dr = new Rectangle(bound.getCenter().x
+								- ICON_SIZE / 2, bound.getCenter().y
+								- ICON_SIZE / 2, ICON_SIZE, ICON_SIZE);
+						graphics.drawImage(iconImage, sr, dr);
+					}
 				}
 			}
 
-			@Override
 			/**
-			 * {@inheritDoc}
-			 * <p>
 			 * コンポーネントの外にポートが出ているように見せるため、空実装
 			 */
+			@Override
 			protected void paintBorder(Graphics graphics) {
 				// void
 			}
 
-			@Override
 			/**
-			 * {@inheritDoc}
-			 * <p>
 			 * コンポーネントの制約が変更されるたびに、ラベルも移動させる。
 			 * （責務の分離からすればあまりよくないが、ファイル内に閉じているのでここに実装にした）
 			 */
+			@Override
 			public void setBounds(Rectangle rect) {
 				super.setBounds(rect);
 
@@ -154,16 +161,13 @@
 
 				propertyChangeSupport.firePropertyChange("Bounds", null, rect);
 			}
-
 		};
 
 		result.addMouseListener(new MouseListener.Stub() {
-			@Override
 			/**
-			 * {@inheritDoc}
-			 * <p>
 			 * コンポーネントを右クリック（+Shift）して、方向を変換する機能の実装
 			 */
+			@Override
 			public void mousePressed(MouseEvent me) {
 				if (me.button == 3) { // right click
 					IAction action = null;
@@ -188,7 +192,7 @@
 		result.setBackgroundColor(ColorConstants.orange);
 
 		// 注意：ComponentLabelの親はSystemDiagram
-		componentLabel = new ComponentFloatingLabel(
+		componentLabel = new FloatingLabel(
 				((AbstractGraphicalEditPart) getParent()).getFigure());
 		componentLabel.setText(getModel().getInstanceNameL());
 		componentLabel.setSize(30, 10);
@@ -209,9 +213,6 @@
 
 	@SuppressWarnings("unchecked")
 	@Override
-	/**
-	 * {@inheritDoc}
-	 */
 	public void activate() {
 		super.activate();
 		if (getModel().isCompositeComponent()) {
@@ -227,9 +228,6 @@
 
 	@SuppressWarnings("unchecked")
 	@Override
-	/**
-	 * {@inheritDoc}
-	 */
 	public void deactivate() {
 		componentLabel.deactivate();
 		super.deactivate();
@@ -245,9 +243,6 @@
 	}
 
 	@Override
-	/**
-	 * {@inheritDoc}
-	 */
 	protected void createEditPolicies() {
 		installEditPolicy(EditPolicy.COMPONENT_ROLE,
 				new ComponentComponentEditPolicy());
@@ -258,9 +253,6 @@
 	}
 
 	@Override
-	/**
-	 * {@inheritDoc}
-	 */
 	protected void refreshVisuals() {
 		getFigure().setBackgroundColor(getNewBodyColor());
 
@@ -306,8 +298,6 @@
 								SystemEditorPreferenceManager.COLOR_RTC_STATE_UNKNOWN);
 			}
 		}
-		
-
 		return exexucitonContextColor;
 	}
 
@@ -356,7 +346,6 @@
 						SystemEditorPreferenceManager.COLOR_RTC_STATE_INACTIVE);
 			}
 		}
-
 		return stateColor;
 	}
 
@@ -386,16 +375,10 @@
 	}
 
 	@Override
-	/**
-	 * {@inheritDoc}
-	 */
 	public Component getModel() {
 		return (Component) super.getModel();
 	}
 
-	/**
-	 * {@inheritDoc}component.eAdapters().add(this);
-	 */
 	@SuppressWarnings("unchecked")
 	public void notifyChanged(Notification notification) {
 		if (ComponentPackage.eINSTANCE.getComponent_Components().equals(
@@ -440,6 +423,7 @@
 
 	private void refreshComponent() {
 		PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
+			@Override
 			public void run() {
 				if (isActive()) {
 					refresh();
@@ -452,6 +436,7 @@
 
 	private void refreshComponent2() {
 		PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
+			@Override
 			public void run() {
 				if (isActive()) {
 					refresh();
@@ -461,6 +446,7 @@
 				}
 			}
 
+			@SuppressWarnings("unchecked")
 			private void refreshChildren2() {
 				int i;
 				EditPart editPart;
@@ -486,7 +472,6 @@
 						continue;						
 					}
 
-
 					//Look to see if the EditPart is already around but in the wrong location
 					editPart = (EditPart)modelToEditPart.get(model);
 
@@ -507,7 +492,7 @@
 				}
 			}
 			
-
+			@SuppressWarnings("unchecked")
 			private void refreshChildDiagram() {
 				// 複合RTCエディタ内の子RTCのポート再描画
 				SystemDiagram diagram = getModel().getChildSystemDiagram();
@@ -533,7 +518,6 @@
 					editor.refresh();
 				}
 			}
-
 		});
 	}
 
@@ -552,6 +536,7 @@
 			setFocus(true);
 		}
 		PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
+			@Override
 			public void run() {
 				setFocus(false);
 			}
@@ -560,9 +545,6 @@
 
 	@SuppressWarnings("unchecked")
 	@Override
-	/**
-	 * {@inheritDoc}
-	 */
 	protected List getModelChildren() {
 		List result = new ArrayList();
 		// 複合コンポーネントに直接属するポートだけを表示させる 2008.11.26
@@ -591,54 +573,6 @@
 		propertyChangeSupport.removePropertyChangeListener(listener);
 	}
 
-	/**
-	 * システムダイアグラムのコンポーネントに表示されるラベル
-	 */
-	public class ComponentFloatingLabel extends Label {
-
-		/**
-		 * コンストラクタ
-		 * 
-		 * @param parentFigure
-		 *            親フィギュア
-		 */
-		public ComponentFloatingLabel(IFigure parentFigure) {
-			setParent(parentFigure);
-			parentFigure.add(this);
-		}
-
-		/**
-		 * 削除する場合に呼び出されることを意図する
-		 */
-		public void deactivate() {
-			getParent().remove(this);
-		}
-
-		@Override
-		/**
-		 * {@inheritDoc}
-		 */
-		public boolean isFocusTraversable() {
-			return false;
-		}
-
-		@Override
-		/**
-		 * {@inheritDoc}
-		 */
-		public boolean isRequestFocusEnabled() {
-			return false;
-		}
-
-		@Override
-		/**
-		 * {@inheritDoc}
-		 */
-		protected boolean isMouseEventTarget() {
-			return false;
-		}
-	}
-
 	@Override
 	public void performRequest(Request req) {
 		if (req.getType().equals(RequestConstants.REQ_OPEN)) {

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/editpart/InPortEditPart.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/editpart/InPortEditPart.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/editpart/InPortEditPart.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -11,6 +11,7 @@
 import org.eclipse.draw2d.Panel;
 import org.eclipse.draw2d.StackLayout;
 import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.gef.GraphicalEditPart;
 import org.eclipse.gef.ui.actions.ActionRegistry;
@@ -33,18 +34,14 @@
 	}
 
 	@Override
-	/**
-	 * {@inheritDoc}
-	 */
 	public InPort getModel() {
 		return (InPort) super.getModel();
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
+	@Override
 	public void notifyChanged(Notification notification) {
 		PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
+			@Override
 			public void run() {
 				if (isActive()) {
 					refresh();
@@ -56,12 +53,27 @@
 	}
 
 	@Override
-	/**
-	 * {@inheritDoc}
-	 */
 	protected IFigure createFigure() {
-		IFigure result =  isExported() ? new ExportedInPortFigure(getModel())
-				: new InPortFigure(getModel());
+		super.createFigure();
+
+		IFigure result = null;
+		if (isExported()) {
+			result = new ExportedInPortFigure(getModel()) {
+				@Override
+				public void setBounds(Rectangle rect) {
+					super.setBounds(rect);
+					setLabelBounds(getBaseBounds(), rect, getDirection());
+				}
+			};
+		} else {
+			result = new InPortFigure(getModel()) {
+				@Override
+				public void setBounds(Rectangle rect) {
+					super.setBounds(rect);
+					setLabelBounds(getBaseBounds(), rect, getDirection());
+				}
+			};
+		}
 		result.setLocation(new Point(0, 0));
 
 		OutPortEditPart.supportAutoCreateConnectorToolMode(getViewer(), result);
@@ -70,9 +82,6 @@
 	}
 
 	@Override
-	/**
-	 * {@inheritDoc}
-	 */
 	protected void refreshVisuals() {
 		Color color = SystemEditorPreferenceManager.getInstance().getColor(
 				SystemEditorPreferenceManager.COLOR_DATAPORT_NO_CONNECT);

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/editpart/OutPortEditPart.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/editpart/OutPortEditPart.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/editpart/OutPortEditPart.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -11,6 +11,7 @@
 import org.eclipse.draw2d.MouseListener;
 import org.eclipse.draw2d.MouseMotionListener;
 import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.gef.EditDomain;
 import org.eclipse.gef.EditPartViewer;
@@ -26,8 +27,6 @@
  */
 public class OutPortEditPart extends PortEditPart {
 
-//	private Notification notification;
-
 	/**
 	 * コンストラクタ
 	 * 
@@ -39,19 +38,14 @@
 	}
 
 	@Override
-	/**
-	 * {@inheritDoc}
-	 */
 	public OutPort getModel() {
 		return (OutPort) super.getModel();
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
+	@Override
 	public void notifyChanged(Notification notification) {
-//		this.notification = notification;
 		PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
+			@Override
 			public void run() {
 				if (isActive()) {
 					refresh();
@@ -63,12 +57,27 @@
 	}
 
 	@Override
-	/**
-	 * {@inheritDoc}
-	 */
 	protected IFigure createFigure() {
-		IFigure result = isExported() ? new ExportedOutPortFigure(getModel())
-				: new OutPortFigure(getModel());
+		super.createFigure();
+
+		IFigure result = null;
+		if (isExported()) {
+			result = new ExportedOutPortFigure(getModel()) {
+				@Override
+				public void setBounds(Rectangle rect) {
+					super.setBounds(rect);
+					setLabelBounds(getBaseBounds(), rect, getDirection());
+				}
+			};
+		} else {
+			result = new OutPortFigure(getModel()) {
+				@Override
+				public void setBounds(Rectangle rect) {
+					super.setBounds(rect);
+					setLabelBounds(getBaseBounds(), rect, getDirection());
+				}
+			};
+		}
 		result.setLocation(new Point(0, 0));
 
 		supportAutoCreateConnectorToolMode(getViewer(), result);
@@ -85,15 +94,18 @@
 		final AutoConnectorCreationTool connectionCreationTool = new AutoConnectorCreationTool();
 
 		figure.addMouseMotionListener(new MouseMotionListener() {
+			@Override
 			public void mouseDragged(MouseEvent me) {
 			}
 
+			@Override
 			public void mouseEntered(MouseEvent me) {
 				connectionCreationTool.setFactory(new SimpleFactory(
 						PortConnectorImpl.class));
 				domain.setActiveTool(connectionCreationTool);
 			}
 
+			@Override
 			public void mouseExited(MouseEvent me) {
 				if (domain.getActiveTool() == connectionCreationTool
 						&& connectionCreationTool.isStartedState() == false) {
@@ -101,14 +113,16 @@
 				}
 			}
 
+			@Override
 			public void mouseHover(MouseEvent me) {
 			}
 
+			@Override
 			public void mouseMoved(MouseEvent me) {
 			}
 		});
+		
 		figure.addMouseListener(new MouseListener.Stub(){
-
 			@Override
 			public void mousePressed(MouseEvent me) {
 				// right click
@@ -116,7 +130,6 @@
 					domain.setActiveTool(domain.getDefaultTool());
 				}
 			}
-			
 		});
 	}
 
@@ -137,9 +150,6 @@
 	}
 
 	@Override
-	/**
-	 * {@inheritDoc}
-	 */
 	protected void refreshVisuals() {
 		Color color = SystemEditorPreferenceManager.getInstance().getColor(
 				SystemEditorPreferenceManager.COLOR_DATAPORT_NO_CONNECT);
@@ -151,8 +161,7 @@
 
 		getFigure().setBackgroundColor(color);
 
-		getFigure().setToolTip(
-				InPortEditPart.getDataPortToolTip(getModel()));
+		getFigure().setToolTip(InPortEditPart.getDataPortToolTip(getModel()));
 
 		((GraphicalEditPart) getParent()).setLayoutConstraint(this,
 				getFigure(), getFigure().getBounds());

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/editpart/PortEditPart.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/editpart/PortEditPart.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/editpart/PortEditPart.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -13,6 +13,7 @@
 import jp.go.aist.rtm.systemeditor.ui.editor.figure.PortAnchor;
 import jp.go.aist.rtm.systemeditor.ui.editor.figure.PortFigure;
 import jp.go.aist.rtm.systemeditor.ui.util.ComponentUtil;
+import jp.go.aist.rtm.toolscommon.model.component.Component;
 import jp.go.aist.rtm.toolscommon.model.component.ComponentPackage;
 import jp.go.aist.rtm.toolscommon.model.component.ComponentSpecification;
 import jp.go.aist.rtm.toolscommon.model.component.Port;
@@ -21,6 +22,8 @@
 
 import org.eclipse.draw2d.ConnectionAnchor;
 import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.impl.AdapterImpl;
 import org.eclipse.gef.ConnectionEditPart;
@@ -28,6 +31,7 @@
 import org.eclipse.gef.GraphicalEditPart;
 import org.eclipse.gef.NodeEditPart;
 import org.eclipse.gef.Request;
+import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
 import org.eclipse.gef.ui.actions.ActionRegistry;
 import org.eclipse.ui.PlatformUI;
 
@@ -37,6 +41,8 @@
 public abstract class PortEditPart extends AbstractEditPart implements
 		NodeEditPart {
 
+	FloatingLabel portLabel;
+	
 	/**
 	 * コンストラクタ
 	 * 
@@ -48,50 +54,81 @@
 	}
 
 	@Override
-	/**
-	 * {@inheritDoc}
-	 */
+	protected IFigure createFigure() {
+		portLabel = new FloatingLabel(((AbstractGraphicalEditPart) getParent()
+				.getParent()).getFigure());
+		portLabel.setText(getPortBaseName());
+		portLabel.setSize(30, 10);
+		return null;
+	}
+	
+	String getPortBaseName() {
+		String name = getModel().getNameL();
+		if (name == null) {
+			return "";
+		}
+		int index = name.lastIndexOf(".");
+		if (index != -1) {
+			name = name.substring(index + 1);
+		}
+		return name;
+	}
+	
+	public void setLabelBounds(Rectangle baseRect, Rectangle rect,
+			String direction) {
+		if (portLabel == null) {
+			return;
+		}
+		Rectangle labelRect = portLabel.getTextBounds().getCopy();
+		if (Component.OUTPORT_DIRECTION_RIGHT_LITERAL.equals(direction)) {
+			Point p = rect.getTopRight();
+			labelRect.x = baseRect.x + p.x;
+			labelRect.y = baseRect.y + p.y - labelRect.height;
+		} else if (Component.OUTPORT_DIRECTION_LEFT_LITERAL.equals(direction)) {
+			Point p = rect.getTopLeft();
+			labelRect.x = baseRect.x + p.x - labelRect.width;
+			labelRect.y = baseRect.y + p.y - labelRect.height;
+		} else if (Component.OUTPORT_DIRECTION_UP_LITERAL.equals(direction)) {
+			Point p = rect.getTop();
+			labelRect.x = baseRect.x + p.x - labelRect.width / 2;
+			labelRect.y = baseRect.y + p.y - labelRect.height;
+		} else if (Component.OUTPORT_DIRECTION_DOWN_LITERAL.equals(direction)) {
+			Point p = rect.getBottom();
+			labelRect.x = baseRect.x + p.x - labelRect.width / 2;
+			labelRect.y = baseRect.y + p.y;
+		}
+		portLabel.setBounds(labelRect);
+	}
+	
+	@Override
 	protected void createEditPolicies() {
 		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE,
 				new PortGraphicalNodeEditPolicy());
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
+	@Override
 	public ConnectionAnchor getSourceConnectionAnchor(
 			ConnectionEditPart connection) {
-//		System.out.println("getSourceConnectionAnchor on " + this);
 		return new PortAnchor(getFigure());
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
+	@Override
 	public ConnectionAnchor getTargetConnectionAnchor(
 			ConnectionEditPart connection) {
-//		System.out.println("getTargetConnectionAnchor on " + this);
 		return new PortAnchor(getFigure());
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
+	@Override
 	public ConnectionAnchor getSourceConnectionAnchor(Request request) {
 		return new PortAnchor(getFigure());
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
+	@Override
 	public ConnectionAnchor getTargetConnectionAnchor(Request request) {
 		return new PortAnchor(getFigure());
 	}
 	
 	@Override
-	/**
-	 * {@inheritDoc}
-	 */
 	public PortFigure getFigure() {
 		if (invalid) {
 			setInvalid(false);
@@ -107,24 +144,16 @@
 
 	@SuppressWarnings("unchecked")
 	@Override
-	/**
-	 * {@inheritDoc}
-	 */
 	protected List getModelTargetConnections() {
 		return CompositeFilter.getModelTargetConnections(getModel());
 	}
 
 	@SuppressWarnings("unchecked")
 	@Override
-	/**
-	 * {@inheritDoc}
-	 */
 	protected List getModelSourceConnections() {
-//		debugPrint(getModel());
 		return CompositeFilter.getModelSourceConnections(getModel());
 	}
 
-
 	@Override
 	public Port getModel() {
 		return (Port) super.getModel();
@@ -134,16 +163,15 @@
 	 * 設定マネージャを監視するリスナ
 	 */
 	PropertyChangeListener preferenceChangeListener = new PropertyChangeListener() {
+		@Override
 		public void propertyChange(PropertyChangeEvent evt) {
 			refreshVisuals();
 		}
 	};
+	
 	private boolean invalid = false;
 
 	@Override
-	/**
-	 * {@inheritDoc}
-	 */
 	public void activate() {
 		super.activate();
 
@@ -155,10 +183,8 @@
 	}
 
 	@Override
-	/**
-	 * {@inheritDoc}
-	 */
 	public void deactivate() {
+		portLabel.deactivate();
 		super.deactivate();
 
 		SystemEditorPreferenceManager.getInstance()
@@ -175,7 +201,6 @@
 	}
 
 	private class Adapter extends AdapterImpl {
-		@SuppressWarnings("unchecked")
 		@Override
 		public void notifyChanged(Notification msg) {
 			if (ComponentPackage.eINSTANCE.getPort_ConnectorProfiles()
@@ -214,6 +239,7 @@
 	}
 
 	// ターゲットのポートのEditPartが存在しない時に走るときがある。
+	@Override
 	protected void addSourceConnection(ConnectionEditPart connection, int index) {
 
 		// ターゲット側の設定も行う
@@ -244,6 +270,7 @@
 //		System.out.println("addSourceConnection from " + connection.getSource() + " to " + connection.getTarget());
 	}
 
+	@Override
 	protected void addTargetConnection(ConnectionEditPart connection, int index) {
 		// ソース側の設定も行う
 		PortConnector connectionModel = (PortConnector) connection.getModel();
@@ -274,6 +301,7 @@
 	}
 
 	@SuppressWarnings("unchecked")
+	@Override
 	protected void refreshSourceConnections() {
 		int i;
 		ConnectionEditPart editPart;
@@ -313,6 +341,7 @@
 	}
 
 	@SuppressWarnings("unchecked")
+	@Override
 	protected void refreshTargetConnections() {
 		int i;
 		ConnectionEditPart editPart;
@@ -351,5 +380,4 @@
 			removeTargetConnection((ConnectionEditPart)trash.get(i));
 	}	
 	
-	
 }

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/editpart/ServicePortEditPart.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/editpart/ServicePortEditPart.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/editpart/ServicePortEditPart.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -7,6 +7,7 @@
 
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.gef.GraphicalEditPart;
 import org.eclipse.gef.ui.actions.ActionRegistry;
@@ -29,18 +30,14 @@
 	}
 
 	@Override
-	/**
-	 * {@inheritDoc}
-	 */
 	public ServicePort getModel() {
 		return (ServicePort) super.getModel();
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
+	@Override
 	public void notifyChanged(Notification notification) {
 		PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
+			@Override
 			public void run() {
 				if (isActive()) {
 					refresh();
@@ -51,12 +48,27 @@
 	}
 
 	@Override
-	/**
-	 * {@inheritDoc}
-	 */
 	protected IFigure createFigure() {
-		IFigure result = isExported() ? new ExportedServicePortFigure(
-				getModel()) : new ServicePortFigure(getModel());
+		super.createFigure();
+
+		IFigure result = null;
+		if (isExported()) {
+			result = new ExportedServicePortFigure(getModel()) {
+				@Override
+				public void setBounds(Rectangle rect) {
+					super.setBounds(rect);
+					setLabelBounds(getBaseBounds(), rect, getDirection());
+				}
+			};
+		} else {
+			result = new ServicePortFigure(getModel()) {
+				@Override
+				public void setBounds(Rectangle rect) {
+					super.setBounds(rect);
+					setLabelBounds(getBaseBounds(), rect, getDirection());
+				}
+			};
+		}
 		result.setLocation(new Point(0, 0));
 
 		OutPortEditPart.supportAutoCreateConnectorToolMode(getViewer(), result);
@@ -65,9 +77,6 @@
 	}
 
 	@Override
-	/**
-	 * {@inheritDoc}
-	 */
 	protected void refreshVisuals() {
 		Color color = SystemEditorPreferenceManager.getInstance().getColor(
 				SystemEditorPreferenceManager.COLOR_SERVICEPORT_NO_CONNECT);

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/editpolicy/GraphicalConnectorCreateManager.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/editpolicy/GraphicalConnectorCreateManager.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/editpolicy/GraphicalConnectorCreateManager.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -89,6 +89,11 @@
 				&& getTarget().validateSourceConnector(getSource());
 	}
 
+	public boolean validateSingle() {
+		return (getSource() != null && getTarget() == null)
+				|| (getSource() == null && getTarget() != null);
+	}
+
 	/**
 	 * ConnectorProfileを生成し、ポート接続を行います。
 	 * 
@@ -136,6 +141,18 @@
 			return new ServiceConnectorCreaterDialog(shell)
 					.getConnectorProfile((ServicePort) getSource(),
 							(ServicePort) getTarget());
+		} else if (getSource() instanceof OutPort && getTarget() == null) {
+			// OutPortのみ
+			return new DataConnectorCreaterDialog(shell).getConnectorProfile(
+					(OutPort) getSource(), null);
+		} else if (getSource() instanceof InPort && getTarget() == null) {
+			// InPortのみ
+			return new DataConnectorCreaterDialog(shell).getConnectorProfile(
+					null, (InPort) getSource());
+		} else if (getSource() instanceof ServicePort && getTarget() == null) {
+			// ServicePortのみ
+			return new ServiceConnectorCreaterDialog(shell)
+					.getConnectorProfile((ServicePort) getSource(), null);
 		} else {
 			return null;
 		}

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/editpolicy/SystemXYLayoutEditPolicy.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/editpolicy/SystemXYLayoutEditPolicy.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/editpolicy/SystemXYLayoutEditPolicy.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -44,10 +44,10 @@
 	@Override
 	protected Command getCreateCommand(CreateRequest request) {
 		ComponentCommandCreator creator = new ComponentCommandCreator();
-		ComponentCommandCreator.CommandPair result = creator.getCreateCommand(
-				request, getHost().getModel());
+		ComponentCommandCreator.MultiCreateCommand result = creator
+				.getCreateCommand(request, getHost().getModel());
 
-		if (result == null) {
+		if (result.getCommandPairs().isEmpty()) {
 			MessageDialog.openInformation(PlatformUI.getWorkbench()
 					.getActiveWorkbenchWindow().getShell(), Messages
 					.getString("SystemXYLayoutEditPolicy.6"), creator
@@ -56,10 +56,18 @@
 		}
 
 		if (request.getLocation() != null) {
-			result.component.setConstraint(Draw2dUtil
-					.toRtcLinkRectangle((Rectangle) getConstraintFor(request)));
+			int count = 0;
+			for (ComponentCommandCreator.CommandPair pair : result
+					.getCommandPairs()) {
+				Rectangle rect = (Rectangle) getConstraintFor(request);
+				rect.x += count * 20;
+				rect.y += count * 20;
+				pair.component.setConstraint(Draw2dUtil
+						.toRtcLinkRectangle(rect));
+				count++;
+			}
 		}
-		return result.command;
+		return result;
 	}
 
 	@Override

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/figure/ComponentLayout.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/figure/ComponentLayout.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/figure/ComponentLayout.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -44,18 +44,14 @@
 
 	@SuppressWarnings("unchecked")
 	@Override
-	/**
-	 * {@inheritDoc}
-	 */
 	public void layout(IFigure parent) {
 		Iterator children = parent.getChildren().iterator();
 		IFigure child;
 		while (children.hasNext()) {
 			child = (IFigure) children.next();
-
 			Rectangle bounds = getLocation(parent, child);
 			child.setLocation(new Point(bounds.x, bounds.y));
-
+			child.setBounds(child.getBounds());
 			parent.setBounds(parent.getBounds());
 		}
 	}

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/figure/InPortFigure.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/figure/InPortFigure.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/figure/InPortFigure.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -21,14 +21,14 @@
 		setFill(true);
 
 		PointList pointList = new PointList(5);
-		pointList.addPoint(-5, -5);
-		pointList.addPoint(-5, 5);
-		pointList.addPoint(5, 5);
+		pointList.addPoint(-6, -6);
+		pointList.addPoint(-6, 6);
+		pointList.addPoint(6, 6);
 		pointList.addPoint(0, 0);
-		pointList.addPoint(5, -5);
+		pointList.addPoint(6, -6);
 		
 		setTemplate(pointList);
-		setSize(20 + 1, 20 + 1);
+		setSize(24 + 1, 24 + 1);
 
 		setBackgroundColor(ColorConstants.darkBlue);
 		setForegroundColor(ColorConstants.red);

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/figure/OutPortFigure.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/figure/OutPortFigure.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/figure/OutPortFigure.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -20,14 +20,14 @@
 		setFill(true);
 
 		PointList pointList = new PointList(5);
-		pointList.addPoint(-5, -5);
-		pointList.addPoint(0, -5);
-		pointList.addPoint(5, 0);
-		pointList.addPoint(0, 5);
-		pointList.addPoint(-5, 5);
+		pointList.addPoint(-6, -6);
+		pointList.addPoint(0, -6);
+		pointList.addPoint(6, 0);
+		pointList.addPoint(0, 6);
+		pointList.addPoint(-6, 6);
 		setTemplate(pointList);
 
-		setSize(20 + 1, 20 + 1);
+		setSize(24 + 1, 24 + 1);
 
 		setBackgroundColor(ColorConstants.darkGreen);
 		setForegroundColor(ColorConstants.red);

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/figure/PortFigure.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/figure/PortFigure.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/figure/PortFigure.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -8,6 +8,7 @@
 import org.eclipse.draw2d.PolygonDecoration;
 import org.eclipse.draw2d.StackLayout;
 import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
 
 /**
  * PortのFigure
@@ -75,12 +76,14 @@
 	}
 
 	@Override
-	/**
-	 * {@inheritDoc}
-	 */
 	public void setLocation(Point p) {
 		super.setLocation(p);
 		fireFigureMoved();
 	}
 
+	public Rectangle getBaseBounds() {
+		return (getParent() != null) ? getParent().getBounds()
+				: new Rectangle();
+	}
+	
 }

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/figure/ServicePortFigure.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/figure/ServicePortFigure.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/figure/ServicePortFigure.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -21,13 +21,13 @@
 		setFill(true);
 
 		PointList pointList = new PointList(5);
-		pointList.addPoint(-5, -5);
-		pointList.addPoint(-5, 5);
-		pointList.addPoint(5, 5);
-		pointList.addPoint(5, -5);
+		pointList.addPoint(-6, -6);
+		pointList.addPoint(-6, 6);
+		pointList.addPoint(6, 6);
+		pointList.addPoint(6, -6);
 
 		setTemplate(pointList);
-		setSize(20 + 1, 20 + 1);
+		setSize(24 + 1, 24 + 1);
 
 		setBackgroundColor(ColorConstants.lightBlue);
 		setForegroundColor(ColorConstants.red);

Copied: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/preference/IconPreferencePage.java (from rev 393, trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/preference/IconPreferencePage.java)
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/preference/IconPreferencePage.java	                        (rev 0)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/preference/IconPreferencePage.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -0,0 +1,334 @@
+package jp.go.aist.rtm.systemeditor.ui.preference;
+
+import static jp.go.aist.rtm.systemeditor.nl.Messages.getString;
+
+import java.io.File;
+import java.util.List;
+
+import jp.go.aist.rtm.systemeditor.manager.ComponentIconStore;
+import jp.go.aist.rtm.systemeditor.manager.SystemEditorPreferenceManager;
+import jp.go.aist.rtm.systemeditor.ui.dialog.IconPreferenceDialog;
+
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.preference.PreferencePage;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ITableColorProvider;
+import org.eclipse.jface.viewers.ITableLabelProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.FileDialog;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+
+public class IconPreferencePage extends PreferencePage implements
+		IWorkbenchPreferencePage {
+
+	static final int EXEC_BUTTON_WIDTH = 90;
+
+	static final String ERROR_IMPORT_PROFILE = getString("IconPreferencePage.error.import");
+	static final String ERROR_EXPORT_PROFILE = getString("IconPreferencePage.error.export");
+
+	static final String BUTTON_LABEL_ADD = getString("Common.button.add");
+	static final String BUTTON_LABEL_EDIT = getString("Common.button.edit");
+	static final String BUTTON_LABEL_DELETE = getString("Common.button.delete");
+	static final String BUTTON_LABEL_IMPORT = getString("Common.button.import");
+	static final String BUTTON_LABEL_EXPORT = getString("Common.button.export");
+
+	static final int PROPERTY_IMAGE = 0;
+	static final int PROPERTY_PATTERN = 1;
+	static final int PROPERTY_KIND = 2;
+	static final int PROPERTY_PATH = 3;
+
+	TableViewer iconTableViewer;
+
+	Button addButton;
+	Button editButton;
+	Button deleteButton;
+	Button importButton;
+	Button exportButton;
+
+	SystemEditorPreferenceManager manager;
+
+	List<ComponentIconStore.Entry> entryList;
+	ComponentIconStore.Entry selectedEntry;
+
+	@Override
+	protected Control createContents(Composite parent) {
+
+		manager = SystemEditorPreferenceManager.getInstance();
+
+		GridLayout gl;
+		GridData gd;
+
+		Composite composite = new Composite(parent, SWT.NULL);
+		composite.setLayout(new GridLayout(2, false));
+
+		iconTableViewer = new TableViewer(composite, SWT.FULL_SELECTION
+				| SWT.SINGLE | SWT.BORDER);
+		iconTableViewer.setContentProvider(new ArrayContentProvider());
+
+		Table table = iconTableViewer.getTable();
+		table.setLinesVisible(true);
+		table.setHeaderVisible(true);
+		gd = new GridData();
+		gd.verticalAlignment = SWT.FILL;
+		gd.horizontalAlignment = SWT.FILL;
+		gd.grabExcessVerticalSpace = true;
+		gd.grabExcessHorizontalSpace = true;
+		table.setLayoutData(gd);
+
+		createColumn(iconTableViewer, "icon", 64);
+		createColumn(iconTableViewer, "pattern", 90);
+		createColumn(iconTableViewer, "kind", 70);
+		createColumn(iconTableViewer, "path", 200);
+
+		iconTableViewer.setLabelProvider(new IconLabelProvider());
+		iconTableViewer
+				.addSelectionChangedListener(new ISelectionChangedListener() {
+					@Override
+					public void selectionChanged(SelectionChangedEvent event) {
+						StructuredSelection selection = (StructuredSelection) event
+								.getSelection();
+						selectedEntry = (ComponentIconStore.Entry) selection
+								.getFirstElement();
+						notifyModified();
+					}
+				});
+
+		Composite buttonComposite = new Composite(composite, SWT.NONE);
+		gl = new GridLayout(1, false);
+		gd = new GridData();
+		gd.verticalAlignment = SWT.TOP;
+		buttonComposite.setLayout(gl);
+		buttonComposite.setLayoutData(gd);
+
+		addButton = new Button(buttonComposite, SWT.PUSH);
+		addButton.setText(BUTTON_LABEL_ADD);
+		gd = new GridData();
+		gd.widthHint = EXEC_BUTTON_WIDTH;
+		addButton.setLayoutData(gd);
+		addButton.setEnabled(true);
+		addButton.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				IconPreferenceDialog dialog = new IconPreferenceDialog(
+						getShell());
+				if (dialog.open() != IDialogConstants.OK_ID) {
+					return;
+				}
+				entryList.add(dialog.getIconEntry());
+				notifyModified();
+			}
+		});
+
+		editButton = new Button(buttonComposite, SWT.PUSH);
+		editButton.setText(BUTTON_LABEL_EDIT);
+		gd = new GridData();
+		gd.widthHint = EXEC_BUTTON_WIDTH;
+		editButton.setLayoutData(gd);
+		editButton.setEnabled(false);
+		editButton.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if (selectedEntry != null) {
+					IconPreferenceDialog dialog = new IconPreferenceDialog(
+							getShell());
+					dialog.setIconEntry(selectedEntry);
+					if (dialog.open() != IDialogConstants.OK_ID) {
+						return;
+					}
+				}
+				notifyModified();
+			}
+		});
+
+		deleteButton = new Button(buttonComposite, SWT.PUSH);
+		deleteButton.setText(BUTTON_LABEL_DELETE);
+		gd = new GridData();
+		gd.widthHint = EXEC_BUTTON_WIDTH;
+		deleteButton.setLayoutData(gd);
+		deleteButton.setEnabled(false);
+		deleteButton.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if (selectedEntry != null) {
+					entryList.remove(selectedEntry);
+				}
+				notifyModified();
+			}
+		});
+
+		importButton = new Button(buttonComposite, SWT.PUSH);
+		importButton.setText(BUTTON_LABEL_IMPORT);
+		gd = new GridData();
+		gd.widthHint = EXEC_BUTTON_WIDTH;
+		importButton.setLayoutData(gd);
+		importButton.setEnabled(true);
+		importButton.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				setErrorMessage(null);
+				FileDialog dialog = new FileDialog(getShell());
+				dialog.setFilterExtensions(new String[] { "*.xml" });
+				String s = dialog.open();
+				if (s == null) {
+					return;
+				}
+				try {
+					File file = new File(s);
+					ComponentIconStore store = ComponentIconStore
+							.loadProfile(file.getAbsolutePath());
+					entryList = store.toEntries();
+					iconTableViewer.setInput(entryList);
+				} catch (Exception e1) {
+					setErrorMessage(ERROR_IMPORT_PROFILE);
+					e1.printStackTrace();
+				}
+			}
+		});
+
+		exportButton = new Button(buttonComposite, SWT.PUSH);
+		exportButton.setText(BUTTON_LABEL_EXPORT);
+		gd = new GridData();
+		gd.widthHint = EXEC_BUTTON_WIDTH;
+		exportButton.setLayoutData(gd);
+		exportButton.setEnabled(true);
+		exportButton.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				setErrorMessage(null);
+				FileDialog dialog = new FileDialog(getShell());
+				dialog.setFilterExtensions(new String[] { "*.xml" });
+				String s = dialog.open();
+				if (s == null) {
+					return;
+				}
+				ComponentIconStore store = ComponentIconStore
+						.getByEntries(entryList);
+				try {
+					File file = new File(s);
+					store.saveProfile(file.getAbsolutePath());
+				} catch (Exception e1) {
+					setErrorMessage(ERROR_EXPORT_PROFILE);
+					e1.printStackTrace();
+				}
+			}
+		});
+
+		buildData();
+
+		return composite;
+	}
+
+	TableViewerColumn createColumn(TableViewer viewer, String title, int width) {
+		TableViewerColumn col;
+		col = new TableViewerColumn(viewer, SWT.NONE);
+		col.getColumn().setText(title);
+		col.getColumn().setWidth(width);
+		return col;
+	}
+
+	@Override
+	public void init(IWorkbench workbench) {
+	}
+
+	@Override
+	public boolean performOk() {
+		ComponentIconStore store = ComponentIconStore.getByEntries(entryList);
+		manager.saveComponentIconStore(store);
+		buildData();
+		return super.performOk();
+	}
+
+	@Override
+	protected void performDefaults() {
+		manager.resetComponentIconStore();
+		buildData();
+		super.performDefaults();
+	}
+
+	void buildData() {
+		manager.loadComponentIconStore(ComponentIconStore.eINSTANCE);
+		entryList = ComponentIconStore.eINSTANCE.toEntries();
+		iconTableViewer.setInput(entryList);
+	}
+
+	void notifyModified() {
+		editButton.setEnabled(false);
+		deleteButton.setEnabled(false);
+		if (selectedEntry != null) {
+			editButton.setEnabled(true);
+			deleteButton.setEnabled(true);
+		}
+		iconTableViewer.refresh();
+	}
+
+	/** アイコン設定表示のLabelProvider */
+	public class IconLabelProvider extends LabelProvider implements
+			ITableLabelProvider, ITableColorProvider {
+
+		@Override
+		public Image getColumnImage(Object element, int columnIndex) {
+			ComponentIconStore.Entry entry = (ComponentIconStore.Entry) element;
+			switch (columnIndex) {
+			case PROPERTY_IMAGE:
+				ImageDescriptor desc = entry.getImageDescriptor();
+				if (desc == null) {
+					return null;
+				}
+				return desc.createImage();
+			default:
+				break;
+			}
+			return null;
+		}
+
+		@Override
+		public String getColumnText(Object element, int columnIndex) {
+			ComponentIconStore.Entry entry = (ComponentIconStore.Entry) element;
+			switch (columnIndex) {
+			case PROPERTY_PATTERN:
+				if (entry.isType()) {
+					return entry.getType();
+				} else {
+					return entry.getCategory();
+				}
+			case PROPERTY_KIND:
+				return (entry.isType()) ? ComponentIconStore.Entry.KIND_TYPE
+						: ComponentIconStore.Entry.KIND_CATEGORY;
+			case PROPERTY_PATH:
+				return entry.getPath();
+			default:
+				break;
+			}
+			return null;
+		}
+
+		@Override
+		public Color getBackground(Object element, int columnIndex) {
+			return null;
+		}
+
+		@Override
+		public Color getForeground(Object element, int columnIndex) {
+			return null;
+		}
+	}
+
+}

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/preference/SystemEditorPreferencePage.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/preference/SystemEditorPreferencePage.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/preference/SystemEditorPreferencePage.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -64,7 +64,7 @@
 		Composite composite = new Composite(parent, SWT.NULL);
 		composite.setLayout(new GridLayout());
 
-		// ó‘Ô’Ê’mƒIƒuƒU[ƒoÝ’è
+		// 状態通知オブザーバ設定
 		Group statusObserverGroup = new Group(composite, SWT.NONE);
 		gl = new GridLayout();
 		gl.numColumns = 3;
@@ -111,7 +111,7 @@
 
 		createLabel(statusObserverGroup, LABEL_HB_TRYCOUNT_UNIT);
 
-		// “¯ŠúÝ’è
+		// 同期設定
 		Group syncGroup = new Group(composite, SWT.NONE);
 		gl = new GridLayout();
 		gl.numColumns = 3;
@@ -223,13 +223,14 @@
 				.getText()));
 		tcPref.setSTATUS_OBSERVER_HB_TRYCOUNT(Integer.valueOf(hbTryCountText
 				.getText()));
-		buildData();
 
 		SystemEditorPreferenceManager sePref = SystemEditorPreferenceManager
 				.getInstance();
 		sePref.setInterval(SYNC_SYSTEMEDITOR_INTERVAL, Integer
 				.parseInt(syncCycleText.getText()));
 
+		buildData();
+
 		return super.performOk();
 	}
 

Copied: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/util/DeployUtil.java (from rev 393, trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/util/DeployUtil.java)
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/util/DeployUtil.java	                        (rev 0)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/util/DeployUtil.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -0,0 +1,87 @@
+package jp.go.aist.rtm.systemeditor.ui.util;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import jp.go.aist.rtm.nameserviceview.model.manager.NameServerManager;
+import jp.go.aist.rtm.nameserviceview.model.nameservice.NamingContextNode;
+import jp.go.aist.rtm.nameserviceview.model.nameservice.NamingObjectNode;
+import jp.go.aist.rtm.toolscommon.model.component.Component;
+import jp.go.aist.rtm.toolscommon.model.component.CorbaComponent;
+import jp.go.aist.rtm.toolscommon.model.manager.RTCManager;
+import jp.go.aist.rtm.toolscommon.util.AdapterUtil;
+
+import org.eclipse.emf.common.util.EList;
+
+import RTC.RTObjectHelper;
+
+public class DeployUtil {
+
+	static public List<CorbaComponent> searchComponentList(EList target, List<CorbaComponent> result) {
+
+		for(int index=0;index<target.size();index++) {
+			if( target.get(index) instanceof NamingObjectNode ) {
+				NamingObjectNode obj = ((NamingObjectNode)target.get(index));
+				try {
+					if( obj.getCorbaObject()._is_a(RTObjectHelper.id()) ) {
+						CorbaComponent component = (CorbaComponent)(jp.go.aist.rtm.toolscommon.model.component.Component) AdapterUtil.getAdapter(obj,jp.go.aist.rtm.toolscommon.model.component.Component.class);
+						obj.getSynchronizationSupport().getSynchronizationManager().assignSynchonizationSupport(component);					
+						component.synchronizeManually();
+						component.setIor(obj.getCorbaObject().toString());
+						result.add(component);
+					}
+				} catch(Exception ex) {
+					ex.printStackTrace();
+				}
+			} else {
+				EList nscomps = ((NamingContextNode)target.get(index)).getNodes();
+				searchComponentList(nscomps, result);
+			}
+		}
+		return result;
+	}
+	
+	static public CorbaComponent searchComponent(String id, EList target) {
+
+		CorbaComponent result = null;
+		
+		for(int index=0;index<target.size();index++) {
+			if( target.get(index) instanceof NamingObjectNode ) {
+				NamingObjectNode obj = ((NamingObjectNode)target.get(index));
+				try {
+					if( obj.getCorbaObject()._is_a(RTObjectHelper.id()) ) {
+						CorbaComponent component = (CorbaComponent)(jp.go.aist.rtm.toolscommon.model.component.Component) AdapterUtil.getAdapter(obj,jp.go.aist.rtm.toolscommon.model.component.Component.class);
+						obj.getSynchronizationSupport().getSynchronizationManager().assignSynchonizationSupport(component);					
+						component.synchronizeManually();
+					
+						if( id.equals(component.getCorbaObject().toString()) ) {
+							return component;
+						}
+					}
+				} catch(Exception ex) {
+					ex.printStackTrace();
+				}
+			} else {
+				EList nscomps = ((NamingContextNode)target.get(index)).getNodes();
+				result = searchComponent(id, nscomps);
+			}
+		}
+		return result;
+	}
+	
+	static public  java.util.List<RTCManager> searchManager(Component targetComponent) {
+		java.util.List<RTCManager> result = new ArrayList<RTCManager>();
+		java.util.List<RTCManager> mgrList = NameServerManager.eInstance.getRTCManagerList();
+		if( targetComponent.getCompositeTypeL()==null || targetComponent.getCompositeTypeL().equals("None") ) {
+			String compType = targetComponent.getTypeNameL();
+			for(RTCManager manager : mgrList) {
+				if( manager.getFactoryProfileTypeNamesR().contains(compType) ) {
+					result.add(manager);
+				}
+			}
+		} else {
+			result.addAll(mgrList);
+		}
+		return result;
+	}
+}

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/util/RTMixin.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/util/RTMixin.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/util/RTMixin.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -5,6 +5,21 @@
  */
 public class RTMixin {
 
+	public static String form(String fm, String... args) {
+		String result = fm;
+		for (int i = 0; i < args.length; i++) {
+			String p = "{" + i + "}";
+			int j = result.indexOf(p);
+			if (j == -1) {
+				continue;
+			}
+			String head = result.substring(0, j);
+			String tail = result.substring(j + p.length());
+			result = head + args[i] + tail;
+		}
+		return result;
+	}
+
 	public static boolean isBlank(String s) {
 		return (s == null || s.isEmpty());
 	}

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/views/configurationview/ConfigurationView.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/views/configurationview/ConfigurationView.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/views/configurationview/ConfigurationView.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -23,6 +23,8 @@
 import jp.go.aist.rtm.toolscommon.util.AdapterUtil;
 import jp.go.aist.rtm.toolscommon.util.SDOUtil;
 
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.impl.AdapterImpl;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.MessageDialog;
@@ -249,7 +251,7 @@
 						copiedComponent.getActiveConfigSet());
 
 		ConfigurationSet newActiveConfigurationSet = null;
-		if (activeConfigurationIndex != -1) {
+        if (activeConfigurationIndex != -1) {
 			newActiveConfigurationSet = newConfigurationSetList
 					.get(activeConfigurationIndex);
 		}
@@ -264,16 +266,16 @@
 		}
 		if (targetComponent instanceof CorbaComponent) {
 			CorbaComponent c = (CorbaComponent) targetComponent;
-			c.synchronizeLocalAttribute(
-					ComponentPackage.eINSTANCE
-							.getComponent_ConfigurationSets());
-			c.synchronizeLocalAttribute(
-					ComponentPackage.eINSTANCE
-							.getComponent_ActiveConfigurationSet());
+			c.synchronizeRemoteAttribute(ComponentPackage.eINSTANCE
+					.getComponent_ConfigurationSets());
+			c.synchronizeRemoteAttribute(ComponentPackage.eINSTANCE
+					.getComponent_ActiveConfigurationSet());
+			c.synchronizeLocalAttribute(null);
 		}
 		buildData();
 
 		leftTable.setSelection(selectionIndex);
+		refreshRightData();
 	}
 
 	/** ActiveなRTCのコンフィグを変更するかを確認する */
@@ -299,36 +301,43 @@
 	}
 
 	/**
-	 * アクティブなコンフィグレーションを修正したかどうか
-	 * 
-	 * @return
+	 * アクティブなコンフィグレーションを切り替えたか
 	 */
-	private boolean isActiveConfigurationSetModified() {
-		if (copiedComponent.getActiveConfigSet() == null ||
-				copiedComponent.getActiveConfigSet().getConfigurationSet() == null) {
+	private boolean isActiveConfigurationSetChanged() {
+		if (copiedComponent.getActiveConfigSet() == null
+				|| copiedComponent.getActiveConfigSet().getConfigurationSet() == null) {
 			return targetComponent.getActiveConfigurationSet() != null;
 		}
-
-		if (targetComponent.getActiveConfigurationSet() == null)
+		if (targetComponent.getActiveConfigurationSet() == null) {
 			return true;
-		if (copiedComponent.getActiveConfigSet().getConfigurationSet().getId().equals(
-				targetComponent.getActiveConfigurationSet().getId()) == false) 
+		}
+		if (!copiedComponent.getActiveConfigSet().getConfigurationSet().getId()
+				.equals(targetComponent.getActiveConfigurationSet().getId())) {
 			return true;
-		if (copiedComponent.getActiveConfigSet().getNamedValueList()
-					.size() != targetComponent.getActiveConfigurationSet()
-					.getConfigurationData().size()) {
+		}
+		return false;
+	}
+
+	/**
+	 * アクティブなコンフィグレーションを修正したかどうか
+	 */
+	private boolean isActiveConfigurationSetModified() {
+		if (isActiveConfigurationSetChanged()) {
 			return true;
 		}
+		if (copiedComponent.getActiveConfigSet().getNamedValueList().size() != targetComponent
+				.getActiveConfigurationSet().getConfigurationData().size()) {
+			return true;
+		}
 		for (NamedValueConfigurationWrapper namedValue : copiedComponent
-					.getActiveConfigSet().getNamedValueList()) {
-			if (namedValue.isKeyModified()
-						|| namedValue.isValueModified()) {
-					return true;
+				.getActiveConfigSet().getNamedValueList()) {
+			if (namedValue.isKeyModified() || namedValue.isValueModified()) {
+				return true;
 			}
 		}
 		return false;
 	}
-
+	
 	/**
 	 * 編集後の新しいConfigurationSetを作成する。
 	 * <p>
@@ -467,7 +476,6 @@
 		gd.widthHint = BUTTON_WIDTH;
 		addConfigurationSetButton.setLayoutData(gd);
 		addConfigurationSetButton.addSelectionListener(new SelectionAdapter() {
-			@SuppressWarnings("unchecked") //$NON-NLS-1$
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				ConfigurationSetConfigurationWrapper csw = new ConfigurationSetConfigurationWrapper(
@@ -572,7 +580,6 @@
 		gd.widthHint = BUTTON_WIDTH;
 		copyConfigurationSetButton.setLayoutData(gd);
 		copyConfigurationSetButton.addSelectionListener(new SelectionAdapter() {
-			@SuppressWarnings("unchecked") //$NON-NLS-1$
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				if (leftTable.getSelectionIndex() < 0) return;
@@ -842,19 +849,52 @@
 		return super.getAdapter(adapter);
 	}
 
+	/** CORBAの同期による変更通知を受け取るアダプタ */
+	AdapterImpl eAdapter = new AdapterImpl() {
+		@Override
+		public void notifyChanged(Notification msg) {
+			if (msg.getOldValue() == this || msg.getNewValue() == this) {
+				return;
+			}
+			boolean update = false;
+			if (ComponentPackage.eINSTANCE.getComponent_ConfigurationSets()
+					.equals(msg.getFeature())) {
+				update = true;
+			}
+			if (ComponentPackage.eINSTANCE
+					.getComponent_ActiveConfigurationSet().equals(
+							msg.getFeature())) {
+				update = true;
+			}
+			if (!update) {
+				return;
+			}
+			leftTableViewer.getControl().getDisplay().asyncExec(new Runnable() {
+				@Override
+				public void run() {
+					buildData();
+				}
+			});
+		}
+	};
+
 	/**
 	 * 選択を監視するリスナ
 	 */
 	private ISelectionListener selectionListener = new ISelectionListener() {
 		public void selectionChanged(IWorkbenchPart part, ISelection selection) {
+			if (targetComponent != null) {
+				targetComponent.eAdapters().remove(eAdapter);
+			}
 			targetComponent = null;
 			if (selection instanceof IStructuredSelection) {
 				IStructuredSelection sSelection = (IStructuredSelection) selection;
-				Object selectedComponent = AdapterUtil.getAdapter(sSelection.getFirstElement(),
-										Component.class);
+				Object selectedComponent = AdapterUtil.getAdapter(sSelection
+						.getFirstElement(), Component.class);
 				if (selectedComponent != null) {
 					targetComponent = (Component) selectedComponent;
 					targetComponent.synchronizeManually();
+					targetComponent.eAdapters().add(eAdapter);
 				}
 			}
 			buildData();
@@ -930,18 +970,18 @@
 		configrationSetNameLabel.setText(""); //$NON-NLS-1$
 		addNamedValueButton.setEnabled(false);
 
-		if (copiedComponent != null) {
-			if (leftTable.getSelectionIndex() != -1) {
-				addNamedValueButton.setEnabled(true);
-				ConfigurationSetConfigurationWrapper currentConfugurationSet = copiedComponent
-						.getConfigurationSetList().get(
-								leftTable.getSelectionIndex());
+		if (copiedComponent != null && leftTable.getSelectionIndex() != -1) {
+			ConfigurationSetConfigurationWrapper currentConfugurationSet = copiedComponent
+					.getConfigurationSetList().get(
+							leftTable.getSelectionIndex());
 
-				configrationSetNameLabel.setText(currentConfugurationSet
-						.getId());
+			configrationSetNameLabel.setText(currentConfugurationSet.getId());
 
-				rightTableViewer.setInput(currentConfugurationSet
-						.getNamedValueList());
+			rightTableViewer.setInput(currentConfugurationSet
+					.getNamedValueList());
+			//
+			if (!(targetComponent instanceof CorbaComponent)) {
+				addNamedValueButton.setEnabled(true);
 			}
 		}
 
@@ -950,7 +990,9 @@
 
 	private void updateDeleteNamedValueButtonEnable() {
 		if (rightTable.getSelectionIndex() != -1) {
-			deleteNamedValueButton.setEnabled(true);
+			if (!(targetComponent instanceof CorbaComponent)) {
+				deleteNamedValueButton.setEnabled(true);
+			}
 		} else {
 			deleteNamedValueButton.setEnabled(false);
 		}
@@ -1190,7 +1232,7 @@
 
 			boolean isModify = false;
 			if (columnIndex == 0) {
-				if (isActiveConfigurationSetModified()) {
+				if (isActiveConfigurationSetChanged()) {
 					if (targetComponent.getActiveConfigurationSet() == configurationSetConfigurationWrapper
 							.getConfigurationSet()
 							|| copiedComponent.getActiveConfigSet() == configurationSetConfigurationWrapper) {

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/views/configurationview/configurationwrapper/ComponentConfigurationWrapper.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/views/configurationview/configurationwrapper/ComponentConfigurationWrapper.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/views/configurationview/configurationwrapper/ComponentConfigurationWrapper.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -25,9 +25,9 @@
 		List<ConfigurationSetConfigurationWrapper> configurationSetList = result
 				.getConfigurationSetList();
 
-		// パラメータ名－widget種別
+		// パラメータ名−widget種別
 		Map<String, String> widgets = new HashMap<String, String>();
-		// configurationSet名－制約条件マップ(パラメータ名－制約)
+		// configurationSet名−制約条件マップ(パラメータ名−制約)
 		Map<String, Map<String, String>> conditions = new HashMap<String, Map<String, String>>();
 
 		for (Object o : target.getConfigurationSets()) {

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/views/configurationview/configurationwrapper/ConfigurationCondition.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/views/configurationview/configurationwrapper/ConfigurationCondition.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/views/configurationview/configurationwrapper/ConfigurationCondition.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -503,7 +503,7 @@
 	}
 
 	/**
-	 * valueをmin～max内でmaxStep段階でステップ位置に変換します
+	 * valueをmin〜max内でmaxStep段階でステップ位置に変換します
 	 * @param value 値
 	 * @param widget Widgetオブジェクト
 	 * @return 換算したステップ位置
@@ -530,7 +530,7 @@
 	}
 
 	/**
-	 * maxStep内のstepをmin～max内の値に変換します
+	 * maxStep内のstepをmin〜max内の値に変換します
 	 * @param step ステップ位置
 	 * @param widget Widgetオブジェクト
 	 * @param previousValue 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/views/configurationview/configurationwrapper/ConfigurationWidget.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/views/configurationview/configurationwrapper/ConfigurationWidget.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/views/configurationview/configurationwrapper/ConfigurationWidget.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -13,6 +13,8 @@
 	public static final String SLIDER = "slider";
 	public static final String SPIN = "spin";
 	public static final String RADIO = "radio";
+	public static final String CHECKBOX = "checkbox";
+	public static final String ORDERED_LIST = "ordered_list";
 
 	private String type;
 	private ConfigurationCondition condition;
@@ -98,7 +100,8 @@
 					// slider、spinnerで最大、最小値がなければテキスト
 					this.type = TEXT;
 				}
-			} else if (this.isRadio()) {
+			} else if (this.isRadio() || this.isCheckbox()
+					|| this.isOrderedList()) {
 				if (!condition.hasEnumList()) {
 					// radioは列挙設定がなければテキスト
 					this.type = TEXT;
@@ -119,8 +122,15 @@
 			setSpinStep(type);
 			return SPIN;
 		}
-		if (type.equals(RADIO))
+		if (type.equals(RADIO)) {
 			return RADIO;
+		}
+		if (type.equals(CHECKBOX)) {
+			return CHECKBOX;
+		}
+		if (type.equals(ORDERED_LIST)) {
+			return ORDERED_LIST;
+		}
 		return TEXT;
 	}
 
@@ -162,8 +172,17 @@
 		return this.type.equals(RADIO);
 	}
 
+	public boolean isCheckbox() {
+		return this.type.equals(CHECKBOX);
+	}
+
+	public boolean isOrderedList() {
+		return this.type.equals(ORDERED_LIST);
+	}
+
 	public boolean isText() {
-		return !(this.isSlider() || this.isSpinner() || this.isRadio());
+		return !(this.isSlider() || this.isSpinner() || this.isRadio()
+				|| this.isCheckbox() || this.isOrderedList());
 	}
 
 	public boolean hasCondition() {
@@ -184,10 +203,32 @@
 		this.valueModified = true;
 	}
 
+	public void setValueByArray(String[] values) {
+		if (values == null) {
+			return;
+		}
+		String val = "";
+		for (String s : values) {
+			if (!val.isEmpty()) {
+				val += ",";
+			}
+			val += s;
+		}
+		setValue(val);
+	}
+
 	public String getValue() {
 		return this.value;
 	}
 
+	public String[] getValueAsArray() {
+		String[] values = new String[0];
+		if (this.value != null && !this.value.isEmpty()) {
+			values = this.value.split(",");
+		}
+		return values;
+	}
+
 	public void clearValueModified() {
 		this.valueModified = false;
 	}

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/test/jp/go/aist/rtm/systemeditor/ui/views/configurationview/configurationwrapper/ComponentConfigurationWrapperTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/test/jp/go/aist/rtm/systemeditor/ui/views/configurationview/configurationwrapper/ComponentConfigurationWrapperTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/test/jp/go/aist/rtm/systemeditor/ui/views/configurationview/configurationwrapper/ComponentConfigurationWrapperTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -32,6 +32,16 @@
 						assertEquals("(test1,test2,test3,test4,test5)", nv
 								.widget().getCondition().toString());
 					} else if (nv.getKey() == "str_param2") {
+						assertEquals("top", this.getNamedValueString(nv));
+						assertEquals("checkbox", nv.widget().getType());
+						assertEquals("(top,left,bottom,right)", nv.widget()
+								.getCondition().toString());
+					} else if (nv.getKey() == "str_param3") {
+						assertEquals("bottom", this.getNamedValueString(nv));
+						assertEquals("ordered_list", nv.widget().getType());
+						assertEquals("(top,left,bottom,right)", nv.widget()
+								.getCondition().toString());
+					} else if (nv.getKey() == "str_param4") {
 						assertEquals("case1", this.getNamedValueString(nv));
 						assertEquals("text", nv.widget().getType());
 						assertEquals("null", nv.widget().getCondition().toString());
@@ -70,6 +80,16 @@
 						assertEquals("(test1,test2,test3)", nv.widget()
 								.getCondition().toString());
 					} else if (nv.getKey() == "str_param2") {
+						assertEquals("right", this.getNamedValueString(nv));
+						assertEquals("checkbox", nv.widget().getType());
+						assertEquals("(top,left,bottom,right)", nv.widget()
+								.getCondition().toString());
+					} else if (nv.getKey() == "str_param3") {
+						assertEquals("top,left", this.getNamedValueString(nv));
+						assertEquals("ordered_list", nv.widget().getType());
+						assertEquals("(top,left,bottom,right)", nv.widget()
+								.getCondition().toString());
+					} else if (nv.getKey() == "str_param4") {
 						assertEquals("case2", this.getNamedValueString(nv));
 						assertEquals("text", nv.widget().getType());
 						assertEquals("null", nv.widget().getCondition().toString());
@@ -108,6 +128,16 @@
 						assertEquals("(test1,test2,test3,test4,test5)", nv
 								.widget().getCondition().toString());
 					} else if (nv.getKey() == "str_param2") {
+						assertEquals("left", this.getNamedValueString(nv));
+						assertEquals("checkbox", nv.widget().getType());
+						assertEquals("(top,left,bottom,right)", nv.widget()
+								.getCondition().toString());
+					} else if (nv.getKey() == "str_param3") {
+						assertEquals("bottom,right,right", this.getNamedValueString(nv));
+						assertEquals("ordered_list", nv.widget().getType());
+						assertEquals("(top,left,bottom,right)", nv.widget()
+								.getCondition().toString());
+					} else if (nv.getKey() == "str_param4") {
 						assertEquals("case3", this.getNamedValueString(nv));
 						assertEquals("text", nv.widget().getType());
 						assertEquals("null", nv.widget().getCondition().toString());
@@ -142,6 +172,8 @@
 		assertEquals(true, names.contains("double_param1"));
 		assertEquals(true, names.contains("str_param1"));
 		assertEquals(true, names.contains("str_param2"));
+		assertEquals(true, names.contains("str_param3"));
+		assertEquals(true, names.contains("str_param4"));
 		assertEquals(true, names.contains("vector_param1"));
 		assertEquals(false, names.contains("unknown_param1"));
 	}

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/test/jp/go/aist/rtm/systemeditor/ui/views/configurationview/configurationwrapper/ConfigurationWidgetTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/test/jp/go/aist/rtm/systemeditor/ui/views/configurationview/configurationwrapper/ConfigurationWidgetTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/test/jp/go/aist/rtm/systemeditor/ui/views/configurationview/configurationwrapper/ConfigurationWidgetTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -47,7 +47,21 @@
 		verifyWidget(result.get("key0"), ConfigurationWidget.SLIDER, "0.0<x<10.0");
 		verifyWidget(result.get("key1"), ConfigurationWidget.SLIDER, "0.1<x<10.0");
 	}
-	
+
+	public void testParseHashWidget3() throws Exception {
+		ConfigurationCondition cc = ConfigurationCondition.parse("{key0:(top,left,bottom,right), key1:0.0<x<10.0 }");
+		Map<String, ConfigurationWidget> result = ConfigurationWidget.parseHashWidget("{key0:checkbox, key1:spin}", cc);
+		verifyWidget(result.get("key0"), ConfigurationWidget.CHECKBOX, "(top,left,bottom,right)");
+		verifyWidget(result.get("key1"), ConfigurationWidget.SPIN, "0.0<x<10.0");
+	}
+
+	public void testParseHashWidget4() throws Exception {
+		ConfigurationCondition cc = ConfigurationCondition.parse("{key0:(top,left,bottom,right), key1:0.0<x<10.0 }");
+		Map<String, ConfigurationWidget> result = ConfigurationWidget.parseHashWidget("{key0:ordered_list, key1:spin}", cc);
+		verifyWidget(result.get("key0"), ConfigurationWidget.ORDERED_LIST, "(top,left,bottom,right)");
+		verifyWidget(result.get("key1"), ConfigurationWidget.SPIN, "0.0<x<10.0");
+	}
+
 	public void testSimpleWidget() throws Exception {
 		ConfigurationCondition cc = ConfigurationCondition.parse(" 0.0<x<10.0 ");
 		List<ConfigurationWidget> result = ConfigurationWidget.parseSimpleWidget(" slider ", cc);

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/test/jp/go/aist/rtm/systemeditor/ui/views/configurationview/configurationwrapper/NamedValueConfigurationWrapperTest.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/test/jp/go/aist/rtm/systemeditor/ui/views/configurationview/configurationwrapper/NamedValueConfigurationWrapperTest.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/test/jp/go/aist/rtm/systemeditor/ui/views/configurationview/configurationwrapper/NamedValueConfigurationWrapperTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -65,6 +65,42 @@
 		assertEquals(true, nv.widget().isText());
 		assertEquals(true, nv.widget().getCondition().isNull());
 
+		// checkboxは列挙設定が必要
+		nv.setWidgetAndCondition("checkbox", "(top,left,bottom,right)");
+		assertEquals(true, nv.widget().isCheckbox());
+		assertEquals(true, nv.widget().getCondition().hasEnumList());
+		assertEquals(4, nv.widget().getCondition().getEnumList().size());
+
+		nv.setWidgetAndCondition("checkbox", "x<100");
+		assertEquals(false, nv.widget().isCheckbox());
+		assertEquals(true, nv.widget().isText());
+		assertEquals(false, nv.widget().getCondition().hasEnumList());
+		assertEquals(null, nv.widget().getCondition().getMin());
+		assertEquals("100", nv.widget().getCondition().getMax());
+
+		nv.setWidgetAndCondition("checkbox", "");
+		assertEquals(false, nv.widget().isCheckbox());
+		assertEquals(true, nv.widget().isText());
+		assertEquals(true, nv.widget().getCondition().isNull());
+
+		// ordered_listは列挙設定が必要
+		nv.setWidgetAndCondition("ordered_list", "(top,left,bottom,right)");
+		assertEquals(true, nv.widget().isOrderedList());
+		assertEquals(true, nv.widget().getCondition().hasEnumList());
+		assertEquals(4, nv.widget().getCondition().getEnumList().size());
+
+		nv.setWidgetAndCondition("ordered_list", "x<100");
+		assertEquals(false, nv.widget().isOrderedList());
+		assertEquals(true, nv.widget().isText());
+		assertEquals(false, nv.widget().getCondition().hasEnumList());
+		assertEquals(null, nv.widget().getCondition().getMin());
+		assertEquals("100", nv.widget().getCondition().getMax());
+
+		nv.setWidgetAndCondition("ordered_list", "");
+		assertEquals(false, nv.widget().isOrderedList());
+		assertEquals(true, nv.widget().isText());
+		assertEquals(true, nv.widget().getCondition().isNull());
+
 		// 制約条件エラーの場合はtext
 		nv.setWidgetAndCondition("radio", "(100,200"); // 列挙閉じ括弧なし
 		assertEquals(false, nv.widget().isRadio());

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/test/jp/go/aist/rtm/systemeditor/ui/views/configurationview/mock/ComponentMock.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/test/jp/go/aist/rtm/systemeditor/ui/views/configurationview/mock/ComponentMock.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/test/jp/go/aist/rtm/systemeditor/ui/views/configurationview/mock/ComponentMock.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -7,6 +7,7 @@
 import jp.go.aist.rtm.toolscommon.model.component.ConfigurationSet;
 import jp.go.aist.rtm.toolscommon.model.component.ContextHandler;
 import jp.go.aist.rtm.toolscommon.model.component.ExecutionContext;
+import jp.go.aist.rtm.toolscommon.model.component.IPropertyMap;
 import jp.go.aist.rtm.toolscommon.model.component.InPort;
 import jp.go.aist.rtm.toolscommon.model.component.NameValue;
 import jp.go.aist.rtm.toolscommon.model.component.OutPort;
@@ -52,8 +53,12 @@
 		cs.configurationData.add(nv);
 		nv = createNameValue("str_param1", "test1");
 		cs.configurationData.add(nv);
-		nv = createNameValue("str_param2", "case1");
+		nv = createNameValue("str_param2", "top");
 		cs.configurationData.add(nv);
+		nv = createNameValue("str_param3", "bottom");
+		cs.configurationData.add(nv);
+		nv = createNameValue("str_param4", "case1");
+		cs.configurationData.add(nv);
 		nv = createNameValue("vector_param1", "0.01, 0.11, 0.22");
 		cs.configurationData.add(nv);
 		mock1.configurationSets.add(cs);
@@ -66,8 +71,12 @@
 		cs.configurationData.add(nv);
 		nv = createNameValue("str_param1", "test2");
 		cs.configurationData.add(nv);
-		nv = createNameValue("str_param2", "case2");
+		nv = createNameValue("str_param2", "right");
 		cs.configurationData.add(nv);
+		nv = createNameValue("str_param3", "top,left");
+		cs.configurationData.add(nv);
+		nv = createNameValue("str_param4", "case2");
+		cs.configurationData.add(nv);
 		nv = createNameValue("vector_param1", "5.5, 10.5, 15.5");
 		cs.configurationData.add(nv);
 		mock1.configurationSets.add(cs);
@@ -80,8 +89,12 @@
 		cs.configurationData.add(nv);
 		nv = createNameValue("str_param1", "test3");
 		cs.configurationData.add(nv);
-		nv = createNameValue("str_param2", "case3");
+		nv = createNameValue("str_param2", "left");
 		cs.configurationData.add(nv);
+		nv = createNameValue("str_param3", "bottom,right,right");
+		cs.configurationData.add(nv);
+		nv = createNameValue("str_param4", "case3");
+		cs.configurationData.add(nv);
 		nv = createNameValue("vector_param1", "0.05, 0.15, 0.25");
 		cs.configurationData.add(nv);
 		mock1.configurationSets.add(cs);
@@ -94,8 +107,12 @@
 		cs.configurationData.add(nv);
 		nv = createNameValue("str_param1", "radio");
 		cs.configurationData.add(nv);
-		nv = createNameValue("str_param2", "hoge"); // 不明なwidget種別
+		nv = createNameValue("str_param2", "checkbox");
 		cs.configurationData.add(nv);
+		nv = createNameValue("str_param3", "ordered_list");
+		cs.configurationData.add(nv);
+		nv = createNameValue("str_param4", "hoge"); // 不明なwidget種別
+		cs.configurationData.add(nv);
 		nv = createNameValue("vector_param1", "spin"); // TODO 配列表記
 		cs.configurationData.add(nv);
 		mock1.configurationSets.add(cs);
@@ -108,6 +125,10 @@
 		cs.configurationData.add(nv);
 		nv = createNameValue("str_param1", "(test1,test2,test3,test4,test5)");
 		cs.configurationData.add(nv);
+		nv = createNameValue("str_param2", "(top,left,bottom,right)");
+		cs.configurationData.add(nv);
+		nv = createNameValue("str_param3", "(top,left,bottom,right)");
+		cs.configurationData.add(nv);
 		nv = createNameValue("vector_param1", "0.0<x<1.0, 1.0<x<2.0, 2.0<x<3.0");
 		cs.configurationData.add(nv);
 		mock1.configurationSets.add(cs);
@@ -120,6 +141,10 @@
 		cs.configurationData.add(nv);
 		nv = createNameValue("str_param1", "(test1,test2,test3)");
 		cs.configurationData.add(nv);
+		nv = createNameValue("str_param2", "(top,left,bottom,right)");
+		cs.configurationData.add(nv);
+		nv = createNameValue("str_param3", "(top,left,bottom,right)");
+		cs.configurationData.add(nv);
 		nv = createNameValue("vector_param1", "5.0<x<10.0, 10.0<x<15.0, 15.0<x<20.0");
 		cs.configurationData.add(nv);
 		mock1.configurationSets.add(cs);
@@ -598,4 +623,20 @@
 		// TODO Auto-generated method stub
 	}
 
+	@Override
+	public IPropertyMap getPropertyMap() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void synchronizeRemoteAttribute(EStructuralFeature reference) {
+		// TODO Auto-generated method stub
+	}
+
+	@Override
+	public void synchronizeRemoteChildComponents() {
+		// TODO Auto-generated method stub
+	}
+
 }

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor.nl1/META-INF/MANIFEST.MF
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor.nl1/META-INF/MANIFEST.MF	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor.nl1/META-INF/MANIFEST.MF	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,7 +1,12 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Graphical Editor for RT system Nl1 Fragment
-Bundle-SymbolicName: jp.go.aist.rtm.systemeditor.nl1
-Bundle-Version: 1.1.0.v20110411
-Fragment-Host: jp.go.aist.rtm.systemeditor;bundle-version="0.0.0"
-Bundle-Vendor: AIST
+Manifest-Version: 1.0
+Ant-Version: Apache Ant 1.7.1
+Created-By: 20.0-b12 (Sun Microsystems Inc.)
+Bundle-ManifestVersion: 2
+Bundle-Name: Graphical Editor for RT system Nl1 Fragment
+Bundle-SymbolicName: jp.go.aist.rtm.systemeditor.nl1
+Bundle-Version: 1.1.0.rc4v20130124
+Fragment-Host: jp.go.aist.rtm.systemeditor;bundle-version="1.1.0"
+Bundle-Vendor: AIST
+Built-By: n-ando
+Built-Date: 2013/01/25 00:47:32
+

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor.nl1/build.xml
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor.nl1/build.xml	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor.nl1/build.xml	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,6 +1,8 @@
-<project name="jp.go.aist.rtm.systemeditor.nl1_1.0.0" default="jar">
-	<property name="target.name" value="jp.go.aist.rtm.systemeditor.nl1_1.0.0"/>
+<project name="jp.go.aist.rtm.systemeditor.nl1" default="jar">
+	<property name="target.name" value="jp.go.aist.rtm.systemeditor.nl1" />
 
+	<taskdef name="manifesttask" classname="aist.ManifestTask" />
+
 	<property name="source" value="src"/>
 
 	<property name="dist.dir" value="jar" />
@@ -14,6 +16,9 @@
 	<property name="targetPlatformLocation" value="${eclipse.home}" />
 	<property name="workspace" value="${basedir}/.." />
 	<property name="project.name" value="jp.go.aist.rtm.toolscommon" />
+	<tstamp>
+		<format property="built.date" pattern="yyyy/MM/dd HH:mm:ss" />
+	</tstamp>
 
 	<target name="buildAll">
 		<!--
@@ -25,27 +30,45 @@
 
 
 	<target name="clean" description="ビルドで生成されたファイルを削除します">
-		<delete includeEmptyDirs="true">
+		<delete includeEmptyDirs="true" quiet="true">
 			<fileset dir="${build.dir}" includes="**/*.class" />
 		</delete>
+		<delete dir="${dist.dir}" quiet="true"/>
 	</target>
 
 	<target name="compile" description="ソースをコンパイルします">
 		<getEclipseClasspath pathid="build.classpath" targetplatformlocation="${targetPlatformLocation}"
 					workspace="${workspace}" projectname="${project.name}"/>
 		<javac srcdir="${source}" destdir="${build.dir}"
-			classpathref="build.classpath" classpath="lib/commons-lang-2.2.jar" encoding="Shift_JIS" />
+			classpathref="build.classpath" classpath="lib/commons-lang-2.2.jar" encoding="UTF-8" />
 	</target>
 
 	<target name="jar" description="jarファイルを作成します">
 		<mkdir dir="${dist.dir}" />
-		<delete file="${dist.dir}/${target.name}.jar" />
-
-		<jar destfile="${dist.dir}/${target.name}.jar" manifest="META-INF/MANIFEST.MF">
+		<delete>
+			<fileset dir="${dist.dir}" includes="${target.name}_*.jar" />
+		</delete>
+		<!-- Version settings -->
+		<manifesttask file="META-INF/MANIFEST.MF" key="Bundle-Version" property="manifest.project.version" />
+		<condition property="project.version"
+                   value="${env.PROJECT_VERSION}"
+                   else="${manifest.project.version}">
+			<isset property="env.PROJECT_VERSION" />
+		</condition>
+		<property name="jar.version" value="_${project.version}"/>
+		<property name="jar.name" value="${target.name}${jar.version}"/>
+		<!-- Updating MANIFEST.MF -->
+		<manifest file="META-INF/MANIFEST.MF" mode="update">
+			<attribute name="Bundle-Version" value="${project.version}"/>
+			<attribute name="Built-By" value="${user.name}"/>
+			<attribute name="Built-Date" value="${built.date}"/>
+		</manifest>
+		<!-- Creating a jar file -->		<jar destfile="${dist.dir}/${jar.name}.jar" manifest="META-INF/MANIFEST.MF">
 			<fileset dir="${source}" />
 			<fileset dir=".">
 				<include name="plugin_ja.properties" />
 			</fileset>
 		</jar>
 	</target>
+
 </project>

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor.nl1/plugin_ja.properties
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor.nl1/plugin_ja.properties	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor.nl1/plugin_ja.properties	2013-01-29 10:39:20 UTC (rev 394)
@@ -38,6 +38,7 @@
 # preferencePages
 Connection = \u63a5\u7d9a
 DisplayColor = \u8868\u793a\u8272
+IconPreference.name = \u30a2\u30a4\u30b3\u30f3
 OfflineEditor = \u30aa\u30d5\u30e9\u30a4\u30f3\u30fb\u30a8\u30c7\u30a3\u30bf
 OnlineEditor = \u30aa\u30f3\u30e9\u30a4\u30f3\u30fb\u30a8\u30c7\u30a3\u30bf 
 
@@ -67,6 +68,13 @@
 Create_Composite_Component = \u8907\u5408\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u306e\u4f5c\u6210
 Decompose_Composite_Component = \u8907\u5408\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u3092\u89e3\u9664
 Open_With_System_Diagram_Editor = \u30a8\u30c7\u30a3\u30bf\u3067\u958b\u304f
+StartLogging.label = \u30ed\u30b0\u53ce\u96c6\u3092\u958b\u59cb
+ConnectPort.label = \u63a5\u7d9a
+DisconnectPort.label = \u5207\u65ad
+Set_Deploy_Info =\u30c7\u30d7\u30ed\u30a4\u60c5\u5831\u306e\u8a2d\u5b9a
+Deploy_System =\u30c7\u30d7\u30ed\u30a4
+Deploy_Save =\u30c7\u30d7\u30ed\u30a4\u60c5\u5831\u306e\u4fdd\u5b58
+Deploy_Load =\u30c7\u30d7\u30ed\u30a4\u60c5\u5831\u306e\u8aad\u8fbc
 
 All_Disconnect =\u3059\u3079\u3066\u5207\u65ad
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor.nl1/src/jp/go/aist/rtm/systemeditor/nl/messages_ja.properties
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor.nl1/src/jp/go/aist/rtm/systemeditor/nl/messages_ja.properties	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor.nl1/src/jp/go/aist/rtm/systemeditor/nl/messages_ja.properties	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,5 +1,11 @@
 Common.dialog.confirm_title=\u78ba\u8a8d
 Common.dialog.error_title=\u30a8\u30e9\u30fc
+Common.button.add=\u8ffd\u52a0
+Common.button.delete=\u524a\u9664
+Common.button.edit=\u7de8\u96c6
+Common.button.import=\u30a4\u30f3\u30dd\u30fc\u30c8
+Common.button.export=\u30a8\u30af\u30b9\u30dd\u30fc\u30c8
+Common.button.browse=\u53c2\u7167..
 
 Restoration.0=RTC\u306e\u30b3\u30f3\u30d5\u30a3\u30b0\u30ec\u30fc\u30b7\u30e7\u30f3\u306e\u5fa9\u5143\u306b\u5931\u6557\u3057\u307e\u3057\u305f:[
 Restoration.4=RTC\u306eActivate\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002[
@@ -33,6 +39,7 @@
 AllComponentActionDelegate.12=\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u3078\u30ea\u30af\u30a8\u30b9\u30c8\u3092\u9001\u308a\u307e\u3057\u305f\u3002
 AllComponentActionDelegate.13=\u30a8\u30e9\u30fc
 AllComponentActionDelegate.14=\u30ea\u30af\u30a8\u30b9\u30c8\u306e\u9001\u4fe1\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f:\r\n
+ConnectorCreaterDialogBase.0=\u30d7\u30ed\u30d1\u30c6\u30a3\u540d\u304c\u91cd\u8907\u3057\u3066\u3044\u307e\u3059\u3002
 DataConnectorCreaterDialog.1=ConnectorProfile\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 DataConnectorCreaterDialog.2=Name : 
 DataConnectorCreaterDialog.3=Data Type : 
@@ -73,6 +80,8 @@
 ProfileInformationDialog.16=Required:
 ProfileInformationDialog.17=\u3059\u3079\u3066\u9078\u629e(&S)
 ProfileInformationDialog.18=\u3059\u3079\u3066\u89e3\u9664(&D)
+DeploymentInformationDialog.0=\u30c7\u30d7\u30ed\u30a4\u60c5\u5831\u8a2d\u5b9a
+Deployment.0=\u30c7\u30d7\u30ed\u30a4\u60c5\u5831\u304c\u4e0d\u5b8c\u5168\u3067\u3059\u3002\u51e6\u7406\u3092\u7d99\u7d9a\u3057\u307e\u3059\u304b\uff1f
 NewCompositeComponentDialog.2=Manager : 
 NewCompositeComponentDialog.3=Name : 
 NewCompositeComponentDialog.4=Type : 
@@ -96,8 +105,8 @@
 AboutDialog.22=About RT System Editor
 ServiceConnectorCreaterDialog.1=\u30dd\u30fc\u30c8\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 ServiceConnectorCreaterDialog.2=Error
-ServiceConnectorCreaterDialog.3=No corresponding port interface.
-ServiceConnectorCreaterDialog.4=Port interfaces do not match completely.
+ServiceConnectorCreaterDialog.3=\u4e00\u81f4\u3059\u308b\u30dd\u30fc\u30c8\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u304c\u3042\u308a\u307e\u305b\u3093\u3002
+ServiceConnectorCreaterDialog.4=\u30dd\u30fc\u30c8\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306e\u4e00\u90e8\u304c\u4e00\u81f4\u3057\u307e\u305b\u3093\u3002
 ServiceConnectorCreaterDialog.5=Name : 
 ServiceConnectorCreaterDialog.6=Port Profile
 ServiceConnectorCreaterDialog.7=Consumer
@@ -106,6 +115,8 @@
 ServiceConnectorCreaterDialog.10=\u524a\u9664
 ServiceConnectorCreaterDialog.11=\u8a73\u7d30...
 ServiceConnectorCreaterDialog.12=unknown
+ServiceConnectorCreaterDialog.13=\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306e\u578b\u304c\u4e00\u81f4\u3057\u307e\u305b\u3093\u3002consumer={0} provider={1}
+ServiceConnectorCreaterDialog.14=\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306e\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u540d\u304c\u4e00\u81f4\u3057\u307e\u305b\u3093\u3002consumer={0} provider={1}
 ConfigurationDialog.3=Apply
 ConfigurationDialog.4=ConfigurationSet : 
 ConfigurationDialog.6=\u5236\u7d04\u6761\u4ef6[
@@ -320,3 +331,18 @@
 ExecutionContextView.12=\u30c7\u30bf\u30c3\u30c1
 ExecutionContextView.13=\u30a2\u30bf\u30c3\u30c1
 SelectAttachComponentDialog.1=\u30a2\u30bf\u30c3\u30c1\u3059\u308b\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+StartLoggingActionDelegate.start=\u30ed\u30b0\u53ce\u96c6\u3092\u958b\u59cb
+StartLoggingActionDelegate.stop=\u30ed\u30b0\u53ce\u96c6\u3092\u505c\u6b62
+DeployActionDelegate.0=XML\u5f62\u5f0f
+ConnectPortActionDelegate.connect=\u63a5\u7d9a
+ConnectPortActionDelegate.disconnect=\u5207\u65ad
+ConnectPortActionDelegate.error.1=\u30dd\u30fc\u30c8\u3092\u5207\u65ad\u3067\u304d\u307e\u305b\u3093
+ConnectPortActionDelegate.error.2=\u30dd\u30fc\u30c8\u306e\u5207\u65ad\u306b\u5931\u6557\u3057\u307e\u3057\u305f [{0}]
+DisconnectDialog.title=Disconnect Profile
+DisconnectDialog.explain=\u5207\u65ad\u3059\u308b\u30b3\u30cd\u30af\u30b7\u30e7\u30f3\u3092\u9078\u3073\u3001OK\u3092\u30af\u30ea\u30c3\u30af\u3057\u3066\u78ba\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044
+IconPreferenceDialog.title=Icon Preference
+IconPreferenceDialog.label.pattern=Pattern: 
+IconPreferenceDialog.label.path=Icon path: 
+IconPreferenceDialog.filter.name=\u30a2\u30a4\u30b3\u30f3\u753b\u50cf
+IconPreferencePage.error.import=\u30a2\u30a4\u30b3\u30f3\u8a2d\u5b9a\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u306e\u8aad\u8fbc\u306b\u5931\u6557\u3057\u307e\u3057\u305f
+IconPreferencePage.error.export=\u30a2\u30a4\u30b3\u30f3\u8a2d\u5b9a\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u306e\u4fdd\u5b58\u306b\u5931\u6557\u3057\u307e\u3057\u305f

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/META-INF/MANIFEST.MF
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/META-INF/MANIFEST.MF	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/META-INF/MANIFEST.MF	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,57 +1,41 @@
 Manifest-Version: 1.0
+Ant-Version: Apache Ant 1.7.1
+Created-By: 20.0-b12 (Sun Microsystems Inc.)
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: jp.go.aist.rtm.toolscommon; singleton:=true
-Bundle-Version: 1.1.0.v20110411
-Bundle-ClassPath: .,
- lib/commons-lang-2.2.jar
+Bundle-Version: 1.1.0.rc4v20130124
+Bundle-ClassPath: .,lib/commons-lang-2.2.jar
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: RTC,
- RTM,
- _SDOPackage,
- jp.go.aist.rtm.toolscommon,
- jp.go.aist.rtm.toolscommon.adapterfactory,
- jp.go.aist.rtm.toolscommon.corba,
- jp.go.aist.rtm.toolscommon.extension,
- jp.go.aist.rtm.toolscommon.factory,
- jp.go.aist.rtm.toolscommon.manager,
- jp.go.aist.rtm.toolscommon.model.component,
- jp.go.aist.rtm.toolscommon.model.component.impl,
- jp.go.aist.rtm.toolscommon.model.component.util,
- jp.go.aist.rtm.toolscommon.model.core,
- jp.go.aist.rtm.toolscommon.model.core.impl,
- jp.go.aist.rtm.toolscommon.model.core.util,
- jp.go.aist.rtm.toolscommon.model.manager,
- jp.go.aist.rtm.toolscommon.model.manager.impl,
- jp.go.aist.rtm.toolscommon.model.manager.util,
- jp.go.aist.rtm.toolscommon.synchronizationframework,
- jp.go.aist.rtm.toolscommon.synchronizationframework.mapping,
- jp.go.aist.rtm.toolscommon.ui.dialog,
- jp.go.aist.rtm.toolscommon.ui.perspective,
- jp.go.aist.rtm.toolscommon.ui.propertysource,
- jp.go.aist.rtm.toolscommon.ui.views.propertysheetview,
- jp.go.aist.rtm.toolscommon.ui.workbenchadapter,
- jp.go.aist.rtm.toolscommon.util,
- jp.go.aist.rtm.toolscommon.validation,
- org.apache.commons.lang,
- org.apache.commons.lang.builder,
- org.apache.commons.lang.enums,
- org.apache.commons.lang.exception,
- org.apache.commons.lang.math,
- org.apache.commons.lang.mutable,
- org.apache.commons.lang.text,
- org.apache.commons.lang.time
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.xmi;visibility:=reexport,
- org.eclipse.ui;visibility:=reexport,
- org.eclipse.ui.views,
- org.eclipse.core.runtime;visibility:=reexport,
- org.eclipse.ui.editors;visibility:=reexport,
- org.eclipse.core.resources;visibility:=reexport,
- org.eclipse.ui.ide;visibility:=reexport,
- jp.go.aist.rtm.toolscommon.profiles
+Export-Package: OpenRTM,RTC,RTM,_SDOPackage,jp.go.aist.rtm.toolscommon
+ ,jp.go.aist.rtm.toolscommon.adapterfactory,jp.go.aist.rtm.toolscommon
+ .corba,jp.go.aist.rtm.toolscommon.extension,jp.go.aist.rtm.toolscommo
+ n.factory,jp.go.aist.rtm.toolscommon.manager,jp.go.aist.rtm.toolscomm
+ on.model.component,jp.go.aist.rtm.toolscommon.model.component.impl,jp
+ .go.aist.rtm.toolscommon.model.component.util,jp.go.aist.rtm.toolscom
+ mon.model.core,jp.go.aist.rtm.toolscommon.model.core.impl,jp.go.aist.
+ rtm.toolscommon.model.core.util,jp.go.aist.rtm.toolscommon.model.mana
+ ger,jp.go.aist.rtm.toolscommon.model.manager.impl,jp.go.aist.rtm.tool
+ scommon.model.manager.util,jp.go.aist.rtm.toolscommon.synchronization
+ framework,jp.go.aist.rtm.toolscommon.synchronizationframework.mapping
+ ,jp.go.aist.rtm.toolscommon.ui.dialog,jp.go.aist.rtm.toolscommon.ui.p
+ erspective,jp.go.aist.rtm.toolscommon.ui.propertysource,jp.go.aist.rt
+ m.toolscommon.ui.views.propertysheetview,jp.go.aist.rtm.toolscommon.u
+ i.workbenchadapter,jp.go.aist.rtm.toolscommon.util,jp.go.aist.rtm.too
+ lscommon.validation,org.apache.commons.lang,org.apache.commons.lang.b
+ uilder,org.apache.commons.lang.enums,org.apache.commons.lang.exceptio
+ n,org.apache.commons.lang.math,org.apache.commons.lang.mutable,org.ap
+ ache.commons.lang.text,org.apache.commons.lang.time
+Require-Bundle: org.eclipse.core.runtime,org.eclipse.emf.ecore;visibil
+ ity:=reexport,org.eclipse.emf.ecore.xmi;visibility:=reexport,org.ecli
+ pse.ui;visibility:=reexport,org.eclipse.ui.views,org.eclipse.core.run
+ time;visibility:=reexport,org.eclipse.ui.editors;visibility:=reexport
+ ,org.eclipse.core.resources;visibility:=reexport,org.eclipse.ui.ide;v
+ isibility:=reexport,jp.go.aist.rtm.toolscommon.profiles
 Bundle-ActivationPolicy: lazy
 Eclipse-BuddyPolicy: registered
 Bundle-Activator: jp.go.aist.rtm.toolscommon.ToolsCommonPlugin
+Built-By: n-ando
+Built-Date: 2013/01/25 00:46:59
+

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/build.xml
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/build.xml	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/build.xml	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,6 +1,8 @@
-<project name="jp.go.aist.rtm.toolscommon_1.0.0" default="jar">
-	<property name="target.name" value="jp.go.aist.rtm.toolscommon_1.0.0"/>
+<project name="jp.go.aist.rtm.toolscommon" default="jar">
+	<property name="target.name" value="jp.go.aist.rtm.toolscommon" />
 
+	<taskdef name="manifesttask" classname="aist.ManifestTask" />
+
 	<property name="source" value="src"/>
 	<property name="source.sdo" value="src/_SDOPackage"/>
 	<property name="source.rtc" value="src/RTC"/>
@@ -16,21 +18,21 @@
 	<property name="idl.path" value="idl" />
 	<property name="idl.SDOPackage" value="${idl.path}/SDOPackage11.idl" />
 	<property name="idl.RTC" value="${idl.path}/RTC10.idl" />
-	<property name="idl.OpenRTM" value="${idl.path}/OpenRTM.idl" />
-	<property name="idl.BasicDataType" value="${idl.path}/BasicDataType.idl" />
-	<property name="idl.DataPort" value="${idl.path}/DataPort.idl" />
 	<property name="idl.Manager" value="${idl.path}/Manager.idl" />
-
+	<property name="idl.ComponentObserver" value="${idl.path}/ComponentObserver.idl" />
+	<property name="idl.Logger" value="${idl.path}/Logger.idl" />
 	
-	
 	<taskdef resource="net/sf/ant4eclipse/antlib.xml" />
 	<property name="targetPlatformLocation" value="${eclipse.home}" />
 	<property name="workspace" value="${basedir}/.." />
 	<property name="project.name" value="jp.go.aist.rtm.toolscommon" />
+	<tstamp>
+		<format property="built.date" pattern="yyyy/MM/dd HH:mm:ss" />
+	</tstamp>
 
 	<target name="buildAll">
+		<antcall target="clean" />
 		<antcall target="idlCompile" />
-		<antcall target="clean" />
 		<antcall target="compile" />
 		<antcall target="jar" />
 	</target>
@@ -47,19 +49,36 @@
 		<exec executable="${java.home}\..\bin\idlj">
 			<arg line="-fall -td ${source} -i ${idl.path} -emitAll ${idl.Manager}"/>
 		</exec>
+		<exec executable="${java.home}\..\bin\idlj">
+			<arg line="-fall -td ${source} -i ${idl.path} -emitAll ${idl.ComponentObserver}"/>
+		</exec>
+		<exec executable="${java.home}\..\bin\idlj">
+			<arg line="-fall -td ${source} -i ${idl.path} -emitAll ${idl.Logger}"/>
+		</exec>
 	</target>
 
 	<target name="clean" description="ビルドで生成されたファイルを削除します">
-		<delete includeEmptyDirs="true">
+		<delete includeEmptyDirs="true" quiet="true">
 			<fileset dir="${build.dir}" includes="**/*.class" />
+			<fileset dir="." includes="**/*.log" />
 		</delete>
+		<delete dir="${build.dir}/_SDOPackage" quiet="true"/>
+		<delete dir="${build.dir}/OpenRTM" quiet="true"/>
+		<delete dir="${build.dir}/RTM" quiet="true"/>
+		<delete dir="${build.dir}/RTC" quiet="true"/>
+		<delete dir="${build.dir}/jp" quiet="true"/>
+		<delete dir="${source}/_SDOPackage" quiet="true"/>
+		<delete dir="${source}/OpenRTM" quiet="true"/>
+		<delete dir="${source}/RTM" quiet="true"/>
+		<delete dir="${source}/RTC" quiet="true"/>
+		<delete dir="${dist.dir}" quiet="true"/>
 	</target>
 
 	<target name="compile" description="ソースをコンパイルします">
 		<getEclipseClasspath pathid="build.classpath" targetplatformlocation="${targetPlatformLocation}"
 					workspace="${workspace}" projectname="${project.name}"/>
 		<javac srcdir="${source}" destdir="${build.dir}"
-			classpathref="build.classpath" classpath="lib/commons-lang-2.2.jar" encoding="Shift_JIS" />
+			classpathref="build.classpath" classpath="lib/commons-lang-2.2.jar" encoding="UTF-8" />
 	</target>
 
 	<target name="jar" description="jarファイルを作成します">
@@ -72,9 +91,26 @@
 			</fileset>
 		</copy>
 		<mkdir dir="${dist.dir}" />
-		<delete file="${dist.dir}/${target.name}.jar" />
-
-		<jar destfile="${dist.dir}/${target.name}.jar" manifest="META-INF/MANIFEST.MF">
+		<delete>
+			<fileset dir="${dist.dir}" includes="${target.name}_*.jar" />
+		</delete>
+		<!-- Version settings -->
+		<manifesttask file="META-INF/MANIFEST.MF" key="Bundle-Version" property="manifest.project.version" />
+		<condition property="project.version"
+                   value="${env.PROJECT_VERSION}"
+                   else="${manifest.project.version}">
+			<isset property="env.PROJECT_VERSION" />
+		</condition>
+		<property name="jar.version" value="_${project.version}"/>
+		<property name="jar.name" value="${target.name}${jar.version}"/>
+		<!-- Updating MANIFEST.MF -->
+		<manifest file="META-INF/MANIFEST.MF" mode="update">
+			<attribute name="Bundle-Version" value="${project.version}"/>
+			<attribute name="Built-By" value="${user.name}"/>
+			<attribute name="Built-Date" value="${built.date}"/>
+		</manifest>
+		<!-- Creating a jar file -->
+		<jar destfile="${dist.dir}/${jar.name}.jar" manifest="META-INF/MANIFEST.MF">
 			<fileset dir="${build.dir}" />
 			<fileset dir=".">
 				<include name="icons/**.**" />
@@ -85,4 +121,5 @@
 			</fileset>
 		</jar>
 	</target>
+
 </project>

Copied: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/idl/BasicDataType.idl (from rev 393, trunk/rtmtools/jp.go.aist.rtm.toolscommon/idl/BasicDataType.idl)
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/idl/BasicDataType.idl	                        (rev 0)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/idl/BasicDataType.idl	2013-01-29 10:39:20 UTC (rev 394)
@@ -0,0 +1,189 @@
+// -*- IDL -*-
+/*!
+ * @file DataType.idl
+ * @brief Basic Data Type definition
+ * @date $Date: 2007-01-09 15:36:29 $
+ * @author Noriaki Ando <n-ando at aist.go.jp>
+ *
+ * Copyright (C) 2003-2006
+ *     Task-intelligence Research Group,
+ *     Intelligent Systems Research Institute,
+ *     National Institute of
+ *         Advanced Industrial Science and Technology (AIST), Japan
+ *     All rights reserved.
+ *
+ * $Id: BasicDataType.idl 1580 2009-12-07 08:54:10Z kurihara $
+ *
+ */
+
+#ifndef BasicDataType_idl
+#define BasicDataType_idl
+
+module RTC {
+  //------------------------------------------------------------
+  // Basic data type definition
+  //------------------------------------------------------------
+  struct Time
+  {
+        unsigned long sec;    // sec
+        unsigned long nsec;   // nano sec
+  };
+
+  struct TimedState
+  {
+	Time tm;
+	short data;
+  };
+
+  struct TimedShort
+  {
+	Time tm;
+	short data;
+  };
+
+  struct TimedLong
+  {
+	Time tm;
+	long data;
+  };
+
+  struct TimedUShort
+  {
+	Time tm;
+	unsigned short data;
+  };
+
+  struct TimedULong
+  {
+	Time tm;
+	unsigned long data;
+  };
+
+  struct TimedFloat
+  {
+	Time tm;
+	float data;
+  };
+
+  struct TimedDouble
+  {
+	Time tm;
+	double data;
+  };
+
+  struct TimedChar
+  {
+	Time tm;
+	char data;
+  };
+
+  struct TimedWChar
+  {
+	Time tm;
+	wchar data;
+  };
+
+  struct TimedBoolean
+  {
+	Time tm;
+	boolean data;
+  };
+
+  struct TimedOctet
+  {
+	Time tm;
+	octet data;
+  };
+
+  struct TimedString
+  {
+	Time tm;
+	string data;
+  };
+
+
+  struct TimedWString
+  {
+	Time tm;
+	wstring data;
+  };
+
+
+  /*!
+   * Sequence data type
+   */
+  struct TimedShortSeq
+  {
+	Time tm;
+	sequence<short> data;
+  };
+
+  struct TimedLongSeq
+  {
+	Time tm;
+	sequence<long> data;
+  };
+
+  struct TimedUShortSeq
+  {
+	Time tm;
+	sequence<unsigned short> data;
+  };
+
+  struct TimedULongSeq
+  {
+	Time tm;
+	sequence<unsigned long> data;
+  };
+
+  struct TimedFloatSeq
+  {
+	Time tm;
+	sequence<float> data;
+  };
+
+  struct TimedDoubleSeq
+  {
+	Time tm;
+	sequence<double> data;
+  };
+
+  struct TimedCharSeq
+  {
+	Time tm;
+	sequence<char> data;
+  };
+
+  struct TimedWCharSeq
+  {
+	Time tm;
+	sequence<wchar> data;
+  };
+
+  struct TimedBooleanSeq
+  {
+	Time tm;
+	sequence<boolean> data;
+  };
+
+  struct TimedOctetSeq
+  {
+	Time tm;
+	sequence<octet> data;
+  };
+
+  struct TimedStringSeq
+  {
+	Time tm;
+	sequence<string> data;
+  };
+  
+  struct TimedWStringSeq
+  {
+	Time tm;
+	sequence<wstring> data;
+  };
+  
+};
+
+#endif // end of BasicDataType_idl

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/idl/ComponentObserver.idl
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/idl/ComponentObserver.idl	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/idl/ComponentObserver.idl	2013-01-29 10:39:20 UTC (rev 394)
@@ -21,12 +21,12 @@
 
 /*!
  * @if jp
- * @brief コンポーネント状態オブザーバインターフェース
+ * @brief コンポーネント状態オブザーバインターフェース
  *
- * コンポーネントの状態を監視するためのオブザーバインターフェース。オブ
- * ザーバパターンに従い、外部ツールがコンポーネントにオブザーバオブジェ
- * クトをセットし、コンポーネントは各種内部状態変更時にをオブザーバオブ
- * ジェクトをコールし、オブザーバに対して変更を通知する。
+ * コンポーネントの状態を監視するためのオブザーバインターフェース。オブ
+ * ザーバパターンに従い、外部ツールがコンポーネントにオブザーバオブジェ
+ * クトをセットし、コンポーネントは各種内部状態変更時にをオブザーバオブ
+ * ジェクトをコールし、オブザーバに対して変更を通知する。
  *
  * @since 1.1
  *
@@ -48,9 +48,9 @@
   /*!
    * @if jp
    *
-   * @brief 更新された状態の種類
+   * @brief 更新された状態の種類
    * 
-   * ターゲットRTCで更新された状態の種類を分類する列挙型。
+   * ターゲットRTCで更新された状態の種類を分類する列挙型。
    * 
    * @else
    *
@@ -65,21 +65,21 @@
     /*!
      * @if jp
      *
-     * @brief コンポーネントプロファイル
+     * @brief コンポーネントプロファイル
      * 
-     * コンポーネントプロファイル RTC::ComponentProfile が更新されたこ
-     * とを示す列挙型。
+     * コンポーネントプロファイル RTC::ComponentProfile が更新されたこ
+     * とを示す列挙型。
      *
-     * RTC::ComponentProfile のメンバーのうち、instance_name,
-     * type_name, description, version, vendor, category はRTC動作中に
-     * 変更されることはない。これらが変更された場合には、
-     * ComponentObserver::updatestatus() の hint には、それぞれのメンバー
-     * 名が文字列で指定される。また、parent に対する変更は通知されない。
-     * さらに、properties に対する変更は、hint に "<key0>, <key1>,
-     * ..." の形で通知される。
+     * RTC::ComponentProfile のメンバーのうち、instance_name,
+     * type_name, description, version, vendor, category はRTC動作中に
+     * 変更されることはない。これらが変更された場合には、
+     * ComponentObserver::updatestatus() の hint には、それぞれのメンバー
+     * 名が文字列で指定される。また、parent に対する変更は通知されない。
+     * さらに、properties に対する変更は、hint に "<key0>, <key1>,
+     * ..." の形で通知される。
      *
-     * port_profiles に対する変更は、後述の PORT_PROFILE によって通知さ
-     * れるため、COMPONENT_PROFILE では通知されない。
+     * port_profiles に対する変更は、後述の PORT_PROFILE によって通知さ
+     * れるため、COMPONENT_PROFILE では通知されない。
      *
      * @else
      *
@@ -106,22 +106,22 @@
     /*!
      * @if jp
      *
-     * @brief コンポーネントの状態
+     * @brief コンポーネントの状態
      * 
-     * コンポーネントの状態が変化したことを示す列挙子。
+     * コンポーネントの状態が変化したことを示す列挙子。
      *
-     * RTCにはECの状態として、INACTIVE_STATE, ACTIVE_STATE,
-     * ERROR_STATE があるが、この状態が変化したことを通知するための列挙
-     * 子。
+     * RTCにはECの状態として、INACTIVE_STATE, ACTIVE_STATE,
+     * ERROR_STATE があるが、この状態が変化したことを通知するための列挙
+     * 子。
      *
-     * ComponentObserver::updatestatus() の hint には、状態と、どの実行
-     * コンテキストで変化があったかを知らせる以下の文字列が hint に引数
-     * として与えられる。
+     * ComponentObserver::updatestatus() の hint には、状態と、どの実行
+     * コンテキストで変化があったかを知らせる以下の文字列が hint に引数
+     * として与えられる。
      *
      * hint: (INACTIVE, ACTIVE, ERROR):<Execution Context ID>
-     * 例:
-     *   ACTIVE:0 (デフォルトコンテキストでRTCがアクティブになった)
-     *   ERROR:1002 (実行コンテキスト1002でRTCがエラーになった)
+     * 例:
+     *   ACTIVE:0 (デフォルトコンテキストでRTCがアクティブになった)
+     *   ERROR:1002 (実行コンテキスト1002でRTCがエラーになった)
      *
      * @else
      *
@@ -144,22 +144,22 @@
     /*!
      * @if jp
      *
-     * @brief ExecutionContextの状態
+     * @brief ExecutionContextの状態
      * 
-     * ExecutionContextの状態が変化したことを示す列挙子。
+     * ExecutionContextの状態が変化したことを示す列挙子。
      *
-     * RTCにECが attach/detach/rate_change/startup/shutdown されたことを
-     * 示す列挙子。
+     * RTCにECが attach/detach/rate_change/startup/shutdown されたことを
+     * 示す列挙子。
      *
-     * ComponentObserver::updatestatus() の hint には、
-     * attach/detach/rate_change/startup/shutdow のいずれが行われたかと、
-     * 対象となるECのidが与えられる。
+     * ComponentObserver::updatestatus() の hint には、
+     * attach/detach/rate_change/startup/shutdow のいずれが行われたかと、
+     * 対象となるECのidが与えられる。
      *
      * hint: (ATTACHED, DETACHED, RATE_CHANGED, STARTUP,
      *        SHUTDOWN):<Execution Context ID>
      *
-     * 例:
-     *   ATTACHED:1002 (ECがアタッチされ、そのIDは1002)
+     * 例:
+     *   ATTACHED:1002 (ECがアタッチされ、そのIDは1002)
      *
      * @else
      *
@@ -182,16 +182,16 @@
     /*!
      * @if jp
      *
-     * @brief Portの状態
+     * @brief Portの状態
      * 
-     * Portの状態が変化したことを示す列挙子。Portの追加、削除、接続、切
-     * 断が行われたことを示す。ComponentObserver::updatestatus() の
-     * hint には、いずれかのアクションが行われたかと、対象となるポート
-     * の名前が与えられる。
+     * Portの状態が変化したことを示す列挙子。Portの追加、削除、接続、切
+     * 断が行われたことを示す。ComponentObserver::updatestatus() の
+     * hint には、いずれかのアクションが行われたかと、対象となるポート
+     * の名前が与えられる。
      *
      * hint: (ADD, REMOVE, CONNECT, DISCONNECT):<port name>
-     * 例:
-     *   CONNECT:velocity (velocity ポートで接続が確立された)
+     * 例:
+     *   CONNECT:velocity (velocity ポートで接続が確立された)
      *
      * @else
      *
@@ -212,16 +212,16 @@
     /*!
      * @if jp
      *
-     * @brief Configurationの状態
+     * @brief Configurationの状態
      * 
-     * Configurationの状態が変化したことを示す列挙子。Configurationに対
-     * して、コンフィギュレーションが更新された (UPDATE)、コンフィギュ
-     * レーションパラメータが更新された (UPDATEPARAM)、アクティブコンフィ
-     * ギュレーションが変更された (SET_ACTIVE_CONFIG_SET)、コンフィギュ
-     * レーションセットが追加された (ADD_CONFIG_SET)、コンフィギュレー
-     * ションセットが削除された (REMOVE_CONFIG_SET)、コンフィギュレーショ
-     * ンセットがアクティブにされた (ACTIVATE_CONFIG_SET) といったアク
-     * ションがあったことが通知される。
+     * Configurationの状態が変化したことを示す列挙子。Configurationに対
+     * して、コンフィギュレーションが更新された (UPDATE)、コンフィギュ
+     * レーションパラメータが更新された (UPDATEPARAM)、アクティブコンフィ
+     * ギュレーションが変更された (SET_ACTIVE_CONFIG_SET)、コンフィギュ
+     * レーションセットが追加された (ADD_CONFIG_SET)、コンフィギュレー
+     * ションセットが削除された (REMOVE_CONFIG_SET)、コンフィギュレーショ
+     * ンセットがアクティブにされた (ACTIVATE_CONFIG_SET) といったアク
+     * ションがあったことが通知される。
      *
      * - UPDATE_CONFIGSET:<configuration set's name>
      * - UPDATE_PARAMETER:<config set's name>.<config param's key>
@@ -253,12 +253,12 @@
     /*!
      * @if jp
      *
-     * @brief ハートビートイベント
+     * @brief ハートビートイベント
      * 
-     * 当該RTCが生存していることをオブザーバー側に通知する列挙子。
+     * 当該RTCが生存していることをオブザーバー側に通知する列挙子。
      *
-     * ハートビートを利用するかどうか、およびハートビートの周期は、
-     * ServiceProfile::properties の以下のプロパティによって与えられる。
+     * ハートビートを利用するかどうか、およびハートビートの周期は、
+     * ServiceProfile::properties の以下のプロパティによって与えられる。
      *
      * heartbeat.enable: YES/NO
      * heartbeat.interval: x [s]
@@ -287,34 +287,34 @@
    *
    * @interface ComponentObserver
    * 
-   * RTCの各種状態の更新を知らせるためのオブザーバーオブジェクトのため
-   * のインターフェース。SDO Service として、対象となるRTC/SDOに対して
-   * アタッチされ、RTC/SDO内の状態が変更された場合に、変更された状態の
-   * 種類とヒントを同時に通知する。ツールなどで、ポーリングによらずRTC
-   * の状態の変化を知りたい場合などに利用する。
+   * RTCの各種状態の更新を知らせるためのオブザーバーオブジェクトのため
+   * のインターフェース。SDO Service として、対象となるRTC/SDOに対して
+   * アタッチされ、RTC/SDO内の状態が変更された場合に、変更された状態の
+   * 種類とヒントを同時に通知する。ツールなどで、ポーリングによらずRTC
+   * の状態の変化を知りたい場合などに利用する。
    *
-   * 想定している利用方法は以下のとおりである。
+   * 想定している利用方法は以下のとおりである。
    *
-   * -# SDO::get_configuration() により Configuration オブジェクトを取得
-   * -# Configuration::add_service_profile() によりTool側の
-   *     ComponentObserver を ServiceProfile により RTC に与える。
-   *     ServiceProfile のメンバーは以下のように設定すること
-   *   - id: UUID など一意なIDを設定する。削除時にも必要になるので、Tool
-   *     側ではIDを保持しておかなければならない。
-   *   - interface_type: 当該サービスのIFRのIDを文字列として指定。RTC側で
-   *     はこの文字列により当該サービスオブジェクトを受け入れるか決定す
-   *     るため指定は必須となる。
-   *   - properties: RTC側のサービスの受け入れ側に通知するプロパティを設
-   *     定する。このサービスでは、下記の heartbeat 関連のプロパティを
-   *     指定する。
-   *    - service: SDOService オブジェクトの参照を指定する。
-   * -# RTC側で状態の変化があった場合に update_status() オペレーション
-   *     が StatusKind および hint の文字列とともに呼び出される。Tool側
-   *     では、StatusKind と hint に基づき RTC のある部分の状態が変化し
-   *     たことを知り、必要な処理を行う。
-   * -# 最終的にComponentObserverオブジェクトが不要になった場合には、
-   *     Configuration::remove_service_profile() を id とともに呼び出し
-   *     RTC から削除する。
+   * -# SDO::get_configuration() により Configuration オブジェクトを取得
+   * -# Configuration::add_service_profile() によりTool側の
+   *     ComponentObserver を ServiceProfile により RTC に与える。
+   *     ServiceProfile のメンバーは以下のように設定すること
+   *   - id: UUID など一意なIDを設定する。削除時にも必要になるので、Tool
+   *     側ではIDを保持しておかなければならない。
+   *   - interface_type: 当該サービスのIFRのIDを文字列として指定。RTC側で
+   *     はこの文字列により当該サービスオブジェクトを受け入れるか決定す
+   *     るため指定は必須となる。
+   *   - properties: RTC側のサービスの受け入れ側に通知するプロパティを設
+   *     定する。このサービスでは、下記の heartbeat 関連のプロパティを
+   *     指定する。
+   *    - service: SDOService オブジェクトの参照を指定する。
+   * -# RTC側で状態の変化があった場合に update_status() オペレーション
+   *     が StatusKind および hint の文字列とともに呼び出される。Tool側
+   *     では、StatusKind と hint に基づき RTC のある部分の状態が変化し
+   *     たことを知り、必要な処理を行う。
+   * -# 最終的にComponentObserverオブジェクトが不要になった場合には、
+   *     Configuration::remove_service_profile() を id とともに呼び出し
+   *     RTC から削除する。
    *
    * <pre>
    * 
@@ -339,33 +339,33 @@
    *
    * </pre>
    *
-   * なお、ServiceProfile::properties に指定するプロパティとしては、
+   * なお、ServiceProfile::properties に指定するプロパティとしては、
    *
    * - observed_status: ALL or kind of status
    * - heartbeat.enable: YES/NO
    * - heartbeat.interval: x [s]
    * 
-   * がある。
+   * がある。
    * 
-   * - observed_staus: ALL または状態の種類をカンマ区切りで指定
-   *   監視する状態を指定する。指定可能な状態を表す文字列は、
+   * - observed_staus: ALL または状態の種類をカンマ区切りで指定
+   *   監視する状態を指定する。指定可能な状態を表す文字列は、
    *   COMPONENT_PROFILE, RTC_STATUS, EC_STATUS, PORT_PROFILE,
-   *   CONFIGURATION 5種類である。監視したい対象をカンマで区切り複数指
-   *   定することができる。また、すべての状態を監視する場合、ALL を指定
-   *   することができる。指定文字列は大文字、小文字を問わない。
+   *   CONFIGURATION 5種類である。監視したい対象をカンマで区切り複数指
+   *   定することができる。また、すべての状態を監視する場合、ALL を指定
+   *   することができる。指定文字列は大文字、小文字を問わない。
    *
-   * - heartbeat.interval: 秒単位で数値で指定
-   *   ハートビートを送信する周期を秒単位で指定する。なお、指定した秒数
-   *   でハートビートが必ず送信される保証はない。したがって、RTCが死ん
-   *   だかどうかを確認するには、heartbeat.interval 数回分の時間を待つ
-   *   必要がある。
+   * - heartbeat.interval: 秒単位で数値で指定
+   *   ハートビートを送信する周期を秒単位で指定する。なお、指定した秒数
+   *   でハートビートが必ず送信される保証はない。したがって、RTCが死ん
+   *   だかどうかを確認するには、heartbeat.interval 数回分の時間を待つ
+   *   必要がある。
    *
-   * - heartbeat.enable: YES または NOで指定
-   *   Tool側では、状態に変化があるまで RTC が生存しているかどうか知る
-   *   ことはできないため、突然RTCが死んだ場合には、これを知ることがで
-   *   きない。そこで、HEART_BEAT イベントを周期的にRTC側から送らせるこ
-   *   とができる。ハートビートを有効にするか否かをこのオプションで指定
-   *   する。
+   * - heartbeat.enable: YES または NOで指定
+   *   Tool側では、状態に変化があるまで RTC が生存しているかどうか知る
+   *   ことはできないため、突然RTCが死んだ場合には、これを知ることがで
+   *   きない。そこで、HEART_BEAT イベントを周期的にRTC側から送らせるこ
+   *   とができる。ハートビートを有効にするか否かをこのオプションで指定
+   *   する。
    * 
    * 
    * @else
@@ -471,14 +471,14 @@
     /*!
      * @if jp
      *
-     * @brief 状態が更新されたことを知らせる
+     * @brief 状態が更新されたことを知らせる
      * 
-     * 状態が更新されたことを知らせるオペレーション。status_kind によっ
-     * て更新された状態の種類、hint によってどのような状態が変更された
-     * かに関するヒントが与えられる。
+     * 状態が更新されたことを知らせるオペレーション。status_kind によっ
+     * て更新された状態の種類、hint によってどのような状態が変更された
+     * かに関するヒントが与えられる。
      *
-     * @param status_kind: StatusKind 型の状態の種類
-     * @param hint; StatusKind 毎に決まる状態変更に関するヒント
+     * @param status_kind: StatusKind 型の状態の種類
+     * @param hint; StatusKind 毎に決まる状態変更に関するヒント
      *
      * @else
      *

Copied: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/idl/Logger.idl (from rev 393, trunk/rtmtools/jp.go.aist.rtm.toolscommon/idl/Logger.idl)
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/idl/Logger.idl	                        (rev 0)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/idl/Logger.idl	2013-01-29 10:39:20 UTC (rev 394)
@@ -0,0 +1,388 @@
+// -*- IDL -*-
+/*!
+ * @file Logger.idl
+ * @brief Component logger SDO service
+ * @date $Date$
+ * @author Noriaki Ando <n-ando at aist.go.jp>
+ *
+ * Copyright (C) 2011
+ *     Noriaki Ando
+ *     Intelligent Systems Research Institute,
+ *     National Institute of
+ *         Advanced Industrial Science and Technology (AIST), Japan
+ *     All rights reserved.
+ *
+ * $Id$
+ *
+ */
+
+#include <BasicDataType.idl>
+#include <SDOPackage11.idl>
+/*!
+ * @if jp
+ * @brief コンポーネントログ収集サービスインターフェース
+ *
+ * コンポーネントのログ情報を外部から取得するためのインターフェース。コ
+ * ンポーネントに対して、本SDOサービスオブジェクトをアタッチすることで、
+ * コンポーネントが出力するログを外部から取得することができる。
+ * 
+ * @since 1.1
+ *
+ * @else
+ * @brief Component logging service interface
+ *
+ * This interface defines logging service of an RT-Component from
+ * outside. Attaching this service interface to an RT-Component, you
+ * can get logging information from the RT-Component.
+ *
+ * @since 1.1
+ * @endif
+ *
+ */
+module OpenRTM
+{
+  /*!
+   * @if jp
+   *
+   * @brief ログレベル
+   * 
+   * ログレベル。ログレベルは9段階あり、それぞれ以下の意味を持つ。
+   * 
+   *  - SILENT  : ロギング機能をオフにするための疑似レベル
+   *  - ERROR   : エラーが発生したことを意味するログレベル
+   *  - WARN    : エラーではないが注意すべき警告を意味するログレベル
+   *  - INFO    : 付加的な情報を提供するためのログレベル
+   *  - NORMAL  : 通常の情報を提供するためのログレベル
+   *  - DEBUG   : デバッグ情報を提供する際のログレベル
+   *  - TRACE   : トレースレベルの情報を提供する際のログレベル
+   *  - VERBOSE : トレース情報以上に詳細な情報を提供する際のログレベル
+   *  - PARANOID: リアルタイム周期処理実行時等の情報を提供するログレベル
+   * 
+   * @else
+   *
+   * @brief Log level
+   * 
+   * This enumeration defines log levels. The log level consists of
+   * nine levels, and each level means the following meaning.
+   * 
+   *  - SILENT  : Pseudo log level to stop logging function.
+   *  - ERROR   : This log level means that an error event is occurring.
+   *  - WARN    : This log level means that a warning event is occurring.
+   *  - INFO    : This log level used to notify information.
+   *  - NORMAL  : This log level means that an event is normal thing.
+   *  - DEBUG   : This log level used to notify debugging information.
+   *  - TRACE   : This log level used to notify trace information.
+   *  - VERBOSE : This log level used to notify more detailed information.
+   *  - PARANOID: This is used only to notify information in real-time loop.
+   *
+   * @endif
+   */
+  enum LogLevel
+  {
+    SILENT,
+    ERROR,
+    WARN,
+    INFO,
+    NORMAL,
+    DEBUG,
+    TRACE,
+    VERBOSE,
+    PARANOID
+  };
+
+  /*!
+   * @if jp
+   * @brief ログレコード構造体
+   *
+   * ログメッセージを含むログ情報を保持する構造体
+   *
+   * @else
+   * @brief Log record structure
+   *
+   * This struct defines logging information including log message.
+   *
+   * @endif
+   *
+   */
+  struct LogRecord
+  {
+    /*!
+     * @if jp
+     * @brief 時刻
+     * タイムスタンプ
+     * @else
+     * @brief Time
+     * Time stump.
+     * @endif
+     */
+    RTC::Time   time;
+
+    /*!
+     * @if jp
+     * @brief ロガー名
+     * ログを書きこんだロガーオブジェクト名
+     * @else
+     * @brief logger name
+     * The logger name which writes this record.
+     * @endif
+     */
+    string loggername;
+
+    /*!
+     * @if jp
+     * @brief ログレベル
+     * このレコードのログレベル
+     * @else
+     * @brief Log level
+     * The log level of this record
+     * @endif
+     */
+    LogLevel  level;
+
+    /*!
+     * @if jp
+     * @brief メッセージ
+     * ログメッセージ
+     * @else
+     * @brief Message
+     * Log message.
+     * @endif
+     */
+    string message;
+  };
+
+
+  /*!
+   * @if jp
+   *
+   * @interface Logger インターフェース
+   *
+   * 個別のRTCのログ情報を取得するためのサービスインターフェース。SDO
+   * Service として対象となるRTC/SDOに対してアタッチされ、RTC/SDOのログ
+   * 情報を外部から取得する。実際の処理シーケンスは以下の通りである。
+   *
+   * -# SDO::get_configuration() により Configuration オブジェクトを取得
+   * -# Configuration::add_service_profile() によりTool側の
+   *     Logger を ServiceProfile により RTC に与える。
+   *     ServiceProfile のメンバーは以下のように設定すること
+   *   - id: UUID など一意なIDを設定する。削除時にも必要になるので、Tool
+   *     側ではIDを保持しておかなければならない。
+   *   - interface_type: 当該サービスのIFRのIDを文字列として指定。RTC側で
+   *     はこの文字列により当該サービスオブジェクトを受け入れるか決定す
+   *     るため指定は必須となる。
+   *   - properties: RTC側のサービスの受け入れ側に通知するプロパティを設
+   *     定する。このサービスでは、下記のログレベル関連のプロパティを
+   *     指定する。
+   *    - service: SDOService オブジェクトの参照を指定する。
+   * -# RTC側でロガーへの書き込みが有った場合には publish() オペレーション
+   *     が LogRecord 構造体としてログメッセージやタイムスタンプをサー
+   *     ビス側に通知する。サービスを保持する側では、LogRecord内の情報
+   *     をファイルに書き込む、表示する等の方法で利用することができる。
+   * -# RTC側が終了するときには、close() オペレーションが呼び出されるの
+   *    で、サービス提供側は適切な終了処理を行う必要がある。close()が呼
+   *    ばれた場合は、remove_service_profile() により明示的にサービスを
+   *    削除する必要はない。またRTC側ではclose() を呼んだ後は、当該サー
+   *    ビスに関する情報やリソースを適切に開放しなければならない。
+   * -# ツール等のサービス提供側が終了する場合などは、
+   *    remove_service_profile() オペレーションを呼び出し、当該RTC上の
+   *    リソースを適切に開放する必要がある。RTC側は、
+   *    remove_service_profile() が呼び出された際には、当該ロギングに関
+   *    するリソースを適切に開放する必要がある。
+   *
+   * 上記のプロセスを下記シーケンス図に示す。
+   *
+   * <pre>
+   * 
+   *   [RTC]    [Configuration]           [Logger]      [Tool]
+   *     |            |                       |            |
+   *     |            | get_configuration()   |            |
+   *     |<------------------------------------------------|
+   *     |            |                       |            |
+   *     |            | add_service_profile(prof)          |
+   *     |            |<-----------------------------------|
+   *     |            |                       |            |
+   *     |            | publish(logrecord)    |            |
+   *     |----------------------------------->|            |
+   *     |            | publish(logrecord)    |            |
+   *     |----------------------------------->|            |
+   *     |            |       :               |            |
+   *     |            |       :               |            |
+   *     |            | 1) RTCが先に終了するとき           |
+   *     |            |       :               |            |
+   *     |            | [close()]             |            |
+   *     |----------------------------------->|            |
+   *     |            |       :               |            |
+   *     |            | 2) ツールがロギングを終了するとき  |
+   *     |            |       :               |            |
+   *     |            | remove_service_profile(id)         |
+   *     |            |<-----------------------------------|
+   *     |            |                       |            |
+   *     |            |                       x            x
+   *
+   * </pre>
+   *
+   * なお、ServiceProfile::properties に指定するプロパティとしては、
+   *
+   * - logger.log_level: (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE, VERBOSE,
+   *                     PARANOID)
+   * - logger.filter: logger name or "ALL"
+   *
+   * がある、
+   *
+   * - logger.log_level: ERROR, WARN, INFO, NORMAL, DEBUG, TRACE,
+   *   VERBOSE またはPARANOID のうち一つを指定する。無指定の場合は
+   *   NORMAL と同等となる。指定されたレベルと同等あるいはそれより重要
+   *   な情報がロギングされる。すなわち、それぞれのログレベルを指定した
+   *   際に出力されるログは以下の関係になる。
+   *   - ERROR   : (ERROR)
+   *   - WARN    : (ERROR, WARN)
+   *   - INFO    : (ERROR, WARN, INFO)
+   *   - NORMAL  : (ERROR, WARN, INFO, NORMAL)
+   *   - DEBUG   : (ERROR, WARN, INFO, NORMAL, DEBUG)
+   *   - TRACE   : (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE)
+   *   - VERBOSE : (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE, VERBOSE)
+   *   - PARANOID: (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE, VERBOSE, PARA)
+   * - logger.filter: RTC内部は、RTC本体、データポート、サービスポート
+   *   等それぞれのオブジェクトにロガーオブジェクトが存在する。このプロ
+   *   パティはロギングする対象のロガーオブジェクトをカンマ区切りで指定
+   *   する。または、ALLを指定することでRTC配下のすべてのロギングオブジェ
+   *   クトからのメッセージを受信する。無指定の場合はALLと同等になる。
+   *
+   * @else
+   * @class
+   *
+   * @interface Logger interface
+   *
+   * This interface defines logging service for each RT-Component.
+   * This service would be attached to a target RTC/SDO, and provides
+   * functionality to collect log information from remote
+   * applications.  Actual process sequences are the following.
+   *
+   * -# Get configuration object by SDO::get_configuration() 
+   * -# Attach Logger object with ServiceProfile by
+   *    Configuration::add_service_profile(). ServiceProfile should be
+   *    set as follows.
+   *   - id: An unique ID like UUID. This ID is used when this service
+   *         is removed. Tools or applications should keep the ID for
+   *         this.
+   *   - interface_type: Specify this service's IFR ID in string. This
+   *         string is used to search available service in the RTC,
+   *         and if it matches with available SDO services, this
+   *         service is accepted.
+   *   - properties: This member specifies properties to notify
+   *         information to the target RTC.  The following properties
+   *         for log level and others would be specified in this
+   *         properties.
+   *
+   *   - service: A SDOService object reference is specified.
+   * -# When logging occurs in the RTC side, the "publish()" operation
+   *    notifies a log message, time stump and so on to the service
+   *    provider as a LogRecord structure. The service provider can
+   *    use notified information for example writing to files and
+   *    showing them on the display.
+   * -# When RTC is terminated, the "close()" operation is called, and
+   *    the service provider has to terminate the logging service
+   *    properly.  In this case, tools and applications that have
+   *    service provider do not need to call remove_service_profile()
+   *    and remove the service explicitly. After calling close()
+   *    operation, the RTC has to release the service profile and
+   *    resources.
+   * -# When tools and applications terminate services, they have to
+   *    call remove_service_profile() operation, and have to release
+   *    resources in the target RTC. When remove_service_profile() is
+   *    called, the RTC have to release service profile and resources
+   *    for this service.
+   *
+   * The following diagram shows above mentioned sequence.
+   *
+   * <pre>
+   * 
+   *   [RTC]    [Configuration]           [Logger]      [Tool]
+   *     |            |                       |            |
+   *     |            | get_configuration()   |            |
+   *     |<------------------------------------------------|
+   *     |            |                       |            |
+   *     |            | add_service_profile(prof)          |
+   *     |            |<-----------------------------------|
+   *     |            |                       |            |
+   *     |            | publish(logrecord)    |            |
+   *     |----------------------------------->|            |
+   *     |            | publish(logrecord)    |            |
+   *     |----------------------------------->|            |
+   *     |            |       :               |            |
+   *     |            |       :               |            |
+   *     |            | 1) When RTC is terminated          |
+   *     |            |       :               |            |
+   *     |            | [close()]             |            |
+   *     |----------------------------------->|            |
+   *     |            |       :               |            |
+   *     |            | 2) When tool terminates logging    |
+   *     |            |       :               |            |
+   *     |            | remove_service_profile(id)         |
+   *     |            |<-----------------------------------|
+   *     |            |                       |            |
+   *     |            |                       x            x
+   *
+   * </pre>
+   *
+   * So far, the following properties for ServiceProfile::properties
+   * are available.
+   *
+   * - logger.log_level: (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE, VERBOSE,
+   *                     PARANOID)
+   * - logger.filter: logger name or "ALL"
+   *
+   *
+   * - logger.log_level: One of ERROR, WARN, INFO, NORMAL, DEBUG,
+   *     TRACE, VERBOSE or PARANOID can be specified.  If no
+   *     properties are specified, it will be NORMAL.  Log messages
+   *     equals and/or more important specified log level would be
+   *     published.  The following list shows the relation between
+   *     specified level and published level.
+   *   - ERROR   : (ERROR)
+   *   - WARN    : (ERROR, WARN)
+   *   - INFO    : (ERROR, WARN, INFO)
+   *   - NORMAL  : (ERROR, WARN, INFO, NORMAL)
+   *   - DEBUG   : (ERROR, WARN, INFO, NORMAL, DEBUG)
+   *   - TRACE   : (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE)
+   *   - VERBOSE : (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE, VERBOSE)
+   *   - PARANOID: (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE, VERBOSE, PARA)
+   * - logger.filter: Some logger objects exist in some object of an
+   *     RTC such as RTC body, data port, service port and so on.
+   *     Some logger objects exist in some object of an RTC such as
+   *     RTC body, data port, service port and so on.  This properties
+   *     specify target logger names separated with commas.  If ALL is
+   *     specified, all the logger's messages under the target RTC's
+   *     logger would be published.  If no property is specified, all
+   *     the messages will be published.
+   *
+   * @endif
+   *
+   */
+  interface Logger
+    : SDOPackage::SDOService
+  {
+    /*!
+     * @if jp
+     * @brief ログメッセージ配信
+     * ログメッセージを配信する
+     * @else
+     * @brief Publish log message
+     * This operation publishes log message.
+     * @endif
+     */
+    oneway void publish(in LogRecord record);
+
+    /*!
+     * @if jp
+     * @brief サービスの終了
+     * ロギングサービスの終了を通知する
+     * @else
+     * @brief Terminate service
+     * This operation notifies logging service.
+     * @endif
+     */
+    void close();
+  };
+};
+

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/idl/Manager.idl
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/idl/Manager.idl	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/idl/Manager.idl	2013-01-29 10:39:20 UTC (rev 394)
@@ -47,22 +47,22 @@
 
   interface Manager
   {
-    // module ŠÖ˜A
+    // module 関連
     /*!
      * @if jp
-     * @brief ƒ‚ƒWƒ…[ƒ‹‚ðƒ[ƒh‚·‚é
+     * @brief モジュールをロードする
      *
-     * “–ŠYƒ}ƒl[ƒWƒƒ‚ÉŽw’肳‚ꂽƒ‚ƒWƒ…[ƒ‹‚ðƒ[ƒh‚µAŽw’肳‚ꂽ‰Šú‰»
-     * ŠÖ”‚ŏ‰Šú‰»‚ðs‚¤B
+     * 当該マネージャに指定されたモジュールをロードし、指定された初期化
+     * 関数で初期化を行う。
      *
-     * @param pathname ƒ‚ƒWƒ…[ƒ‹‚ւ̃pƒX
-     * @param initfunc ƒ‚ƒWƒ…[ƒ‹‚̏‰Šú‰»ŠÖ”
-     * @return ƒŠƒ^[ƒ“ƒR[ƒh
+     * @param pathname モジュールへのパス
+     * @param initfunc モジュールの初期化関数
+     * @return リターンコード
      *
      * @else
      * @brief Loading a module
      *
-     * This operation loads a specified loadable moduleAand perform
+     * This operation loads a specified loadable module、and perform
      * initialization with the specified function.
      *
      * @param pathname A path to a loading module.
@@ -75,12 +75,12 @@
 
     /*!
      * @if jp
-     * @brief ƒ‚ƒWƒ…[ƒ‹‚ðƒAƒ“ƒ[ƒh‚·‚é
+     * @brief モジュールをアンロードする
      *
-     * “–ŠYƒ}ƒl[ƒWƒƒ‚ÉŽw’肳‚ꂽƒ‚ƒWƒ…[ƒ‹‚ðƒAƒ“ƒ[ƒh‚·‚éB
+     * 当該マネージャに指定されたモジュールをアンロードする。
      *
-     * @param pathname ƒ‚ƒWƒ…[ƒ‹‚ւ̃pƒX
-     * @return ƒŠƒ^[ƒ“ƒR[ƒh
+     * @param pathname モジュールへのパス
+     * @return リターンコード
      *
      * @else
      * @brief Unloading a module
@@ -96,11 +96,11 @@
 
     /*!
      * @if jp
-     * @brief ƒ[ƒh‰Â”\‚ȃ‚ƒWƒ…[ƒ‹‚̃vƒƒtƒ@ƒCƒ‹‚ðŽæ“¾‚·‚é
+     * @brief ロード可能なモジュールのプロファイルを取得する
      *
-     * ƒ[ƒh‰Â”\‚ȃ‚ƒWƒ…[ƒ‹‚̃vƒƒtƒ@ƒCƒ‹‚ðŽæ“¾‚·‚éB
+     * ロード可能なモジュールのプロファイルを取得する。
      *
-     * @return ƒ‚ƒWƒ…[ƒ‹ƒvƒƒtƒ@ƒCƒ‹
+     * @return モジュールプロファイル
      *
      * @else
      * @brief Getting loadable module profiles
@@ -115,11 +115,11 @@
 
     /*!
      * @if jp
-     * @brief ƒ[ƒhÏ‚݂̃‚ƒWƒ…[ƒ‹‚̃vƒƒtƒ@ƒCƒ‹‚ðŽæ“¾‚·‚é
+     * @brief ロード済みのモジュールのプロファイルを取得する
      *
-     * ƒ[ƒhÏ‚݂̃‚ƒWƒ…[ƒ‹‚̃vƒƒtƒ@ƒCƒ‹‚ðŽæ“¾‚·‚éB
+     * ロード済みのモジュールのプロファイルを取得する。
      *
-     * @return ƒ‚ƒWƒ…[ƒ‹ƒvƒƒtƒ@ƒCƒ‹
+     * @return モジュールプロファイル
      *
      * @else
      * @brief Getting loaded module profiles
@@ -132,15 +132,15 @@
      */
     ModuleProfileList get_loaded_modules();
     
-    // component ŠÖ˜A
+    // component 関連
     /*!
      * @if jp
-     * @brief ƒRƒ“ƒ|[ƒlƒ“ƒgƒtƒ@ƒNƒgƒŠ‚̃vƒƒtƒ@ƒCƒ‹‚ðŽæ“¾‚·‚é
+     * @brief コンポーネントファクトリのプロファイルを取得する
      *
-     * ƒ[ƒhÏ‚݂̃‚ƒWƒ…[ƒ‹‚Ì‚¤‚¿ARTƒRƒ“ƒ|[ƒlƒ“ƒg‚̃‚ƒWƒ…[ƒ‹‚ªŽ‚Â
-     * ƒtƒ@ƒNƒgƒŠ‚̃vƒƒtƒ@ƒCƒ‹‚̃ŠƒXƒg‚ðŽæ“¾‚·‚éB
+     * ロード済みのモジュールのうち、RTコンポーネントのモジュールが持つ
+     * ファクトリのプロファイルのリストを取得する。
      *
-     * @return ƒRƒ“ƒ|[ƒlƒ“ƒgƒtƒ@ƒNƒgƒŠ‚̃vƒƒtƒ@ƒCƒ‹ƒŠƒXƒg
+     * @return コンポーネントファクトリのプロファイルリスト
      *
      * @else
      * @brief Getting component factory profiles
@@ -156,11 +156,11 @@
 
     /*!
      * @if jp
-     * @brief ƒRƒ“ƒ|[ƒlƒ“ƒg‚𐶐¬‚·‚é
+     * @brief コンポーネントを生成する
      *
-     * ˆø”‚ÉŽw’肳‚ꂽƒRƒ“ƒ|[ƒlƒ“ƒg‚𐶐¬‚·‚éB
+     * 引数に指定されたコンポーネントを生成する。
      *
-     * @return ¶¬‚³‚ꂽRTƒRƒ“ƒ|[ƒlƒ“ƒg
+     * @return 生成されたRTコンポーネント
      *
      * @else
      * @brief Creating an RT-Component
@@ -176,11 +176,11 @@
 
     /*!
      * @if jp
-     * @brief ƒRƒ“ƒ|[ƒlƒ“ƒg‚ðíœ‚·‚é
+     * @brief コンポーネントを削除する
      *
-     * ˆø”‚ÉŽw’肳‚ꂽƒRƒ“ƒ|[ƒlƒ“ƒg‚ðíœ‚·‚éB
+     * 引数に指定されたコンポーネントを削除する。
      *
-     * @return ƒŠƒ^[ƒ“ƒR[ƒh
+     * @return リターンコード
      *
      * @else
      * @brief Deleting an RT-Component
@@ -196,11 +196,11 @@
 
     /*!
      * @if jp
-     * @brief ‹N“®’†‚̃Rƒ“ƒ|[ƒlƒ“ƒg‚̃ŠƒXƒg‚ðŽæ“¾‚·‚é
+     * @brief 起動中のコンポーネントのリストを取得する
      *
-     * Œ»Ý“–ŠYƒ}ƒl[ƒWƒƒã‚Å‹N“®’†‚̃Rƒ“ƒ|[ƒlƒ“ƒg‚̃ŠƒXƒg‚ð•Ô‚·B
+     * 現在当該マネージャ上で起動中のコンポーネントのリストを返す。
      *
-     * @return RTƒRƒ“ƒ|[ƒlƒ“ƒg‚̃ŠƒXƒg
+     * @return RTコンポーネントのリスト
      *
      * @else
      * @brief Getting RT-Component list running on this manager
@@ -215,12 +215,12 @@
 
     /*!
      * @if jp
-     * @brief ‹N“®’†‚̃Rƒ“ƒ|[ƒlƒ“ƒgƒvƒƒtƒ@ƒCƒ‹‚̃ŠƒXƒg‚ðŽæ“¾‚·‚é
+     * @brief 起動中のコンポーネントプロファイルのリストを取得する
      *
-     * Œ»Ý“–ŠYƒ}ƒl[ƒWƒƒã‚Å‹N“®’†‚̃Rƒ“ƒ|[ƒlƒ“ƒg‚̃vƒƒtƒ@ƒCƒ‹‚̃ŠƒX
-     * ƒg‚ð•Ô‚·B
+     * 現在当該マネージャ上で起動中のコンポーネントのプロファイルのリス
+     * トを返す。
      *
-     * @return RTƒRƒ“ƒ|[ƒlƒ“ƒgƒvƒƒtƒ@ƒCƒ‹‚̃ŠƒXƒg
+     * @return RTコンポーネントプロファイルのリスト
      *
      * @else
      * @brief Getting RT-Component's profile list running on this manager
@@ -234,14 +234,14 @@
      */
     RTC::ComponentProfileList get_component_profiles();
 
-    // manager Šî–{
+    // manager 基本
     /*!
      * @if jp
-     * @brief ƒ}ƒl[ƒWƒƒ‚̃vƒƒtƒ@ƒCƒ‹‚ðŽæ“¾‚·‚é
+     * @brief マネージャのプロファイルを取得する
      *
-     * Œ»Ý“–ŠYƒ}ƒl[ƒWƒƒ‚̃vƒƒtƒ@ƒCƒ‹‚ðŽæ“¾‚·‚éB
+     * 現在当該マネージャのプロファイルを取得する。
      *
-     * @return ƒ}ƒl[ƒWƒƒƒvƒƒtƒ@ƒCƒ‹
+     * @return マネージャプロファイル
      *
      * @else
      * @brief Getting this manager's profile.
@@ -256,11 +256,11 @@
 
     /*!
      * @if jp
-     * @brief ƒ}ƒl[ƒWƒƒ‚̃Rƒ“ƒtƒBƒMƒ…ƒŒ[ƒVƒ‡ƒ“‚ðŽæ“¾‚·‚é
+     * @brief マネージャのコンフィギュレーションを取得する
      *
-     * Œ»Ý“–ŠYƒ}ƒl[ƒWƒƒ‚̃Rƒ“ƒtƒBƒMƒ…ƒŒ[ƒVƒ‡ƒ“‚ðŽæ“¾‚·‚éB
+     * 現在当該マネージャのコンフィギュレーションを取得する。
      *
-     * @return ƒ}ƒl[ƒWƒƒƒRƒ“ƒtƒBƒMƒ…ƒŒ[ƒVƒ‡ƒ“
+     * @return マネージャコンフィギュレーション
      *
      * @else
      * @brief Getting this manager's configuration.
@@ -275,13 +275,13 @@
 
     /*!
      * @if jp
-     * @brief ƒ}ƒl[ƒWƒƒ‚̃Rƒ“ƒtƒBƒMƒ…ƒŒ[ƒVƒ‡ƒ“‚ðÝ’è‚·‚é
+     * @brief マネージャのコンフィギュレーションを設定する
      *
-     * Œ»Ý“–ŠYƒ}ƒl[ƒWƒƒ‚̃Rƒ“ƒtƒBƒMƒ…ƒŒ[ƒVƒ‡ƒ“‚ðÝ’è‚·‚éB
+     * 現在当該マネージャのコンフィギュレーションを設定する。
      *
-     * @param name ƒZƒbƒg‚·‚éƒRƒ“ƒtƒBƒMƒ…ƒŒ[ƒVƒ‡ƒ“‚̃L[–¼
-     * @param value ƒZƒbƒg‚·‚éƒRƒ“ƒtƒBƒMƒ…ƒŒ[ƒVƒ‡ƒ“‚Ì’l
-     * @return ƒŠƒ^[ƒ“ƒR[ƒh
+     * @param name セットするコンフィギュレーションのキー名
+     * @param value セットするコンフィギュレーションの値
+     * @return リターンコード
      *
      * @else
      * @brief Setting manager's configuration
@@ -298,12 +298,12 @@
 
     /*!
      * @if jp
-     * @brief ƒ}ƒl[ƒWƒƒ‚ªƒ}ƒXƒ^[‚©‚Ç‚¤‚©
+     * @brief マネージャがマスターかどうか
      *
-     * ‚±‚̊֐”‚̓}ƒl[ƒWƒƒ‚ªƒ}ƒXƒ^[‚©‚Ç‚¤‚©‚ð•Ô‚·BTrue‚È‚ç‚΁A“–ŠYƒ}
-     * ƒl[ƒWƒƒ‚̓}ƒXƒ^[‚Å‚ ‚èA‚»‚êˆÈŠO‚Í False ‚ð•Ô‚·B
+     * この関数はマネージャがマスターかどうかを返す。Trueならば、当該マ
+     * ネージャはマスターであり、それ以外は False を返す。
      *
-     * @return ƒ}ƒXƒ^[ƒ}ƒl[ƒWƒƒ‚©‚Ç‚¤‚©‚Ìbool’l
+     * @return マスターマネージャかどうかのbool値
      *
      * @else
      * @brief Whether this manager is master or not
@@ -319,13 +319,13 @@
 
     /*!
      * @if jp
-     * @brief ƒ}ƒXƒ^[ƒ}ƒl[ƒWƒƒ‚̎擾
+     * @brief マスターマネージャの取得
      *
-     * ‚±‚̃}ƒl[ƒWƒƒ‚ªƒXƒŒ[ƒuƒ}ƒl[ƒWƒƒ‚̏ꍇAƒ}ƒXƒ^[‚Æ‚È‚Á‚Ä‚¢‚éƒ}
-     * ƒl[ƒWƒƒ‚̃ŠƒXƒg‚ð•Ô‚·B‚±‚̃}ƒl[ƒWƒƒ‚ªƒ}ƒXƒ^[‚̏ꍇA‹ó‚̃ŠƒX
-     * ƒg‚ª•Ô‚éB
+     * このマネージャがスレーブマネージャの場合、マスターとなっているマ
+     * ネージャのリストを返す。このマネージャがマスターの場合、空のリス
+     * トが返る。
      *
-     * @return ƒ}ƒXƒ^[ƒ}ƒl[ƒWƒƒ‚̃ŠƒXƒg
+     * @return マスターマネージャのリスト
      *
      * @else
      * @brief Getting master managers
@@ -342,11 +342,11 @@
 
     /*!
      * @if jp
-     * @brief ƒ}ƒXƒ^[ƒ}ƒl[ƒWƒƒ‚̒ljÁ
+     * @brief マスターマネージャの追加
      *
-     * ‚±‚̃}ƒl[ƒWƒƒ‚̃}ƒXƒ^‚Æ‚µ‚ă}ƒl[ƒWƒƒ‚ðˆê‚’ljÁ‚·‚éB
+     * このマネージャのマスタとしてマネージャを一つ追加する。
      *
-     * @param mgr ƒ}ƒXƒ^[ƒ}ƒl[ƒWƒƒ
+     * @param mgr マスターマネージャ
      * @return ReturnCode_t
      *
      * @else
@@ -363,11 +363,11 @@
 
     /*!
      * @if jp
-     * @brief ƒ}ƒXƒ^[ƒ}ƒl[ƒWƒƒ‚̍폜
+     * @brief マスターマネージャの削除
      *
-     * ‚±‚̃}ƒl[ƒWƒƒ‚ª•ÛŽ‚·‚éƒ}ƒXƒ^‚Ì‚¤‚¿AŽw’肳‚ꂽ‚à‚Ì‚ðíœ‚·‚éB
+     * このマネージャが保持するマスタのうち、指定されたものを削除する。
      *
-     * @param mgr ƒ}ƒXƒ^[ƒ}ƒl[ƒWƒƒ
+     * @param mgr マスターマネージャ
      * @return ReturnCode_t
      *
      * @else
@@ -384,13 +384,13 @@
 
     /*!
      * @if jp
-     * @brief ƒXƒŒ[ƒuƒ}ƒl[ƒWƒƒ‚̎擾
+     * @brief スレーブマネージャの取得
      *
-     * ‚±‚̃}ƒl[ƒWƒƒ‚ªƒXƒŒ[ƒuƒ}ƒl[ƒWƒƒ‚̏ꍇAƒXƒŒ[ƒu‚Æ‚È‚Á‚Ä‚¢‚éƒ}
-     * ƒl[ƒWƒƒ‚̃ŠƒXƒg‚ð•Ô‚·B‚±‚̃}ƒl[ƒWƒƒ‚ªƒXƒŒ[ƒu‚̏ꍇA‹ó‚̃ŠƒX
-     * ƒg‚ª•Ô‚éB
+     * このマネージャがスレーブマネージャの場合、スレーブとなっているマ
+     * ネージャのリストを返す。このマネージャがスレーブの場合、空のリス
+     * トが返る。
      *
-     * @return ƒXƒŒ[ƒuƒ}ƒl[ƒWƒƒ‚̃ŠƒXƒg
+     * @return スレーブマネージャのリスト
      *
      * @else
      * @brief Getting slave managers
@@ -406,11 +406,11 @@
     ManagerList get_slave_managers();
     /*!
      * @if jp
-     * @brief ƒXƒŒ[ƒuƒ}ƒl[ƒWƒƒ‚̒ljÁ
+     * @brief スレーブマネージャの追加
      *
-     * ‚±‚̃}ƒl[ƒWƒƒ‚̃}ƒXƒ^‚Æ‚µ‚ă}ƒl[ƒWƒƒ‚ðˆê‚’ljÁ‚·‚éB
+     * このマネージャのマスタとしてマネージャを一つ追加する。
      *
-     * @param mgr ƒXƒŒ[ƒuƒ}ƒl[ƒWƒƒ
+     * @param mgr スレーブマネージャ
      * @return ReturnCode_t
      *
      * @else
@@ -427,11 +427,11 @@
 
     /*!
      * @if jp
-     * @brief ƒXƒŒ[ƒuƒ}ƒl[ƒWƒƒ‚̍폜
+     * @brief スレーブマネージャの削除
      *
-     * ‚±‚̃}ƒl[ƒWƒƒ‚ª•ÛŽ‚·‚éƒ}ƒXƒ^‚Ì‚¤‚¿AŽw’肳‚ꂽ‚à‚Ì‚ðíœ‚·‚éB
+     * このマネージャが保持するマスタのうち、指定されたものを削除する。
      *
-     * @param mgr ƒXƒŒ[ƒuƒ}ƒl[ƒWƒƒ
+     * @param mgr スレーブマネージャ
      * @return ReturnCode_t
      *
      * @else

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/idl/RTC10.idl
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/idl/RTC10.idl	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/idl/RTC10.idl	2013-01-29 10:39:20 UTC (rev 394)
@@ -34,17 +34,17 @@
    * @if jp
    * @brief ReturnCode_t
    *
-   * OMG RTC 1.0 Žd—l’†‚Ì‘½‚­‚̃IƒyƒŒ[ƒVƒ‡ƒ“‚́AƒNƒ‰ƒCƒ“‚Ƃɑ΂µ‚čl‚¦
-   * ‚ç‚ê‚éƒGƒ‰[ó‘Ô‚ð•ñ‚·‚é•K—v‚ª‚ ‚éB‚±‚ê‚́AReturnCode_tŒ^‚̏Šˆà
-   * ƒŠƒ^[ƒ“ƒR[ƒh‚É‚æ‚ès‚í‚ê‚éB
+   * OMG RTC 1.0 仕様中の多くのオペレーションは、クラインとに対して考え
+   * られるエラー状態を報告する必要がある。これは、ReturnCode_t型の所謂
+   * リターンコードにより行われる。
    *
-   * OMG RTC 1.0 ‚Ì PIM “à‚É‚¨‚¢‚āAReturnCode_tŒ^‚Ì’l‚ð•Ô‚³‚È‚¢ƒIƒyƒŒ[ƒVƒ‡ƒ“‚Í
-   * ‚»‚ê‚ç‚Ì–ß‚è’l‚ÌŒ^‚Ɉˑ¶‚µ‚āAŽŸ‚Ì•û–@‚É‚æ‚èƒGƒ‰[‚ð•ñ‚·‚é‚à‚Ì‚Æ‚·‚éB
-   * -ƒIƒyƒŒ[ƒVƒ‡ƒ“‚ª³”’l‚ð•Ô‚·ê‡ (OMG RTC 1.0 Section 5.2.2.6.4 ‚Ì
-   *  get_rate‚̂悤‚É)A•‰”’l‚ð•Ô‚·‚±‚Æ‚É‚æ‚èƒGƒ‰[‚ðŽ¦‚·‚à‚Ì‚Æ‚·‚éB
-   * - ƒIƒyƒŒ[ƒVƒ‡ƒ“‚ªƒIƒuƒWƒFƒNƒgƒŠƒtƒ@ƒŒƒ“ƒX(RTObject::get_component_profile
-   *   OMG RTC 1.0 5.4.2.2.1‚ðŽQÆ) ‚ð’ʏí•Ô‚·ê‡AnilŽQÆ‚ð•Ô‚·‚±‚Æ‚É‚æ‚è
-   *   ƒGƒ‰[‚ðŽ¦‚·‚à‚Ì‚Æ‚·‚éB
+   * OMG RTC 1.0 の PIM 内において、ReturnCode_t型の値を返さないオペレーションは
+   * それらの戻り値の型に依存して、次の方法によりエラーを報告するものとする。
+   * -オペレーションが正数値を返す場合 (OMG RTC 1.0 Section 5.2.2.6.4 の
+   *  get_rateのように)、負数値を返すことによりエラーを示すものとする。
+   * - オペレーションがオブジェクトリファレンス(RTObject::get_component_profile
+   *   OMG RTC 1.0 5.4.2.2.1を参照) を通常返す場合、nil参照を返すことにより
+   *   エラーを示すものとする。
    *
    * @else
    * @brief ReturnCode_t
@@ -329,7 +329,7 @@
      *
      * If the RTC is in the Error state relative to some execution
      * context when it would otherwise be invoked from that context
-     * (according to the contextfs ExecutionKind), this callback
+     * (according to the context’s ExecutionKind), this callback
      * shall be invoked instead. For example,
      *
      * - If the ExecutionKind is PERIODIC, this operation shall be
@@ -408,7 +408,7 @@
    * Relative to a given execution context, an RTC may either be
    * Active, Inactive, or in Error. When the RTC is Active in a
    * Running execution context, the ComponentAction callbacks (see
-   * Section 5.2.2.4) shall be invoked as appropriate for the contextf
+   * Section 5.2.2.4) shall be invoked as appropriate for the context’
    * s ExecutionKind. The callbacks shall not be invoked relative to
    * that context when either the RTC is Inactive in that context or
    * the context is Stopped. (Note that starting and stopping an
@@ -428,7 +428,7 @@
    * corresponding to that context. While the RTC is in Error, the
    * ComponentAction::on_error callback will be invoked in place of
    * those callbacks that would otherwise have been invoked according
-   * to the contextfs ExecutionKind. For example, if the kind is
+   * to the context’s ExecutionKind. For example, if the kind is
    * PERIODIC, on_error shall be invoked instead of the pair of
    * on_execute, and on_state_update.  When an RTC is in Error, it may
    * be reset. If resetting is successful, the RTC shall return to the
@@ -531,7 +531,7 @@
      *
      * @section Description
      *
-     * Stop the RTCfs execution context(s) and finalize it along with
+     * Stop the RTC’s execution context(s) and finalize it along with
      * its contents.
      *
      * @section Semantics
@@ -634,7 +634,7 @@
      *
      * @section Description 
      *
-     * ‚±‚Ì RTC ‚ªŠ—L‚·‚é ExecutionContext ‚̃ŠƒXƒg‚ðŽæ“¾‚·‚éB
+     * この RTC が所有する ExecutionContext のリストを取得する。
      * 
      * @else
      * @brief get_owned_contexts
@@ -654,13 +654,13 @@
      *  
      * @section Description
      *
-     * ‚±‚Ì RTC ‚ªŽQ‰Á‚µ‚Ä‚¢‚é‚·‚×‚Ä‚Ì ExecutionContext ‚̃ŠƒXƒg‚ðŽæ“¾‚·‚éB
+     * この RTC が参加しているすべての ExecutionContext のリストを取得する。
      *
      * @section Semantics
      *
-     * ‚±‚̃ŠƒXƒg‚ÉŠÜ‚Ü‚ê‚éŽÀsƒRƒ“ƒeƒLƒXƒg‚́Aattach_context ‚ªŒÄ‚яo
-     * ‚³‚ê‚邲‚ƂɁAƒŠƒXƒg‚ɒljÁ‚³‚êAdetach_context ‚ªŒÄ‚яo‚³‚ê‚邲
-     * ‚ƂɁAƒŠƒXƒg‚©‚çíœ‚³‚ê‚éB
+     * このリストに含まれる実行コンテキストは、attach_context が呼び出
+     * されるごとに、リストに追加され、detach_context が呼び出されるご
+     * とに、リストから削除される。
      *
      * @else
      * @brief* get_participating_contexts
@@ -682,8 +682,8 @@
     
     /*!
      * @if jp
-     * ### [ŒëA] RTC.idl ‚É‚ÍŠÜ‚Ü‚ê‚Ä‚¢‚È‚¢‚ªPIM‚É‚ÍŠÜ‚Ü‚ê‚Ä‚¢‚éB
-     * ### PIM‚ª³‚µ‚¢B
+     * ### [誤植] RTC.idl には含まれていないがPIMには含まれている。
+     * ### PIMが正しい。
      *
      * @brief 
      * @else
@@ -803,8 +803,8 @@
    * indirectly. An RTC that owns one or more execution contexts is
    * known as an autonomous RTC.  An autonomous RTC and some subset of
    * the RTCs within it (to be defined by the application developer)
-   * shall be executed by the infrastructure according to the contextf
-   * s execution kind, which defines when each RTCfs operations will
+   * shall be executed by the infrastructure according to the context’
+   * s execution kind, which defines when each RTC’s operations will
    * be invoked when and in which order. These RTCs are said to
    * participate in the context. The available execution kinds are
    * described in Section 5.2.2.7.  The relationship between RTCs and
@@ -819,7 +819,7 @@
    *
    * Although an execution context represents a logical thread of
    * control, the choice of how it maps to a physical thread shall be
-   * left to the applicationfs deployment
+   * left to the application’s deployment
    * environment. Implementations may elect to associate contexts with
    * threads with a one-to-one mapping, to serve multiple contexts
    * from a single thread, or by any other means. In the case where a
@@ -844,7 +844,7 @@
      * @section Semantics
      *
      * While the context is Running, all Active RTCs participating in
-     * the context shall be executed according to the contextfs
+     * the context shall be executed according to the context’s
      * execution kind.  
      *
      * @endif
@@ -952,7 +952,7 @@
      * @section Description
      *
      * This operation shall set the rate (in hertz) at which this
-     * contextfs Active participating RTCs are being called.
+     * context’s Active participating RTCs are being called.
      *
      * @section Semantics
      *
@@ -1051,7 +1051,7 @@
      * @section Description
      *
      * The given participant RTC is Inactive and is therefore not
-     * being invoked according to the execution contextfs execution
+     * being invoked according to the execution context’s execution
      * kind. This operation shall cause the RTC to transition to the
      * Active state such that it may subsequently be invoked in this
      * execution context.
@@ -1418,7 +1418,7 @@
    *
    * @section Description
    *
-   * The ModeCapable interface provides access to an objectfs modes
+   * The ModeCapable interface provides access to an object’s modes
    * and a means to set the current mode.
    *
    * @section Semantics
@@ -1442,13 +1442,13 @@
    * Figure 5.26 depicts a state machine that describes mode
    * changes. Each parallel region in the composite state Mode Pending
    * represents an execution context. The trigger "sample" within
-   * that state is considered to have occurred: - cjust before the
+   * that state is considered to have occurred: - …just before the
    * next call to on_execute (see Section 5.3.1.2.1) in the case where
-   * immediate is false and the execution kind is PERIODIC, c
+   * immediate is false and the execution kind is PERIODIC, …
    *
-   * - cjust before the processing of the next stimulus in the case
+   * - …just before the processing of the next stimulus in the case
    *   where immediate is false and the execution kind is
-   *   EVENT_DRIVEN, or c- cimmediately in all other cases.
+   *   EVENT_DRIVEN, or …- …immediately in all other cases.
    *
    * @endif
    */
@@ -1518,7 +1518,7 @@
      * @section Description
      *
      * This operation shall return the last mode to have been passed
-     * to set_mode that has not yet stabilized. Once the RTCfs mode
+     * to set_mode that has not yet stabilized. Once the RTC’s mode
      * has stabilized, this operation shall return nil.
      *
      * @endif
@@ -1825,7 +1825,7 @@
    *
    * A PortProfile describes a port of an RTC (referred to as the
    * "target" RTC). This port is referred to as the "target" port.
-   * From this profile, other components and tools can obtain Portfs
+   * From this profile, other components and tools can obtain Port’s
    * name, type, object reference, and so on.
    *
    * @endif
@@ -1945,7 +1945,7 @@
      *
      * @section Description
      *
-     * This attribute stores the contextfs ExecutionKind.
+     * This attribute stores the context’s ExecutionKind.
      *
      * @endif
      */
@@ -1991,7 +1991,7 @@
      *
      * @section Description
      *
-     * This attribute stores references to the contextfs participant RTCs.
+     * This attribute stores references to the context’s participant RTCs.
      *
      * @endif
      */

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/plugin.xml
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/plugin.xml	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/plugin.xml	2013-01-29 10:39:20 UTC (rev 394)
@@ -82,11 +82,16 @@
      </factory>
      <factory
             class="jp.go.aist.rtm.toolscommon.adapterfactory.WorkbenchAdapterFactory"
-            adaptableType="jp.go.aist.rtm.toolscommon.model.component.CorbaStatusObserver">
+            adaptableType="jp.go.aist.rtm.toolscommon.model.component.IPropertyMap">
                 <adapter type="org.eclipse.ui.model.IWorkbenchAdapter"/>
      </factory>
      <factory
             class="jp.go.aist.rtm.toolscommon.adapterfactory.WorkbenchAdapterFactory"
+            adaptableType="jp.go.aist.rtm.toolscommon.model.component.CorbaObserver">
+                <adapter type="org.eclipse.ui.model.IWorkbenchAdapter"/>
+     </factory>
+     <factory
+            class="jp.go.aist.rtm.toolscommon.adapterfactory.WorkbenchAdapterFactory"
             adaptableType="jp.go.aist.rtm.toolscommon.model.component.SystemDiagram">
                 <adapter type="org.eclipse.ui.model.IWorkbenchAdapter"/>
      </factory>

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/adapterfactory/WorkbenchAdapterFactory.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/adapterfactory/WorkbenchAdapterFactory.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/adapterfactory/WorkbenchAdapterFactory.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,8 +2,9 @@
 
 import jp.go.aist.rtm.toolscommon.model.component.Component;
 import jp.go.aist.rtm.toolscommon.model.component.ContextHandler;
-import jp.go.aist.rtm.toolscommon.model.component.CorbaStatusObserver;
+import jp.go.aist.rtm.toolscommon.model.component.CorbaObserver;
 import jp.go.aist.rtm.toolscommon.model.component.ExecutionContext;
+import jp.go.aist.rtm.toolscommon.model.component.IPropertyMap;
 import jp.go.aist.rtm.toolscommon.model.component.InPort;
 import jp.go.aist.rtm.toolscommon.model.component.OutPort;
 import jp.go.aist.rtm.toolscommon.model.component.PortConnector;
@@ -13,12 +14,13 @@
 import jp.go.aist.rtm.toolscommon.model.manager.RTCManager;
 import jp.go.aist.rtm.toolscommon.ui.workbenchadapter.ComponentWorkbenchAdapter;
 import jp.go.aist.rtm.toolscommon.ui.workbenchadapter.ContextHandlerWorkbenchAdapter;
-import jp.go.aist.rtm.toolscommon.ui.workbenchadapter.CorbaStatusObserverWorkbenchAdapter;
+import jp.go.aist.rtm.toolscommon.ui.workbenchadapter.CorbaObserverWorkbenchAdapter;
 import jp.go.aist.rtm.toolscommon.ui.workbenchadapter.ExecutionContextWorkbenchAdapter;
 import jp.go.aist.rtm.toolscommon.ui.workbenchadapter.InPortWorkbenchAdapter;
 import jp.go.aist.rtm.toolscommon.ui.workbenchadapter.OutPortWorkbenchAdapter;
 import jp.go.aist.rtm.toolscommon.ui.workbenchadapter.PortConnectorWorkbenchAdapter;
 import jp.go.aist.rtm.toolscommon.ui.workbenchadapter.PortInterfaceProfileWorkbenchAdapter;
+import jp.go.aist.rtm.toolscommon.ui.workbenchadapter.PropertyMapWorkbenchAdapter;
 import jp.go.aist.rtm.toolscommon.ui.workbenchadapter.RTCManagerWorkbenchAdapter;
 import jp.go.aist.rtm.toolscommon.ui.workbenchadapter.ServicePortWorkbenchAdapter;
 import jp.go.aist.rtm.toolscommon.ui.workbenchadapter.SystemDiagramWorkbenchAdapter;
@@ -50,10 +52,12 @@
 				return new ExecutionContextWorkbenchAdapter();
 			} else if (adaptable instanceof ContextHandler) {
 				return new ContextHandlerWorkbenchAdapter();
-			} else if (adaptable instanceof CorbaStatusObserver) {
-				return new CorbaStatusObserverWorkbenchAdapter();
+			} else if (adaptable instanceof CorbaObserver) {
+				return new CorbaObserverWorkbenchAdapter();
 			} else if (adaptable instanceof SystemDiagram) {
 				return new SystemDiagramWorkbenchAdapter();
+			} else if (adaptable instanceof IPropertyMap) {
+				return new PropertyMapWorkbenchAdapter();
 			} else if (adaptable instanceof RTCManager) {
 				return new RTCManagerWorkbenchAdapter();
 			}

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/Component.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/Component.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/Component.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -705,12 +705,23 @@
 	void synchronizeManually();
 
 	/**
-	 * 子コンポーネントの同期を手動で行う
+	 * 子コンポーネントのリモートからの同期を手動で行う
 	 */
+	void synchronizeRemoteChildComponents();
+
+	/**
+	 * 指定した属性（nullの場合は全属性）をリモートから同期する
+	 * @param reference
+	 */
+	void synchronizeRemoteAttribute(EStructuralFeature reference);
+
+	/**
+	 * 子コンポーネントのローカルでの同期を手動で行う
+	 */
 	void synchronizeChildComponents();
-	
+
 	/**
-	 * 指定した属性（nullの場合は全属性）の同期を実行する
+	 * 指定した属性（nullの場合は全属性）をローカルで同期する
 	 * @param reference
 	 */
 	void synchronizeLocalAttribute(EStructuralFeature reference);

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/ComponentFactory.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/ComponentFactory.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/ComponentFactory.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -135,6 +135,15 @@
 	CorbaStatusObserver createCorbaStatusObserver();
 
 	/**
+	 * Returns a new object of class '<em>Corba Log Observer</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Corba Log Observer</em>'.
+	 * @generated
+	 */
+	CorbaLogObserver createCorbaLogObserver();
+
+	/**
 	 * Returns a new object of class '<em>Specification</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/ComponentPackage.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/ComponentPackage.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/ComponentPackage.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -1480,7 +1480,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int IPROPERTY_MAP_FEATURE_COUNT = 0;
+	int IPROPERTY_MAP_FEATURE_COUNT = CorePackage.IADAPTABLE_FEATURE_COUNT + 0;
 
 	/**
 	 * The meta object id for the '{@link jp.go.aist.rtm.toolscommon.model.component.impl.EIntegerObjectToPointMapEntryImpl <em>EInteger Object To Point Map Entry</em>}' class.
@@ -2160,13 +2160,22 @@
 	int CORBA_COMPONENT__STATUS_OBSERVER = COMPONENT_FEATURE_COUNT + 10;
 
 	/**
+	 * The feature id for the '<em><b>Log Observer</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CORBA_COMPONENT__LOG_OBSERVER = COMPONENT_FEATURE_COUNT + 11;
+
+	/**
 	 * The number of structural features of the '<em>Corba Component</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CORBA_COMPONENT_FEATURE_COUNT = COMPONENT_FEATURE_COUNT + 11;
+	int CORBA_COMPONENT_FEATURE_COUNT = COMPONENT_FEATURE_COUNT + 12;
 
 	/**
 	 * The meta object id for the '{@link jp.go.aist.rtm.toolscommon.model.component.impl.CorbaPortSynchronizerImpl <em>Corba Port Synchronizer</em>}' class.
@@ -2725,6 +2734,43 @@
 	int CORBA_STATUS_OBSERVER_FEATURE_COUNT = CORBA_OBSERVER_FEATURE_COUNT + 0;
 
 	/**
+	 * The meta object id for the '{@link jp.go.aist.rtm.toolscommon.model.component.impl.CorbaLogObserverImpl <em>Corba Log Observer</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see jp.go.aist.rtm.toolscommon.model.component.impl.CorbaLogObserverImpl
+	 * @see jp.go.aist.rtm.toolscommon.model.component.impl.ComponentPackageImpl#getCorbaLogObserver()
+	 * @generated
+	 */
+	int CORBA_LOG_OBSERVER = 24;
+
+	/**
+	 * The feature id for the '<em><b>Service Profile</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CORBA_LOG_OBSERVER__SERVICE_PROFILE = CORBA_OBSERVER__SERVICE_PROFILE;
+
+	/**
+	 * The feature id for the '<em><b>Servant</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CORBA_LOG_OBSERVER__SERVANT = CORBA_OBSERVER__SERVANT;
+
+	/**
+	 * The number of structural features of the '<em>Corba Log Observer</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CORBA_LOG_OBSERVER_FEATURE_COUNT = CORBA_OBSERVER_FEATURE_COUNT + 0;
+
+	/**
 	 * The meta object id for the '{@link jp.go.aist.rtm.toolscommon.model.component.SystemDiagramKind <em>System Diagram Kind</em>}' enum.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -2732,7 +2778,7 @@
 	 * @see jp.go.aist.rtm.toolscommon.model.component.impl.ComponentPackageImpl#getSystemDiagramKind()
 	 * @generated
 	 */
-	int SYSTEM_DIAGRAM_KIND = 24;
+	int SYSTEM_DIAGRAM_KIND = 25;
 
 	/**
 	 * The meta object id for the '<em>RTC Component Profile</em>' data type.
@@ -2742,7 +2788,7 @@
 	 * @see jp.go.aist.rtm.toolscommon.model.component.impl.ComponentPackageImpl#getRTCComponentProfile()
 	 * @generated
 	 */
-	int RTC_COMPONENT_PROFILE = 30;
+	int RTC_COMPONENT_PROFILE = 31;
 
 	/**
 	 * The meta object id for the '<em>RTCRT Object</em>' data type.
@@ -2752,7 +2798,7 @@
 	 * @see jp.go.aist.rtm.toolscommon.model.component.impl.ComponentPackageImpl#getRTCRTObject()
 	 * @generated
 	 */
-	int RTCRT_OBJECT = 29;
+	int RTCRT_OBJECT = 30;
 
 	/**
 	 * The meta object id for the '<em>List</em>' data type.
@@ -2762,7 +2808,7 @@
 	 * @see jp.go.aist.rtm.toolscommon.model.component.impl.ComponentPackageImpl#getList()
 	 * @generated
 	 */
-	int LIST = 37;
+	int LIST = 38;
 
 	/**
 	 * The meta object id for the '<em>Servant</em>' data type.
@@ -2772,7 +2818,7 @@
 	 * @see jp.go.aist.rtm.toolscommon.model.component.impl.ComponentPackageImpl#getServant()
 	 * @generated
 	 */
-	int SERVANT = 38;
+	int SERVANT = 39;
 
 	/**
 	 * The meta object id for the '<em>SDO Configuration</em>' data type.
@@ -2782,7 +2828,7 @@
 	 * @see jp.go.aist.rtm.toolscommon.model.component.impl.ComponentPackageImpl#getSDOConfiguration()
 	 * @generated
 	 */
-	int SDO_CONFIGURATION = 25;
+	int SDO_CONFIGURATION = 26;
 
 	/**
 	 * The meta object id for the '<em>SDO Configuration Set</em>' data type.
@@ -2792,7 +2838,7 @@
 	 * @see jp.go.aist.rtm.toolscommon.model.component.impl.ComponentPackageImpl#getSDOConfigurationSet()
 	 * @generated
 	 */
-	int SDO_CONFIGURATION_SET = 26;
+	int SDO_CONFIGURATION_SET = 27;
 
 	/**
 	 * The meta object id for the '<em>RTC Connector Profile</em>' data type.
@@ -2802,7 +2848,7 @@
 	 * @see jp.go.aist.rtm.toolscommon.model.component.impl.ComponentPackageImpl#getRTCConnectorProfile()
 	 * @generated
 	 */
-	int RTC_CONNECTOR_PROFILE = 31;
+	int RTC_CONNECTOR_PROFILE = 32;
 
 	/**
 	 * The meta object id for the '<em>RTC Port Profile</em>' data type.
@@ -2812,7 +2858,7 @@
 	 * @see jp.go.aist.rtm.toolscommon.model.component.impl.ComponentPackageImpl#getRTCPortProfile()
 	 * @generated
 	 */
-	int RTC_PORT_PROFILE = 32;
+	int RTC_PORT_PROFILE = 33;
 
 	/**
 	 * The meta object id for the '<em>RTC Execution Context</em>' data type.
@@ -2822,7 +2868,7 @@
 	 * @see jp.go.aist.rtm.toolscommon.model.component.impl.ComponentPackageImpl#getRTCExecutionContext()
 	 * @generated
 	 */
-	int RTC_EXECUTION_CONTEXT = 33;
+	int RTC_EXECUTION_CONTEXT = 34;
 
 	/**
 	 * The meta object id for the '<em>Property Change Listener</em>' data type.
@@ -2832,7 +2878,7 @@
 	 * @see jp.go.aist.rtm.toolscommon.model.component.impl.ComponentPackageImpl#getPropertyChangeListener()
 	 * @generated
 	 */
-	int PROPERTY_CHANGE_LISTENER = 35;
+	int PROPERTY_CHANGE_LISTENER = 36;
 
 	/**
 	 * The meta object id for the '<em>SDO Organization</em>' data type.
@@ -2842,7 +2888,7 @@
 	 * @see jp.go.aist.rtm.toolscommon.model.component.impl.ComponentPackageImpl#getSDOOrganization()
 	 * @generated
 	 */
-	int SDO_ORGANIZATION = 27;
+	int SDO_ORGANIZATION = 28;
 
 
 	/**
@@ -2853,7 +2899,7 @@
 	 * @see jp.go.aist.rtm.toolscommon.model.component.impl.ComponentPackageImpl#getSDOServiceProfile()
 	 * @generated
 	 */
-	int SDO_SERVICE_PROFILE = 28;
+	int SDO_SERVICE_PROFILE = 29;
 
 	/**
 	 * The meta object id for the '<em>Port Interface Profile</em>' data type.
@@ -2863,7 +2909,7 @@
 	 * @see jp.go.aist.rtm.toolscommon.model.component.impl.ComponentPackageImpl#getPortInterfaceProfile()
 	 * @generated
 	 */
-	int PORT_INTERFACE_PROFILE = 36;
+	int PORT_INTERFACE_PROFILE = 37;
 
 
 	/**
@@ -2874,7 +2920,7 @@
 	 * @see jp.go.aist.rtm.toolscommon.model.component.impl.ComponentPackageImpl#getRTCExecutionContextProfile()
 	 * @generated
 	 */
-	int RTC_EXECUTION_CONTEXT_PROFILE = 34;
+	int RTC_EXECUTION_CONTEXT_PROFILE = 35;
 
 
 	/**
@@ -3359,6 +3405,17 @@
 	EReference getCorbaComponent_StatusObserver();
 
 	/**
+	 * Returns the meta object for the reference '{@link jp.go.aist.rtm.toolscommon.model.component.CorbaComponent#getLogObserver <em>Log Observer</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Log Observer</em>'.
+	 * @see jp.go.aist.rtm.toolscommon.model.component.CorbaComponent#getLogObserver()
+	 * @see #getCorbaComponent()
+	 * @generated
+	 */
+	EReference getCorbaComponent_LogObserver();
+
+	/**
 	 * Returns the meta object for class '{@link jp.go.aist.rtm.toolscommon.model.component.ComponentSpecification <em>Specification</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -4275,6 +4332,16 @@
 	EClass getCorbaStatusObserver();
 
 	/**
+	 * Returns the meta object for class '{@link jp.go.aist.rtm.toolscommon.model.component.CorbaLogObserver <em>Corba Log Observer</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Corba Log Observer</em>'.
+	 * @see jp.go.aist.rtm.toolscommon.model.component.CorbaLogObserver
+	 * @generated
+	 */
+	EClass getCorbaLogObserver();
+
+	/**
 	 * Returns the meta object for enum '{@link jp.go.aist.rtm.toolscommon.model.component.SystemDiagramKind <em>System Diagram Kind</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -4819,6 +4886,14 @@
 		EReference CORBA_COMPONENT__STATUS_OBSERVER = eINSTANCE.getCorbaComponent_StatusObserver();
 
 		/**
+		 * The meta object literal for the '<em><b>Log Observer</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CORBA_COMPONENT__LOG_OBSERVER = eINSTANCE.getCorbaComponent_LogObserver();
+
+		/**
 		 * The meta object literal for the '{@link jp.go.aist.rtm.toolscommon.model.component.impl.ComponentSpecificationImpl <em>Specification</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -5541,6 +5616,16 @@
 		EClass CORBA_STATUS_OBSERVER = eINSTANCE.getCorbaStatusObserver();
 
 		/**
+		 * The meta object literal for the '{@link jp.go.aist.rtm.toolscommon.model.component.impl.CorbaLogObserverImpl <em>Corba Log Observer</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see jp.go.aist.rtm.toolscommon.model.component.impl.CorbaLogObserverImpl
+		 * @see jp.go.aist.rtm.toolscommon.model.component.impl.ComponentPackageImpl#getCorbaLogObserver()
+		 * @generated
+		 */
+		EClass CORBA_LOG_OBSERVER = eINSTANCE.getCorbaLogObserver();
+
+		/**
 		 * The meta object literal for the '{@link jp.go.aist.rtm.toolscommon.model.component.SystemDiagramKind <em>System Diagram Kind</em>}' enum.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/CorbaComponent.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/CorbaComponent.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/CorbaComponent.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -35,6 +35,7 @@
  *   <li>{@link jp.go.aist.rtm.toolscommon.model.component.CorbaComponent#getRTCRTObjects <em>RTCRT Objects</em>}</li>
  *   <li>{@link jp.go.aist.rtm.toolscommon.model.component.CorbaComponent#getIor <em>Ior</em>}</li>
  *   <li>{@link jp.go.aist.rtm.toolscommon.model.component.CorbaComponent#getStatusObserver <em>Status Observer</em>}</li>
+ *   <li>{@link jp.go.aist.rtm.toolscommon.model.component.CorbaComponent#getLogObserver <em>Log Observer</em>}</li>
  * </ul>
  * </p>
  *
@@ -288,11 +289,37 @@
 	void setStatusObserver(CorbaStatusObserver value);
 
 	/**
+	 * Returns the value of the '<em><b>Log Observer</b></em>' reference.
 	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Log Observer</em>' reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
 	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Log Observer</em>' reference.
+	 * @see #setLogObserver(CorbaLogObserver)
+	 * @see jp.go.aist.rtm.toolscommon.model.component.ComponentPackage#getCorbaComponent_LogObserver()
 	 * @model
 	 * @generated
 	 */
+	CorbaLogObserver getLogObserver();
+
+	/**
+	 * Sets the value of the '{@link jp.go.aist.rtm.toolscommon.model.component.CorbaComponent#getLogObserver <em>Log Observer</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Log Observer</em>' reference.
+	 * @see #getLogObserver()
+	 * @generated
+	 */
+	void setLogObserver(CorbaLogObserver value);
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model
+	 * @generated
+	 */
 	int startR();
 
 	/**
@@ -351,6 +378,14 @@
 	 */
 	RTObject getCorbaObjectInterface();
 
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model
+	 * @generated
+	 */
+	boolean supportedCorbaObserver();
+
 	RTC.ExecutionContext getPrimaryRTCExecutionContext();
 
 	void activateAll();

Copied: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/CorbaLogObserver.java (from rev 393, trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/CorbaLogObserver.java)
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/CorbaLogObserver.java	                        (rev 0)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/CorbaLogObserver.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -0,0 +1,21 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package jp.go.aist.rtm.toolscommon.model.component;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Corba Log Observer</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see jp.go.aist.rtm.toolscommon.model.component.ComponentPackage#getCorbaLogObserver()
+ * @model
+ * @generated
+ */
+public interface CorbaLogObserver extends CorbaObserver {
+} // CorbaLogObserver

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/CorbaObserver.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/CorbaObserver.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/CorbaObserver.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -89,6 +89,14 @@
 	 * @model
 	 * @generated
 	 */
-	boolean detachComponent(CorbaComponent component);
+	boolean detachComponent();
 
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model
+	 * @generated
+	 */
+	boolean finish();
+
 } // CorbaObserver

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/IPropertyMap.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/IPropertyMap.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/IPropertyMap.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -6,6 +6,7 @@
  */
 package jp.go.aist.rtm.toolscommon.model.component;
 
+import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.emf.common.util.EList;
 
 import org.eclipse.emf.ecore.EObject;
@@ -17,10 +18,10 @@
  *
  *
  * @see jp.go.aist.rtm.toolscommon.model.component.ComponentPackage#getIPropertyMap()
- * @model interface="true" abstract="true"
+ * @model interface="true" abstract="true" superTypes="jp.go.aist.rtm.toolscommon.model.core.IAdaptable"
  * @generated
  */
-public interface IPropertyMap extends EObject {
+public interface IPropertyMap extends EObject, IAdaptable {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -53,4 +54,12 @@
 	 */
 	EList<String> getPropertyKeys();
 
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model kind="operation"
+	 * @generated
+	 */
+	IPropertyMap getPropertyMap();
+
 } // IPropertyMap

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/PortSynchronizer.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/PortSynchronizer.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/PortSynchronizer.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -58,12 +58,28 @@
 
 	/**
 	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model
+	 * @generated
+	 */
+	boolean disconnect(String conn_id);
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model
+	 * @generated
+	 */
+	boolean disconnect(ConnectorProfile conn_prof);
+
+	/**
+	 * <!-- begin-user-doc -->
 	 * 当該ポート上の接続をすべて切断する。
 	 * <!-- end-user-doc -->
 	 * @model
 	 * @generated
 	 */
-	void disconnectAll();
+	boolean disconnectAll();
 
 	String getDataflowType();
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/SystemDiagram.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/SystemDiagram.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/SystemDiagram.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -237,6 +237,11 @@
 	RtsProfileExt getProfile();
 
 	/**
+	 * ダイアグラムを終了
+	 */
+	void dispose();
+
+	/**
 	 * @return 複合RTCの内部を表現するダイアグラムでない、RTシステムそのものを表現するダイアグラム
 	 */
 	SystemDiagram getRootDiagram();
@@ -270,7 +275,7 @@
 	/**
 	 * @param ｃomponents	追加するコンポーネント
 	 */
-	void addComponents(List<Component> ｃomponents);
+	void addComponents(List<Component> components);
 
 	/**
 	 * 子コンポーネントをクリアする

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ComponentFactoryImpl.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ComponentFactoryImpl.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ComponentFactoryImpl.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -119,6 +119,7 @@
 			case ComponentPackage.CORBA_CONTEXT_HANDLER: return createCorbaContextHandler();
 			case ComponentPackage.CORBA_OBSERVER: return createCorbaObserver();
 			case ComponentPackage.CORBA_STATUS_OBSERVER: return createCorbaStatusObserver();
+			case ComponentPackage.CORBA_LOG_OBSERVER: return createCorbaLogObserver();
 			default:
 				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
@@ -360,6 +361,16 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public CorbaLogObserver createCorbaLogObserver() {
+		CorbaLogObserverImpl corbaLogObserver = new CorbaLogObserverImpl();
+		return corbaLogObserver;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public ComponentSpecification createComponentSpecification() {
 		ComponentSpecificationImpl componentSpecification = new ComponentSpecificationImpl();
 		return componentSpecification;

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ComponentImpl.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ComponentImpl.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ComponentImpl.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -17,6 +17,7 @@
 import jp.go.aist.rtm.toolscommon.model.component.ConfigurationSet;
 import jp.go.aist.rtm.toolscommon.model.component.ContextHandler;
 import jp.go.aist.rtm.toolscommon.model.component.ExecutionContext;
+import jp.go.aist.rtm.toolscommon.model.component.IPropertyMap;
 import jp.go.aist.rtm.toolscommon.model.component.CorbaComponent;
 import jp.go.aist.rtm.toolscommon.model.component.InPort;
 import jp.go.aist.rtm.toolscommon.model.component.NameValue;
@@ -28,13 +29,13 @@
 import jp.go.aist.rtm.toolscommon.model.core.ModelElement;
 import jp.go.aist.rtm.toolscommon.model.core.Visiter;
 import jp.go.aist.rtm.toolscommon.model.core.impl.WrapperObjectImpl;
-import jp.go.aist.rtm.toolscommon.synchronizationframework.LocalObject;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.common.util.BasicEList;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
@@ -1139,6 +1140,17 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public IPropertyMap getPropertyMap() {
+		// TODO: implement this method
+		// Ensure that you remove @generated or mark it @generated NOT
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
@@ -1475,34 +1487,46 @@
 		return getComponentId().hashCode() * 3 + getPathId().hashCode() + 5;
 	}
 
-	public void synchronizeChildComponents() {
-		for (Object content : eContents()) {
-			if (content instanceof LocalObject) {
-				LocalObject lo = (LocalObject) content;
-				if (lo.getSynchronizationSupport() != null) {
-					lo.getSynchronizationSupport().synchronizeLocal();
-				}
-			}
+	@Override
+	public void synchronizeManually() {
+	}
+
+	@Override
+	public void synchronizeRemoteChildComponents() {
+		if (getComponents() == null) {
+			return;
 		}
-		for (ExecutionContext pc : getParticipationContexts()) {
-			if (pc.getSynchronizationSupport() != null) {
-				pc.getSynchronizationSupport().synchronizeLocal();
-			}
+		for (Component comp : getComponents()) {
+			comp.synchronizeRemoteAttribute(null);
+			comp.synchronizeRemoteChildComponents();
 		}
+	}
 
+	@Override
+	public void synchronizeRemoteAttribute(EStructuralFeature reference) {
+	}
+
+	@Override
+	public void synchronizeChildComponents() {
 		if (getComponents() == null) {
 			return;
 		}
-		for (Object obj : getComponents()) {
-			if (obj instanceof CorbaComponent) {
-				CorbaComponent c = (CorbaComponent) obj;
-				c.synchronizeLocalAttribute(null);
-				c.synchronizeLocalReference();
-				c.synchronizeChildComponents();
-			}
+		for (Component comp : getComponents()) {
+			comp.synchronizeLocalAttribute(null);
+			comp.synchronizeLocalReference();
+			comp.synchronizeChildComponents();
 		}
 	}
 
+	@Override
+	public void synchronizeLocalAttribute(EStructuralFeature reference) {
+	}
+
+	@Override
+	public void synchronizeLocalReference() {
+	}
+
+	@Override
 	public synchronized void addComponent(Component component) {
 		getComponents().add(component);
 	}

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ComponentPackageImpl.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ComponentPackageImpl.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ComponentPackageImpl.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -22,6 +22,7 @@
 import jp.go.aist.rtm.toolscommon.model.component.CorbaConnectorProfile;
 import jp.go.aist.rtm.toolscommon.model.component.CorbaContextHandler;
 import jp.go.aist.rtm.toolscommon.model.component.CorbaExecutionContext;
+import jp.go.aist.rtm.toolscommon.model.component.CorbaLogObserver;
 import jp.go.aist.rtm.toolscommon.model.component.CorbaObserver;
 import jp.go.aist.rtm.toolscommon.model.component.CorbaPortSynchronizer;
 import jp.go.aist.rtm.toolscommon.model.component.CorbaStatusObserver;
@@ -234,6 +235,13 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	private EClass corbaLogObserverEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	private EClass componentSpecificationEClass = null;
 
 	/**
@@ -737,6 +745,15 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EReference getCorbaComponent_LogObserver() {
+		return (EReference)corbaComponentEClass.getEStructuralFeatures().get(10);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EClass getExecutionContext() {
 		return executionContextEClass;
 	}
@@ -1538,6 +1555,15 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EClass getCorbaLogObserver() {
+		return corbaLogObserverEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EClass getComponentSpecification() {
 		return componentSpecificationEClass;
 	}
@@ -1873,6 +1899,7 @@
 		createEAttribute(corbaComponentEClass, CORBA_COMPONENT__RTCRT_OBJECTS);
 		createEAttribute(corbaComponentEClass, CORBA_COMPONENT__IOR);
 		createEReference(corbaComponentEClass, CORBA_COMPONENT__STATUS_OBSERVER);
+		createEReference(corbaComponentEClass, CORBA_COMPONENT__LOG_OBSERVER);
 
 		corbaPortSynchronizerEClass = createEClass(CORBA_PORT_SYNCHRONIZER);
 		createEAttribute(corbaPortSynchronizerEClass, CORBA_PORT_SYNCHRONIZER__RTC_PORT_PROFILE);
@@ -1894,6 +1921,8 @@
 
 		corbaStatusObserverEClass = createEClass(CORBA_STATUS_OBSERVER);
 
+		corbaLogObserverEClass = createEClass(CORBA_LOG_OBSERVER);
+
 		// Create enums
 		systemDiagramKindEEnum = createEEnum(SYSTEM_DIAGRAM_KIND);
 
@@ -1963,6 +1992,7 @@
 		portConnectorEClass.getESuperTypes().add(theCorePackage.getWrapperObject());
 		connectorProfileEClass.getESuperTypes().add(theCorePackage.getWrapperObject());
 		connectorProfileEClass.getESuperTypes().add(this.getIPropertyMap());
+		iPropertyMapEClass.getESuperTypes().add(theCorePackage.getIAdaptable());
 		corbaComponentEClass.getESuperTypes().add(this.getComponent());
 		corbaComponentEClass.getESuperTypes().add(theCorePackage.getCorbaWrapperObject());
 		corbaPortSynchronizerEClass.getESuperTypes().add(theCorePackage.getCorbaWrapperObject());
@@ -1975,6 +2005,7 @@
 		corbaObserverEClass.getESuperTypes().add(this.getIPropertyMap());
 		corbaObserverEClass.getESuperTypes().add(theCorePackage.getIAdaptable());
 		corbaStatusObserverEClass.getESuperTypes().add(this.getCorbaObserver());
+		corbaLogObserverEClass.getESuperTypes().add(this.getCorbaObserver());
 
 		// Initialize classes and features; add operations and parameters
 		initEClass(systemDiagramEClass, SystemDiagram.class, "SystemDiagram", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -2154,8 +2185,14 @@
 		initEClass(portSynchronizerEClass, PortSynchronizer.class, "PortSynchronizer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getPortSynchronizer_OriginalPortString(), ecorePackage.getEString(), "originalPortString", null, 0, 1, PortSynchronizer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		addEOperation(portSynchronizerEClass, null, "disconnectAll", 0, 1, IS_UNIQUE, IS_ORDERED);
+		op = addEOperation(portSynchronizerEClass, ecorePackage.getEBoolean(), "disconnect", 0, 1, IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, ecorePackage.getEString(), "conn_id", 0, 1, IS_UNIQUE, IS_ORDERED);
 
+		op = addEOperation(portSynchronizerEClass, ecorePackage.getEBoolean(), "disconnect", 0, 1, IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, this.getConnectorProfile(), "conn_prof", 0, 1, IS_UNIQUE, IS_ORDERED);
+
+		addEOperation(portSynchronizerEClass, ecorePackage.getEBoolean(), "disconnectAll", 0, 1, IS_UNIQUE, IS_ORDERED);
+
 		initEClass(portConnectorEClass, PortConnector.class, "PortConnector", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getPortConnector_ConnectorProfile(), this.getConnectorProfile(), null, "connectorProfile", null, 0, 1, PortConnector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getPortConnector_RoutingConstraint(), this.getEIntegerObjectToPointMapEntry(), null, "routingConstraint", null, 0, -1, PortConnector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -2211,6 +2248,8 @@
 
 		addEOperation(iPropertyMapEClass, ecorePackage.getEString(), "getPropertyKeys", 0, -1, IS_UNIQUE, IS_ORDERED);
 
+		addEOperation(iPropertyMapEClass, this.getIPropertyMap(), "getPropertyMap", 0, 1, IS_UNIQUE, IS_ORDERED);
+
 		initEClass(corbaComponentEClass, CorbaComponent.class, "CorbaComponent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getCorbaComponent_ExecutionContextState(), ecorePackage.getEInt(), "executionContextState", "0", 0, 1, CorbaComponent.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getCorbaComponent_ComponentState(), ecorePackage.getEInt(), "componentState", "1", 0, 1, CorbaComponent.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -2222,6 +2261,7 @@
 		initEAttribute(getCorbaComponent_RTCRTObjects(), this.getRTCRTObject(), "rTCRTObjects", "", 0, -1, CorbaComponent.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getCorbaComponent_Ior(), ecorePackage.getEString(), "ior", null, 0, 1, CorbaComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getCorbaComponent_StatusObserver(), this.getCorbaStatusObserver(), null, "statusObserver", null, 0, 1, CorbaComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getCorbaComponent_LogObserver(), this.getCorbaLogObserver(), null, "logObserver", null, 0, 1, CorbaComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		addEOperation(corbaComponentEClass, ecorePackage.getEInt(), "startR", 0, 1, IS_UNIQUE, IS_ORDERED);
 
@@ -2239,6 +2279,8 @@
 
 		addEOperation(corbaComponentEClass, this.getRTCRTObject(), "getCorbaObjectInterface", 0, 1, IS_UNIQUE, IS_ORDERED);
 
+		addEOperation(corbaComponentEClass, ecorePackage.getEBoolean(), "supportedCorbaObserver", 0, 1, IS_UNIQUE, IS_ORDERED);
+
 		initEClass(corbaPortSynchronizerEClass, CorbaPortSynchronizer.class, "CorbaPortSynchronizer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getCorbaPortSynchronizer_RTCPortProfile(), this.getRTCPortProfile(), "rTCPortProfile", null, 0, 1, CorbaPortSynchronizer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
@@ -2290,13 +2332,16 @@
 		op = addEOperation(corbaObserverEClass, ecorePackage.getEBoolean(), "attachComponent", 0, 1, IS_UNIQUE, IS_ORDERED);
 		addEParameter(op, this.getCorbaComponent(), "component", 0, 1, IS_UNIQUE, IS_ORDERED);
 
-		op = addEOperation(corbaObserverEClass, ecorePackage.getEBoolean(), "detachComponent", 0, 1, IS_UNIQUE, IS_ORDERED);
-		addEParameter(op, this.getCorbaComponent(), "component", 0, 1, IS_UNIQUE, IS_ORDERED);
+		addEOperation(corbaObserverEClass, ecorePackage.getEBoolean(), "detachComponent", 0, 1, IS_UNIQUE, IS_ORDERED);
 
+		addEOperation(corbaObserverEClass, ecorePackage.getEBoolean(), "finish", 0, 1, IS_UNIQUE, IS_ORDERED);
+
 		initEClass(corbaStatusObserverEClass, CorbaStatusObserver.class, "CorbaStatusObserver", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
 		addEOperation(corbaStatusObserverEClass, ecorePackage.getEBoolean(), "isTimeOut", 0, 1, IS_UNIQUE, IS_ORDERED);
 
+		initEClass(corbaLogObserverEClass, CorbaLogObserver.class, "CorbaLogObserver", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
 		// Initialize enums and add enum literals
 		initEEnum(systemDiagramKindEEnum, SystemDiagramKind.class, "SystemDiagramKind");
 		addEEnumLiteral(systemDiagramKindEEnum, SystemDiagramKind.ONLINE_LITERAL);

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ComponentSpecificationImpl.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ComponentSpecificationImpl.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ComponentSpecificationImpl.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -16,8 +16,8 @@
 import jp.go.aist.rtm.toolscommon.model.component.ComponentSpecification;
 import jp.go.aist.rtm.toolscommon.model.component.ConfigurationSet;
 import jp.go.aist.rtm.toolscommon.model.component.ExecutionContext;
+import jp.go.aist.rtm.toolscommon.model.component.IPropertyMap;
 import jp.go.aist.rtm.toolscommon.model.component.Port;
-import jp.go.aist.rtm.toolscommon.model.component.util.IPropertyMapUtil;
 import jp.go.aist.rtm.toolscommon.model.component.util.PropertyMap;
 import jp.go.aist.rtm.toolscommon.synchronizationframework.LocalObject;
 import jp.go.aist.rtm.toolscommon.synchronizationframework.mapping.AttributeMapping;
@@ -31,7 +31,6 @@
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.ui.views.properties.IPropertySource;
@@ -112,7 +111,7 @@
 	 */
 	protected String rtcType = RTC_TYPE_EDEFAULT;
 
-	IPropertyMapUtil properties;
+	IPropertyMap properties;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -302,7 +301,9 @@
 		
 		clearConfigurationSet();
 		getConfigurationSets().addAll(list);
-		setActiveConfigurationSet(activeConfigurationSet);
+		if (activeConfigurationSet != null) {
+			setActiveConfigurationSet(activeConfigurationSet);
+		}
 
 		return true;
 	}
@@ -475,6 +476,11 @@
 		return properties.getPropertyKeys();
 	}
 
+	@Override
+	public IPropertyMap getPropertyMap() {
+		return properties;
+	}
+
 	/** Grouping複合RTC用のマッピングルール */
 	public static final MappingRule MAPPING_RULE = new MappingRule(null,
 			new ClassMapping(ComponentSpecificationImpl.class,
@@ -535,10 +541,7 @@
 		};
 	}
 
-	public void synchronizeLocalAttribute(EStructuralFeature reference) {
-		// Nothing to do
-	}
-
+	@Override
 	public void synchronizeLocalReference() {
 		if (!inOnlineSystemDiagram()) return;
 		if (!isGroupingCompositeComponent()) return;
@@ -561,11 +564,6 @@
 	}
 
 	@Override
-	public void synchronizeManually() {
-		//Nothing to do
-	}
-	
-	@Override
 	public Component copy() {
 		Component copy = (Component) EcoreUtil.copy(this);
 		// ExecutionContextとIDの関連付けを複製
@@ -603,5 +601,4 @@
 		return true;
 	}
 
-
 } // ComponentSpecificationImpl

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ConnectorProfileImpl.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ConnectorProfileImpl.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ConnectorProfileImpl.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -8,7 +8,7 @@
 
 import jp.go.aist.rtm.toolscommon.model.component.ComponentPackage;
 import jp.go.aist.rtm.toolscommon.model.component.ConnectorProfile;
-import jp.go.aist.rtm.toolscommon.model.component.util.IPropertyMapUtil;
+import jp.go.aist.rtm.toolscommon.model.component.IPropertyMap;
 import jp.go.aist.rtm.toolscommon.model.component.util.PropertyMap;
 import jp.go.aist.rtm.toolscommon.model.core.impl.WrapperObjectImpl;
 
@@ -505,7 +505,7 @@
 	 */
 	protected Double inportBufferReadTimeout = INPORT_BUFFER_READ_TIMEOUT_EDEFAULT;
 
-	IPropertyMapUtil properties;
+	IPropertyMap properties;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -1053,6 +1053,15 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	public IPropertyMap getPropertyMap() {
+		return properties;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaComponentImpl.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaComponentImpl.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaComponentImpl.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -8,28 +8,29 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
-
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 
 import jp.go.aist.rtm.toolscommon.factory.CorbaWrapperFactory;
 import jp.go.aist.rtm.toolscommon.model.component.Component;
+import jp.go.aist.rtm.toolscommon.model.component.ComponentFactory;
 import jp.go.aist.rtm.toolscommon.model.component.ComponentPackage;
 import jp.go.aist.rtm.toolscommon.model.component.ConfigurationSet;
 import jp.go.aist.rtm.toolscommon.model.component.ContextHandler;
 import jp.go.aist.rtm.toolscommon.model.component.CorbaComponent;
 import jp.go.aist.rtm.toolscommon.model.component.CorbaConfigurationSet;
 import jp.go.aist.rtm.toolscommon.model.component.CorbaExecutionContext;
+import jp.go.aist.rtm.toolscommon.model.component.CorbaLogObserver;
 import jp.go.aist.rtm.toolscommon.model.component.CorbaPortSynchronizer;
 import jp.go.aist.rtm.toolscommon.model.component.CorbaStatusObserver;
 import jp.go.aist.rtm.toolscommon.model.component.ExecutionContext;
+import jp.go.aist.rtm.toolscommon.model.component.IPropertyMap;
 import jp.go.aist.rtm.toolscommon.model.component.NameValue;
 import jp.go.aist.rtm.toolscommon.model.component.Port;
 import jp.go.aist.rtm.toolscommon.model.component.SystemDiagram;
 import jp.go.aist.rtm.toolscommon.model.component.util.CorbaObjectStore;
+import jp.go.aist.rtm.toolscommon.model.component.util.CorbaObserverStore;
 import jp.go.aist.rtm.toolscommon.model.component.util.CorbaPropertyMap;
-import jp.go.aist.rtm.toolscommon.model.component.util.IPropertyMapUtil;
 import jp.go.aist.rtm.toolscommon.model.core.CorbaWrapperObject;
 import jp.go.aist.rtm.toolscommon.model.core.CorePackage;
 import jp.go.aist.rtm.toolscommon.synchronizationframework.LocalObject;
@@ -47,7 +48,6 @@
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EDataTypeEList;
@@ -85,6 +85,7 @@
  *   <li>{@link jp.go.aist.rtm.toolscommon.model.component.impl.CorbaComponentImpl#getRTCRTObjects <em>RTCRT Objects</em>}</li>
  *   <li>{@link jp.go.aist.rtm.toolscommon.model.component.impl.CorbaComponentImpl#getIor <em>Ior</em>}</li>
  *   <li>{@link jp.go.aist.rtm.toolscommon.model.component.impl.CorbaComponentImpl#getStatusObserver <em>Status Observer</em>}</li>
+ *   <li>{@link jp.go.aist.rtm.toolscommon.model.component.impl.CorbaComponentImpl#getLogObserver <em>Log Observer</em>}</li>
  * </ul>
  * </p>
  *
@@ -271,8 +272,18 @@
 	 */
 	protected CorbaStatusObserver statusObserver;
 
-	protected IPropertyMapUtil properties;
+	/**
+	 * The cached value of the '{@link #getLogObserver() <em>Log Observer</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLogObserver()
+	 * @generated
+	 * @ordered
+	 */
+	protected CorbaLogObserver logObserver;
 
+	protected IPropertyMap properties;
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -378,10 +389,17 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	@Override
 	public Configuration getSDOConfiguration() {
+		try {
+			RTC.RTObject ro = getCorbaObjectInterface();
+			_SDOPackage.Configuration conf = ro.get_configuration();
+			setSDOConfiguration(conf);
+		} catch (Exception e) {
+			// void
+		}
 		return sDOConfiguration;
 	}
 
@@ -450,10 +468,21 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	@Override
 	public Organization getSDOOrganization() {
+		try {
+			RTC.RTObject ro = getCorbaObjectInterface();
+			Organization[] orgs = ro.get_owned_organizations();
+			if (orgs == null || orgs.length == 0) {
+				setSDOOrganization(new NullSDOOrganization());
+			} else {
+				setSDOOrganization(orgs[0]); // １つ目固定
+			}
+		} catch (Exception e) {
+			setSDOOrganization(new NullSDOOrganization());
+		}
 		return sDOOrganization;
 	}
 
@@ -509,19 +538,12 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	@Override
 	public CorbaStatusObserver getStatusObserver() {
-		if (statusObserver != null && statusObserver.eIsProxy()) {
-			InternalEObject oldStatusObserver = (InternalEObject)statusObserver;
-			statusObserver = (CorbaStatusObserver)eResolveProxy(oldStatusObserver);
-			if (statusObserver != oldStatusObserver) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ComponentPackage.CORBA_COMPONENT__STATUS_OBSERVER, oldStatusObserver, statusObserver));
-			}
-		}
-		return statusObserver;
+		return CorbaObserverStore.eINSTANCE
+				.findStatusObserver(getCorbaObjectInterface());
 	}
 
 	/**
@@ -536,16 +558,53 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	@Override
 	public void setStatusObserver(CorbaStatusObserver newStatusObserver) {
+		CorbaObserverStore.eINSTANCE.registStatusObserver(
+				getCorbaObjectInterface(), newStatusObserver);
+		//
 		CorbaStatusObserver oldStatusObserver = statusObserver;
 		statusObserver = newStatusObserver;
 		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ComponentPackage.CORBA_COMPONENT__STATUS_OBSERVER, oldStatusObserver, statusObserver));
 	}
 
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	public CorbaLogObserver getLogObserver() {
+		return CorbaObserverStore.eINSTANCE
+				.findLogObserver(getCorbaObjectInterface());
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CorbaLogObserver basicGetLogObserver() {
+		return logObserver;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	public void setLogObserver(CorbaLogObserver newLogObserver) {
+		CorbaObserverStore.eINSTANCE.registLogObserver(
+				getCorbaObjectInterface(), newLogObserver);
+		//
+		CorbaLogObserver oldLogObserver = logObserver;
+		logObserver = newLogObserver;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ComponentPackage.CORBA_COMPONENT__LOG_OBSERVER, oldLogObserver, logObserver));
+	}
+
 	@Override
 	public RTC.RTObject getCorbaObjectInterface() {
 		return RTC.RTObjectHelper.narrow(getCorbaObject());
@@ -726,6 +785,9 @@
 			case ComponentPackage.CORBA_COMPONENT__STATUS_OBSERVER:
 				if (resolve) return getStatusObserver();
 				return basicGetStatusObserver();
+			case ComponentPackage.CORBA_COMPONENT__LOG_OBSERVER:
+				if (resolve) return getLogObserver();
+				return basicGetLogObserver();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -775,6 +837,9 @@
 			case ComponentPackage.CORBA_COMPONENT__STATUS_OBSERVER:
 				setStatusObserver((CorbaStatusObserver)newValue);
 				return;
+			case ComponentPackage.CORBA_COMPONENT__LOG_OBSERVER:
+				setLogObserver((CorbaLogObserver)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -820,6 +885,9 @@
 			case ComponentPackage.CORBA_COMPONENT__STATUS_OBSERVER:
 				setStatusObserver((CorbaStatusObserver)null);
 				return;
+			case ComponentPackage.CORBA_COMPONENT__LOG_OBSERVER:
+				setLogObserver((CorbaLogObserver)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -854,6 +922,8 @@
 				return IOR_EDEFAULT == null ? ior != null : !IOR_EDEFAULT.equals(ior);
 			case ComponentPackage.CORBA_COMPONENT__STATUS_OBSERVER:
 				return statusObserver != null;
+			case ComponentPackage.CORBA_COMPONENT__LOG_OBSERVER:
+				return logObserver != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -936,117 +1006,57 @@
 			List originalConfigurationSets) {
 
 		try {
-			Configuration configuration = getCorbaObjectInterface()
+			_SDOPackage.Configuration configuration = getCorbaObjectInterface()
 					.get_configuration();
-			
-			List<_SDOPackage.ConfigurationSet> delectedConfigs = new ArrayList<_SDOPackage.ConfigurationSet>();
-			_SDOPackage.ConfigurationSet activeConfig = configuration.get_active_configuration_set();
-			for (Object original : originalConfigurationSets) {
-				ConfigurationSet configurationSet = (ConfigurationSet) original;
-				boolean isFind = false;
-				final String id = configurationSet.getId();
-				for (Iterator iter = localConfigurationSets.iterator(); iter
-						.hasNext();) {
-					ConfigurationSet element = (ConfigurationSet) iter.next();
-					if (element.getId().equals(id)) {
-						isFind = true;
+			for (Object o : localConfigurationSets) {
+				ConfigurationSet local = (ConfigurationSet) o;
+				ConfigurationSet updated = null;
+				for (Object o2 : originalConfigurationSets) {
+					ConfigurationSet original = (ConfigurationSet) o2;
+					if (local.getId().equals(original.getId())) {
+						updated = ComponentFactory.eINSTANCE
+								.createConfigurationSet();
+						updated.setId(local.getId());
+						for (int i = 0; i < local.getConfigurationData().size(); i++) {
+							NameValue lnv = (NameValue) local
+									.getConfigurationData().get(i);
+							NameValue onv = (NameValue) original
+									.getConfigurationData().get(i);
+							if (!lnv.getName().equals(onv.getName())) {
+								updated.getConfigurationData().add(lnv);
+							} else if (!lnv.getValueAsString().equals(
+									onv.getValueAsString())) {
+								updated.getConfigurationData().add(lnv);
+							}
+						}
 						break;
 					}
 				}
-
-				if (isFind == false) {
-					_SDOPackage.ConfigurationSet deletedConfig = configuration.get_configuration_set(id);
-					boolean result = configuration.remove_configuration_set(id);
+				if (updated != null
+						&& !updated.getConfigurationData().isEmpty()) {
+					boolean result = configuration
+							.set_configuration_set_values(SDOUtil
+									.createSdoConfigurationSet(updated));
 					if (!result) {
-						rollbackDelete(configuration, delectedConfigs, activeConfig);
 						return false;
 					}
-					delectedConfigs.add(deletedConfig);
 				}
 			}
-
-			for (Iterator iter = localConfigurationSets.iterator(); iter
-					.hasNext();) {
-				ConfigurationSet local = (ConfigurationSet) iter.next();
-
-				boolean isFind = false;
-				boolean isModified = false;
-				for (Object original : originalConfigurationSets) {
-					ConfigurationSet originalConfig = (ConfigurationSet) original;
-					if (local.getId().equals(originalConfig.getId())) {
-						isFind = true;
-						isModified = checkConfigurationSet(local,
-								originalConfig);
-						break;
-					}
-				}
-				if (isFind) {
-					if (isModified) {
-						boolean result = configuration
-								.set_configuration_set_values(SDOUtil
-										.createSdoConfigurationSet(local));
-						if (!result) return false;
-					}
-				} else {
-					boolean result = configuration.add_configuration_set(SDOUtil
-							.createSdoConfigurationSet(local));
-					if (!result) return false;
-				}
-			}
-
 			if (localActiveConfigurationSet != null) {
 				boolean result = configuration
 						.activate_configuration_set(localActiveConfigurationSet
 								.getId());
-				if (!result) return false;
+				if (!result) {
+					return false;
+				}
 			}
-
 		} catch (Exception e) {
 			e.printStackTrace();
 			return false;
 		}
-
 		return true;
 	}
 
-	private void rollbackDelete(Configuration configuration,
-			List<_SDOPackage.ConfigurationSet> delectedConfigs,
-			_SDOPackage.ConfigurationSet activeConfig) {
-		try {
-			for (_SDOPackage.ConfigurationSet configurationSet : delectedConfigs) {
-					configuration.add_configuration_set(configurationSet);				
-			}
-			if (activeConfig != null){
-				configuration.activate_configuration_set(activeConfig.id);
-			}
-		} catch (Exception e) {
-			// ignore
-		}
-		
-	}
-
-	private boolean checkConfigurationSet(ConfigurationSet local,
-			ConfigurationSet original) {
-
-		if (local.getConfigurationData().size() != original
-				.getConfigurationData().size())
-			return true;
-
-		for (int index = 0; index < local.getConfigurationData().size(); index++) {
-			NameValue localNV = (NameValue) local.getConfigurationData().get(
-					index);
-			NameValue originalNV = (NameValue) original.getConfigurationData()
-					.get(index);
-			if (!localNV.getName().equals(originalNV.getName()))
-				return true;
-			if (!localNV.getValueAsString().equals(
-					originalNV.getValueAsString()))
-				return true;
-		}
-
-		return false;
-	}
-	
 	@Override
 	public boolean setComponentsR(List<Component> componentList) {
 		try {
@@ -1301,6 +1311,11 @@
 		return properties.getPropertyKeys();
 	}
 
+	@Override
+	public IPropertyMap getPropertyMap() {
+		return properties;
+	}
+
 	// Mapping Rule
 	public static final MappingRule MAPPING_RULE = new MappingRule(
 			null,
@@ -1330,149 +1345,94 @@
 			}, new AttributeMapping[] {}, new ReferenceMapping[] {});
 
 	@Override
+	public void synchronizeRemoteAttribute(EStructuralFeature reference) {
+		ComponentPackage pkg = ComponentPackage.eINSTANCE;
+		RTC.RTObject ro = getCorbaObjectInterface();
+		//
+		if (pkg.getCorbaComponent_RTCComponentProfile().equals(reference)
+				|| reference == null) {
+			synchronizeRemote_RTCComponentProfile();
+		}
+		//
+		if (pkg.getCorbaComponent_RTCExecutionContexts().equals(reference)
+				|| reference == null) {
+			synchronizeRemote_RTCExecutionContexts();
+			// owned context
+			RTC.ExecutionContext[] oec = CorbaObjectStore.eINSTANCE
+					.findOwnedContexts(ro);
+			if (oec != null) {
+				for (RTC.ExecutionContext ec : oec) {
+					// ec profile
+					synchronizeRemote_EC_ECProfile(ec);
+					// ec state
+					synchronizeRemote_EC_ECState(ec);
+					// component state
+					synchronizeRemote_EC_ComponentState(ec);
+				}
+			}
+			// participating context
+			RTC.ExecutionContext[] pec = CorbaObjectStore.eINSTANCE
+					.findParticipatingContexts(ro);
+			if (pec != null) {
+				for (RTC.ExecutionContext ec : pec) {
+					// component state
+					synchronizeRemote_EC_ComponentState(ec);
+				}
+			}
+		}
+		//
+		if (pkg.getComponent_ConfigurationSets().equals(reference)
+				|| reference == null) {
+			synchronizeRemote_ConfigurationSets();
+		}
+		//
+		if (pkg.getComponent_ActiveConfigurationSet().equals(reference)
+				|| reference == null) {
+			synchronizeRemote_ActiveConfigurationSet();
+		}
+		//
+		if (pkg.getCorbaComponent_RTCRTObjects().equals(reference)
+				|| reference == null) {
+			synchronizeRemote_RTCRTObjects();
+		}
+	}
+
+	@Override
 	public void synchronizeLocalAttribute(EStructuralFeature reference) {
-		if (getStatusObserver() != null) {
-			// オブザーバの場合の更新
+		ComponentPackage pkg = ComponentPackage.eINSTANCE;
+		if (pkg.getCorbaComponent_RTCComponentProfile().equals(reference)
+				|| reference == null) {
 			synchronizeLocal_RTCComponentProfile();
+		}
+		//
+		if (pkg.getCorbaComponent_RTCExecutionContexts().equals(reference)
+				|| reference == null) {
 			synchronizeLocal_RTCExecutionContexts();
+		}
+		//
+		if (pkg.getComponent_ConfigurationSets().equals(reference)
+				|| reference == null) {
 			synchronizeLocal_ConfigurationSets();
+		}
+		//
+		if (pkg.getComponent_ActiveConfigurationSet().equals(reference)
+				|| reference == null) {
 			synchronizeLocal_ActiveConfigurationSet();
+		}
+		//
+		if (pkg.getCorbaComponent_RTCRTObjects().equals(reference)
+				|| reference == null) {
 			synchronizeLocal_RTCRTObjects();
-			return;
 		}
-		for (AttributeMapping attibuteMapping : getAttributeMappings()) {
-			if (reference != null) {
-				if (reference.equals(attibuteMapping.getLocalFeature())) {
-					try {
-						attibuteMapping.syncronizeLocal(this);
-						break;
-					} catch (Exception e) {
-						e.printStackTrace();
-						return;
-					}
-				}
-			} else {
-				try {
-					attibuteMapping.syncronizeLocal(this);
-				} catch (Exception e) {
-					e.printStackTrace();
-					return;
-				}
-			}
-		}
 	}
 
-	private static AttributeMapping[] getAttributeMappings() {
-		return new AttributeMapping[] {
-				new AttributeMapping(ComponentPackage.eINSTANCE
-						.getCorbaComponent_SDOConfiguration(), true) {
-					@Override
-					public Object getRemoteAttributeValue(
-							LocalObject localObject, Object[] remoteObjects) {
-						Object result = null;
-						try {
-							result = RTC.RTObjectHelper.narrow(
-									(org.omg.CORBA.Object) remoteObjects[0])
-									.get_configuration();
-						} catch (Exception e) {
-							// void
-						}
-						return result;
-					}
-				},
-				new AttributeMapping(ComponentPackage.eINSTANCE
-						.getCorbaComponent_SDOOrganization(), true) {
-					@Override
-					public Object getRemoteAttributeValue(
-							LocalObject localObject, Object[] remoteObjects) {
-						try {
-							RTC.RTObject ro = RTC.RTObjectHelper
-									.narrow((org.omg.CORBA.Object) remoteObjects[0]);
-							Organization[] orgs = ro.get_owned_organizations();
-							if (orgs == null || orgs.length == 0) {
-								return new NullSDOOrganization();
-							}
-							return orgs[0]; // １つ目固定
-						} catch (Exception e) {
-							return new NullSDOOrganization();
-						}
-					}
-				},
-				new AttributeMapping(ComponentPackage.eINSTANCE
-						.getCorbaComponent_RTCComponentProfile(), false) {
-					@Override
-					public void syncronizeLocal(LocalObject localObject) {
-						CorbaComponentImpl cc = (CorbaComponentImpl) localObject;
-						cc.synchronizeRemote_RTCComponentProfile();
-						cc.synchronizeLocal_RTCComponentProfile();
-					}
-				},
-				new AttributeMapping(ComponentPackage.eINSTANCE
-						.getCorbaComponent_RTCExecutionContexts(), false) {
-					@Override
-					public void syncronizeLocal(LocalObject localObject) {
-						CorbaComponentImpl cc = (CorbaComponentImpl) localObject;
-						cc.synchronizeRemote_RTCExecutionContexts();
-						//
-						RTC.RTObject ro = cc.getCorbaObjectInterface();
-						// owned context
-						RTC.ExecutionContext[] oec = CorbaObjectStore.eINSTANCE
-								.findOwnedContexts(ro);
-						if (oec != null) {
-							for (RTC.ExecutionContext ec : oec) {
-								// ec profile
-								cc.synchronizeRemote_EC_ECProfile(ec);
-								// ec state
-								cc.synchronizeRemote_EC_ECState(ec);
-								// component state
-								cc.synchronizeRemote_EC_ComponentState(ec);
-							}
-						}
-						// participating context
-						RTC.ExecutionContext[] pec = CorbaObjectStore.eINSTANCE
-								.findParticipatingContexts(ro);
-						if (pec != null) {
-							for (RTC.ExecutionContext ec : pec) {
-								// component state
-								cc.synchronizeRemote_EC_ComponentState(ec);
-							}
-						}
-						//
-						cc.synchronizeLocal_RTCExecutionContexts();
-					}
-				},
-				new AttributeMapping(ComponentPackage.eINSTANCE
-						.getComponent_ConfigurationSets()) {
-					@Override
-					public void syncronizeLocal(LocalObject localObject) {
-						CorbaComponentImpl cc = (CorbaComponentImpl) localObject;
-						cc.synchronizeRemote_ConfigurationSets();
-						cc.synchronizeLocal_ConfigurationSets();
-					}
-				},
-				new AttributeMapping(ComponentPackage.eINSTANCE
-						.getComponent_ActiveConfigurationSet()) {
-					@Override
-					public void syncronizeLocal(LocalObject localObject) {
-						CorbaComponentImpl cc = (CorbaComponentImpl) localObject;
-						cc.synchronizeRemote_ActiveConfigurationSet();
-						cc.synchronizeLocal_ActiveConfigurationSet();
-					}
-				},
-				new AttributeMapping(ComponentPackage.eINSTANCE
-						.getCorbaComponent_RTCRTObjects(), false) {
-					@Override
-					public void syncronizeLocal(LocalObject localObject) {
-						CorbaComponentImpl cc = (CorbaComponentImpl) localObject;
-						cc.synchronizeRemote_RTCRTObjects();
-						cc.synchronizeLocal_RTCRTObjects();
-					}
-				}, };
-	}
-
 	/** RTC.ComponentProfileの同期 (CORBA=>オブジェクトDB) */
 	public void synchronizeRemote_RTCComponentProfile() {
 		RTC.RTObject ro = getCorbaObjectInterface();
+		synchronizeRemote_RTCComponentProfile(ro);
+	}
+
+	public static void synchronizeRemote_RTCComponentProfile(RTC.RTObject ro) {
 		try {
 			RTC.ComponentProfile prof = ro.get_component_profile();
 			CorbaObjectStore.eINSTANCE.registRTCProfile(ro, prof);
@@ -1484,6 +1444,11 @@
 	/** RTC.PortProfileの同期 (CORBA=>オブジェクトDB) */
 	public void synchronizeRemote_RTCPortProfile(String name) {
 		RTC.RTObject ro = getCorbaObjectInterface();
+		synchronizeRemote_RTCPortProfile(ro, name);
+	}
+
+	public static void synchronizeRemote_RTCPortProfile(RTC.RTObject ro,
+			String name) {
 		RTC.PortProfile prof = CorbaObjectStore.eINSTANCE.findRTCPortProfile(
 				ro, name);
 		if (prof != null) {
@@ -1510,6 +1475,10 @@
 	/** RTC.ExecutionContextの同期 (CORBA=>オブジェクトDB) */
 	public void synchronizeRemote_RTCExecutionContexts() {
 		RTC.RTObject ro = getCorbaObjectInterface();
+		synchronizeRemote_RTCExecutionContexts(ro);
+	}
+
+	public static void synchronizeRemote_RTCExecutionContexts(RTC.RTObject ro) {
 		boolean update = false;
 		try {
 			// owned context
@@ -1551,8 +1520,13 @@
 
 	/** RTC.ExecutionContextの同期(comp_state) (CORBA=>オブジェクトDB) */
 	public void synchronizeRemote_EC_ComponentState(RTC.ExecutionContext ec) {
+		RTC.RTObject ro = getCorbaObjectInterface();
+		synchronizeRemote_EC_ComponentState(ro, ec);
+	}
+
+	public static void synchronizeRemote_EC_ComponentState(RTC.RTObject ro,
+			RTC.ExecutionContext ec) {
 		try {
-			RTC.RTObject ro = getCorbaObjectInterface();
 			RTC.LifeCycleState state = ec.get_component_state(ro);
 			int stateValue = RTC_STATUS(state);
 			CorbaObjectStore.eINSTANCE.registComponentState(ec, ro, stateValue);
@@ -1562,7 +1536,7 @@
 	}
 
 	/** RTC.ExecutionContextの同期(ec_state) (CORBA=>オブジェクトDB) */
-	public void synchronizeRemote_EC_ECState(RTC.ExecutionContext ec) {
+	public static void synchronizeRemote_EC_ECState(RTC.ExecutionContext ec) {
 		try {
 			int ecStateValue = ExecutionContext.STATE_UNKNOWN;
 			if (ec.is_running()) {
@@ -1577,7 +1551,7 @@
 	}
 
 	/** RTC.ExecutionContextの同期(ec_profile) (CORBA=>オブジェクトDB) */
-	public void synchronizeRemote_EC_ECProfile(RTC.ExecutionContext ec) {
+	public static void synchronizeRemote_EC_ECProfile(RTC.ExecutionContext ec) {
 		try {
 			RTC.ExecutionContextProfile prof;
 			if (ec._is_a(RTC.ExecutionContextServiceHelper.id())) {
@@ -1647,8 +1621,12 @@
 	/** SDO.ConfigurationSetの同期 (CORBA=>オブジェクトDB) */
 	public void synchronizeRemote_ConfigurationSets() {
 		RTC.RTObject ro = getCorbaObjectInterface();
-		_SDOPackage.Configuration conf = getSDOConfiguration();
+		synchronizeRemote_ConfigurationSets(ro);
+	}
+
+	public static void synchronizeRemote_ConfigurationSets(RTC.RTObject ro) {
 		try {
+			_SDOPackage.Configuration conf = ro.get_configuration();
 			_SDOPackage.ConfigurationSet[] cs = conf.get_configuration_sets();
 			CorbaObjectStore.eINSTANCE.registConfigSet(ro, cs);
 		} catch (Exception e) {
@@ -1695,8 +1673,12 @@
 	/** SDO.ConfigurationSet(active)の同期 (CORBA=>オブジェクトDB) */
 	public void synchronizeRemote_ActiveConfigurationSet() {
 		RTC.RTObject ro = getCorbaObjectInterface();
-		_SDOPackage.Configuration conf = getSDOConfiguration();
+		synchronizeRemote_ActiveConfigurationSet(ro);
+	}
+
+	public static void synchronizeRemote_ActiveConfigurationSet(RTC.RTObject ro) {
 		try {
+			_SDOPackage.Configuration conf = ro.get_configuration();
 			_SDOPackage.ConfigurationSet cs = conf
 					.get_active_configuration_set();
 			CorbaObjectStore.eINSTANCE.registActiveConfigSet(ro, cs);
@@ -1711,6 +1693,10 @@
 		boolean update = false;
 		_SDOPackage.ConfigurationSet cs = CorbaObjectStore.eINSTANCE
 				.findActiveConfigSet(ro);
+		if (cs == null) {
+			setActiveConfigurationSet(null);
+			return;
+		}
 		if (!(getActiveConfigurationSet() instanceof CorbaConfigurationSet)) {
 			update = true;
 		} else {
@@ -1737,14 +1723,18 @@
 	/** RTC.RTObjectメンバの同期 (CORBA=>オブジェクトDB) */
 	public void synchronizeRemote_RTCRTObjects() {
 		RTC.RTObject ro = getCorbaObjectInterface();
-		Organization org = getSDOOrganization();
-		if (org == null) {
-			return;
-		}
+		synchronizeRemote_RTCRTObjects(ro);
+	}
+
+	public static void synchronizeRemote_RTCRTObjects(RTC.RTObject ro) {
 		List<RTC.RTObject> list = CorbaObjectStore.eINSTANCE
 				.getCompositeMemberList(ro);
 		try {
-			_SDOPackage.SDO[] sdo_list = org.get_members();
+			Organization[] orgs = ro.get_owned_organizations();
+			if (orgs.length == 0) {
+				return;
+			}
+			_SDOPackage.SDO[] sdo_list = orgs[0].get_members();
 			if (sdo_list == null) {
 				return;
 			}
@@ -1969,6 +1959,10 @@
 		if (System.currentTimeMillis() - lastExecutedTime < SYNC_MANUAL_INTERVAL) {
 			return;
 		}
+		//
+		synchronizeRemoteAttribute(null);
+		synchronizeRemoteChildComponents();
+		//
 		synchronizeLocalAttribute(null);
 		synchronizeLocalReference();
 		synchronizeChildComponents();
@@ -1976,8 +1970,10 @@
 	}
 
 	static _SDOPackage.ServiceProfile dummyServiceProfile;
+	Boolean supportCorbaObserver = null;
 
-	boolean supportedCorbaObserver() {
+	@Override
+	public boolean supportedCorbaObserver() {
 		// OpenRTM-aistバージョンチェック
 		if (dummyServiceProfile == null) {
 			dummyServiceProfile = new _SDOPackage.ServiceProfile();
@@ -1985,14 +1981,17 @@
 			dummyServiceProfile.interface_type = "";
 			dummyServiceProfile.properties = new _SDOPackage.NameValue[0];
 		}
-		boolean result = true;
-		try {
-			result = !getSDOConfiguration().add_service_profile(
-					dummyServiceProfile);
-		} catch (Exception e) {
-			result = false;
+		if (supportCorbaObserver == null) {
+			boolean result = true;
+			try {
+				result = !getSDOConfiguration().add_service_profile(
+						dummyServiceProfile);
+			} catch (Exception e) {
+				result = false;
+			}
+			supportCorbaObserver = Boolean.valueOf(result);
 		}
-		return result;
+		return supportCorbaObserver.booleanValue();
 	}
 
 	@Override
@@ -2010,4 +2009,4 @@
 		return !SynchronizationSupport.ping(getCorbaObject());
 	}
 
-} //CorbaComponentImpl
+} // CorbaComponentImpl

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaConnectorProfileImpl.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaConnectorProfileImpl.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaConnectorProfileImpl.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -11,6 +11,7 @@
 
 import jp.go.aist.rtm.toolscommon.model.component.ComponentPackage;
 import jp.go.aist.rtm.toolscommon.model.component.CorbaConnectorProfile;
+import jp.go.aist.rtm.toolscommon.model.component.IPropertyMap;
 import jp.go.aist.rtm.toolscommon.model.component.util.CorbaPropertyMap;
 import jp.go.aist.rtm.toolscommon.synchronizationframework.mapping.AttributeMapping;
 import jp.go.aist.rtm.toolscommon.synchronizationframework.mapping.ClassMapping;
@@ -266,9 +267,7 @@
 				PROP.INPORT_READ_TIMEOUT);
 
 		for (String key : profile.getPropertyKeys()) {
-			if (InterfaceId.isValid(key)) {
-				addProperty(result, profile.getProperty(key), key);
-			}
+			addProperty(result, profile.getProperty(key), key);
 		}
 
 		return result.toArray(new NameValue[0]);
@@ -529,6 +528,11 @@
 		return properties.getPropertyKeys();
 	}
 
+	@Override
+	public IPropertyMap getPropertyMap() {
+		return properties;
+	}
+
 	// Mapping Rule
 	public static final MappingRule MAPPING_RULE = new MappingRule(
 			null,

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaExecutionContextImpl.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaExecutionContextImpl.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaExecutionContextImpl.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -182,8 +182,13 @@
 		rtcExecutionContextProfile = newRtcExecutionContextProfile;
 		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ComponentPackage.CORBA_EXECUTION_CONTEXT__RTC_EXECUTION_CONTEXT_PROFILE, oldRtcExecutionContextProfile, rtcExecutionContextProfile));
-		setRateL(rtcExecutionContextProfile.rate);
-		setKindL(rtcExecutionContextProfile.kind.value());
+		if (rtcExecutionContextProfile == null) {
+			setRateL(RATE_L_EDEFAULT);
+			setKindL(KIND_L_EDEFAULT);
+		} else {
+			setRateL(rtcExecutionContextProfile.rate);
+			setKindL(rtcExecutionContextProfile.kind.value());
+		}
 	}
 
 	@Override
@@ -310,9 +315,9 @@
 	public String getComponentStateName(Component comp) {
 		int state = getComponentState(comp);
 		if (state == RTC.LifeCycleState.ACTIVE_STATE.value()) {
-			return "ACTIVATE";
+			return "ACTIVE";
 		} else if (state == RTC.LifeCycleState.INACTIVE_STATE.value()) {
-			return "INACTIVATE";
+			return "INACTIVE";
 		} else if (state == RTC.LifeCycleState.ERROR_STATE.value()) {
 			return "ERROR";
 		}

Copied: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaLogObserverImpl.java (from rev 393, trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaLogObserverImpl.java)
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaLogObserverImpl.java	                        (rev 0)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaLogObserverImpl.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -0,0 +1,168 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package jp.go.aist.rtm.toolscommon.model.component.impl;
+
+import java.util.logging.Logger;
+
+import jp.go.aist.rtm.toolscommon.ToolsCommonPlugin;
+import jp.go.aist.rtm.toolscommon.model.component.ComponentPackage;
+import jp.go.aist.rtm.toolscommon.model.component.CorbaComponent;
+import jp.go.aist.rtm.toolscommon.model.component.CorbaLogObserver;
+import jp.go.aist.rtm.toolscommon.model.component.util.CorbaObserverStore;
+import jp.go.aist.rtm.toolscommon.model.component.util.RTCLogStore;
+
+import org.eclipse.emf.ecore.EClass;
+import org.omg.PortableServer.Servant;
+
+import static jp.go.aist.rtm.toolscommon.util.RTMixin.*;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Corba Log Observer</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * </p>
+ *
+ * @generated
+ */
+public class CorbaLogObserverImpl extends CorbaObserverImpl implements CorbaLogObserver {
+
+	static Logger log = ToolsCommonPlugin.getLogger();
+
+	public static final String[] LEVEL_NAMES = new String[] { "SILENT", //
+			"ERROR", //
+			"WARN", //
+			"INFO", //
+			"NORMAL", //
+			"DEBUG", //
+			"TRACE", //
+			"VERBOSE", //
+			"PARANOID", //
+	};
+
+	protected LoggerPOAImpl servant;
+
+	RTC.RTObject rtc;
+	String rtcName;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	protected CorbaLogObserverImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ComponentPackage.Literals.CORBA_LOG_OBSERVER;
+	}
+
+	@Override
+	public Servant getServant() {
+		if (servant == null) {
+			servant = new LoggerPOAImpl(this);
+		}
+		return servant;
+	}
+
+	@Override
+	public boolean attachComponent(CorbaComponent component) {
+		RTC.RTObject ro = component.getCorbaObjectInterface();
+		if (rtc == null) {
+			rtc = ro;
+			rtcName = component.getInstanceNameL();
+		}
+		if (!eql(rtc, ro)) {
+			return false;
+		}
+		CorbaLogObserver obs = CorbaObserverStore.eINSTANCE.findLogObserver(ro);
+		if (obs != null) {
+			return true;
+		} else {
+			serviceProfile = new _SDOPackage.ServiceProfile();
+			serviceProfile.interface_type = OpenRTM.LoggerHelper.id();
+			setProperty("logger.filter", "ALL");
+			//
+			activate();
+			try {
+				boolean result = addServiceProfile(rtc.get_configuration());
+				if (!result) {
+					deactivate();
+					return false;
+				}
+			} catch (Exception e) {
+				deactivate();
+				return false;
+			}
+			CorbaObserverStore.eINSTANCE.registLogObserver(ro, this);
+		}
+		return true;
+	}
+
+	@Override
+	public boolean detachComponent() {
+		if (rtc == null) {
+			return true;
+		}
+		if (!CorbaObserverStore.eINSTANCE.isEmptyComponentReference(rtc)) {
+			return true;
+		}
+		return finish();
+	}
+
+	@Override
+	public boolean finish() {
+		if (rtc == null) {
+			return true;
+		}
+		//
+		boolean result = false;
+		try {
+			result = removeServiceProfile(rtc.get_configuration());
+		} catch (Exception e) {
+		}
+		deactivate();
+		//
+		RTCLogStore.eINSTANCE.remove(serviceProfile.id);
+		CorbaObserverStore.eINSTANCE.removeLogObserver(rtc);
+		//
+		return result;
+	}
+
+	public void save(OpenRTM.LogRecord record) {
+		log.info("publish(" + LEVEL_NAMES[record.level.value()] + ", "
+				+ record.loggername + ", " + record.message + ")");
+		RTCLogStore.eINSTANCE.save(serviceProfile.id, rtcName, record);
+	}
+
+	static class LoggerPOAImpl extends OpenRTM.LoggerPOA {
+		CorbaLogObserverImpl parent;
+
+		public LoggerPOAImpl(CorbaLogObserverImpl parent) {
+			this.parent = parent;
+		}
+
+		@Override
+		public void publish(OpenRTM.LogRecord record) {
+			parent.save(record);
+		}
+
+		@Override
+		public void close() {
+			// TODO Auto-generated method stub
+
+		}
+	}
+
+} //CorbaLogObserverImpl

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaObserverImpl.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaObserverImpl.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaObserverImpl.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -6,8 +6,6 @@
  */
 package jp.go.aist.rtm.toolscommon.model.component.impl;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.UUID;
 import java.util.logging.Logger;
 
@@ -17,15 +15,16 @@
 import jp.go.aist.rtm.toolscommon.model.component.ComponentPackage;
 import jp.go.aist.rtm.toolscommon.model.component.CorbaComponent;
 import jp.go.aist.rtm.toolscommon.model.component.CorbaObserver;
-import jp.go.aist.rtm.toolscommon.model.component.SystemDiagram;
+import jp.go.aist.rtm.toolscommon.model.component.IPropertyMap;
 import jp.go.aist.rtm.toolscommon.model.component.util.CorbaPropertyMap;
-import jp.go.aist.rtm.toolscommon.model.component.util.IPropertyMapUtil;
+import jp.go.aist.rtm.toolscommon.ui.propertysource.CorbaObserverPropertySource;
 
 import org.eclipse.emf.common.util.EList;
 
 import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.ui.views.properties.IPropertySource;
 
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.ORBPackage.InvalidName;
@@ -91,7 +90,7 @@
 
 	static Logger log = ToolsCommonPlugin.getLogger();
 
-	protected IPropertyMapUtil properties;
+	protected IPropertyMap properties;
 
 	static ORB orb = null;
 	static POA rootpoa = null;
@@ -217,20 +216,15 @@
 		throw new UnsupportedOperationException();
 	}
 
-	protected boolean addServiceProfile(CorbaComponent component) {
-		boolean result;
-		try {
-			serviceProfile.id = UUID.randomUUID().toString();
-			result = component.getSDOConfiguration().add_service_profile(
-					serviceProfile);
-			//
-			log.info("add_service_profile:    id=" + serviceProfile.id
-					+ " ior=" + serviceProfile.service + " obs="
-					+ this.getClass());
-		} catch (Exception e) {
-			result = false;
-		}
-		return result;
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean detachComponent() {
+		// TODO: implement this method
+		// Ensure that you remove @generated or mark it @generated NOT
+		throw new UnsupportedOperationException();
 	}
 
 	/**
@@ -238,21 +232,39 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean detachComponent(CorbaComponent component) {
+	public boolean finish() {
 		// TODO: implement this method
 		// Ensure that you remove @generated or mark it @generated NOT
 		throw new UnsupportedOperationException();
 	}
 
-	protected boolean removeServiceProfile(CorbaComponent component) {
+	protected boolean addServiceProfile(_SDOPackage.Configuration config) {
 		boolean result;
 		try {
-			result = component.getSDOConfiguration().remove_service_profile(
-					serviceProfile.id);
+			serviceProfile.id = UUID.randomUUID().toString();
+			result = config.add_service_profile(serviceProfile);
 			//
+			if( result ) {
+				log.info("add_service_profile:    id=" + serviceProfile.id
+						+ " type=" + serviceProfile.interface_type + " ior="
+						+ serviceProfile.service + " obs="
+						+ this.getClass().getName());
+			}
+		} catch (Exception e) {
+			result = false;
+		}
+		return result;
+	}
+
+	protected boolean removeServiceProfile(_SDOPackage.Configuration config) {
+		boolean result;
+		try {
+			result = config.remove_service_profile(serviceProfile.id);
+			//
 			log.info("remove_service_profile: id=" + serviceProfile.id
-					+ " ior=" + serviceProfile.service + " obs="
-					+ this.getClass());
+					+ " type=" + serviceProfile.interface_type + " ior="
+					+ serviceProfile.service + " obs="
+					+ this.getClass().getName());
 		} catch (Exception e) {
 			result = false;
 		}
@@ -302,6 +314,15 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	public IPropertyMap getPropertyMap() {
+		return properties;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
@@ -352,61 +373,11 @@
 	@SuppressWarnings("unchecked")
 	@Override
 	public Object getAdapter(Class adapter) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public boolean isCompositeMember(CorbaComponent component) {
-		if (component.eContainer() instanceof SystemDiagram) {
-			SystemDiagram sd = (SystemDiagram) component.eContainer();
-			if (sd.getCompositeComponent() != null) {
-				return true;
-			}
+		java.lang.Object result = null;
+		if (IPropertySource.class.equals(adapter)) {
+			result = new CorbaObserverPropertySource(this);
 		}
-		return false;
+		return result;
 	}
 
-	protected static class ComponentList {
-		List<CorbaComponent> components;
-
-		ComponentList() {
-			this.components = new ArrayList<CorbaComponent>();
-		}
-
-		public CorbaComponent get(int index) {
-			return components.get(index);
-		}
-
-		public boolean add(CorbaComponent component) {
-			return components.add(component);
-		}
-
-		public boolean contain(CorbaComponent component) {
-			for (CorbaComponent comp : components) {
-				if (comp == component) {
-					return true;
-				}
-			}
-			return false;
-		}
-
-		public boolean isEmpty() {
-			return components.isEmpty();
-		}
-
-		public CorbaComponent remove(CorbaComponent component) {
-			int index = -1;
-			for (int i = 0; i < components.size(); i++) {
-				if (components.get(i) == component) {
-					index = i;
-					break;
-				}
-			}
-			if (index != -1) {
-				return components.remove(index);
-			}
-			return null;
-		}
-	}
-
 } //CorbaObserverImpl

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaPortConnectorImpl.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaPortConnectorImpl.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaPortConnectorImpl.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -6,6 +6,9 @@
  */
 package jp.go.aist.rtm.toolscommon.model.component.impl;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import jp.go.aist.rtm.toolscommon.model.component.ConnectorProfile;
 import jp.go.aist.rtm.toolscommon.model.component.CorbaPortSynchronizer;
 import jp.go.aist.rtm.toolscommon.model.component.Port;
@@ -40,17 +43,33 @@
 			if (profile.connector_id == null) {
 				profile.connector_id = "";
 			}
-
 			profile.name = connectorProfile.getName();
-			profile.ports = new RTC.PortService[] { getCorbaObjectInterface(first),
-					getCorbaObjectInterface(second) };
-			profile.properties = CorbaConnectorProfileImpl.createProperties(connectorProfile);
 
+			List<RTC.PortService> portLists = new ArrayList<RTC.PortService>();
+			RTC.PortService firstPortService = null;
+			RTC.PortService secondPortService = null;
+			if (first != null) {
+				firstPortService = getCorbaObjectInterface(first);
+				portLists.add(firstPortService);
+			}
+			if (second != null) {
+				secondPortService = getCorbaObjectInterface(second);
+				portLists.add(secondPortService);
+			}
+			profile.ports = portLists.toArray(new RTC.PortService[0]);
+			profile.properties = CorbaConnectorProfileImpl
+					.createProperties(connectorProfile);
+
 			ConnectorProfileHolder connectorProfileHolder = new ConnectorProfileHolder(
 					profile);
-			getCorbaObjectInterface(first).connect(connectorProfileHolder);
+			RTC.ReturnCode_t ret = RTC.ReturnCode_t.BAD_PARAMETER;
+			if (firstPortService != null) {
+				ret = firstPortService.connect(connectorProfileHolder);
+			} else if (secondPortService != null) {
+				ret = secondPortService.connect(connectorProfileHolder);
+			}
+			return ret == RTC.ReturnCode_t.RTC_OK;
 
-			return true;
 		} catch (RuntimeException e) {
 			e.printStackTrace();
 		}
@@ -59,24 +78,24 @@
 	}
 
 	private PortService getCorbaObjectInterface(Port port) {
-		CorbaPortSynchronizer synchronizer = (CorbaPortSynchronizer) port.getSynchronizer();
+		CorbaPortSynchronizer synchronizer = (CorbaPortSynchronizer) port
+				.getSynchronizer();
 		return (PortService) synchronizer.getCorbaObjectInterface();
 	}
 
+	@Override
 	public boolean deleteConnectorR() {
 		try {
 			RTC.PortService inport = getCorbaObjectInterface(getTarget());
-
 			ReturnCode_t code = inport.disconnect(this.getConnectorProfile()
 					.getConnectorId());
-
 			if (code == ReturnCode_t.RTC_OK) {
 				return true;
 			}
 		} catch (RuntimeException e) {
 			// void
 		}
-
 		return false;
 	}
-} //CorbaPortConnectorImpl
+
+} // CorbaPortConnectorImpl

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaPortSynchronizerImpl.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaPortSynchronizerImpl.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaPortSynchronizerImpl.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -13,6 +13,7 @@
 import jp.go.aist.rtm.toolscommon.factory.CorbaWrapperFactory;
 import jp.go.aist.rtm.toolscommon.model.component.ComponentFactory;
 import jp.go.aist.rtm.toolscommon.model.component.ComponentPackage;
+import jp.go.aist.rtm.toolscommon.model.component.ConnectorProfile;
 import jp.go.aist.rtm.toolscommon.model.component.CorbaPortInterfaceProfile;
 import jp.go.aist.rtm.toolscommon.model.component.CorbaPortSynchronizer;
 import jp.go.aist.rtm.toolscommon.model.component.IPropertyMap;
@@ -21,7 +22,6 @@
 import jp.go.aist.rtm.toolscommon.model.component.SystemDiagram;
 import jp.go.aist.rtm.toolscommon.model.component.ConnectorProfile.PROP;
 import jp.go.aist.rtm.toolscommon.model.component.util.CorbaPropertyMap;
-import jp.go.aist.rtm.toolscommon.model.component.util.IPropertyMapUtil;
 import jp.go.aist.rtm.toolscommon.model.core.impl.CorbaWrapperObjectImpl;
 import jp.go.aist.rtm.toolscommon.synchronizationframework.LocalObject;
 import jp.go.aist.rtm.toolscommon.synchronizationframework.mapping.AttributeMapping;
@@ -106,7 +106,7 @@
 	@SuppressWarnings("unused")
 	private SystemDiagram currentDiagram;
 
-	protected IPropertyMapUtil properties;
+	protected IPropertyMap properties;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -184,6 +184,41 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	@Override
+	public boolean disconnect(String conn_id) {
+		RTC.ReturnCode_t ret = getCorbaObjectInterface().disconnect(conn_id);
+		return ret == RTC.ReturnCode_t.RTC_OK;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	@Override
+	public boolean disconnect(ConnectorProfile conn_prof) {
+		if (conn_prof == null) {
+			return false;
+		}
+		return disconnect(conn_prof.getConnectorId());
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	@Override
+	public boolean disconnectAll() {
+		RTC.ReturnCode_t ret = getCorbaObjectInterface().disconnect_all();
+		return ret != RTC.ReturnCode_t.RTC_OK;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
@@ -441,11 +476,6 @@
 	}
 
 	@Override
-	public void disconnectAll() {
-		getCorbaObjectInterface().disconnect_all();
-	}
-
-	@Override
 	public String getDataflowType() {
 		String result = getProperty(PROP.DATAFLOW_TYPE);
 		return result;
@@ -539,7 +569,17 @@
 		return properties.getPropertyKeys();
 	}
 
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
 	@Override
+	public IPropertyMap getPropertyMap() {
+		return properties;
+	}
+
+	@Override
 	public void setCurrentDiagram(SystemDiagram currentDiagram) {
 		this.currentDiagram = currentDiagram;
 	}

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaStatusObserverImpl.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaStatusObserverImpl.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaStatusObserverImpl.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -20,15 +20,24 @@
 import jp.go.aist.rtm.toolscommon.model.component.CorbaStatusObserver;
 import jp.go.aist.rtm.toolscommon.model.component.ExecutionContext;
 import jp.go.aist.rtm.toolscommon.model.component.util.CorbaObjectStore;
-import jp.go.aist.rtm.toolscommon.ui.propertysource.CorbaStatusObserverPropertySource;
+import jp.go.aist.rtm.toolscommon.model.component.util.CorbaObserverStore;
 
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.ui.views.properties.IPropertySource;
 import org.omg.PortableServer.Servant;
 
 import static jp.go.aist.rtm.toolscommon.util.RTMixin.*;
 import static jp.go.aist.rtm.toolscommon.manager.ToolsCommonPreferenceManager.*;
 
+import static jp.go.aist.rtm.toolscommon.model.component.impl.CorbaComponentImpl.synchronizeRemote_RTCComponentProfile;
+import static jp.go.aist.rtm.toolscommon.model.component.impl.CorbaComponentImpl.synchronizeRemote_RTCExecutionContexts;
+import static jp.go.aist.rtm.toolscommon.model.component.impl.CorbaComponentImpl.synchronizeRemote_RTCPortProfile;
+import static jp.go.aist.rtm.toolscommon.model.component.impl.CorbaComponentImpl.synchronizeRemote_RTCRTObjects;
+import static jp.go.aist.rtm.toolscommon.model.component.impl.CorbaComponentImpl.synchronizeRemote_EC_ComponentState;
+import static jp.go.aist.rtm.toolscommon.model.component.impl.CorbaComponentImpl.synchronizeRemote_EC_ECProfile;
+import static jp.go.aist.rtm.toolscommon.model.component.impl.CorbaComponentImpl.synchronizeRemote_EC_ECState;
+import static jp.go.aist.rtm.toolscommon.model.component.impl.CorbaComponentImpl.synchronizeRemote_ActiveConfigurationSet;
+import static jp.go.aist.rtm.toolscommon.model.component.impl.CorbaComponentImpl.synchronizeRemote_ConfigurationSets;
+
 /**
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Corba Status Observer</b></em>'.
@@ -55,9 +64,9 @@
 
 	RTC.RTObject rtc;
 
-	static Map<RTC.RTObject, _SDOPackage.ServiceProfile> profileMap;
+	PropertyChangeListener listener;
+
 	static Map<RTC.RTObject, HeartBeat> hbMap;
-	static Map<RTC.RTObject, ComponentList> componentListMap;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -66,15 +75,9 @@
 	 */
 	protected CorbaStatusObserverImpl() {
 		super();
-		if (profileMap == null) {
-			profileMap = new HashMap<RTC.RTObject, _SDOPackage.ServiceProfile>();
-		}
 		if (hbMap == null) {
 			hbMap = new HashMap<RTC.RTObject, HeartBeat>();
 		}
-		if (componentListMap == null) {
-			componentListMap = new HashMap<RTC.RTObject, ComponentList>();
-		}
 	}
 
 	/**
@@ -115,8 +118,6 @@
 		return servant;
 	}
 
-	PropertyChangeListener listener;
-
 	@Override
 	public boolean attachComponent(CorbaComponent component) {
 		RTC.RTObject ro = component.getCorbaObjectInterface();
@@ -126,9 +127,10 @@
 		if (!eql(rtc, ro)) {
 			return false;
 		}
-		_SDOPackage.ServiceProfile prof = profileMap.get(rtc);
-		if (prof != null) {
-			serviceProfile = prof;
+		CorbaStatusObserver obs = CorbaObserverStore.eINSTANCE
+				.findStatusObserver(ro);
+		if (obs != null) {
+			return true;
 		} else {
 			HeartBeat hb = new HeartBeat();
 			hbMap.put(rtc, hb);
@@ -151,58 +153,54 @@
 					.addPropertyChangeListener(listener);
 			//
 			activate();
-			boolean result = addServiceProfile(component);
-			if (!result) {
+			try {
+				boolean result = addServiceProfile(rtc.get_configuration());
+				if (!result) {
+					deactivate();
+					return false;
+				}
+			} catch (Exception e) {
 				deactivate();
 				return false;
 			}
-			profileMap.put(rtc, serviceProfile);
+			CorbaObserverStore.eINSTANCE.registStatusObserver(ro, this);
 		}
-		ComponentList components = getComponentList();
-		if (!components.contain(component)) {
-			components.add(component);
-			component.setStatusObserver(this);
-		}
 		return true;
 	}
 
 	@Override
-	public boolean detachComponent(CorbaComponent component) {
-		RTC.RTObject ro = component.getCorbaObjectInterface();
-		if (!eql(rtc, ro)) {
-			return false;
+	public boolean detachComponent() {
+		if (rtc == null) {
+			return true;
 		}
-		ComponentList components = getComponentList();
-		if (components.contain(component)) {
-			if (!isCompositeMember(component)) {
-				components.remove(component);
-				component.setStatusObserver(null);
-			}
+		if (!CorbaObserverStore.eINSTANCE.isEmptyComponentReference(rtc)) {
+			return true;
 		}
-		if (!components.isEmpty()) {
+		//
+		return finish();
+	}
+
+	@Override
+	public boolean finish() {
+		if (rtc == null) {
 			return true;
 		}
-		boolean result = removeServiceProfile(component);
+		//
+		boolean result = false;
+		try {
+			result = removeServiceProfile(rtc.get_configuration());
+		} catch (Exception e) {
+		}
 		deactivate();
-		profileMap.remove(rtc);
+		//
+		CorbaObserverStore.eINSTANCE.removeStatusObserver(rtc);
 		hbMap.remove(rtc);
 		ToolsCommonPreferenceManager.getInstance()
 				.removePropertyChangeListener(listener);
+		//
 		return result;
 	}
 
-	ComponentList getComponentList() {
-		if (rtc == null) {
-			return new ComponentList();
-		}
-		ComponentList result = componentListMap.get(rtc);
-		if (result == null) {
-			result = new ComponentList();
-			componentListMap.put(rtc, result);
-		}
-		return result;
-	}
-
 	public void notifyStatus(OpenRTM.StatusKind status_kind, String hint) {
 		if (OpenRTM.StatusKind.HEARTBEAT.equals(status_kind)) {
 			// H.B受信
@@ -214,17 +212,17 @@
 			return;
 		}
 
+		String profId = (serviceProfile == null) ? "" : serviceProfile.id;
 		log.info("update_status(" + TYPE_NAMES[status_kind.value()] + ", "
-				+ hint + ")");
+				+ hint + "): id=" + profId);
 
-		ComponentList components = getComponentList();
-		if (components.isEmpty()) {
+		if (CorbaObserverStore.eINSTANCE.isEmptyComponentReference(rtc)) {
 			return;
 		}
-		CorbaComponentImpl ccImpl = (CorbaComponentImpl) components.get(0);
+		//
 		if (OpenRTM.StatusKind.COMPONENT_PROFILE.equals(status_kind)) {
 			// RTC.ComponentProfileの変更通知
-			ccImpl.synchronizeRemote_RTCComponentProfile();
+			synchronizeRemote_RTCComponentProfile(rtc);
 		}
 		if (OpenRTM.StatusKind.RTC_STATUS.equals(status_kind)) {
 			// RTC状態の変更通知
@@ -253,9 +251,9 @@
 			}
 			//
 			RTC.ExecutionContext ec = CorbaObjectStore.eINSTANCE.findContext(
-					ccImpl.getCorbaObjectInterface(), id);
-			CorbaObjectStore.eINSTANCE.registComponentState(ec, ccImpl
-					.getCorbaObjectInterface(), stateValue);
+					rtc, id);
+			CorbaObjectStore.eINSTANCE
+					.registComponentState(ec, rtc, stateValue);
 		}
 		if (OpenRTM.StatusKind.EC_STATUS.equals(status_kind)) {
 			// EC状態の変更通知
@@ -270,24 +268,41 @@
 			String id = ss[1];
 			//
 			if ("ATTACHED".equals(action) || "DETACHED".equals(action)) {
-				ccImpl.synchronizeRemote_RTCExecutionContexts();
-				RTC.ExecutionContext ec = CorbaObjectStore.eINSTANCE
-						.findContext(ccImpl.getCorbaObjectInterface(), id);
+				RTC.ExecutionContext oldEc = CorbaObjectStore.eINSTANCE
+						.findContext(rtc, id);
+				//
+				synchronizeRemote_RTCExecutionContexts(rtc);
+				//
+				RTC.ExecutionContext newEc = CorbaObjectStore.eINSTANCE
+						.findContext(rtc, id);
+				//
+				RTC.ExecutionContext ec = null;
+				if ("ATTACHED".equals(action)) {
+					ec = newEc;
+				} else if ("DETACHED".equals(action)) {
+					ec = oldEc;
+				}
 				if (ec != null) {
-					ccImpl.synchronizeRemote_EC_ECProfile(ec);
-					ccImpl.synchronizeRemote_EC_ComponentState(ec);
+					synchronizeRemote_EC_ECProfile(ec);
+					synchronizeRemote_EC_ComponentState(rtc, ec);
+					// 複合RTCの子情報の変更通知がないため、ECのアタッチ/デタッチ時にECオーナーを更新
+					RTC.ExecutionContextProfile ecprof = CorbaObjectStore.eINSTANCE
+							.findECProfile(ec);
+					if (ecprof != null && ecprof.owner != null) {
+						synchronizeRemote_RTCRTObjects(ecprof.owner);
+					}
 				}
 			} else if ("RATE_CHANGED".equals(action)) {
 				RTC.ExecutionContext ec = CorbaObjectStore.eINSTANCE
-						.findContext(ccImpl.getCorbaObjectInterface(), id);
+						.findContext(rtc, id);
 				if (ec != null) {
-					ccImpl.synchronizeRemote_EC_ECProfile(ec);
+					synchronizeRemote_EC_ECProfile(ec);
 				}
 			} else if ("STARTUP".equals(action) || "SHUTDOWN".equals(action)) {
 				RTC.ExecutionContext ec = CorbaObjectStore.eINSTANCE
-						.findContext(ccImpl.getCorbaObjectInterface(), id);
+						.findContext(rtc, id);
 				if (ec != null) {
-					ccImpl.synchronizeRemote_EC_ECState(ec);
+					synchronizeRemote_EC_ECState(ec);
 				}
 			}
 		}
@@ -304,9 +319,9 @@
 			String port_name = ss[1];
 			//
 			if ("CONNECT".equals(action) || "DISCONNECT".equals(action)) {
-				ccImpl.synchronizeRemote_RTCPortProfile(port_name);
+				synchronizeRemote_RTCPortProfile(rtc, port_name);
 			} else if ("ADD".equals(action) || "REMOVE".equals(action)) {
-				ccImpl.synchronizeRemote_RTCComponentProfile();
+				synchronizeRemote_RTCComponentProfile(rtc);
 			}
 		}
 		if (OpenRTM.StatusKind.CONFIGURATION.equals(status_kind)) {
@@ -315,9 +330,16 @@
 				return;
 			}
 			if ("ACTIVATE_CONFIG_SET".equals(hint)) {
-				ccImpl.synchronizeRemote_ActiveConfigurationSet();
+				synchronizeRemote_ActiveConfigurationSet(rtc);
 			} else {
-				ccImpl.synchronizeRemote_ConfigurationSets();
+				synchronizeRemote_ConfigurationSets(rtc);
+				// 複合RTCの公開ポート変更の通知がないので、ConfigurationSetの通知時にプロファイルを更新
+				RTC.ComponentProfile prof = CorbaObjectStore.eINSTANCE
+						.findRTCProfile(rtc);
+				if (prof != null && prof.category != null
+						&& prof.category.startsWith("composite.")) {
+					synchronizeRemote_RTCComponentProfile(rtc);
+				}
 			}
 		}
 	}
@@ -340,32 +362,19 @@
 			return;
 		}
 		HeartBeat hb = hbMap.get(rtc);
-		serviceProfile = profileMap.get(rtc);
 		if (hb == null || serviceProfile == null) {
 			return;
 		}
-		ComponentList components = getComponentList();
-		if (components.isEmpty()) {
-			return;
-		}
-		CorbaComponent component = components.get(0);
 		//
 		hb.updatePreference();
 		setProperty("heartbeat.enable", hb.getPropEnable());
 		setProperty("heartbeat.interval", hb.getPropInterval());
 		//
-		removeServiceProfile(component);
-		addServiceProfile(component);
-	}
-
-	@SuppressWarnings("unchecked")
-	@Override
-	public Object getAdapter(Class adapter) {
-		java.lang.Object result = null;
-		if (IPropertySource.class.equals(adapter)) {
-			result = new CorbaStatusObserverPropertySource(this);
+		try {
+			removeServiceProfile(rtc.get_configuration());
+			addServiceProfile(rtc.get_configuration());
+		} catch (Exception e) {
 		}
-		return result;
 	}
 
 	static class ComponentObserverPOAImpl extends OpenRTM.ComponentObserverPOA {

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ExecutionContextImpl.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ExecutionContextImpl.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ExecutionContextImpl.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -11,7 +11,7 @@
 import jp.go.aist.rtm.toolscommon.model.component.ComponentPackage;
 import jp.go.aist.rtm.toolscommon.model.component.ExecutionContext;
 
-import jp.go.aist.rtm.toolscommon.model.component.util.IPropertyMapUtil;
+import jp.go.aist.rtm.toolscommon.model.component.IPropertyMap;
 import jp.go.aist.rtm.toolscommon.model.component.util.PropertyMap;
 import jp.go.aist.rtm.toolscommon.model.core.impl.WrapperObjectImpl;
 
@@ -123,7 +123,7 @@
 	 */
 	protected EList<Component> participants;
 
-	protected IPropertyMapUtil properties;
+	protected IPropertyMap properties;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -343,6 +343,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated NOT
 	 */
+	@Override
 	public String getProperty(String key) {
 		return properties.getProperty(key);
 	}
@@ -352,6 +353,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated NOT
 	 */
+	@Override
 	public void setProperty(String key, String value) {
 		properties.setProperty(key, value);
 	}
@@ -361,6 +363,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated NOT
 	 */
+	@Override
 	public String removeProperty(String key) {
 		return properties.removeProperty(key);
 	}
@@ -370,6 +373,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated NOT
 	 */
+	@Override
 	public EList<String> getPropertyKeys() {
 		return properties.getPropertyKeys();
 	}
@@ -377,6 +381,16 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	@Override
+	public IPropertyMap getPropertyMap() {
+		return properties;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/OutPortImpl.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/OutPortImpl.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/OutPortImpl.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -28,7 +28,8 @@
 public class OutPortImpl extends PortImpl implements OutPort {
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
 	protected OutPortImpl() {
@@ -36,7 +37,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
@@ -49,16 +51,18 @@
 		return false;
 	}
 
+	@Override
 	public boolean validateTargetConnector(Port target) {
-		if (target instanceof InPort == false) {
+		if (!(target instanceof InPort)) {
 			return false;
 		}
-		if (isAllowDataType((InPort) target)) return true;
-		if (this.eContainer instanceof ComponentSpecification){
-			if (ConnectorUtil.getAllowDataTypes(this, (InPort) target)
-					.size() >= 1
-					|| ConnectorUtil.isAllowAnyDataType(this,
-							(InPort) target)) {
+		InPort inTarget = (InPort) target;
+		if (isAllowDataType(inTarget)) {
+			return true;
+		}
+		if (this.eContainer instanceof ComponentSpecification) {
+			if (!ConnectorUtil.getAllowDataTypes(this, inTarget).isEmpty()
+					|| ConnectorUtil.isAllowAnyDataType(this, inTarget)) {
 				return true;
 			}
 		}
@@ -66,17 +70,17 @@
 	}
 
 	private boolean isAllowDataType(InPort target) {
-		if (ConnectorUtil.getAllowDataTypes(this, target).size() < 1
-				&& !ConnectorUtil.isAllowAnyDataType(this,target)) 
+		if (ConnectorUtil.getAllowDataTypes(this, target).isEmpty()
+				&& !ConnectorUtil.isAllowAnyDataType(this, target))
 			return false;
-		if (ConnectorUtil.getAllowDataflowTypes(this, target).size() < 1
-				&& !ConnectorUtil.isAllowAnyDataflowType(this,target)) 
+		if (ConnectorUtil.getAllowDataflowTypes(this, target).isEmpty()
+				&& !ConnectorUtil.isAllowAnyDataflowType(this, target))
 			return false;
-		if (ConnectorUtil.getAllowInterfaceTypes(this, target).size() < 1
-				&& !ConnectorUtil.isAllowAnyInterfaceType(this, target)) 
+		if (ConnectorUtil.getAllowInterfaceTypes(this, target).isEmpty()
+				&& !ConnectorUtil.isAllowAnyInterfaceType(this, target))
 			return false;
-		if (ConnectorUtil.getAllowSubscriptionTypes(this, target).size() < 1
-				&& !ConnectorUtil.isAllowAnySubscriptionType(this, target)) 
+		if (ConnectorUtil.getAllowSubscriptionTypes(this, target).isEmpty()
+				&& !ConnectorUtil.isAllowAnySubscriptionType(this, target))
 			return false;
 		return true;
 	}

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/PortConnectorSpecificationImpl.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/PortConnectorSpecificationImpl.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/PortConnectorSpecificationImpl.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -22,24 +22,29 @@
  *
  * @generated
  */
-public class PortConnectorSpecificationImpl extends PortConnectorImpl
-		implements PortConnector {
+public class PortConnectorSpecificationImpl extends PortConnectorImpl implements
+		PortConnector {
 
-
-	@SuppressWarnings("unchecked")
 	public boolean createConnectorR(Port source, Port target,
 			ConnectorProfile connectorProfile) {
 		if (connectorProfile.getConnectorId() == null) {
 			connectorProfile.setConnectorId(UUID.randomUUID().toString());
 		}
-		connectorProfile.setSourceString(source.getOriginalPortString());
-		connectorProfile.setTargetString(target.getOriginalPortString());
-		addPortProfile(source, connectorProfile);
-		addPortProfile(target, connectorProfile);
+		if (source != null) {
+			connectorProfile.setSourceString(source.getOriginalPortString());
+		}
+		if (target != null) {
+			connectorProfile.setTargetString(target.getOriginalPortString());
+		}
+		if (source != null) {
+			addPortProfile(source, connectorProfile);
+		}
+		if (target != null) {
+			addPortProfile(target, connectorProfile);
+		}
 		return true;
 	}
 
-	@SuppressWarnings("unchecked")
 	private void addPortProfile(Port port, ConnectorProfile connectorProfile) {
 		for (Object object : port.getConnectorProfiles()) {
 			if (connectorProfile.getConnectorId().equals(
@@ -50,13 +55,17 @@
 		port.getConnectorProfiles().add(connectorProfile);
 	}
 
-	@SuppressWarnings("unchecked")
+	@Override
 	public boolean deleteConnectorR() {
 		try {
-			removeByID(getSource().getConnectorProfiles(),
-					getConnectorProfile());
-			removeByID(getTarget().getConnectorProfiles(),
-					getConnectorProfile());
+			if (getSource() != null) {
+				removeByID(getSource().getConnectorProfiles(),
+						getConnectorProfile());
+			}
+			if (getTarget() != null) {
+				removeByID(getTarget().getConnectorProfiles(),
+						getConnectorProfile());
+			}
 			return true;
 		} catch (RuntimeException e) {
 			return false;
@@ -74,8 +83,7 @@
 
 	@Override
 	public boolean createConnectorR() {
-		return createConnectorR(getSource(), getTarget(),
-				getConnectorProfile());
+		return createConnectorR(getSource(), getTarget(), getConnectorProfile());
 
 	}
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/PortImpl.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/PortImpl.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/PortImpl.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -8,7 +8,6 @@
 
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 
 import jp.go.aist.rtm.toolscommon.model.component.Component;
@@ -538,18 +537,13 @@
 			eNotify(new ENotificationImpl(this, Notification.SET, ComponentPackage.PORT__INTERFACE_TYPE, oldInterfaceType, interfaceType));
 	}
 
-	@SuppressWarnings("unchecked")
-	public static boolean isExistAny(List targetList) {
-		boolean result = false;
-		for (Iterator iter = targetList.iterator(); iter.hasNext();) {
-			String target = (String) iter.next();
+	public static boolean isExistAny(List<String> targetList) {
+		for (String target : targetList) {
 			if (isAnyString(target)) {
-				result = true;
-				break;
+				return true;
 			}
 		}
-
-		return result;
+		return false;
 	}
 
 	/**

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/PortSynchronizerImpl.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/PortSynchronizerImpl.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/PortSynchronizerImpl.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -11,13 +11,13 @@
 
 import jp.go.aist.rtm.toolscommon.model.component.ComponentFactory;
 import jp.go.aist.rtm.toolscommon.model.component.ComponentPackage;
+import jp.go.aist.rtm.toolscommon.model.component.IPropertyMap;
 import jp.go.aist.rtm.toolscommon.model.component.ConnectorProfile;
 import jp.go.aist.rtm.toolscommon.model.component.NameValue;
 import jp.go.aist.rtm.toolscommon.model.component.Port;
 import jp.go.aist.rtm.toolscommon.model.component.PortConnector;
 import jp.go.aist.rtm.toolscommon.model.component.PortSynchronizer;
 import jp.go.aist.rtm.toolscommon.model.component.SystemDiagram;
-import jp.go.aist.rtm.toolscommon.model.component.util.IPropertyMapUtil;
 import jp.go.aist.rtm.toolscommon.model.component.util.PortConnectorFactory;
 import jp.go.aist.rtm.toolscommon.model.component.util.PropertyMap;
 
@@ -61,7 +61,7 @@
 	protected String originalPortString = ORIGINAL_PORT_STRING_EDEFAULT;
 	private SystemDiagram currentDiagram;
 
-	IPropertyMapUtil properties;
+	IPropertyMap properties;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -109,12 +109,61 @@
 	 * <!-- end-user-doc -->
 	 * @generated NOT
 	 */
-	public void disconnectAll() {
+	@Override
+	public boolean disconnect(String conn_id) {
+		Port port = (Port) eContainer();
+		ConnectorProfile profile = findConnProfile(conn_id, port);
+		if (profile == null) {
+			return false;
+		}
+		SystemDiagram diagram = (SystemDiagram) port.eContainer().eContainer();
+		if (diagram == null) {
+			diagram = currentDiagram.getRootDiagram();
+		} else {
+			diagram = diagram.getRootDiagram();
+		}
+		PortConnector connector = PortConnectorFactory
+				.createPortConnectorSpecification();
+		connector.setConnectorProfile(profile);
+		connector.setSource(port.findPort(diagram, profile.getSourceString()));
+		connector.setTarget(port.findPort(diagram, profile.getTargetString()));
+		return connector.deleteConnectorR();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	@Override
+	public boolean disconnect(ConnectorProfile conn_prof) {
+		if (conn_prof == null) {
+			return false;
+		}
+		return disconnect(conn_prof.getConnectorId());
+	}
+
+	ConnectorProfile findConnProfile(String conn_id, Port port) {
+		for (ConnectorProfile profile : port.getConnectorProfiles()) {
+			if (conn_id != null && conn_id.equals(profile.getConnectorId())) {
+				return profile;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	@Override
+	public boolean disconnectAll() {
 		// ここではオフラインのポート全切断を行う
 		Port port = (Port) eContainer();
 		SystemDiagram diagram = (SystemDiagram) port.eContainer().eContainer();
 		diagram = diagram != null ? diagram.getRootDiagram() : currentDiagram.getRootDiagram();
-		
+
 		List<ConnectorProfile> profiles = new ArrayList<ConnectorProfile>(port.getConnectorProfiles());
 		for (ConnectorProfile profile : profiles) {
 			PortConnector connector = PortConnectorFactory.createPortConnectorSpecification();
@@ -123,6 +172,7 @@
 			connector.setTarget(port.findPort(diagram, profile.getTargetString()));
 			connector.deleteConnectorR();
 		}
+		return true;
 	}
 
 	/**
@@ -199,22 +249,22 @@
 		return result.toString();
 	}
 
-//	@Override
+	@Override
 	public String getDataflowType() {
 		return null;
 	}
 
-//	@Override
+	@Override
 	public String getDataType() {
 		return null;
 	}
 
-//	@Override
+	@Override
 	public String getInterfaceType() {
 		return null;
 	}
 
-//	@Override
+	@Override
 	public String getSubscriptionType() {
 		return null;
 	}
@@ -238,6 +288,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated NOT
 	 */
+	@Override
 	public String getProperty(String key) {
 		return properties.getProperty(key);
 	}
@@ -247,6 +298,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated NOT
 	 */
+	@Override
 	public void setProperty(String key, String value) {
 		properties.setProperty(key, value);
 	}
@@ -256,6 +308,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated NOT
 	 */
+	@Override
 	public String removeProperty(String key) {
 		return properties.removeProperty(key);
 	}
@@ -265,14 +318,30 @@
 	 * <!-- end-user-doc -->
 	 * @generated NOT
 	 */
+	@Override
 	public EList<String> getPropertyKeys() {
 		return properties.getPropertyKeys();
 	}
 
-	//	@Override
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	@Override
+	public IPropertyMap getPropertyMap() {
+		return properties;
+	}
+
+	@Override
 	public void setCurrentDiagram(SystemDiagram currentDiagram) {
 		this.currentDiagram = currentDiagram;
 	}
 
+	@SuppressWarnings("unchecked")
+	@Override
+	public Object getAdapter(Class adapter) {
+		return null;
+	}
 
 } //PortSynchronizerImpl

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/SystemDiagramImpl.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/SystemDiagramImpl.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/SystemDiagramImpl.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -15,15 +15,16 @@
 import java.util.Map;
 
 import jp.go.aist.rtm.toolscommon.model.component.Component;
+import jp.go.aist.rtm.toolscommon.model.component.ComponentFactory;
 import jp.go.aist.rtm.toolscommon.model.component.ComponentPackage;
+import jp.go.aist.rtm.toolscommon.model.component.IPropertyMap;
 import jp.go.aist.rtm.toolscommon.model.component.CorbaStatusObserver;
 import jp.go.aist.rtm.toolscommon.model.component.PortConnector;
 import jp.go.aist.rtm.toolscommon.model.component.SystemDiagram;
 import jp.go.aist.rtm.toolscommon.model.component.SystemDiagramKind;
-import jp.go.aist.rtm.toolscommon.model.component.util.IPropertyMapUtil;
+import jp.go.aist.rtm.toolscommon.model.component.util.CorbaObserverStore;
 import jp.go.aist.rtm.toolscommon.model.component.util.PropertyMap;
 import jp.go.aist.rtm.toolscommon.model.core.impl.ModelElementImpl;
-import jp.go.aist.rtm.toolscommon.synchronizationframework.LocalObject;
 import jp.go.aist.rtm.toolscommon.synchronizationframework.RefreshThread;
 import jp.go.aist.rtm.toolscommon.synchronizationframework.SynchronizationSupport;
 import jp.go.aist.rtm.toolscommon.ui.propertysource.SystemDiagramPropertySource;
@@ -91,7 +92,7 @@
 	 */
 	protected SystemDiagramKind kind = KIND_EDEFAULT;
 
-	protected IPropertyMapUtil properties;
+	protected IPropertyMap properties;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -306,7 +307,6 @@
 			eNotify(new ENotificationImpl(this, Notification.SET, ComponentPackage.SYSTEM_DIAGRAM__COMPOSITE_COMPONENT, oldCompositeComponent, compositeComponent));
 	}
 
-	private RefreshThread refreshThread;
 	/**
 	 * The default value of the '{@link #isConnectorProcessing() <em>Connector Processing</em>}' attribute.
 	 * <!-- begin-user-doc -->
@@ -407,25 +407,42 @@
 	 */
 	protected Component compositeComponent;
 
+	RefreshThread syncRemoteThread;
+	RefreshThread syncLocalThread;
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 */
 	@Override
 	public synchronized void setSynchronizeInterval(long milliSecond) {
-		if (!SystemDiagramKind.ONLINE_LITERAL.equals(getKind())) return;
-		if (refreshThread == null) {
-			refreshThread = new RefreshThread(milliSecond){
+		if (!SystemDiagramKind.ONLINE_LITERAL.equals(getKind())) {
+			return;
+		}
+		// CORBAからの同期
+		if (syncRemoteThread == null) {
+			syncRemoteThread = new RefreshThread(milliSecond) {
 				@Override
 				protected void executeCommand() {
-					synchronizeLocal();
+					synchronizeRemote();
 				}
 			};
-			refreshThread.setDaemon(true);
-			refreshThread.start();
+			syncRemoteThread.setDaemon(true);
+			syncRemoteThread.start();
 		} else {
-			refreshThread.setSynchronizeInterval(milliSecond);
+			syncRemoteThread.setSynchronizeInterval(milliSecond);
 		}
+		// モデルへの同期
+		if (syncLocalThread == null) {
+			syncLocalThread = new RefreshThread(1000) {
+				@Override
+				protected void executeCommand() {
+					synchronizeLocal();
+				}
+			};
+			syncLocalThread.setDaemon(true);
+			syncLocalThread.start();
+		}
 	}
 
 	protected synchronized List<Component> getUnmodifiedComponents() {
@@ -434,25 +451,34 @@
 
 	@Override
 	public synchronized void removeComponent(Component component) {
-		if (component instanceof CorbaComponentImpl) {
-			CorbaComponentImpl corbaComp = (CorbaComponentImpl) component;
-			// 状態通知オブザーバ解除
-			if (corbaComp.getStatusObserver() != null) {
-				corbaComp.getStatusObserver().detachComponent(corbaComp);
-			}
-		}
+		removeObserver(component);
 		for (Component comp : component.getComponents()) {
-			if (comp instanceof CorbaComponentImpl) {
-				CorbaComponentImpl corbaComp = (CorbaComponentImpl) comp;
-				// 状態通知オブザーバ解除
-				if (corbaComp.getStatusObserver() != null) {
-					corbaComp.getStatusObserver().detachComponent(corbaComp);
-				}
-			}
+			removeObserver(comp);
 		}
+		//
 		getComponents().remove(component);
 	}
 
+	void removeObserver(Component component) {
+		if (!(component instanceof CorbaComponentImpl)) {
+			return;
+		}
+		if (isCompositeMember(component)) {
+			return;
+		}
+		CorbaComponentImpl corbaComp = (CorbaComponentImpl) component;
+		//
+		CorbaObserverStore.eINSTANCE.removeComponentReference(corbaComp);
+		// 状態通知オブザーバ解除
+		if (corbaComp.getStatusObserver() != null) {
+			corbaComp.getStatusObserver().detachComponent();
+		}
+		// ログ通知オブザーバ解除
+		if (corbaComp.getLogObserver() != null) {
+			corbaComp.getLogObserver().detachComponent();
+		}
+	}
+
 	@Override
 	public synchronized void removeComponents(List<Component> components) {
 		for (Component c : components) {
@@ -467,24 +493,11 @@
 
 	@Override
 	public synchronized void addComponent(int pos, Component component) {
-		if (component instanceof CorbaComponentImpl) {
-			CorbaComponentImpl corbaComp = (CorbaComponentImpl) component;
-			if (corbaComp.supportedCorbaObserver()) {
-				// 状態通知オブザーバ登録
-				CorbaStatusObserver ob = new CorbaStatusObserverImpl();
-				ob.attachComponent(corbaComp);
-			}
-		}
+		addObserver(component);
 		for (Component comp : component.getComponents()) {
-			if (comp instanceof CorbaComponentImpl) {
-				CorbaComponentImpl corbaComp = (CorbaComponentImpl) comp;
-				if (corbaComp.supportedCorbaObserver()) {
-					// 状態通知オブザーバ登録
-					CorbaStatusObserver ob = new CorbaStatusObserverImpl();
-					ob.attachComponent(corbaComp);
-				}
-			}
+			addObserver(comp);
 		}
+		//
 		if (pos == -1) {
 			getComponents().add(component);
 		} else {
@@ -492,6 +505,25 @@
 		}
 	}
 
+	void addObserver(Component component) {
+		if (!(component instanceof CorbaComponentImpl)) {
+			return;
+		}
+		if (isCompositeMember(component)) {
+			return;
+		}
+		CorbaComponentImpl corbaComp = (CorbaComponentImpl) component;
+		if (!corbaComp.supportedCorbaObserver()) {
+			return;
+		}
+		// 状態通知オブザーバ登録
+		CorbaStatusObserver ob = ComponentFactory.eINSTANCE
+				.createCorbaStatusObserver();
+		ob.attachComponent(corbaComp);
+		//
+		CorbaObserverStore.eINSTANCE.addComponentReference(corbaComp);
+	}
+
 	@Override
 	public synchronized void addComponents(List<Component> components) {
 		for (Component c : components) {
@@ -506,6 +538,16 @@
 		}
 	}
 
+	public boolean isCompositeMember(Component component) {
+		if (component.eContainer() instanceof SystemDiagram) {
+			SystemDiagram sd = (SystemDiagram) component.eContainer();
+			if (sd.getCompositeComponent() != null) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	@Override
 	public SystemDiagram getRootDiagram() {
 		if (getParentSystemDiagram() == null) return this;
@@ -597,6 +639,16 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	@Override
+	public IPropertyMap getPropertyMap() {
+		return properties;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
@@ -794,9 +846,66 @@
 		return connectorMap;
 	}
 
-	private void synchronizeLocal() {
-		// リモートと同期を取る
-		synchronizeFromRemote();
+	@Override
+	public void dispose() {
+		if (syncLocalThread != null) {
+			syncLocalThread.setSynchronizeInterval(-1);
+			syncLocalThread = null;
+		}
+		if (syncRemoteThread != null) {
+			syncRemoteThread.setSynchronizeInterval(-1);
+			syncRemoteThread = null;
+		}
+	}
+
+	void synchronizeRemote() {
+		if (getParentSystemDiagram() == null) {
+			for (Component component : getUnmodifiedComponents()) {
+				if (component instanceof CorbaComponentImpl) {
+					CorbaComponentImpl corbaComp = (CorbaComponentImpl) component;
+					CorbaStatusObserver obs = corbaComp.getStatusObserver();
+					if (obs != null) {
+						continue;
+					}
+				}
+				//
+				SynchronizationSupport support = component
+						.getSynchronizationSupport();
+				if (support == null) {
+					continue;
+				}
+				support.synchronizeRemote();
+			}
+		}
+	}
+
+	void synchronizeLocal() {
+		// // リモートと同期を取る
+		for (Component component : getUnmodifiedComponents()) {
+			if (component instanceof CorbaComponentImpl) {
+				CorbaComponentImpl corbaComp = (CorbaComponentImpl) component;
+				CorbaStatusObserver obs = corbaComp.getStatusObserver();
+				if (obs != null) {
+					// 状態通知オブザーバが登録されている場合の同期
+					if (obs.isTimeOut()) {
+						// H.Bがタイムアウトしていたらダイアグラムから削除
+						if (!SynchronizationSupport.ping(corbaComp
+								.getCorbaObjectInterface())) {
+							removeComponent(corbaComp);
+						}
+						continue;
+					}
+				}
+			}
+			//
+			SynchronizationSupport support = component
+					.getSynchronizationSupport();
+			if (support == null) {
+				continue;
+			}
+			support.synchronizeLocal();
+		}
+		//
 		try {
 			closeIfExit();
 		} catch (Exception e) {
@@ -842,56 +951,12 @@
 		return false;
 	}
 
-	private void synchronizeFromRemote() {
-		if (getParentSystemDiagram() != null) {
-			return;
-		}
-		List<Component> components = getUnmodifiedComponents();
-		for (Component component : components) {
-			if (component instanceof CorbaComponentImpl) {
-				CorbaComponentImpl corbaComp = (CorbaComponentImpl) component;
-				CorbaStatusObserver obs = corbaComp.getStatusObserver();
-				if (obs != null) {
-					// 状態通知オブザーバが登録されている場合の同期
-					if (obs.isTimeOut()) {
-						// H.Bがタイムアウトしていたらダイアグラムから削除
-						if (!SynchronizationSupport.ping(corbaComp
-								.getCorbaObjectInterface())) {
-							removeComponent(corbaComp);
-						}
-						continue;
-					}
-					corbaComp.synchronizeLocalAttribute(null);
-					corbaComp.synchronizeLocalReference();
-					corbaComp.synchronizeChildComponents();
-					for (Object content : corbaComp.eContents()) {
-						if (content instanceof LocalObject) {
-							LocalObject lo = (LocalObject) content;
-							if (lo.getSynchronizationSupport() != null) {
-								lo.getSynchronizationSupport()
-										.synchronizeLocal();
-							}
-						}
-					}
-					continue;
-				}
-			}
-			//
-			SynchronizationSupport support = component
-					.getSynchronizationSupport();
-			if (support == null) {
-				continue;
-			}
-			support.synchronizeLocal();
-		}
-	}
-
 	@Override
 	public synchronized boolean synchronizeManually() {
 		if (!SystemDiagramKind.ONLINE_LITERAL.equals(getKind())) {
 			return false;
 		}
-		if (refreshThread != null && refreshThread.isRunning()) {
+		if (syncRemoteThread != null && syncRemoteThread.isRunning()) {
 			return false;
 		}
 		synchronizeLocal();

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/util/ComponentAdapterFactory.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/util/ComponentAdapterFactory.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/util/ComponentAdapterFactory.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -193,6 +193,10 @@
 				return createCorbaStatusObserverAdapter();
 			}
 			@Override
+			public Adapter caseCorbaLogObserver(CorbaLogObserver object) {
+				return createCorbaLogObserverAdapter();
+			}
+			@Override
 			public Adapter caseIAdaptable(IAdaptable object) {
 				return createIAdaptableAdapter();
 			}
@@ -471,6 +475,20 @@
 	}
 
 	/**
+	 * Creates a new adapter for an object of class '{@link jp.go.aist.rtm.toolscommon.model.component.CorbaLogObserver <em>Corba Log Observer</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see jp.go.aist.rtm.toolscommon.model.component.CorbaLogObserver
+	 * @generated
+	 */
+	public Adapter createCorbaLogObserverAdapter() {
+		return null;
+	}
+
+	/**
 	 * Creates a new adapter for an object of class '{@link jp.go.aist.rtm.toolscommon.model.component.ComponentSpecification <em>Specification</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/util/ComponentSwitch.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/util/ComponentSwitch.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/util/ComponentSwitch.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -230,6 +230,7 @@
 				PortSynchronizer portSynchronizer = (PortSynchronizer)theEObject;
 				T result = casePortSynchronizer(portSynchronizer);
 				if (result == null) result = caseIPropertyMap(portSynchronizer);
+				if (result == null) result = caseIAdaptable(portSynchronizer);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
@@ -263,6 +264,7 @@
 			case ComponentPackage.IPROPERTY_MAP: {
 				IPropertyMap iPropertyMap = (IPropertyMap)theEObject;
 				T result = caseIPropertyMap(iPropertyMap);
+				if (result == null) result = caseIAdaptable(iPropertyMap);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
@@ -353,6 +355,15 @@
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
+			case ComponentPackage.CORBA_LOG_OBSERVER: {
+				CorbaLogObserver corbaLogObserver = (CorbaLogObserver)theEObject;
+				T result = caseCorbaLogObserver(corbaLogObserver);
+				if (result == null) result = caseCorbaObserver(corbaLogObserver);
+				if (result == null) result = caseIPropertyMap(corbaLogObserver);
+				if (result == null) result = caseIAdaptable(corbaLogObserver);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
 			default: return defaultCase(theEObject);
 		}
 	}
@@ -613,6 +624,21 @@
 	}
 
 	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Corba Log Observer</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Corba Log Observer</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCorbaLogObserver(CorbaLogObserver object) {
+		return null;
+	}
+
+	/**
 	 * Returns the result of interpreting the object as an instance of '<em>Specification</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;

Copied: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/util/CorbaObserverStore.java (from rev 393, trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/util/CorbaObserverStore.java)
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/util/CorbaObserverStore.java	                        (rev 0)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/util/CorbaObserverStore.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -0,0 +1,172 @@
+package jp.go.aist.rtm.toolscommon.model.component.util;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import jp.go.aist.rtm.toolscommon.model.component.CorbaComponent;
+import jp.go.aist.rtm.toolscommon.model.component.CorbaLogObserver;
+import jp.go.aist.rtm.toolscommon.model.component.CorbaStatusObserver;
+
+public class CorbaObserverStore {
+
+	public static CorbaObserverStore eINSTANCE = new CorbaObserverStore();
+
+	// RTC.RTObj => ComponentList
+	Map<RTC.RTObject, ComponentList> compReferenceMap;
+	// RTC.RTObj => CorbaStatusObserver
+	Map<RTC.RTObject, CorbaStatusObserver> statusObserverMap;
+	// RTC.RTObj => CorbaLogObserver
+	Map<RTC.RTObject, CorbaLogObserver> logObserverMap;
+
+	public CorbaObserverStore() {
+		this.compReferenceMap = new HashMap<RTC.RTObject, ComponentList>();
+		this.statusObserverMap = new HashMap<RTC.RTObject, CorbaStatusObserver>();
+		this.logObserverMap = new HashMap<RTC.RTObject, CorbaLogObserver>();
+	}
+
+	/**
+	 * RTC.RTObjectを参照する CorbaComponentを追加します。
+	 */
+	public void addComponentReference(RTC.RTObject ro, CorbaComponent comp) {
+		ComponentList list = compReferenceMap.get(ro);
+		if (list == null) {
+			list = new ComponentList();
+			compReferenceMap.put(ro, list);
+		}
+		list.add(comp);
+	}
+
+	public void addComponentReference(CorbaComponent comp) {
+		addComponentReference(comp.getCorbaObjectInterface(), comp);
+	}
+
+	/**
+	 * RTC.RTObjectを参照する CorbaComponentを削除します。
+	 */
+	public void removeComponentReference(RTC.RTObject ro, CorbaComponent comp) {
+		ComponentList list = compReferenceMap.get(ro);
+		if (list == null) {
+			return;
+		}
+		list.remove(comp);
+	}
+
+	public void removeComponentReference(CorbaComponent comp) {
+		removeComponentReference(comp.getCorbaObjectInterface(), comp);
+	}
+
+	/**
+	 * RTC.RTObjectを参照する CorbaComponentの一覧を取得します。
+	 */
+	public ComponentList findComponentReferenceList(RTC.RTObject ro) {
+		ComponentList result = compReferenceMap.get(ro);
+		if (result == null) {
+			result = new ComponentList();
+		}
+		return result;
+	}
+
+	/**
+	 * RTC.RTObjectを参照する CorbaComponentが存在しない場合はtrue
+	 */
+	public boolean isEmptyComponentReference(RTC.RTObject ro) {
+		ComponentList list = compReferenceMap.get(ro);
+		if (list == null) {
+			return true;
+		}
+		return list.isEmpty();
+	}
+
+	/**
+	 * RTC.RTObjectをキーに CorbaStatusObserverを検索します。
+	 */
+	public CorbaStatusObserver findStatusObserver(RTC.RTObject ro) {
+		return statusObserverMap.get(ro);
+	}
+
+	/**
+	 * RTC.RTObjectをキーに CorbaStatusObserverを保存します。
+	 */
+	public synchronized CorbaStatusObserver registStatusObserver(
+			RTC.RTObject ro, CorbaStatusObserver observer) {
+		return statusObserverMap.put(ro, observer);
+	}
+
+	/**
+	 * RTC.RTObjectをキーに CorbaStatusObserverを削除します。
+	 */
+	public synchronized CorbaStatusObserver removeStatusObserver(RTC.RTObject ro) {
+		return statusObserverMap.remove(ro);
+	}
+
+	/**
+	 * RTC.RTObjectをキーに CorbaLogObserverを検索します。
+	 */
+	public CorbaLogObserver findLogObserver(RTC.RTObject ro) {
+		return logObserverMap.get(ro);
+	}
+
+	/**
+	 * RTC.RTObjectをキーに CorbaLogObserverを保存します。
+	 */
+	public synchronized CorbaLogObserver registLogObserver(RTC.RTObject ro,
+			CorbaLogObserver observer) {
+		return logObserverMap.put(ro, observer);
+	}
+
+	/**
+	 * RTC.RTObjectをキーに CorbaLogObserverを削除します。
+	 */
+	public synchronized CorbaLogObserver removeLogObserver(RTC.RTObject ro) {
+		return logObserverMap.remove(ro);
+	}
+
+	public static class ComponentList {
+		List<CorbaComponent> components;
+
+		ComponentList() {
+			this.components = new ArrayList<CorbaComponent>();
+		}
+
+		public CorbaComponent get(int index) {
+			return components.get(index);
+		}
+
+		public boolean add(CorbaComponent component) {
+			if (contain(component)) {
+				return true;
+			}
+			return components.add(component);
+		}
+
+		public boolean contain(CorbaComponent component) {
+			for (CorbaComponent comp : components) {
+				if (comp == component) {
+					return true;
+				}
+			}
+			return false;
+		}
+
+		public boolean isEmpty() {
+			return components.isEmpty();
+		}
+
+		public CorbaComponent remove(CorbaComponent component) {
+			int index = -1;
+			for (int i = 0; i < components.size(); i++) {
+				if (components.get(i) == component) {
+					index = i;
+					break;
+				}
+			}
+			if (index != -1) {
+				return components.remove(index);
+			}
+			return null;
+		}
+	}
+
+}

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/util/CorbaPropertyMap.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/util/CorbaPropertyMap.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/util/CorbaPropertyMap.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,13 +1,18 @@
 package jp.go.aist.rtm.toolscommon.model.component.util;
 
+import jp.go.aist.rtm.toolscommon.model.component.IPropertyMap;
+import jp.go.aist.rtm.toolscommon.ui.propertysource.PropertyMapPropertySource;
 import jp.go.aist.rtm.toolscommon.util.SDOUtil;
 
 import org.eclipse.emf.common.util.BasicEList;
 import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.ui.views.properties.IPropertySource;
 
 import _SDOPackage.NameValue;
 
-public abstract class CorbaPropertyMap implements IPropertyMapUtil {
+public abstract class CorbaPropertyMap extends EObjectImpl implements
+		IPropertyMap {
 
 	public abstract NameValue[] getNameValues();
 
@@ -43,4 +48,19 @@
 		return result;
 	}
 
+	@Override
+	public IPropertyMap getPropertyMap() {
+		return this;
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public java.lang.Object getAdapter(Class adapter) {
+		java.lang.Object result = null;
+		if (IPropertySource.class.equals(adapter)) {
+			result = new PropertyMapPropertySource(this);
+		}
+		return result;
+	}
+
 }

Deleted: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/util/IPropertyMapUtil.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/util/IPropertyMapUtil.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/util/IPropertyMapUtil.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,15 +0,0 @@
-package jp.go.aist.rtm.toolscommon.model.component.util;
-
-import org.eclipse.emf.common.util.EList;
-
-public interface IPropertyMapUtil {
-
-	String getProperty(String key);
-
-	void setProperty(String key, String value);
-
-	String removeProperty(String key);
-
-	EList<String> getPropertyKeys();
-
-}

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/util/PropertyMap.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/util/PropertyMap.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/util/PropertyMap.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,12 +1,18 @@
 package jp.go.aist.rtm.toolscommon.model.component.util;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
+import jp.go.aist.rtm.toolscommon.model.component.IPropertyMap;
+import jp.go.aist.rtm.toolscommon.ui.propertysource.PropertyMapPropertySource;
+
 import org.eclipse.emf.common.util.BasicEList;
 import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.ui.views.properties.IPropertySource;
 
-public class PropertyMap implements IPropertyMapUtil {
+public class PropertyMap extends EObjectImpl implements IPropertyMap {
 
 	Map<String, String> properties;
 
@@ -38,7 +44,23 @@
 		for (String key : properties.keySet()) {
 			result.add(key);
 		}
+		Collections.sort(result);
 		return result;
 	}
 
+	@Override
+	public IPropertyMap getPropertyMap() {
+		return this;
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public java.lang.Object getAdapter(Class adapter) {
+		java.lang.Object result = null;
+		if (IPropertySource.class.equals(adapter)) {
+			result = new PropertyMapPropertySource(this);
+		}
+		return result;
+	}
+
 }

Copied: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/util/RTCLogStore.java (from rev 393, trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/util/RTCLogStore.java)
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/util/RTCLogStore.java	                        (rev 0)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/util/RTCLogStore.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -0,0 +1,132 @@
+package jp.go.aist.rtm.toolscommon.model.component.util;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static jp.go.aist.rtm.toolscommon.util.RTMixin.*;
+
+public class RTCLogStore {
+
+	public static RTCLogStore eINSTANCE = new RTCLogStore();
+
+	List<Record> store;
+
+	RTCLogStore() {
+		this.store = new ArrayList<Record>();
+	}
+
+	/**
+	 * ログ通知オブザーバのIDリストを指定して、対象の RTCログを検索します。
+	 */
+	public synchronized List<Record> find(List<String> id_list, int limit) {
+		List<Record> result = new ArrayList<Record>();
+		int count = 0;
+		for (Record r : store) {
+			if (!id_list.contains(r.observer_id)) {
+				continue;
+			}
+			result.add(r);
+			count++;
+			if (limit > 0 && count > limit) {
+				break;
+			}
+		}
+		return result;
+	}
+
+	public List<Record> find(List<String> id_list) {
+		return find(id_list, 0);
+	}
+
+	/**
+	 * ログ通知オブザーバのIDに関連付けて、RTCログを保存します。
+	 */
+	public synchronized void save(String id, String name,
+			OpenRTM.LogRecord record) {
+		Record r = new Record(id, name, record);
+		store.add(0, r);
+	}
+
+	/**
+	 * ログ通知オブザーバのIDを指定して、対象の RTCログを削除します。
+	 */
+	public synchronized void remove(String id) {
+		List<Record> unmodified = new ArrayList<Record>(store);
+		for (Record r : unmodified) {
+			if (eql(id, r.observer_id)) {
+				store.remove(r);
+			}
+		}
+	}
+
+	/**
+	 * ログレベルオブジェクトから文字列に変換します。
+	 */
+	public static String toLevelName(OpenRTM.LogLevel lv) {
+		if (OpenRTM.LogLevel.ERROR.equals(lv)) {
+			return "ERROR";
+		} else if (OpenRTM.LogLevel.WARN.equals(lv)) {
+			return "WARN";
+		} else if (OpenRTM.LogLevel.INFO.equals(lv)) {
+			return "INFO";
+		} else if (OpenRTM.LogLevel.NORMAL.equals(lv)) {
+			return "NORMAL";
+		} else if (OpenRTM.LogLevel.DEBUG.equals(lv)) {
+			return "DEBUG";
+		} else if (OpenRTM.LogLevel.TRACE.equals(lv)) {
+			return "TRACE";
+		} else if (OpenRTM.LogLevel.VERBOSE.equals(lv)) {
+			return "VERBOSE";
+		} else if (OpenRTM.LogLevel.PARANOID.equals(lv)) {
+			return "PARANOID";
+		}
+		return "UNKNOWN";
+	}
+
+	/**
+	 * RTCログを表すクラス
+	 */
+	public static class Record {
+		String observer_id;
+		String rtc_name;
+		String level_name;
+		OpenRTM.LogRecord r;
+
+		Record(String id, String name, OpenRTM.LogRecord record) {
+			this.observer_id = id;
+			this.rtc_name = name;
+			this.level_name = toLevelName(record.level);
+			this.r = record;
+		}
+
+		public String getObserverId() {
+			return observer_id;
+		}
+
+		public String getRtcName() {
+			return rtc_name;
+
+		}
+
+		public String getLevelName() {
+			return level_name;
+		}
+
+		public RTC.Time getTime() {
+			return r.time;
+		}
+
+		public OpenRTM.LogLevel getLevel() {
+			return r.level;
+		}
+
+		public String getLoggerName() {
+			return r.loggername;
+		}
+
+		public String getMessage() {
+			return r.message;
+		}
+	}
+
+}

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/validation/CorbaComponentValidator.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/validation/CorbaComponentValidator.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/validation/CorbaComponentValidator.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -8,6 +8,7 @@
 import _SDOPackage.Configuration;
 import _SDOPackage.ConfigurationSet;
 import _SDOPackage.Organization;
+import jp.go.aist.rtm.toolscommon.model.component.CorbaLogObserver;
 import jp.go.aist.rtm.toolscommon.model.component.CorbaStatusObserver;
 import org.eclipse.emf.common.util.EList;
 
@@ -41,4 +42,6 @@
 	boolean validateIor(String value);
 
 	boolean validateStatusObserver(CorbaStatusObserver value);
+
+	boolean validateLogObserver(CorbaLogObserver value);
 }
\ No newline at end of file

Copied: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/validation/CorbaLogObserverValidator.java (from rev 393, trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/validation/CorbaLogObserverValidator.java)
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/validation/CorbaLogObserverValidator.java	                        (rev 0)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/validation/CorbaLogObserverValidator.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -0,0 +1,19 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package jp.go.aist.rtm.toolscommon.model.component.validation;
+
+
+/**
+ * A sample validator interface for {@link jp.go.aist.rtm.toolscommon.model.component.CorbaLogObserver}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface CorbaLogObserverValidator {
+	boolean validate();
+
+}

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component.ecore
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component.ecore	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component.ecore	2013-01-29 10:39:20 UTC (rev 394)
@@ -196,7 +196,13 @@
   <eClassifiers xsi:type="ecore:EClass" name="OutPort" eSuperTypes="#//Port"/>
   <eClassifiers xsi:type="ecore:EClass" name="ServicePort" eSuperTypes="#//Port"/>
   <eClassifiers xsi:type="ecore:EClass" name="PortSynchronizer" eSuperTypes="#//IPropertyMap">
-    <eOperations name="disconnectAll"/>
+    <eOperations name="disconnect" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
+      <eParameters name="conn_id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    </eOperations>
+    <eOperations name="disconnect" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
+      <eParameters name="conn_prof" eType="#//ConnectorProfile"/>
+    </eOperations>
+    <eOperations name="disconnectAll" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="originalPortString" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="PortConnector" abstract="true" eSuperTypes="core.ecore#//WrapperObject">
@@ -255,7 +261,8 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EIntegerObject"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType core.ecore#//Point"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IPropertyMap" abstract="true" interface="true">
+  <eClassifiers xsi:type="ecore:EClass" name="IPropertyMap" abstract="true" interface="true"
+      eSuperTypes="core.ecore#//IAdaptable">
     <eOperations name="getProperty" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eParameters name="key" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     </eOperations>
@@ -267,6 +274,7 @@
       <eParameters name="key" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     </eOperations>
     <eOperations name="getPropertyKeys" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eOperations name="getPropertyMap" eType="#//IPropertyMap"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EDataType" name="SDOConfiguration" instanceClassName="_SDOPackage.Configuration"/>
   <eClassifiers xsi:type="ecore:EDataType" name="SDOConfigurationSet" instanceClassName="_SDOPackage.ConfigurationSet"/>
@@ -294,6 +302,7 @@
     <eOperations name="finalizeR" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
     <eOperations name="exitR" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
     <eOperations name="getCorbaObjectInterface" eType="#//RTCRTObject"/>
+    <eOperations name="supportedCorbaObserver" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="executionContextState"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt" transient="true"
         defaultValueLiteral="0"/>
@@ -313,6 +322,7 @@
         upperBound="-1" eType="#//RTCRTObject" transient="true" defaultValueLiteral=""/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="ior" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="statusObserver" eType="#//CorbaStatusObserver"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="logObserver" eType="#//CorbaLogObserver"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="CorbaPortSynchronizer" eSuperTypes="core.ecore#//CorbaWrapperObject #//PortSynchronizer">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="rTCPortProfile" eType="#//RTCPortProfile"/>
@@ -360,9 +370,8 @@
     <eOperations name="attachComponent" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
       <eParameters name="component" eType="#//CorbaComponent"/>
     </eOperations>
-    <eOperations name="detachComponent" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
-      <eParameters name="component" eType="#//CorbaComponent"/>
-    </eOperations>
+    <eOperations name="detachComponent" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+    <eOperations name="finish" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="serviceProfile" eType="#//SDOServiceProfile"
         changeable="false"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="servant" eType="#//Servant"
@@ -371,5 +380,6 @@
   <eClassifiers xsi:type="ecore:EClass" name="CorbaStatusObserver" eSuperTypes="#//CorbaObserver">
     <eOperations name="isTimeOut" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="CorbaLogObserver" eSuperTypes="#//CorbaObserver"/>
   <eClassifiers xsi:type="ecore:EDataType" name="Servant" instanceClassName="org.omg.PortableServer.Servant"/>
 </ecore:EPackage>

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/nl/messages.properties
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/nl/messages.properties	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/nl/messages.properties	2013-01-29 10:39:20 UTC (rev 394)
@@ -44,9 +44,9 @@
 PortInterfaceProfilePropertySource.unknown=<UNKNOWN>
 PortInterfaceProfilePropertySource.polarity.provided=PROVIDED
 PortInterfaceProfilePropertySource.polarity.required=REQUIRED
-CorbaStatusObserverPropertySource.disp.interface_type=Interface Type
-CorbaStatusObserverPropertySource.disp.service=Service
-CorbaStatusObserverPropertySource.unknown=<UNKNOWN>
+CorbaObserverPropertySource.disp.interface_type=Interface Type
+CorbaObserverPropertySource.disp.service=Service
+CorbaObserverPropertySource.unknown=<UNKNOWN>
 SystemDiagramPropertySource.disp.system_id=System ID
 SystemDiagramPropertySource.disp.kind=Kind
 SystemDiagramPropertySource.disp.create_date=Create Date

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/synchronizationframework/SynchronizationSupport.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/synchronizationframework/SynchronizationSupport.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/synchronizationframework/SynchronizationSupport.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -56,30 +56,40 @@
 	}
 
 	/**
-	 * ローカルオブジェクトを同期する。
-	 * <p>
-	 * 包含参照をたどり、すべてのローカルオブジェクトを同期する
+	 * リモートオブジェクトを同期する。
 	 */
-	public synchronized void synchronizeLocal() {
+	public synchronized void synchronizeRemote() {
 		Object[] remoteObjects = null;
 		try {
 			remoteObjects = getRemoteObjects(); // 例外が発生することがある
 		} catch (Exception e) {
 			// void
 		}
-
 		if (!mappingRule.getClassMapping().allowZombie()
 				&& (remoteObjects == null || !ping(remoteObjects))) {
 			remove();
 			return;
 		}
+		synchronizeRemoteAttribute();
+		if (localObject.eContainer() instanceof SystemDiagram) {
+			if (localObject instanceof Component) {
+				((Component) localObject).synchronizeRemoteChildComponents();
+			}
+		}
+	}
+
+	/**
+	 * ローカルオブジェクトを同期する。
+	 * <p>
+	 * 包含参照をたどり、すべてのローカルオブジェクトを同期する
+	 */
+	public synchronized void synchronizeLocal() {
 		synchronizeLocalAttribute();
 		synchronizeLocalReference();
 		if (localObject.eContainer() instanceof SystemDiagram) {
 			if (localObject instanceof Component) {
 				((Component) localObject).synchronizeChildComponents();
 			}
-			return;
 		}
 		for (Object content : localObject.eContents()) {
 			if (content instanceof LocalObject) {
@@ -102,11 +112,19 @@
 		}
 	}
 
+	private void synchronizeRemoteAttribute() {
+		if (localObject.eContainer() instanceof SystemDiagram) {
+			if (localObject instanceof Component) {
+				((Component) localObject).synchronizeRemoteAttribute(null);
+			}
+		}
+	}
+
 	private void synchronizeLocalAttribute() {
 		if (localObject.eContainer() instanceof SystemDiagram) {
 			if (localObject instanceof Component) {
 				((Component) localObject).synchronizeLocalAttribute(null);
-			} 
+			}
 		}
 		for (AttributeMapping attibuteMapping : mappingRule
 				.getAllAttributeMappings()) {
@@ -121,9 +139,8 @@
 	private void synchronizeLocalReference() {
 		if (localObject.eContainer() instanceof SystemDiagram) {
 			if (localObject instanceof Component) {
-				((Component) localObject)
-						.synchronizeLocalReference();
-			} 
+				((Component) localObject).synchronizeLocalReference();
+			}
 		}
 		for (ReferenceMapping referenceMapping : mappingRule
 				.getAllReferenceMappings()) {

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/propertysource/ComponentPropertySource.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/propertysource/ComponentPropertySource.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/propertysource/ComponentPropertySource.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -69,9 +69,6 @@
 		result.add(new TextPropertyDescriptor(Component.VENDER, DISP_VENDOR));
 		result.add(new TextPropertyDescriptor(Component.CATEGORY, DISP_CATEGORY));
 		result.add(new TextPropertyDescriptor(Component.STATE, DISP_STATE));
-		for (String key : component.getPropertyKeys()) {
-			result.add(new TextPropertyDescriptor(new DynamicID("PROPERTIES", key), key));
-		}
 		return (IPropertyDescriptor[]) result
 				.toArray(new IPropertyDescriptor[result.size()]);
 	}
@@ -108,16 +105,10 @@
 						return STATE_ERROR_VIEWSTRING;
 					}
 				}
-			} else if (id instanceof DynamicID) {
-				DynamicID dynamicId = (DynamicID) id;
-				if ("PROPERTIES".equals(dynamicId.categoryId)) {
-					return component.getProperty(dynamicId.subId);
-				}
 			}
 		} catch (Exception e) {
 			return UNKNOWN;
 		}
-
 		return UNKNOWN;
 	}
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/propertysource/ComponentSpecificationPropertySource.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/propertysource/ComponentSpecificationPropertySource.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/propertysource/ComponentSpecificationPropertySource.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -55,9 +55,6 @@
 		if (component.getRtcType() != null) {
 			result.add(new TextPropertyDescriptor("RTC_TYPE", "RTC Type"));
 		}
-		for (String key : component.getPropertyKeys()) {
-			result.add(new TextPropertyDescriptor(new DynamicID("PROPERTIES", key), key));
-		}
 		return (IPropertyDescriptor[]) result
 				.toArray(new IPropertyDescriptor[result.size()]);
 	}
@@ -82,20 +79,13 @@
 				result = component.getVersionL();
 			} else if ("RTC_TYPE".equals(id)) {
 				result = component.getRtcType();
-			} else if (id instanceof DynamicID) {
-				DynamicID dynamicId = (DynamicID) id;
-				if ("PROPERTIES".equals(dynamicId.categoryId)) {
-					return component.getProperty(dynamicId.subId);
-				}
 			}
 		} catch (Exception e) {
 			// void
 		}
-
 		if (result == null) {
 			result = UNKNOWN;
 		}
-
 		return result;
 	}
 

Copied: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/propertysource/CorbaObserverPropertySource.java (from rev 393, trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/propertysource/CorbaObserverPropertySource.java)
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/propertysource/CorbaObserverPropertySource.java	                        (rev 0)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/propertysource/CorbaObserverPropertySource.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -0,0 +1,60 @@
+package jp.go.aist.rtm.toolscommon.ui.propertysource;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import jp.go.aist.rtm.toolscommon.model.component.CorbaObserver;
+import jp.go.aist.rtm.toolscommon.nl.Messages;
+
+import org.eclipse.ui.views.properties.IPropertyDescriptor;
+import org.eclipse.ui.views.properties.TextPropertyDescriptor;
+
+/**
+ * CorbaObserverのIPropertySourceクラス
+ */
+public class CorbaObserverPropertySource extends AbstractPropertySource {
+
+	static final String ID = "ID";
+	static final String INTERFACE_TYPE = "INTERFACE_TYPE";
+	static final String SERVICE = "SERVICE";
+
+	static final String DISP_ID = "ID";
+	static final String DISP_INTERFACE_TYPE = Messages
+			.getString("CorbaObserverPropertySource.disp.interface_type");
+	static final String DISP_SERVICE = Messages
+			.getString("CorbaObserverPropertySource.disp.service");
+
+	static final String UNKNOWN = Messages
+			.getString("CorbaObserverPropertySource.unknown");
+
+	CorbaObserver observer;
+
+	public CorbaObserverPropertySource(CorbaObserver observer) {
+		this.observer = observer;
+	}
+
+	@Override
+	public IPropertyDescriptor[] getPropertyDescriptors() {
+		List<IPropertyDescriptor> result = new ArrayList<IPropertyDescriptor>();
+		result.add(new TextPropertyDescriptor(ID, DISP_ID));
+		result.add(new TextPropertyDescriptor(INTERFACE_TYPE,
+				DISP_INTERFACE_TYPE));
+		result.add(new TextPropertyDescriptor(SERVICE, DISP_SERVICE));
+		return (IPropertyDescriptor[]) result
+				.toArray(new IPropertyDescriptor[result.size()]);
+	}
+
+	@Override
+	public java.lang.Object getPropertyValue(java.lang.Object id) {
+		String result = UNKNOWN;
+		if (ID.equals(id)) {
+			result = observer.getServiceProfile().id;
+		} else if (INTERFACE_TYPE.equals(id)) {
+			result = observer.getServiceProfile().interface_type;
+		} else if (SERVICE.equals(id)) {
+			result = observer.getServiceProfile().service.toString();
+		}
+		return result;
+	}
+
+}

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/propertysource/CorbaStatusObserverPropertySource.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/propertysource/CorbaStatusObserverPropertySource.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/propertysource/CorbaStatusObserverPropertySource.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -10,7 +10,7 @@
 import org.eclipse.ui.views.properties.TextPropertyDescriptor;
 
 /**
- * CorbaStatusObserver‚ÌIPropertySourceƒNƒ‰ƒX
+ * CorbaStatusObserverのIPropertySourceクラス
  */
 public class CorbaStatusObserverPropertySource extends AbstractPropertySource {
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/propertysource/PortConnectorPropertySource.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/propertysource/PortConnectorPropertySource.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/propertysource/PortConnectorPropertySource.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -7,7 +7,6 @@
 import jp.go.aist.rtm.toolscommon.model.component.OutPort;
 import jp.go.aist.rtm.toolscommon.model.component.PortConnector;
 import jp.go.aist.rtm.toolscommon.model.component.ConnectorProfile;
-import jp.go.aist.rtm.toolscommon.model.component.ServicePort;
 import jp.go.aist.rtm.toolscommon.model.component.ConnectorProfile.PROP;
 
 import org.eclipse.ui.views.properties.IPropertyDescriptor;
@@ -117,39 +116,7 @@
 				descriptors.add(new TextPropertyDescriptor(PROP.INPORT_EMPTY_POLICY, DISP_INPORT_EMPTY_POLICY));
 				descriptors.add(new TextPropertyDescriptor(PROP.INPORT_READ_TIMEOUT, DISP_INPORT_READ_TIMEOUT));
 			}
-		} else if (portConnector.getSource() instanceof ServicePort) {
-			for (String key : profile.getPropertyKeys()) {
-				if (!ConnectorProfile.InterfaceId.isValid(key)) {
-					continue;
-				}
-				descriptors.add(new TextPropertyDescriptor(key, key));
-			}
 		}
-
-		for (String key : profile.getPropertyKeys()) {
-			if (PROP.DATA_TYPE.equals(key) || PROP.INTERFACE_TYPE.equals(key)
-					|| PROP.DATAFLOW_TYPE.equals(key)
-					|| PROP.SUBSCRIPTION_TYPE.equals(key)
-					|| PROP.PUSH_RATE.equals(key)
-					|| PROP.PUSH_POLICY.equals(key)
-					|| PROP.SKIP_COUNT.equals(key)
-					|| PROP.OUTPORT_BUFF_LENGTH.equals(key)
-					|| PROP.OUTPORT_FULL_POLICY.equals(key)
-					|| PROP.OUTPORT_WRITE_TIMEOUT.equals(key)
-					|| PROP.OUTPORT_EMPTY_POLICY.equals(key)
-					|| PROP.OUTPORT_READ_TIMEOUT.equals(key)
-					|| PROP.INPORT_BUFF_LENGTH.equals(key)
-					|| PROP.INPORT_FULL_POLICY.equals(key)
-					|| PROP.INPORT_WRITE_TIMEOUT.equals(key)
-					|| PROP.INPORT_EMPTY_POLICY.equals(key)
-					|| PROP.INPORT_READ_TIMEOUT.equals(key)
-					|| ConnectorProfile.InterfaceId.isValid(key)) {
-				continue;
-			}
-			descriptors.add(new TextPropertyDescriptor(new DynamicID(
-					"PROPERTIES", key), key));
-		}
-
 		return descriptors.toArray(new TextPropertyDescriptor []{});
 	}
 
@@ -199,18 +166,6 @@
 			} else if (PROP.INPORT_READ_TIMEOUT.equals(id)) {
 				result = profile.getInportBufferReadTimeout().toString();
 			}
-			//
-			if (id instanceof String
-					&& ConnectorProfile.InterfaceId.isValid((String) id)) {
-				result = profile.getProperty((String) id);
-			}
-			//
-			else if (id instanceof DynamicID) {
-				DynamicID dynamicId = (DynamicID) id;
-				if ("PROPERTIES".equals(dynamicId.categoryId)) {
-					return profile.getProperty(dynamicId.subId);
-				}
-			}
 		} catch (Exception e) {
 			// void
 		}

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/propertysource/PortPropertySource.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/propertysource/PortPropertySource.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/propertysource/PortPropertySource.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -3,7 +3,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import jp.go.aist.rtm.toolscommon.model.component.NameValue;
 import jp.go.aist.rtm.toolscommon.model.component.Port;
 import jp.go.aist.rtm.toolscommon.util.ConnectorUtil;
 
@@ -68,12 +67,6 @@
 		addPropertyDescriptor(result, port.getSubscriptionType(),
 				new TextPropertyDescriptor(PORT_SUBSCRIPTION_TYPE,
 						DISP_PORT_SUBSCRIPTION_TYPE));
-		for (NameValue entry : port.getProperties()) {
-			result.add(new TextPropertyDescriptor(new DynamicID(
-					PROPERTIES_DYNAMICID_CATEGORY, entry.getName()), entry
-					.getName()));
-		}
-
 		return (IPropertyDescriptor[]) result
 				.toArray(new IPropertyDescriptor[result.size()]);
 	}
@@ -98,16 +91,10 @@
 				return sortValues(port.getInterfaceTypes());
 			} else if (PORT_SUBSCRIPTION_TYPE.equals(id)) {
 				return sortValues(port.getSubscriptionTypes());
-			} else if (id instanceof DynamicID) {
-				DynamicID dynamicId = (DynamicID) id;
-				if (PROPERTIES_DYNAMICID_CATEGORY.equals(dynamicId.categoryId)) {
-					return port.getProperty(dynamicId.subId);
-				}
 			}
 		} catch (Exception e) {
 			return UNKNOWN;
 		}
-
 		return UNKNOWN;
 	}
 

Copied: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/propertysource/PropertyMapPropertySource.java (from rev 393, trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/propertysource/PropertyMapPropertySource.java)
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/propertysource/PropertyMapPropertySource.java	                        (rev 0)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/propertysource/PropertyMapPropertySource.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -0,0 +1,47 @@
+package jp.go.aist.rtm.toolscommon.ui.propertysource;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.ui.views.properties.IPropertyDescriptor;
+import org.eclipse.ui.views.properties.TextPropertyDescriptor;
+
+import jp.go.aist.rtm.toolscommon.model.component.IPropertyMap;
+
+public class PropertyMapPropertySource extends AbstractPropertySource {
+
+	static final String UNKNOWN = "<unknown>";
+
+	IPropertyMap propertyMap;
+
+	public PropertyMapPropertySource(IPropertyMap propertyMap) {
+		this.propertyMap = propertyMap;
+	}
+
+	@Override
+	public IPropertyDescriptor[] getPropertyDescriptors() {
+		List<IPropertyDescriptor> result = new ArrayList<IPropertyDescriptor>();
+		for (String key : propertyMap.getPropertyKeys()) {
+			result.add(new TextPropertyDescriptor(new DynamicID("PROPERTIES",
+					key), key));
+		}
+		return (IPropertyDescriptor[]) result
+				.toArray(new IPropertyDescriptor[result.size()]);
+	}
+
+	@Override
+	public java.lang.Object getPropertyValue(java.lang.Object id) {
+		try {
+			if (id instanceof DynamicID) {
+				DynamicID dynamicId = (DynamicID) id;
+				if ("PROPERTIES".equals(dynamicId.categoryId)) {
+					return propertyMap.getProperty(dynamicId.subId);
+				}
+			}
+		} catch (Exception e) {
+			return UNKNOWN;
+		}
+		return UNKNOWN;
+	}
+
+}

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/propertysource/SystemDiagramPropertySource.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/propertysource/SystemDiagramPropertySource.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/propertysource/SystemDiagramPropertySource.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -45,10 +45,6 @@
 		result.add(new TextPropertyDescriptor(CREATE_DATE, DISP_CREATE_DATE));
 		result.add(new TextPropertyDescriptor(UPDATE_DATE, DISP_UPDATE_DATE));
 		result.add(new TextPropertyDescriptor(COMPOSITE, DISP_COMPOSITE));
-		for (String key : diagram.getPropertyKeys()) {
-			result.add(new TextPropertyDescriptor(new DynamicID("PROPERTIES",
-					key), key));
-		}
 		return (IPropertyDescriptor[]) result
 				.toArray(new IPropertyDescriptor[result.size()]);
 	}
@@ -72,11 +68,6 @@
 				} else {
 					result = comp.getInstanceNameL();
 				}
-			} else if (id instanceof DynamicID) {
-				DynamicID dynamicId = (DynamicID) id;
-				if ("PROPERTIES".equals(dynamicId.categoryId)) {
-					return diagram.getProperty(dynamicId.subId);
-				}
 			}
 		} catch (Exception e) {
 			// void

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/views/propertysheetview/RtcPropertySheetPage.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/views/propertysheetview/RtcPropertySheetPage.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/views/propertysheetview/RtcPropertySheetPage.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,8 +1,14 @@
 package jp.go.aist.rtm.toolscommon.ui.views.propertysheetview;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import jp.go.aist.rtm.toolscommon.model.component.Component;
+import jp.go.aist.rtm.toolscommon.model.component.IPropertyMap;
 import jp.go.aist.rtm.toolscommon.model.component.PortConnector;
 import jp.go.aist.rtm.toolscommon.model.component.SystemDiagram;
+import jp.go.aist.rtm.toolscommon.model.component.util.CorbaPropertyMap;
+import jp.go.aist.rtm.toolscommon.model.component.util.PropertyMap;
 import jp.go.aist.rtm.toolscommon.model.manager.RTCManager;
 import jp.go.aist.rtm.toolscommon.synchronizationframework.LocalObject;
 import jp.go.aist.rtm.toolscommon.util.AdapterUtil;
@@ -16,6 +22,7 @@
 import org.eclipse.jface.viewers.ISelectionProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TreePath;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.StackLayout;
@@ -175,6 +182,7 @@
 	 * Rtcの場合だけ、特殊なページを表示するようにする
 	 * また、このページでは、RTC以外オブジェクトを触っても、それがIPropertySouceを持っていない場合には（Propertyiesページを表示できない場合には）RTCを表示し続ける。（これは、selectionChangedを無視することで実現している）
 	 */
+	@Override
 	public void selectionChanged(IWorkbenchPart part, ISelection selection) {
 		if (!(selection instanceof IStructuredSelection)) {
 			return;
@@ -196,16 +204,31 @@
 			}
 			componentViewer.setInput(new ComponentWrapper(component));
 			componentViewer.reveal(component);// 表示後、上にスクロールする
+
+			// ツリー展開のフィルタリング
+			ExpandFilter filter = new ExpandFilter(componentViewer);
+			filter.filter();
+
 			stackLayout.topControl = componentView;
 
 		} else if (component instanceof PortConnector) {
 			componentViewer.setInput(new PortConnectorWrapper(component));
 			componentViewer.reveal(component);// 表示後、上にスクロールする
+
+			// ツリー展開のフィルタリング
+			ExpandFilter filter = new ExpandFilter(componentViewer);
+			filter.filter();
+
 			stackLayout.topControl = componentView;
 
 		} else if (component instanceof SystemDiagram) {
 			componentViewer.setInput(new SystemDiagramWrapper(component));
 			componentViewer.reveal(component);// 表示後、上にスクロールする
+
+			// ツリー展開のフィルタリング
+			ExpandFilter filter = new ExpandFilter(componentViewer);
+			filter.filter();
+
 			stackLayout.topControl = componentView;
 
 		} else if (component instanceof RTCManager) {
@@ -238,6 +261,35 @@
 		}
 	}
 
+	public static class ExpandFilter {
+		TreeViewer viewer;
+
+		public ExpandFilter(TreeViewer viewer) {
+			this.viewer = viewer;
+		}
+
+		public void filter() {
+			viewer.expandAll();
+			TreePath[] pathes = viewer.getExpandedTreePaths();
+			List<TreePath> pathList = new ArrayList<TreePath>();
+			for (TreePath tp : pathes) {
+				pathList.add(tp);
+			}
+			for (TreePath tp : pathes) {
+				Object last = tp.getLastSegment();
+				if (!(last instanceof PropertySheetContentProvider.ChildWithParent)) {
+					continue;
+				}
+				PropertySheetContentProvider.ChildWithParent cp = (PropertySheetContentProvider.ChildWithParent) last;
+				if (cp.child instanceof PropertyMap
+						|| cp.child instanceof CorbaPropertyMap) {
+					pathList.remove(tp);
+				}
+			}
+			viewer.setExpandedTreePaths(pathList.toArray(new TreePath[0]));
+		}
+	}
+
 	@SuppressWarnings("unchecked")
 	private EObject getDisplayObject(Object firstElement) {
 		for (Class displayClass : PropertysheetpageExtentionpoint

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/workbenchadapter/ComponentWorkbenchAdapter.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/workbenchadapter/ComponentWorkbenchAdapter.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/workbenchadapter/ComponentWorkbenchAdapter.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -28,6 +28,9 @@
 	public Object[] getChildren(Object o) {
 		List<Object> result = new ArrayList<Object>();
 		Component c = (Component) o;
+		if (!c.getPropertyKeys().isEmpty()) {
+			result.add(c.getPropertyMap());
+		}
 		if (!c.getExecutionContextHandler().getOwnerContexts().isEmpty()) {
 			result.add(c.getExecutionContextHandler());
 		}
@@ -41,6 +44,9 @@
 			if (cc.getStatusObserver() != null) {
 				result.add(cc.getStatusObserver());
 			}
+			if (cc.getLogObserver() != null) {
+				result.add(cc.getLogObserver());
+			}
 		}
 		return result.toArray();
 	}

Copied: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/workbenchadapter/CorbaObserverWorkbenchAdapter.java (from rev 393, trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/workbenchadapter/CorbaObserverWorkbenchAdapter.java)
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/workbenchadapter/CorbaObserverWorkbenchAdapter.java	                        (rev 0)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/workbenchadapter/CorbaObserverWorkbenchAdapter.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -0,0 +1,38 @@
+package jp.go.aist.rtm.toolscommon.ui.workbenchadapter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import jp.go.aist.rtm.toolscommon.model.component.CorbaLogObserver;
+import jp.go.aist.rtm.toolscommon.model.component.CorbaObserver;
+import jp.go.aist.rtm.toolscommon.model.component.CorbaStatusObserver;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+
+public class CorbaObserverWorkbenchAdapter extends ModelElementWorkbenchAdapter {
+	@Override
+	public ImageDescriptor getImageDescriptor(Object o) {
+		return null;
+	}
+
+	@Override
+	public String getLabel(Object o) {
+		if (o instanceof CorbaStatusObserver) {
+			return "StatusObserver";
+		} else if (o instanceof CorbaLogObserver) {
+			return "LogObserver";
+		}
+		return "Observer";
+	}
+
+	@Override
+	public Object[] getChildren(Object o) {
+		List<Object> result = new ArrayList<Object>();
+		CorbaObserver c = (CorbaObserver) o;
+		if (!c.getPropertyKeys().isEmpty()) {
+			result.add(c.getPropertyMap());
+		}
+		return result.toArray();
+	}
+
+}

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/workbenchadapter/ExecutionContextWorkbenchAdapter.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/workbenchadapter/ExecutionContextWorkbenchAdapter.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/workbenchadapter/ExecutionContextWorkbenchAdapter.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,6 +1,10 @@
 package jp.go.aist.rtm.toolscommon.ui.workbenchadapter;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import jp.go.aist.rtm.toolscommon.ToolsCommonPlugin;
+import jp.go.aist.rtm.toolscommon.model.component.ExecutionContext;
 import jp.go.aist.rtm.toolscommon.nl.Messages;
 
 import org.eclipse.jface.resource.ImageDescriptor;
@@ -19,9 +23,15 @@
 	public String getLabel(Object o) {
 		return Messages.getString("ExecutionContextWorkbenchAdapter.label");
 	}
-	
+
 	@Override
 	public Object[] getChildren(Object o) {
-		return null;
+		List<Object> result = new ArrayList<Object>();
+		ExecutionContext c = (ExecutionContext) o;
+		if (!c.getPropertyKeys().isEmpty()) {
+			result.add(c.getPropertyMap());
+		}
+		return result.toArray();
 	}
+
 }

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/workbenchadapter/PortConnectorWorkbenchAdapter.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/workbenchadapter/PortConnectorWorkbenchAdapter.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/workbenchadapter/PortConnectorWorkbenchAdapter.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,5 +1,8 @@
 package jp.go.aist.rtm.toolscommon.ui.workbenchadapter;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import jp.go.aist.rtm.toolscommon.ToolsCommonPlugin;
 import jp.go.aist.rtm.toolscommon.model.component.PortConnector;
 import jp.go.aist.rtm.toolscommon.nl.Messages;
@@ -10,8 +13,16 @@
 
 	@Override
 	public Object[] getChildren(Object o) {
+		List<Object> result = new ArrayList<Object>();
 		PortConnector c = (PortConnector) o;
-		return new Object[] { c.getSource(), c.getTarget() };
+		if (c.getConnectorProfile() != null) {
+			if (!c.getConnectorProfile().getPropertyKeys().isEmpty()) {
+				result.add(c.getConnectorProfile().getPropertyMap());
+			}
+		}
+		result.add(c.getSource());
+		result.add(c.getTarget());
+		return result.toArray();
 	}
 
 	@Override

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/workbenchadapter/PortWorkbenchAdapter.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/workbenchadapter/PortWorkbenchAdapter.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/workbenchadapter/PortWorkbenchAdapter.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,13 +1,26 @@
 package jp.go.aist.rtm.toolscommon.ui.workbenchadapter;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import jp.go.aist.rtm.toolscommon.model.component.Port;
 
 /**
  * PortのWorkbenchAdapter
  */
 public abstract class PortWorkbenchAdapter extends ModelElementWorkbenchAdapter {
+
 	@Override
 	public Object[] getChildren(Object o) {
-		return ((Port) o).getInterfaces().toArray();
+		List<Object> result = new ArrayList<Object>();
+		Port c = (Port) o;
+		if (c.getSynchronizer() != null) {
+			if (!c.getSynchronizer().getPropertyKeys().isEmpty()) {
+				result.add(c.getSynchronizer().getPropertyMap());
+			}
+		}
+		result.addAll(c.getInterfaces());
+		return result.toArray();
 	}
+
 }

Copied: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/workbenchadapter/PropertyMapWorkbenchAdapter.java (from rev 393, trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/workbenchadapter/PropertyMapWorkbenchAdapter.java)
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/workbenchadapter/PropertyMapWorkbenchAdapter.java	                        (rev 0)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/workbenchadapter/PropertyMapWorkbenchAdapter.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -0,0 +1,21 @@
+package jp.go.aist.rtm.toolscommon.ui.workbenchadapter;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+
+public class PropertyMapWorkbenchAdapter extends ModelElementWorkbenchAdapter {
+	@Override
+	public ImageDescriptor getImageDescriptor(Object o) {
+		return null;
+	}
+
+	@Override
+	public String getLabel(Object o) {
+		return "properties";
+	}
+
+	@Override
+	public Object[] getChildren(Object o) {
+		return null;
+	}
+
+}

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/workbenchadapter/SystemDiagramWorkbenchAdapter.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/workbenchadapter/SystemDiagramWorkbenchAdapter.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/workbenchadapter/SystemDiagramWorkbenchAdapter.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,6 +1,10 @@
 package jp.go.aist.rtm.toolscommon.ui.workbenchadapter;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import jp.go.aist.rtm.toolscommon.ToolsCommonPlugin;
+import jp.go.aist.rtm.toolscommon.model.component.SystemDiagram;
 import jp.go.aist.rtm.toolscommon.nl.Messages;
 
 import org.eclipse.jface.resource.ImageDescriptor;
@@ -9,7 +13,12 @@
 
 	@Override
 	public Object[] getChildren(Object o) {
-		return null;
+		List<Object> result = new ArrayList<Object>();
+		SystemDiagram c = (SystemDiagram) o;
+		if (!c.getPropertyKeys().isEmpty()) {
+			result.add(c.getPropertyMap());
+		}
+		return result.toArray();
 	}
 
 	@Override

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/util/ConnectorUtil.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/util/ConnectorUtil.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/util/ConnectorUtil.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -3,7 +3,6 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.Iterator;
 import java.util.List;
 
 import jp.go.aist.rtm.toolscommon.model.component.InPort;
@@ -24,7 +23,14 @@
 	 * @return
 	 */
 	public static boolean isAllowAnyDataType(OutPort source, InPort target) {
-		return source.isAllowAnyDataType() && target.isAllowAnyDataType();
+		if (source != null && target != null) {
+			return source.isAllowAnyDataType() && target.isAllowAnyDataType();
+		} else if (source != null && target == null) {
+			return source.isAllowAnyDataType();
+		} else if (source == null && target != null) {
+			return target.isAllowAnyDataType();
+		}
+		return false;
 	}
 
 	/**
@@ -35,8 +41,15 @@
 	 * @return
 	 */
 	public static boolean isAllowAnyInterfaceType(OutPort source, InPort target) {
-		return source.isAllowAnyInterfaceType()
-				&& target.isAllowAnyInterfaceType();
+		if (source != null && target != null) {
+			return source.isAllowAnyInterfaceType()
+					&& target.isAllowAnyInterfaceType();
+		} else if (source != null && target == null) {
+			return source.isAllowAnyInterfaceType();
+		} else if (source == null && target != null) {
+			return target.isAllowAnyInterfaceType();
+		}
+		return false;
 	}
 
 	/**
@@ -47,8 +60,15 @@
 	 * @return
 	 */
 	public static boolean isAllowAnyDataflowType(OutPort source, InPort target) {
-		return source.isAllowAnyDataflowType()
-				&& target.isAllowAnyDataflowType();
+		if (source != null && target != null) {
+			return source.isAllowAnyDataflowType()
+					&& target.isAllowAnyDataflowType();
+		} else if (source != null && target == null) {
+			return source.isAllowAnyDataflowType();
+		} else if (source == null && target != null) {
+			return target.isAllowAnyDataflowType();
+		}
+		return false;
 	}
 
 	/**
@@ -60,10 +80,19 @@
 	 */
 	public static boolean isAllowAnySubscriptionType(OutPort source,
 			InPort target) {
-		return source.isAllowAnySubscriptionType()
-				&& target.isAllowAnySubscriptionType();
+		if (source != null && target != null) {
+			return source.isAllowAnySubscriptionType()
+					&& target.isAllowAnySubscriptionType();
+		} else if (source != null && target == null) {
+			return source.isAllowAnySubscriptionType();
+		} else if (source == null && target != null) {
+			return target.isAllowAnySubscriptionType();
+		}
+		return false;
 	}
 
+	static List<String> emptyList = new ArrayList<String>();
+
 	/**
 	 * 使用可能なデータ型のリストを返す
 	 * 
@@ -72,7 +101,20 @@
 	 * @return
 	 */
 	public static List<String> getAllowDataTypes(OutPort source, InPort target) {
-		return getAllowList(source.getDataTypes(), target.getDataTypes());
+		if (source == null && target == null) {
+			return emptyList;
+		} else if (source != null && target == null) {
+			return source.getDataTypes();
+		} else if (source == null && target != null) {
+			return target.getDataTypes();
+		}
+		List<String> sourceTypes = source.getDataTypes();
+		List<String> targetTypes = target.getDataTypes();
+		//
+		List<String> result = getAllowList(sourceTypes, targetTypes,
+				dataTypeComparer);
+		result = sortTypes(result);
+		return result;
 	}
 
 	/**
@@ -84,8 +126,20 @@
 	 */
 	public static List<String> getAllowInterfaceTypes(OutPort source,
 			InPort target) {
-		return getAllowList(source.getInterfaceTypes(), target
-				.getInterfaceTypes());
+		if (source == null && target == null) {
+			return emptyList;
+		} else if (source != null && target == null) {
+			return source.getInterfaceTypes();
+		} else if (source == null && target != null) {
+			return target.getInterfaceTypes();
+		}
+		List<String> sourceTypes = source.getInterfaceTypes();
+		List<String> targetTypes = target.getInterfaceTypes();
+		//
+		List<String> result = getAllowList(sourceTypes, targetTypes,
+				ignoreCaseComparer);
+		result = sortTypes(result);
+		return result;
 	}
 
 	/**
@@ -97,8 +151,19 @@
 	 */
 	public static List<String> getAllowDataflowTypes(OutPort source,
 			InPort target) {
-		return getAllowList(source.getDataflowTypes(), target
-				.getDataflowTypes(), false);
+		if (source == null && target == null) {
+			return emptyList;
+		} else if (source != null && target == null) {
+			return source.getDataflowTypes();
+		} else if (source == null && target != null) {
+			return target.getDataflowTypes();
+		}
+		List<String> sourceTypes = source.getDataflowTypes();
+		List<String> targetTypes = target.getDataflowTypes();
+		//
+		List<String> result = getAllowList(sourceTypes, targetTypes,
+				ignoreCaseComparer);
+		return result;
 	}
 
 	/**
@@ -110,14 +175,21 @@
 	 */
 	public static List<String> getAllowSubscriptionTypes(OutPort source,
 			InPort target) {
-		return getAllowList(source.getSubscriptionTypes(), target
-				.getSubscriptionTypes());
+		if (source == null && target == null) {
+			return emptyList;
+		} else if (source != null && target == null) {
+			return source.getSubscriptionTypes();
+		} else if (source == null && target != null) {
+			return target.getSubscriptionTypes();
+		}
+		List<String> sourceTypes = source.getSubscriptionTypes();
+		List<String> targetTypes = target.getSubscriptionTypes();
+		//
+		List<String> result = getAllowList(sourceTypes, targetTypes,
+				ignoreCaseComparer);
+		return result;
 	}
 
-	private static List<String> getAllowList(List<String> one, List<String> two) {
-		return getAllowList(one, two, true);
-	}
-	
 	/**
 	 * 2つの文字列のリストを受け取り、両方に存在する文字列だけのリストを作成する。 「Any」が含まれる場合には、相手先すべての文字列を許す。
 	 * 返り値のリストに「Any」自体は含まれないことに注意すること。
@@ -128,58 +200,124 @@
 	 * 
 	 * @param one
 	 * @param two
+	 * @param comparer
 	 * @return
 	 */
-	private static List<String> getAllowList(List<String> one, List<String> two, boolean sorting) {
+	public static List<String> getAllowList(List<String> one, List<String> two,
+			TypeComparer comparer) {
 		boolean isAllowAny_One = PortImpl.isExistAny(one);
 		boolean isAllowAny_Two = PortImpl.isExistAny(two);
 
 		List<String> result = new ArrayList<String>();
-		for (String elem1 : one) {
-			if (PortImpl.isAnyString(elem1) == false) {
-				boolean isEqualsIgnoreCase = false;
-				for (String elem2 : two) {
-					if (isAllowAny_Two || elem1.equalsIgnoreCase(elem2)) {
-						isEqualsIgnoreCase = true;
+		for (String type1 : one) {
+			if (PortImpl.isAnyString(type1)) {
+				continue;
+			}
+			if (isAllowAny_Two) {
+				result.add(type1);
+			} else {
+				String match = null;
+				for (String type2 : two) {
+					match = comparer.match(type1, type2);
+					if (match != null) {
 						break;
 					}
 				}
-
-				if (isEqualsIgnoreCase) {
-					result.add(elem1);
+				if (match != null) {
+					result.add(match);
 				}
 			}
 		}
 		if (isAllowAny_One) {
-			for (String elem1 : two) {
-				if (PortImpl.isAnyString(elem1) == false) {
-					boolean isEqualsIgnoreCase = false;
-					for (String elem2 : result) {
-						if (elem1.equalsIgnoreCase(elem2)) {
-							isEqualsIgnoreCase = true;
-							break;
-						}
+			for (String type1 : two) {
+				if (PortImpl.isAnyString(type1)) {
+					continue;
+				}
+				String match = null;
+				for (String type2 : result) {
+					match = comparer.match(type1, type2);
+					if (match != null) {
+						break;
 					}
-
-					if (isEqualsIgnoreCase == false) {
-						result.add(elem1);
-					}
 				}
+				if (match == null) {
+					result.add(type1);
+				}
 			}
 		}
-		for (Iterator<String> iter = result.iterator(); iter.hasNext();) {
-			String elem = iter.next();
-			if (PortImpl.isAnyString(elem)) {
-				iter.remove();
+		for (String type : new ArrayList<String>(result)) {
+			if (PortImpl.isAnyString(type)) {
+				result.remove(type);
 			}
 		}
+		return result;
+	}
 
-		if(sorting) {
-			// リストを文字列順でソート
-			result = sortTypes(result);
+	/** 型比較インターフェース */
+	public static interface TypeComparer {
+		String match(String type1, String type2);
+	}
+
+	/** デフォルト型比較(IgnoreCase) */
+	static TypeComparer ignoreCaseComparer = new TypeComparer() {
+		@Override
+		public String match(String type1, String type2) {
+			if (type1 != null && type1.equalsIgnoreCase(type2)) {
+				return type1;
+			}
+			return null;
 		}
+	};
 
-		return result;
+	/** データ型比較 */
+	static TypeComparer dataTypeComparer = new TypeComparer() {
+		@Override
+		public String match(String type1, String type2) {
+			boolean isIFR1 = isIFR(type1);
+			boolean isIFR2 = isIFR(type2);
+			// IFR形式同士(1.1)、単純形式同士(1.0)の場合はデフォルト型比較
+			if (isIFR1 == isIFR2) {
+				return ignoreCaseComparer.match(type1, type2);
+			}
+			// 1.1/1.0混在時は後方一致によるあいまい比較
+			String ifrType = null;
+			String oldType = null;
+			if (isIFR1) {
+				ifrType = type1;
+				oldType = type2;
+			} else if (isIFR2) {
+				ifrType = type2;
+				oldType = type1;
+			}
+			if (ifrType == null) {
+				return null;
+			}
+			String ifr[] = ifrType.split(":");
+			String ifrSeg[] = ifr[1].split("/");
+			String oldSeg[] = oldType.split("::");
+			if (oldSeg.length > ifrSeg.length) {
+				return null;
+			}
+			for (int i = 1; i <= oldSeg.length; i++) {
+				String s1 = oldSeg[oldSeg.length - i];
+				String s2 = ifrSeg[ifrSeg.length - i];
+				if (!s1.equalsIgnoreCase(s2)) {
+					return null;
+				}
+			}
+			// 1.1/1.0混在時のConnectorProfileにはIFR形式を使用
+			// return oldType;
+			return ifrType;
+		}
+	};
+
+	/** IFR形式の場合はtrue (ex. IDL:RTC/TimedLong:1.0) */
+	static boolean isIFR(String type) {
+		String ifr[] = (type == null ? "" : type).split(":");
+		if (ifr.length == 3 && ifr[0].equals("IDL")) {
+			return true;
+		}
+		return false;
 	}
 
 	public static List<String> sortTypes(List<String> list) {
@@ -189,6 +327,7 @@
 	public static List<String> sortTypes(List<String> list,
 			final boolean reverse) {
 		Collections.sort(list, new Comparator<String>() {
+			@Override
 			public int compare(String a, String b) {
 				return a.compareTo(b) * (reverse ? -1 : 1);
 			}

Copied: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/util/DeployProfileHandler.java (from rev 393, trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/util/DeployProfileHandler.java)
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/util/DeployProfileHandler.java	                        (rev 0)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/util/DeployProfileHandler.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -0,0 +1,50 @@
+package jp.go.aist.rtm.toolscommon.util;
+
+import javax.xml.datatype.DatatypeFactory;
+
+import org.openrtp.namespaces.deploy.Component;
+import org.openrtp.namespaces.deploy.DeployProfile;
+import org.openrtp.namespaces.deploy.ObjectFactory;
+
+import com.sun.org.apache.xerces.internal.jaxp.datatype.DatatypeFactoryImpl;
+
+public class DeployProfileHandler extends ProfileHandlerBase {
+	
+	public DeployProfile save(
+			jp.go.aist.rtm.toolscommon.model.component.SystemDiagram eDiagram) {
+		
+		ObjectFactory factory = new ObjectFactory();
+		DeployProfile profile = factory.createDeployProfile();
+		profile.setId(eDiagram.getSystemId());
+		DatatypeFactory dateFactory = new DatatypeFactoryImpl();
+		profile.setCreationDate(dateFactory.newXMLGregorianCalendar(eDiagram.getCreationDate()));
+		profile.setUpdateDate(dateFactory.newXMLGregorianCalendar(eDiagram.getUpdateDate()));
+		profile.setVersion("0.1");
+		//
+		for (jp.go.aist.rtm.toolscommon.model.component.Component eComp:
+				eDiagram.getRegisteredComponents()) {
+			String type = eComp.getProperty(KEY_DEPLOY_TYPE);
+			Component target = factory.createComponent();
+			target.setId(eComp.getComponentId());
+			target.setInstanceName(eComp.getInstanceNameL());
+			if( type==null || type.length()==0 ) {
+				target.setDeployType("None");
+				profile.getComponents().add(target);
+				continue;
+				
+			} else 	if( type.equals("Component")) {
+				target.setDeployType("Component");
+				
+			} else if( type.equals("Manager")) {
+				target.setDeployType("Manager");
+				
+			}
+			target.setTarget(eComp.getProperty(KEY_DEPLOY_TARGET));
+			target.setIor(eComp.getProperty(KEY_DEPLOY_IOR));
+			profile.getComponents().add(target);
+		}
+		
+		return profile;
+	}
+
+}

Copied: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/util/ProfileHandlerBase.java (from rev 393, trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/util/ProfileHandlerBase.java)
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/util/ProfileHandlerBase.java	                        (rev 0)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/util/ProfileHandlerBase.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -0,0 +1,8 @@
+package jp.go.aist.rtm.toolscommon.util;
+
+public class ProfileHandlerBase {
+	final static protected String KEY_DEPLOY_TYPE = "DeployType";
+	final static protected String KEY_DEPLOY_TARGET = "DeployTarget";
+	final static protected String KEY_DEPLOY_IOR = "DeployIOR";
+
+}

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/util/RtsProfileHandler.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/util/RtsProfileHandler.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/util/RtsProfileHandler.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -61,7 +61,7 @@
  * RTSプロファイルの入出力を司るクラス
  * 
  */
-public class RtsProfileHandler {
+public class RtsProfileHandler extends ProfileHandlerBase {
 	
 	private boolean online;
 	private RtsProfileExt originalProfile;
@@ -366,16 +366,19 @@
 			ComponentExt target, Component original, RtsProfileExt rtsProfile) {
 		for (jp.go.aist.rtm.toolscommon.model.component.Port ePort : eComp.getOutports()) {
 			addDataPort(ePort, target, original);
-			for(jp.go.aist.rtm.toolscommon.model.component.ConnectorProfile eConnProf : ePort.getConnectorProfiles() ) {
+			for (jp.go.aist.rtm.toolscommon.model.component.ConnectorProfile eConnProf : ePort.getConnectorProfiles()) {
 				addDataPortConnector(eConnProf, rtsProfile, ePort);
 			}
 		}
 		for (jp.go.aist.rtm.toolscommon.model.component.Port ePort : eComp.getInports()) {
 			addDataPort(ePort, target, original);
+			for (jp.go.aist.rtm.toolscommon.model.component.ConnectorProfile eConnProf : ePort.getConnectorProfiles()) {
+				addDataPortConnector(eConnProf, rtsProfile, ePort);
+			}
 		}
 		for (jp.go.aist.rtm.toolscommon.model.component.Port ePort : eComp.getServiceports()) {
 			addServicePort(ePort, target, original);
-			for(jp.go.aist.rtm.toolscommon.model.component.ConnectorProfile eConnProf : ePort.getConnectorProfiles() ) {
+			for (jp.go.aist.rtm.toolscommon.model.component.ConnectorProfile eConnProf : ePort.getConnectorProfiles()) {
 				addServicePortConnector(eConnProf, rtsProfile, ePort);
 			}
 		}
@@ -413,22 +416,35 @@
 		connector.setInterfaceType(eConnProf.getInterfaceType());
 		connector.setDataType(eConnProf.getDataType());
 		connector.setDataflowType(eConnProf.getDataflowType());
-		if(eConnProf.getSubscriptionType()!=null) connector.setSubscriptionType(eConnProf.getSubscriptionType());
-		if(eConnProf.getPushRate()!=null) connector.setPushInterval(eConnProf.getPushRate());
+		if (eConnProf.getSubscriptionType() != null) {
+			connector.setSubscriptionType(eConnProf.getSubscriptionType());
+		}
+		if (eConnProf.getPushRate() != null) {
+			connector.setPushInterval(eConnProf.getPushRate());
+		}
 
 		// ベンドポイントの保存
-		jp.go.aist.rtm.toolscommon.model.component.PortConnector ePortConnector = diagram.getConnectorMap().get(eConnProf.getConnectorId());
+		jp.go.aist.rtm.toolscommon.model.component.PortConnector ePortConnector = diagram
+				.getConnectorMap().get(eConnProf.getConnectorId());
 		if (ePortConnector != null) {
-			saveBendPoint(ePortConnector.getRoutingConstraint().map(), connector.getProperties());			
+			saveBendPoint(ePortConnector.getRoutingConstraint().map(),
+					connector.getProperties());
 		}
-		
-		DataportConnector original = findOrignalDataportConnector(eConnProf.getConnectorId());
 
-		connector.setSourceDataPort(createTargetPort(ePort.findPort(diagram, eConnProf.getSourceString())
-				, original == null ? null : original.getSourceDataPort()));		
-		connector.setTargetDataPort(createTargetPort(ePort.findPort(diagram, eConnProf.getTargetString())
-				, original == null ? null : original.getTargetDataPort()));
-		
+		DataportConnector original = findOrignalDataportConnector(eConnProf
+				.getConnectorId());
+
+		if (eConnProf.getSourceString() != null) {
+			connector.setSourceDataPort(createTargetPort(ePort.findPort(
+					diagram, eConnProf.getSourceString()),
+					original == null ? null : original.getSourceDataPort()));
+		}
+		if (eConnProf.getTargetString() != null) {
+			connector.setTargetDataPort(createTargetPort(ePort.findPort(
+					diagram, eConnProf.getTargetString()),
+					original == null ? null : original.getTargetDataPort()));
+		}
+
 		if (original instanceof DataportConnectorExt) {
 			DataportConnectorExt originalExt = (DataportConnectorExt) original;
 			connector.setComment(originalExt.getComment());
@@ -507,21 +523,32 @@
 	private ServiceportConnector saveServicePortConnector(
 			jp.go.aist.rtm.toolscommon.model.component.Port ePort,
 			jp.go.aist.rtm.toolscommon.model.component.ConnectorProfile eConnProf) {
-		ServiceportConnectorExt connector = factory.createServiceportConnectorExt();
+		ServiceportConnectorExt connector = factory
+				.createServiceportConnectorExt();
 		connector.setConnectorId(eConnProf.getConnectorId());
 		connector.setName(eConnProf.getName());
+
 		// ベンドポイントの保存
-		jp.go.aist.rtm.toolscommon.model.component.PortConnector ePortConnector = diagram.getConnectorMap().get(eConnProf.getConnectorId());
+		jp.go.aist.rtm.toolscommon.model.component.PortConnector ePortConnector = diagram
+				.getConnectorMap().get(eConnProf.getConnectorId());
 		if (ePortConnector != null) {
-			saveBendPoint(ePortConnector.getRoutingConstraint().map(), connector.getProperties());			
+			saveBendPoint(ePortConnector.getRoutingConstraint().map(),
+					connector.getProperties());
 		}
 
-		ServiceportConnector original = findOrignalServiceportConnector(eConnProf.getConnectorId());
+		ServiceportConnector original = findOrignalServiceportConnector(eConnProf
+				.getConnectorId());
 
-		connector.setSourceServicePort(createTargetPort(ePort.findPort(diagram, eConnProf.getSourceString())
-				, original == null ? null : original.getSourceServicePort()));		
-		connector.setTargetServicePort(createTargetPort(ePort.findPort(diagram, eConnProf.getTargetString())
-				, original == null ? null : original.getTargetServicePort()));
+		if (eConnProf.getSourceString() != null) {
+			connector.setSourceServicePort(createTargetPort(ePort.findPort(
+					diagram, eConnProf.getSourceString()),
+					original == null ? null : original.getSourceServicePort()));
+		}
+		if (eConnProf.getTargetString() != null) {
+			connector.setTargetServicePort(createTargetPort(ePort.findPort(
+					diagram, eConnProf.getTargetString()),
+					original == null ? null : original.getTargetServicePort()));
+		}
 
 		if (original instanceof ServiceportConnectorExt) {
 			if (original != null) {
@@ -704,6 +731,10 @@
 			ComponentExt target, Component original) {
 		// プロパティ設定
 		for (String key : eComp.getPropertyKeys()) {
+			//デプロイ情報は除外
+			if(key.equals(KEY_DEPLOY_TYPE) || key.equals(KEY_DEPLOY_TARGET)
+					|| key.equals(KEY_DEPLOY_IOR)) continue;
+			//
 			setProperty(key, eComp.getProperty(key), target.getProperties());
 		}
 		populateIOR(target.getProperties(), eComp);
@@ -1053,9 +1084,10 @@
 							// void
 						}
 					} else {
-						if (!KEY_BEND_POINT.equals(name)) {
-							conn.setProperty(name, value);
+						if (isIOR(value) || KEY_BEND_POINT.equals(name)) {
+							continue;
 						}
+						conn.setProperty(name, value);
 					}
 				}
 			}
@@ -1079,7 +1111,8 @@
 			if (connBase instanceof ServiceportConnectorExt) {
 				ServiceportConnectorExt connExt = (ServiceportConnectorExt) connBase;
 				for (Property p : connExt.getProperties()) {
-					if (KEY_BEND_POINT.equals(p.getName())) {
+					if (isIOR(p.getValue())
+							|| KEY_BEND_POINT.equals(p.getName())) {
 						continue;
 					}
 					eConnProf.setProperty(p.getName(), p.getValue());
@@ -1090,6 +1123,10 @@
 					connBase.getSourceServicePort(), getBendPoint(connBase));
 		}
 	}
+	
+	private boolean isIOR(String value) {
+		return (value != null && value.startsWith("IOR:"));
+	}
 
 	// ベンドポイントをプロパティから復元する
 	private Map<Integer, Point> getBendPoint(DataportConnector connBase) {
@@ -1120,13 +1157,17 @@
 		jp.go.aist.rtm.toolscommon.model.component.Component eComp = null;
 		jp.go.aist.rtm.toolscommon.model.component.Port eSource = null;
 		jp.go.aist.rtm.toolscommon.model.component.Port eTarget = null;
-		eComp = findEMFComponentByTargetComponent(source, eComps);
-		if (eComp != null) {
-			eSource = findEMFPortByTargetPort(source, eComp.getPorts());
+		if (source != null) {
+			eComp = findEMFComponentByTargetComponent(source, eComps);
+			if (eComp != null) {
+				eSource = findEMFPortByTargetPort(source, eComp.getPorts());
+			}
 		}
-		eComp = findEMFComponentByTargetComponent(target, eComps);
-		if (eComp != null) {
-			eTarget = findEMFPortByTargetPort(target, eComp.getPorts());
+		if (target != null) {
+			eComp = findEMFComponentByTargetComponent(target, eComps);
+			if (eComp != null) {
+				eTarget = findEMFPortByTargetPort(target, eComp.getPorts());
+			}
 		}
 		jp.go.aist.rtm.toolscommon.model.component.PortConnector eConnector = PortConnectorFactory
 				.createPortConnector(eSource, eTarget);


Property changes on: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/validation/AbstractValidator.java
___________________________________________________________________
Deleted: svn:executable
   - *


Property changes on: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/validation/ValidateException.java
___________________________________________________________________
Deleted: svn:executable
   - *


Property changes on: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/validation/Validator.java
___________________________________________________________________
Deleted: svn:executable
   - *

Copied: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/test/jp/go/aist/rtm/toolscommon/util/ConnectorUtilTest.java (from rev 393, trunk/rtmtools/jp.go.aist.rtm.toolscommon/test/jp/go/aist/rtm/toolscommon/util/ConnectorUtilTest.java)
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/test/jp/go/aist/rtm/toolscommon/util/ConnectorUtilTest.java	                        (rev 0)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/test/jp/go/aist/rtm/toolscommon/util/ConnectorUtilTest.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -0,0 +1,182 @@
+package jp.go.aist.rtm.toolscommon.util;
+
+import java.util.List;
+
+import jp.go.aist.rtm.toolscommon.model.component.ComponentFactory;
+import jp.go.aist.rtm.toolscommon.model.component.InPort;
+import jp.go.aist.rtm.toolscommon.model.component.OutPort;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public class ConnectorUtilTest {
+
+	OutPort out;
+	InPort in;
+
+	@Before
+	public void setUp() throws Exception {
+		out = ComponentFactory.eINSTANCE.createOutPort();
+		in = ComponentFactory.eINSTANCE.createInPort();
+	}
+
+	@Test
+	public void testGetAllowDataTypes10_1() throws Exception {
+		// 1.0 名前空間あり
+		out.setDataType("RTC::TimedLong,RTC::TimedFloat,RTC::TimedDouble");
+		in.setDataType("RTC::TimedLong,RTC::TimedDouble");
+		List<String> result = ConnectorUtil.getAllowDataTypes(out, in);
+
+		assertEquals(2, result.size());
+		assertTrue(result.contains("RTC::TimedLong"));
+		assertTrue(result.contains("RTC::TimedDouble"));
+	}
+
+	@Test
+	public void testGetAllowDataTypes10_2() throws Exception {
+		// 1.0 名前空間不一致
+		out.setDataType("TimedLong,TimedFloat,RTC::TimedDouble");
+		in.setDataType("RTC::TimedLong,RTC::TimedDouble");
+		List<String> result = ConnectorUtil.getAllowDataTypes(out, in);
+
+		assertEquals(1, result.size());
+		assertTrue(result.contains("RTC::TimedDouble"));
+	}
+
+	@Test
+	public void testGetAllowDataTypes10_3() throws Exception {
+		// 1.0 Any含む(source)
+		out.setDataType("TimedLong,Any");
+		in.setDataType("RTC::TimedFloat,RTC::TimedDouble");
+		List<String> result = ConnectorUtil.getAllowDataTypes(out, in);
+
+		assertEquals(2, result.size());
+		assertTrue(result.contains("RTC::TimedFloat"));
+		assertTrue(result.contains("RTC::TimedDouble"));
+	}
+
+	@Test
+	public void testGetAllowDataTypes10_4() throws Exception {
+		// 1.0 Any含む(target)
+		out.setDataType("TimedLong,RTC::TimedDouble");
+		in.setDataType("Any,TimedLong");
+		List<String> result = ConnectorUtil.getAllowDataTypes(out, in);
+
+		assertEquals(2, result.size());
+		assertTrue(result.contains("TimedLong"));
+		assertTrue(result.contains("RTC::TimedDouble"));
+	}
+
+	@Test
+	public void testGetAllowDataTypes11_1() throws Exception {
+		// 1.1 IFR一致
+		out
+				.setDataType("IDL:RTC/TimedLong:1.0,IDL:RTC/TimedFloat:1.0,IDL:RTC/TimedDouble:1.0");
+		in.setDataType("IDL:RTC/TimedLong:1.0,IDL:RTC/TimedDouble:1.0");
+		List<String> result = ConnectorUtil.getAllowDataTypes(out, in);
+
+		assertEquals(2, result.size());
+		assertTrue(result.contains("IDL:RTC/TimedLong:1.0"));
+		assertTrue(result.contains("IDL:RTC/TimedDouble:1.0"));
+	}
+
+	@Test
+	public void testGetAllowDataTypes11_2() throws Exception {
+		// 1.1 IFR不一致(バージョン)
+		out
+				.setDataType("IDL:RTC/TimedLong:1.1,IDL:RTC/TimedFloat:1.0,IDL:RTC/TimedDouble:1.0");
+		in.setDataType("IDL:RTC/TimedLong:1.0,IDL:RTC/TimedDouble:1.0");
+		List<String> result = ConnectorUtil.getAllowDataTypes(out, in);
+
+		assertEquals(1, result.size());
+		assertTrue(result.contains("IDL:RTC/TimedDouble:1.0"));
+	}
+
+	@Test
+	public void testGetAllowDataTypes11_3() throws Exception {
+		// 1.1/1.0 混在(後方一致でIFR形式を返す)
+		out.setDataType("RTC::TimedLong,RTC::TimedFloat,TimedDouble");
+		in.setDataType("IDL:RTC/TimedLong:1.0,IDL:RTC/TimedDouble:1.0");
+		List<String> result = ConnectorUtil.getAllowDataTypes(out, in);
+
+		assertEquals(2, result.size());
+		// assertTrue(result.contains("RTC::TimedLong"));
+		// assertTrue(result.contains("TimedDouble"));
+		assertTrue(result.contains("IDL:RTC/TimedLong:1.0"));
+		assertTrue(result.contains("IDL:RTC/TimedDouble:1.0"));
+	}
+
+	@Test
+	public void testGetAllowDataTypes11_4() throws Exception {
+		// 1.1/1.0 混在(後方一致でIFR形式を返す)
+		out
+				.setDataType("IDL:RTC/TimedLong:1.0,IDL:RTC/TimedFloat:1.0,IDL:RTC/TimedDouble:1.0");
+		in.setDataType("RTC::TimedLong,TimedDouble");
+		List<String> result = ConnectorUtil.getAllowDataTypes(out, in);
+
+		assertEquals(2, result.size());
+		// assertTrue(result.contains("RTC::TimedLong"));
+		// assertTrue(result.contains("TimedDouble"));
+		assertTrue(result.contains("IDL:RTC/TimedLong:1.0"));
+		assertTrue(result.contains("IDL:RTC/TimedDouble:1.0"));
+	}
+
+	@Test
+	public void testGetAllowDataTypes11_5() throws Exception {
+		// 1.1/1.0 名前空間が不一致
+		out.setDataType("RTC::TimedLong,AAA::TimedFloat,TimedDouble");
+		in
+				.setDataType("IDL:TimedLong:1.0,IDL:RTC/TimedFloat:1.0,IDL:AAA/BBB/TimedDouble:1.0");
+		List<String> result = ConnectorUtil.getAllowDataTypes(out, in);
+
+		assertEquals(1, result.size());
+		// assertTrue(result.contains("TimedDouble"));
+		assertTrue(result.contains("IDL:AAA/BBB/TimedDouble:1.0"));
+	}
+
+	@Test
+	public void testGetAllowDataflowTypes1() throws Exception {
+		out.setDataflowType("push,Pull");
+		in.setDataflowType("pull");
+		List<String> result = ConnectorUtil.getAllowDataflowTypes(out, in);
+
+		assertEquals(1, result.size());
+		assertTrue(result.contains("Pull"));
+	}
+
+	@Test
+	public void testGetAllowDataflowTypes2() throws Exception {
+		out.setDataflowType("Any");
+		in.setDataflowType("pull,push");
+		List<String> result = ConnectorUtil.getAllowDataflowTypes(out, in);
+
+		assertEquals(2, result.size());
+		assertTrue(result.contains("pull"));
+		assertTrue(result.contains("push"));
+	}
+
+	@Test
+	public void testGetAllowSubscriptionTypes1() throws Exception {
+		out.setSubscriptionType("flush,periodic");
+		in.setSubscriptionType("periodic");
+		List<String> result = ConnectorUtil.getAllowSubscriptionTypes(out, in);
+
+		assertEquals(1, result.size());
+		assertTrue(result.contains("periodic"));
+	}
+
+	@Test
+	public void testGetAllowSubscriptionTypes2() throws Exception {
+		out.setSubscriptionType("Any");
+		in.setSubscriptionType("flush,new");
+		List<String> result = ConnectorUtil.getAllowSubscriptionTypes(out, in);
+
+		assertEquals(2, result.size());
+		assertTrue(result.contains("flush"));
+		assertTrue(result.contains("new"));
+	}
+
+}

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/text/description.txt
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/text/description.txt	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon/text/description.txt	2013-01-29 10:39:20 UTC (rev 394)
@@ -186,7 +186,9 @@
 
   Class PortSynchronizer -> IPropertyMap
     Attribute originalPortString : EString
-    Operation disconnectAll() : void
+    Operation disconnect(EString) : EBoolean
+    Operation disconnect(ConnectorProfile) : EBoolean
+    Operation disconnectAll() : EBoolean
 
   Class PortConnector -> WrapperObject
     Reference connectorProfile : ConnectorProfile
@@ -227,11 +229,12 @@
     Attribute key : EIntegerObject
     Attribute value : Point
 
-  Class IPropertyMap
+  Class IPropertyMap -> IAdaptable
     Operation getProperty(EString) : EString
     Operation setProperty(EString, EString) : void
     Operation removeProperty(EString) : EString
     Operation getPropertyKeys() : EString<<0..*>>
+    Operation getPropertyMap() : IPropertyMap
 
   Class CorbaComponent -> Component, CorbaWrapperObject
     Attribute executionContextState : EInt
@@ -244,6 +247,7 @@
     Attribute rTCRTObjects : RTCRTObject<<0..*>>
     Attribute ior : EString
     Reference statusObserver : CorbaStatusObserver
+    Reference logObserver : CorbaLogObserver
     Operation startR() : EInt
     Operation stopR() : EInt
     Operation activateR() : EInt
@@ -252,6 +256,7 @@
     Operation finalizeR() : EInt
     Operation exitR() : EInt
     Operation getCorbaObjectInterface() : RTCRTObject
+    Operation supportedCorbaObserver() : EBoolean
 
   Class CorbaPortSynchronizer -> CorbaWrapperObject, PortSynchronizer
     Attribute rTCPortProfile : RTCPortProfile
@@ -282,11 +287,14 @@
     Operation activate() : void
     Operation deactivate() : void
     Operation attachComponent(CorbaComponent) : EBoolean
-    Operation detachComponent(CorbaComponent) : EBoolean
+    Operation detachComponent() : EBoolean
+    Operation finish() : EBoolean
 
   Class CorbaStatusObserver -> CorbaObserver
     Operation isTimeOut() : EBoolean
 
+  Class CorbaLogObserver -> CorbaObserver
+
   Enum SystemDiagramKind
     Literal ONLINE = 1
     Literal OFFLINE = 2

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.nl1/META-INF/MANIFEST.MF
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.nl1/META-INF/MANIFEST.MF	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.nl1/META-INF/MANIFEST.MF	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,6 +1,11 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Nl1 Fragment
-Bundle-SymbolicName: jp.go.aist.rtm.toolscommon.nl1
-Bundle-Version: 1.1.0.v20110411
-Fragment-Host: jp.go.aist.rtm.toolscommon;bundle-version="0.0.0"
+Manifest-Version: 1.0
+Ant-Version: Apache Ant 1.7.1
+Created-By: 20.0-b12 (Sun Microsystems Inc.)
+Bundle-ManifestVersion: 2
+Bundle-Name: Nl1 Fragment
+Bundle-SymbolicName: jp.go.aist.rtm.toolscommon.nl1
+Bundle-Version: 1.1.0.rc4v20130124
+Fragment-Host: jp.go.aist.rtm.toolscommon;bundle-version="1.1.0"
+Built-By: n-ando
+Built-Date: 2013/01/25 00:47:04
+

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.nl1/build.xml
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.nl1/build.xml	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.nl1/build.xml	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,6 +1,8 @@
-<project name="jp.go.aist.rtm.toolscommon.nl1_1.0.0" default="jar">
-	<property name="target.name" value="jp.go.aist.rtm.toolscommon.nl1_1.0.0"/>
+<project name="jp.go.aist.rtm.toolscommon.nl1" default="jar">
+	<property name="target.name" value="jp.go.aist.rtm.toolscommon.nl1" />
 
+	<taskdef name="manifesttask" classname="aist.ManifestTask" />
+
 	<property name="source" value="src"/>
 
 	<property name="dist.dir" value="jar" />
@@ -15,6 +17,10 @@
 	<property name="workspace" value="${basedir}/.." />
 	<property name="project.name" value="jp.go.aist.rtm.toolscommon" />
 
+    <tstamp>
+      <format property="built.date" pattern="yyyy/MM/dd HH:mm:ss" />
+    </tstamp>
+
 	<target name="buildAll">
 		<!--
 		<antcall target="clean" />
@@ -25,27 +31,49 @@
 
 
 	<target name="clean" description="ビルドで生成されたファイルを削除します">
-		<delete includeEmptyDirs="true">
+		<delete includeEmptyDirs="true" quiet="true">
 			<fileset dir="${build.dir}" includes="**/*.class" />
 		</delete>
+		<delete dir="${dist.dir}" quiet="true"/>
 	</target>
 
 	<target name="compile" description="ソースをコンパイルします">
 		<getEclipseClasspath pathid="build.classpath" targetplatformlocation="${targetPlatformLocation}"
 					workspace="${workspace}" projectname="${project.name}"/>
 		<javac srcdir="${source}" destdir="${build.dir}"
-			classpathref="build.classpath" classpath="lib/commons-lang-2.2.jar" encoding="Shift_JIS" />
+			classpathref="build.classpath" classpath="lib/commons-lang-2.2.jar" encoding="UTF-8" />
 	</target>
 
 	<target name="jar" description="jarファイルを作成します">
 		<mkdir dir="${dist.dir}" />
-		<delete file="${dist.dir}/${target.name}.jar" />
+		<delete>
+			<fileset dir="${dist.dir}" includes="${target.name}_*.jar" />
+		</delete>
 
-		<jar destfile="${dist.dir}/${target.name}.jar" manifest="META-INF/MANIFEST.MF">
+        <!-- Version settings -->
+        <manifesttask file="META-INF/MANIFEST.MF" key="Bundle-Version" property="manifest.project.version" />
+        <condition property="project.version"
+                   value="${env.PROJECT_VERSION}"
+                   else="${manifest.project.version}">
+          <isset property="env.PROJECT_VERSION" />
+        </condition>
+        <property name="jar.version" value="_${project.version}"/>
+        <property name="jar.name" value="${target.name}${jar.version}"/>
+
+        <!-- Updating MANIFEST.MF -->
+        <manifest file="META-INF/MANIFEST.MF" mode="update">
+          <attribute name="Bundle-Version" value="${project.version}"/>
+          <attribute name="Built-By" value="${user.name}"/>
+          <attribute name="Built-Date" value="${built.date}"/> 
+        </manifest>
+      
+        <!-- Creating a jar file -->
+		<jar destfile="${dist.dir}/${jar.name}.jar" manifest="META-INF/MANIFEST.MF">
 			<fileset dir="${source}" />
 			<fileset dir=".">
 				<include name="plugin_ja.properties" />
 			</fileset>
 		</jar>
 	</target>
+
 </project>

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.nl1/src/jp/go/aist/rtm/toolscommon/nl/messages_ja.properties
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.nl1/src/jp/go/aist/rtm/toolscommon/nl/messages_ja.properties	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.nl1/src/jp/go/aist/rtm/toolscommon/nl/messages_ja.properties	2013-01-29 10:39:20 UTC (rev 394)
@@ -44,9 +44,9 @@
 PortInterfaceProfilePropertySource.unknown=<UNKNOWN>
 PortInterfaceProfilePropertySource.polarity.provided=PROVIDED
 PortInterfaceProfilePropertySource.polarity.required=REQUIRED
-CorbaStatusObserverPropertySource.disp.interface_type=Interface Type
-CorbaStatusObserverPropertySource.disp.service=Service
-CorbaStatusObserverPropertySource.unknown=<UNKNOWN>
+CorbaObserverPropertySource.disp.interface_type=Interface Type
+CorbaObserverPropertySource.disp.service=Service
+CorbaObserverPropertySource.unknown=<UNKNOWN>
 SystemDiagramPropertySource.disp.system_id=System ID
 SystemDiagramPropertySource.disp.kind=Kind
 SystemDiagramPropertySource.disp.create_date=Create Date

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/META-INF/MANIFEST.MF
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/META-INF/MANIFEST.MF	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/META-INF/MANIFEST.MF	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,60 +1,41 @@
 Manifest-Version: 1.0
+Ant-Version: Apache Ant 1.7.1
+Created-By: 20.0-b12 (Sun Microsystems Inc.)
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
-Bundle-SymbolicName: jp.go.aist.rtm.toolscommon.profiles;singleton:=true
-Bundle-Version: 1.1.0.v20110411
-Bundle-ClassPath: .,
- schema/,
- lib/jyaml-1.3.jar,
- lib/jaxb-impl.jar
+Bundle-SymbolicName: jp.go.aist.rtm.toolscommon.profiles;singleton:=tr
+ ue
+Bundle-Version: 1.1.0.rc4v20130124
+Bundle-ClassPath: .,schema/,lib/jyaml-1.3.jar,lib/jaxb-impl.jar
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: com.sun.xml.bind;
-  uses:="javax.xml.bind.annotation.adapters,
-   javax.xml.namespace,
-   org.xml.sax,
-   com.sun.xml.bind.v2.runtime.reflect,
-   javax.xml.bind",
- com.sun.xml.bind.annotation,
- com.sun.xml.bind.api;
-  uses:="org.w3c.dom,
-   javax.xml.namespace,
-   org.xml.sax,
-   com.sun.xml.bind.v2.runtime,
-   javax.xml.bind.attachment,
-   javax.xml.stream,
-   javax.xml.transform,
-   com.sun.xml.bind.v2.model.annotation,
-   javax.xml.bind",
- com.sun.xml.bind.api.impl,
- com.sun.xml.bind.marshaller;uses:="org.xml.sax.helpers,org.w3c.dom,org.xml.sax",
- com.sun.xml.bind.unmarshaller;
-  uses:="javax.xml.bind,
-   com.sun.xml.bind.v2.runtime.unmarshaller,
-   org.w3c.dom,
-   org.xml.sax",
- com.sun.xml.bind.util;uses:="javax.xml.bind.helpers,com.sun.xml.bind,org.xml.sax",
- com.sun.xml.bind.v2,
- com.sun.xml.bind.v2.bytecode,
- com.sun.xml.bind.v2.model.annotation,
- com.sun.xml.bind.v2.model.core,
- com.sun.xml.bind.v2.model.impl,
- com.sun.xml.bind.v2.model.nav,
- com.sun.xml.bind.v2.model.runtime,
- com.sun.xml.bind.v2.runtime,
- com.sun.xml.bind.v2.runtime.output,
- com.sun.xml.bind.v2.runtime.property,
- com.sun.xml.bind.v2.runtime.reflect,
- com.sun.xml.bind.v2.runtime.reflect.opt,
- com.sun.xml.bind.v2.runtime.unmarshaller,
- com.sun.xml.bind.v2.schemagen,
- com.sun.xml.bind.v2.schemagen.episode,
- com.sun.xml.bind.v2.schemagen.xmlschema,
- com.sun.xml.bind.v2.util,
- jp.go.aist.rtm.toolscommon.profiles.util;uses:="junit.framework",
- org.openrtp.namespaces.rtc.version01;uses:="javax.xml.bind,javax.xml.datatype",
- org.openrtp.namespaces.rtc.version02;uses:="javax.xml.bind,javax.xml.datatype",
- org.openrtp.namespaces.rts.version01;uses:="javax.xml.bind,javax.xml.datatype",
- org.openrtp.namespaces.rts.version02;uses:="javax.xml.bind,javax.xml.datatype"
+Export-Package: com.sun.xml.bind; uses:="javax.xml.bind.annotation.ada
+ pters,  javax.xml.namespace,  org.xml.sax,  com.sun.xml.bind.v2.runti
+ me.reflect,  javax.xml.bind",com.sun.xml.bind.annotation,com.sun.xml.
+ bind.api; uses:="org.w3c.dom,  javax.xml.namespace,  org.xml.sax,  co
+ m.sun.xml.bind.v2.runtime,  javax.xml.bind.attachment,  javax.xml.str
+ eam,  javax.xml.transform,  com.sun.xml.bind.v2.model.annotation,  ja
+ vax.xml.bind",com.sun.xml.bind.api.impl,com.sun.xml.bind.marshaller;u
+ ses:="org.xml.sax.helpers,org.w3c.dom,org.xml.sax",com.sun.xml.bind.u
+ nmarshaller; uses:="javax.xml.bind,  com.sun.xml.bind.v2.runtime.unma
+ rshaller,  org.w3c.dom,  org.xml.sax",com.sun.xml.bind.util;uses:="ja
+ vax.xml.bind.helpers,com.sun.xml.bind,org.xml.sax",com.sun.xml.bind.v
+ 2,com.sun.xml.bind.v2.bytecode,com.sun.xml.bind.v2.model.annotation,c
+ om.sun.xml.bind.v2.model.core,com.sun.xml.bind.v2.model.impl,com.sun.
+ xml.bind.v2.model.nav,com.sun.xml.bind.v2.model.runtime,com.sun.xml.b
+ ind.v2.runtime,com.sun.xml.bind.v2.runtime.output,com.sun.xml.bind.v2
+ .runtime.property,com.sun.xml.bind.v2.runtime.reflect,com.sun.xml.bin
+ d.v2.runtime.reflect.opt,com.sun.xml.bind.v2.runtime.unmarshaller,com
+ .sun.xml.bind.v2.schemagen,com.sun.xml.bind.v2.schemagen.episode,com.
+ sun.xml.bind.v2.schemagen.xmlschema,com.sun.xml.bind.v2.util,jp.go.ai
+ st.rtm.toolscommon.profiles.util;uses:="junit.framework",org.openrtp.
+ namespaces.deploy,org.openrtp.namespaces.rtc.version01;uses:="javax.x
+ ml.bind,javax.xml.datatype",org.openrtp.namespaces.rtc.version02;uses
+ :="javax.xml.bind,javax.xml.datatype",org.openrtp.namespaces.rts.vers
+ ion01;uses:="javax.xml.bind,javax.xml.datatype",org.openrtp.namespace
+ s.rts.version02;uses:="javax.xml.bind,javax.xml.datatype"
 Bundle-ActivationPolicy: lazy
 Eclipse-BuddyPolicy: registered
+Built-By: n-ando
+Built-Date: 2013/01/25 00:46:56
+

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/build.xml
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/build.xml	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/build.xml	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,17 +1,19 @@
-<project name="jp.go.aist.rtm.toolscommon.profiles_1.0.0" default="jar">
-	<property name="target.name" value="jp.go.aist.rtm.toolscommon.profiles_1.0.0"/>
+<project name="jp.go.aist.rtm.toolscommon.profiles" default="jar">
+	<property name="target.name" value="jp.go.aist.rtm.toolscommon.profiles" />
 
+	<taskdef name="manifesttask" classname="aist.ManifestTask" />
+
 	<property name="source" value="src"/>
 
 	<property name="dist.dir" value="jar" />
 	<property name="build.dir" value="bin"/>
 	<property name="lib.dir" value="lib"/>
 	<property name="schema.dir" value="schema"/>
-
+	
 	<property environment="env"/>
 	<property name="eclipse.home" value="${env.ECLIPSE_HOME}"/>
 	<property name="java.home" value="${env.JAVA_HOME}"/>
-
+	
         <taskdef resource="net/sf/ant4eclipse/antlib.xml" />
 	<property name="targetPlatformLocation" value="${eclipse.home}" />
 	<property name="workspace" value="${basedir}/.." />
@@ -19,6 +21,9 @@
 	<path id="jre.libs" description="Java runtime libraries">
 		<pathelement location="${java.home}/jre/lib" />
 	</path>
+	<tstamp>
+		<format property="built.date" pattern="yyyy/MM/dd HH:mm:ss" />
+	</tstamp>
 
 	<target name="buildAll">
 		<antcall target="clean" />
@@ -27,24 +32,52 @@
 	</target>
 
 	<target name="clean" description="ビルドで生成されたファイルを削除します">
-		<delete includeEmptyDirs="true">
+		<delete includeEmptyDirs="true" quiet="true">
 			<fileset dir="${build.dir}" includes="**/*.class" />
+			<fileset dir="${build.dir}" includes="**/*.xsd" />
+			<fileset dir="." includes="**/*.log" />
 		</delete>
+		<delete dir="${build.dir}/jp" quiet="true" />
+		<delete dir="${build.dir}/org" quiet="true" />
+		<delete dir="${build.dir}/test" quiet="true" />
+		<delete dir="${dist.dir}" quiet="true"/>
 	</target>
 
 	<target name="compile" description="ソースをコンパイルします">
 		<getEclipseClasspath pathid="build.classpath" targetplatformlocation="${targetPlatformLocation}"
 					workspace="${workspace}" projectname="${project.name}" />
 		<javac bootclasspathref="jre.libs" includeJavaRuntime="true" srcdir="${source}" destdir="${build.dir}" verbose="off"
-			classpathref="build.classpath"  encoding="Shift_JIS" />
+			classpathref="build.classpath"  encoding="UTF-8" />
 	</target>
 
 	<target name="jar" description="jarファイルを作成します">
 		<copy file="${source}/jp/go/aist/rtm/toolscommon/profiles/nl/messages.properties" todir="${build.dir}/jp/go/aist/rtm/toolscommon/profiles/nl" />
+		<copy todir="${build.dir}">
+			<fileset dir="${schema.dir}">
+				<include name="**.xsd" />
+			</fileset>
+		</copy>
 		<mkdir dir="${dist.dir}" />
-		<delete file="${dist.dir}/${target.name}.jar" />
-
-		<jar destfile="${dist.dir}/${target.name}.jar" manifest="META-INF/MANIFEST.MF">
+		<delete>
+			<fileset dir="${dist.dir}" includes="${target.name}_*.jar" />
+		</delete>
+		<!-- Version settings -->
+		<manifesttask file="META-INF/MANIFEST.MF" key="Bundle-Version" property="manifest.project.version" />
+		<condition property="project.version"
+                   value="${env.PROJECT_VERSION}"
+                   else="${manifest.project.version}">
+			<isset property="env.PROJECT_VERSION" />
+		</condition>
+		<property name="jar.version" value="_${project.version}"/>
+		<property name="jar.name" value="${target.name}${jar.version}"/>
+		<!-- Updating MANIFEST.MF -->
+		<manifest file="META-INF/MANIFEST.MF" mode="update">
+			<attribute name="Bundle-Version" value="${project.version}"/>
+			<attribute name="Built-By" value="${user.name}"/>
+			<attribute name="Built-Date" value="${built.date}"/>
+		</manifest>
+		<!-- Creating a jar file -->
+		<jar destfile="${dist.dir}/${jar.name}.jar" manifest="META-INF/MANIFEST.MF">
 			<fileset dir="${build.dir}" />
 			<fileset dir=".">
 				<include name="schema/**.**" />
@@ -55,4 +88,5 @@
 			</fileset>
 		</jar>
 	</target>
+
 </project>

Copied: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/schema/DeployProfile.xsd (from rev 393, trunk/rtmtools/jp.go.aist.rtm.toolscommon.profiles/schema/DeployProfile.xsd)
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/schema/DeployProfile.xsd	                        (rev 0)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/schema/DeployProfile.xsd	2013-01-29 10:39:20 UTC (rev 394)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	xmlns:deploy="http://www.openrtp.org/namespaces/deploy"
+	targetNamespace="http://www.openrtp.org/namespaces/deploy"
+	elementFormDefault="qualified"
+	attributeFormDefault="qualified">
+
+	<xsd:element name="DeployProfile" type="deploy:deploy_profile"/>
+	<xsd:complexType name="deploy_profile">
+		<xsd:sequence>
+			<xsd:element name="Components" type="deploy:component" minOccurs="0" maxOccurs="unbounded"/>
+		</xsd:sequence>
+		<xsd:attribute name="id" type="xsd:string" use="required"/>
+		<xsd:attribute name="version" type="xsd:string" use="required"/>
+		<xsd:attribute name="creationDate" type="xsd:dateTime" use="required"/>
+		<xsd:attribute name="updateDate" type="xsd:dateTime" use="required"/>
+	</xsd:complexType>
+
+	<xsd:complexType name="component">
+		<xsd:attribute name="id" type="xsd:string" use="required"/>
+		<xsd:attribute name="instanceName" type="xsd:string" use="required"/>
+		<xsd:attribute name="deployType">
+			<xsd:simpleType>
+				<xsd:restriction base="xsd:string">
+					<xsd:enumeration value="None"/>
+					<xsd:enumeration value="Component"/>
+					<xsd:enumeration value="Manager"/>
+				</xsd:restriction>
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="target" type="xsd:string" use="optional"/>
+		<xsd:attribute name="ior" type="xsd:string" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/jp/go/aist/rtm/toolscommon/profiles/util/NamespacePrefixMapperImpl.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/jp/go/aist/rtm/toolscommon/profiles/util/NamespacePrefixMapperImpl.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/jp/go/aist/rtm/toolscommon/profiles/util/NamespacePrefixMapperImpl.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -31,6 +31,9 @@
         if (namespaceUri.equalsIgnoreCase("http://www.openrtp.org/namespaces/rtc_ext")){
             return "rtcExt";
         }
+        if (namespaceUri.equalsIgnoreCase("http://www.openrtp.org/namespaces/deploy")){
+            return "deploy";
+        }
         if (namespaceUri.equalsIgnoreCase("http://www.w3.org/2001/XMLSchema-instance") ){
 	      return "xsi";
 	    }

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/jp/go/aist/rtm/toolscommon/profiles/util/XmlHandler.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/jp/go/aist/rtm/toolscommon/profiles/util/XmlHandler.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/jp/go/aist/rtm/toolscommon/profiles/util/XmlHandler.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -30,6 +30,7 @@
 
 import jp.go.aist.rtm.toolscommon.profiles.nl.Messages;
 
+import org.openrtp.namespaces.deploy.DeployProfile;
 import org.openrtp.namespaces.rtc.version02.ActionStatusDoc;
 import org.openrtp.namespaces.rtc.version02.Actions;
 import org.openrtp.namespaces.rtc.version02.And;
@@ -249,6 +250,69 @@
 	    return result;
 	}
 	
+	public String convertToXmlDeploy(DeployProfile profile) throws Exception {
+	    String xmlString = "";
+		try {
+			JAXBContext jaxbContext = JAXBContext.newInstance("org.openrtp.namespaces.deploy");
+			Marshaller marshaller = jaxbContext.createMarshaller();
+		    marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT , new Boolean(true));
+		    marshaller.setProperty("com.sun.xml.bind.namespacePrefixMapper",
+					new NamespacePrefixMapperImpl(
+							"http://www.openrtp.org/namespaces/deploy"));
+		    StringWriter xmlFileWriter = new StringWriter();
+		    marshaller.marshal(profile, xmlFileWriter);
+		    xmlString = xmlFileWriter.toString();
+		} catch (JAXBException exception) {
+			throw new Exception(Messages.getString("XmlHandler.17"), exception);
+		}
+		return xmlString;
+	}
+	
+	public DeployProfile restoreFromXmlDeploy(String targetXML) throws Exception {
+		DeployProfile result = null;
+		JAXBContext jc = JAXBContext.newInstance("org.openrtp.namespaces.deploy");
+		Unmarshaller unmarshaller = jc.createUnmarshaller();
+		unmarshaller.setEventHandler(new javax.xml.bind.helpers.DefaultValidationEventHandler());
+	    StringReader xmlReader = new StringReader(targetXML);
+		Object profile = unmarshaller.unmarshal(xmlReader);
+		//
+		result = (DeployProfile) ((JAXBElement<?>) profile).getValue();
+		return result;
+	}
+
+	public DeployProfile loadXmlDeploy(String targetFile) throws Exception {
+		
+		StringBuffer stbRet = new StringBuffer();
+		InputStreamReader isr = new InputStreamReader(new FileInputStream(targetFile), "UTF-8");
+		BufferedReader br = new BufferedReader(isr);
+
+		String str = new String();
+		while( (str = br.readLine()) != null ){
+			stbRet.append(str + "\n");
+		}
+		br.close();
+		isr.close();
+		return restoreFromXmlDeploy(stbRet.toString());
+	}
+
+	public boolean saveXmlDeploy(DeployProfile profile, String targetFile) throws Exception {
+		String xmlString = convertToXmlDeploy(profile);
+
+		String lineSeparator = System.getProperty( "line.separator" );
+		if( lineSeparator==null || lineSeparator.equals("") ) lineSeparator = "\n";
+		String xmlSplit[] = xmlString.split(lineSeparator);
+
+		BufferedWriter outputFile = new BufferedWriter(
+					new OutputStreamWriter(new FileOutputStream(targetFile), "UTF-8"));
+		for(int intIdx=0;intIdx<xmlSplit.length;intIdx++) {
+			outputFile.write(xmlSplit[intIdx]);
+			outputFile.newLine();
+		}
+		outputFile.close();
+		
+		return true;
+	}
+	
 	private class RtsXMLParser extends DefaultHandler {
 		private String version = "";
 
@@ -446,6 +510,7 @@
 	
 	public static ConstraintType convertToXmlConstraint(String source) throws Exception {
 		if(source==null || source.length()==0 ) throw new Exception(Messages.getString("XmlHandler.69"));
+		source = source.replace(" ", "");
 		
 		ObjectFactory factory = new ObjectFactory();
 		ConstraintType result = factory.createConstraintType();

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/ActionStatus.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/ActionStatus.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/ActionStatus.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.04.24 at 07:25:27 Œß‘O GMT 
+// Generated on: 2008.04.24 at 07:25:27 午前 GMT 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/ActionStatusDoc.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/ActionStatusDoc.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/ActionStatusDoc.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.04.24 at 07:25:27 Œß‘O GMT 
+// Generated on: 2008.04.24 at 07:25:27 午前 GMT 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/Actions.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/Actions.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/Actions.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.04.24 at 07:25:27 Œß‘O GMT 
+// Generated on: 2008.04.24 at 07:25:27 午前 GMT 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/BasicInfo.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/BasicInfo.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/BasicInfo.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.04.24 at 07:25:27 Œß‘O GMT 
+// Generated on: 2008.04.24 at 07:25:27 午前 GMT 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/BasicInfoDoc.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/BasicInfoDoc.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/BasicInfoDoc.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.04.24 at 07:25:27 Œß‘O GMT 
+// Generated on: 2008.04.24 at 07:25:27 午前 GMT 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/BasicInfoExt.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/BasicInfoExt.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/BasicInfoExt.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.05.13 at 02:37:07 Χ΋ JST 
+// Generated on: 2008.05.13 at 02:37:07 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/Configuration.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/Configuration.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/Configuration.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.04.24 at 07:25:27 Œß‘O GMT 
+// Generated on: 2008.04.24 at 07:25:27 午前 GMT 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/ConfigurationDoc.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/ConfigurationDoc.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/ConfigurationDoc.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.05.13 at 02:37:07 Χ΋ JST 
+// Generated on: 2008.05.13 at 02:37:07 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/ConfigurationExt.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/ConfigurationExt.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/ConfigurationExt.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.05.13 at 02:37:07 Χ΋ JST 
+// Generated on: 2008.05.13 at 02:37:07 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/ConfigurationSet.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/ConfigurationSet.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/ConfigurationSet.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.04.24 at 07:25:27 Œß‘O GMT 
+// Generated on: 2008.04.24 at 07:25:27 午前 GMT 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/Cxxlang.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/Cxxlang.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/Cxxlang.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.04.24 at 07:25:27 Œß‘O GMT 
+// Generated on: 2008.04.24 at 07:25:27 午前 GMT 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/Dataport.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/Dataport.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/Dataport.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.04.24 at 07:25:27 Œß‘O GMT 
+// Generated on: 2008.04.24 at 07:25:27 午前 GMT 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/DataportDoc.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/DataportDoc.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/DataportDoc.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.04.24 at 07:25:27 Œß‘O GMT 
+// Generated on: 2008.04.24 at 07:25:27 午前 GMT 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/DataportExt.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/DataportExt.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/DataportExt.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.05.13 at 02:37:07 Χ΋ JST 
+// Generated on: 2008.05.13 at 02:37:07 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/DocAction.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/DocAction.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/DocAction.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.04.24 at 07:25:27 Œß‘O GMT 
+// Generated on: 2008.04.24 at 07:25:27 午前 GMT 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/DocBasic.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/DocBasic.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/DocBasic.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.04.24 at 07:25:27 Œß‘O GMT 
+// Generated on: 2008.04.24 at 07:25:27 午前 GMT 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/DocConfiguration.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/DocConfiguration.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/DocConfiguration.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.04.24 at 07:25:27 Œß‘O GMT 
+// Generated on: 2008.04.24 at 07:25:27 午前 GMT 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/DocDataport.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/DocDataport.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/DocDataport.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.04.24 at 07:25:27 Œß‘O GMT 
+// Generated on: 2008.04.24 at 07:25:27 午前 GMT 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/DocServiceinterface.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/DocServiceinterface.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/DocServiceinterface.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.04.24 at 07:25:27 Œß‘O GMT 
+// Generated on: 2008.04.24 at 07:25:27 午前 GMT 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/DocServiceport.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/DocServiceport.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/DocServiceport.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.04.24 at 07:25:27 Œß‘O GMT 
+// Generated on: 2008.04.24 at 07:25:27 午前 GMT 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/Javalang.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/Javalang.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/Javalang.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.04.24 at 07:25:27 Œß‘O GMT 
+// Generated on: 2008.04.24 at 07:25:27 午前 GMT 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/Language.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/Language.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/Language.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.04.24 at 07:25:27 Œß‘O GMT 
+// Generated on: 2008.04.24 at 07:25:27 午前 GMT 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/ObjectFactory.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/ObjectFactory.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/ObjectFactory.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.05.13 at 02:37:07 Χ΋ JST 
+// Generated on: 2008.05.13 at 02:37:07 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/Parameter.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/Parameter.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/Parameter.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.04.24 at 07:25:27 Œß‘O GMT 
+// Generated on: 2008.04.24 at 07:25:27 午前 GMT 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/Position.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/Position.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/Position.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.04.24 at 07:25:27 Œß‘O GMT 
+// Generated on: 2008.04.24 at 07:25:27 午前 GMT 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/Property.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/Property.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/Property.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.05.13 at 02:37:07 Χ΋ JST 
+// Generated on: 2008.05.13 at 02:37:07 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/RtcProfile.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/RtcProfile.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/RtcProfile.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.04.24 at 07:25:27 Œß‘O GMT 
+// Generated on: 2008.04.24 at 07:25:27 午前 GMT 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/Serviceinterface.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/Serviceinterface.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/Serviceinterface.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.04.24 at 07:25:27 Œß‘O GMT 
+// Generated on: 2008.04.24 at 07:25:27 午前 GMT 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/ServiceinterfaceDoc.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/ServiceinterfaceDoc.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/ServiceinterfaceDoc.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.05.13 at 02:37:07 Χ΋ JST 
+// Generated on: 2008.05.13 at 02:37:07 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/ServiceinterfaceExt.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/ServiceinterfaceExt.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/ServiceinterfaceExt.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.05.13 at 02:37:07 Χ΋ JST 
+// Generated on: 2008.05.13 at 02:37:07 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/Serviceport.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/Serviceport.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/Serviceport.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.04.24 at 07:25:27 Œß‘O GMT 
+// Generated on: 2008.04.24 at 07:25:27 午前 GMT 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/ServiceportDoc.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/ServiceportDoc.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/ServiceportDoc.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.04.24 at 07:25:27 Œß‘O GMT 
+// Generated on: 2008.04.24 at 07:25:27 午前 GMT 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/ServiceportExt.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/ServiceportExt.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/ServiceportExt.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.05.13 at 02:37:07 Χ΋ JST 
+// Generated on: 2008.05.13 at 02:37:07 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/package-info.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/package-info.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/package-info.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.04.24 at 07:25:27 Œß‘O GMT 
+// Generated on: 2008.04.24 at 07:25:27 午前 GMT 
 //
 
 @javax.xml.bind.annotation.XmlSchema(namespace = "http://www.openrtp.org/namespaces/rtc", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ActionStatus.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ActionStatus.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ActionStatus.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ActionStatusDoc.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ActionStatusDoc.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ActionStatusDoc.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/Actions.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/Actions.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/Actions.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/And.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/And.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/And.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/BasicInfo.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/BasicInfo.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/BasicInfo.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/BasicInfoDoc.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/BasicInfoDoc.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/BasicInfoDoc.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/BasicInfoExt.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/BasicInfoExt.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/BasicInfoExt.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/Configuration.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/Configuration.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/Configuration.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ConfigurationDoc.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ConfigurationDoc.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ConfigurationDoc.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ConfigurationExt.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ConfigurationExt.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ConfigurationExt.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ConfigurationSet.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ConfigurationSet.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ConfigurationSet.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ConstraintHashType.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ConstraintHashType.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ConstraintHashType.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ConstraintListType.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ConstraintListType.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ConstraintListType.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ConstraintType.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ConstraintType.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ConstraintType.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ConstraintUnitType.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ConstraintUnitType.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ConstraintUnitType.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/Dataport.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/Dataport.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/Dataport.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/DataportDoc.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/DataportDoc.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/DataportDoc.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/DataportExt.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/DataportExt.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/DataportExt.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/DocAction.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/DocAction.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/DocAction.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/DocBasic.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/DocBasic.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/DocBasic.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/DocConfiguration.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/DocConfiguration.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/DocConfiguration.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/DocDataport.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/DocDataport.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/DocDataport.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/DocServiceinterface.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/DocServiceinterface.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/DocServiceinterface.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/DocServiceport.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/DocServiceport.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/DocServiceport.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/Language.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/Language.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/Language.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/LanguageExt.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/LanguageExt.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/LanguageExt.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/Library.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/Library.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/Library.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/Not.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/Not.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/Not.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ObjectFactory.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ObjectFactory.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ObjectFactory.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/Or.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/Or.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/Or.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/Parameter.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/Parameter.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/Parameter.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/Position.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/Position.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/Position.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2009.04.01 at 11:46:04 Œß‘O JST 
+// Generated on: 2009.04.01 at 11:46:04 午前 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/Property.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/Property.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/Property.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/PropertyIsBetween.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/PropertyIsBetween.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/PropertyIsBetween.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/PropertyIsEqualTo.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/PropertyIsEqualTo.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/PropertyIsEqualTo.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/PropertyIsGreaterThan.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/PropertyIsGreaterThan.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/PropertyIsGreaterThan.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/PropertyIsGreaterThanOrEqualTo.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/PropertyIsGreaterThanOrEqualTo.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/PropertyIsGreaterThanOrEqualTo.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/PropertyIsLessThan.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/PropertyIsLessThan.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/PropertyIsLessThan.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/PropertyIsLessThanOrEqualTo.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/PropertyIsLessThanOrEqualTo.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/PropertyIsLessThanOrEqualTo.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/PropertyIsLike.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/PropertyIsLike.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/PropertyIsLike.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/PropertyIsNotEqualTo.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/PropertyIsNotEqualTo.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/PropertyIsNotEqualTo.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/PropertyIsNullType.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/PropertyIsNullType.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/PropertyIsNullType.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/RtcProfile.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/RtcProfile.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/RtcProfile.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/Serviceinterface.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/Serviceinterface.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/Serviceinterface.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ServiceinterfaceDoc.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ServiceinterfaceDoc.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ServiceinterfaceDoc.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ServiceinterfaceExt.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ServiceinterfaceExt.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ServiceinterfaceExt.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/Serviceport.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/Serviceport.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/Serviceport.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ServiceportDoc.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ServiceportDoc.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ServiceportDoc.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ServiceportExt.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ServiceportExt.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/ServiceportExt.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/TargetEnvironment.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/TargetEnvironment.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/TargetEnvironment.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/TransmissionMethod.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/TransmissionMethod.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/TransmissionMethod.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/package-info.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/package-info.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version02/package-info.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.11.22 at 05:14:48 Χ΋ JST 
+// Generated on: 2008.11.22 at 05:14:48 午後 JST 
 //
 
 @javax.xml.bind.annotation.XmlSchema(namespace = "http://www.openrtp.org/namespaces/rtc", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/Component.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/Component.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/Component.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.05.06 at 12:47:57 Χ΋ GMT 
+// Generated on: 2008.05.06 at 12:47:57 午後 GMT 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/ComponentExt.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/ComponentExt.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/ComponentExt.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.05.14 at 04:20:56 Χ΋ JST 
+// Generated on: 2008.05.14 at 04:20:56 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/Condition.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/Condition.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/Condition.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.05.14 at 04:20:56 Χ΋ JST 
+// Generated on: 2008.05.14 at 04:20:56 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/ConditionExt.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/ConditionExt.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/ConditionExt.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.05.14 at 04:20:56 Χ΋ JST 
+// Generated on: 2008.05.14 at 04:20:56 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/ConfigurationData.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/ConfigurationData.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/ConfigurationData.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.05.06 at 12:47:57 Χ΋ GMT 
+// Generated on: 2008.05.06 at 12:47:57 午後 GMT 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/ConfigurationSet.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/ConfigurationSet.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/ConfigurationSet.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.05.06 at 12:47:57 Χ΋ GMT 
+// Generated on: 2008.05.06 at 12:47:57 午後 GMT 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/Dataport.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/Dataport.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/Dataport.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.05.06 at 12:47:57 Χ΋ GMT 
+// Generated on: 2008.05.06 at 12:47:57 午後 GMT 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/DataportConnector.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/DataportConnector.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/DataportConnector.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.05.14 at 04:20:56 Χ΋ JST 
+// Generated on: 2008.05.14 at 04:20:56 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/DataportConnectorExt.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/DataportConnectorExt.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/DataportConnectorExt.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.05.14 at 04:20:56 Χ΋ JST 
+// Generated on: 2008.05.14 at 04:20:56 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/ExecutionContext.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/ExecutionContext.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/ExecutionContext.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.05.14 at 04:20:56 Χ΋ JST 
+// Generated on: 2008.05.14 at 04:20:56 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/ExecutionContextExt.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/ExecutionContextExt.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/ExecutionContextExt.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.05.14 at 04:20:56 Χ΋ JST 
+// Generated on: 2008.05.14 at 04:20:56 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/Location.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/Location.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/Location.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.05.06 at 12:47:57 Χ΋ GMT 
+// Generated on: 2008.05.06 at 12:47:57 午後 GMT 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/ObjectFactory.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/ObjectFactory.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/ObjectFactory.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.05.14 at 04:20:56 Χ΋ JST 
+// Generated on: 2008.05.14 at 04:20:56 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/Participant.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/Participant.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/Participant.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.05.06 at 12:47:57 Χ΋ GMT 
+// Generated on: 2008.05.06 at 12:47:57 午後 GMT 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/PrecedingComponent.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/PrecedingComponent.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/PrecedingComponent.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.05.06 at 12:47:57 Χ΋ GMT 
+// Generated on: 2008.05.06 at 12:47:57 午後 GMT 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/Property.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/Property.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/Property.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.05.14 at 04:20:56 Χ΋ JST 
+// Generated on: 2008.05.14 at 04:20:56 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/RtsProfile.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/RtsProfile.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/RtsProfile.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.05.14 at 04:20:56 Χ΋ JST 
+// Generated on: 2008.05.14 at 04:20:56 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/RtsProfileExt.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/RtsProfileExt.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/RtsProfileExt.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.05.14 at 04:20:56 Χ΋ JST 
+// Generated on: 2008.05.14 at 04:20:56 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/Serviceport.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/Serviceport.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/Serviceport.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.05.06 at 12:47:57 Χ΋ GMT 
+// Generated on: 2008.05.06 at 12:47:57 午後 GMT 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/ServiceportConnector.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/ServiceportConnector.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/ServiceportConnector.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.05.14 at 04:20:56 Χ΋ JST 
+// Generated on: 2008.05.14 at 04:20:56 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/ServiceportConnectorExt.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/ServiceportConnectorExt.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/ServiceportConnectorExt.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.05.14 at 04:20:56 Χ΋ JST 
+// Generated on: 2008.05.14 at 04:20:56 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/Startup.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/Startup.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/Startup.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.05.06 at 12:47:57 Χ΋ GMT 
+// Generated on: 2008.05.06 at 12:47:57 午後 GMT 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/TargetComponent.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/TargetComponent.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/TargetComponent.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.05.14 at 04:20:56 Χ΋ JST 
+// Generated on: 2008.05.14 at 04:20:56 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/TargetComponentExt.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/TargetComponentExt.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/TargetComponentExt.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.05.14 at 04:20:56 Χ΋ JST 
+// Generated on: 2008.05.14 at 04:20:56 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/TargetPort.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/TargetPort.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/TargetPort.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.05.14 at 04:20:56 Χ΋ JST 
+// Generated on: 2008.05.14 at 04:20:56 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/TargetPortExt.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/TargetPortExt.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/TargetPortExt.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.05.14 at 04:20:56 Χ΋ JST 
+// Generated on: 2008.05.14 at 04:20:56 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/package-info.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/package-info.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version01/package-info.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.05.06 at 12:47:57 Χ΋ GMT 
+// Generated on: 2008.05.06 at 12:47:57 午後 GMT 
 //
 
 @javax.xml.bind.annotation.XmlSchema(namespace = "http://www.openrtp.org/namespaces/rts", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Activation.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Activation.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Activation.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.10.24 at 04:33:50 Χ΋ JST 
+// Generated on: 2008.10.24 at 04:33:50 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Component.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Component.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Component.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2009.01.06 at 10:42:01 Œß‘O JST 
+// Generated on: 2009.01.06 at 10:42:01 午前 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/ComponentExt.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/ComponentExt.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/ComponentExt.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.10.24 at 04:33:50 Χ΋ JST 
+// Generated on: 2008.10.24 at 04:33:50 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/ComponentGroup.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/ComponentGroup.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/ComponentGroup.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.10.24 at 04:33:50 Χ΋ JST 
+// Generated on: 2008.10.24 at 04:33:50 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Condition.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Condition.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Condition.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.10.24 at 04:33:50 Χ΋ JST 
+// Generated on: 2008.10.24 at 04:33:50 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/ConditionExt.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/ConditionExt.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/ConditionExt.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.10.24 at 04:33:50 Χ΋ JST 
+// Generated on: 2008.10.24 at 04:33:50 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/ConfigurationData.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/ConfigurationData.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/ConfigurationData.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.10.24 at 04:33:50 Χ΋ JST 
+// Generated on: 2008.10.24 at 04:33:50 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/ConfigurationSet.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/ConfigurationSet.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/ConfigurationSet.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.10.24 at 04:33:50 Χ΋ JST 
+// Generated on: 2008.10.24 at 04:33:50 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Dataport.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Dataport.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Dataport.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.10.24 at 04:33:50 Χ΋ JST 
+// Generated on: 2008.10.24 at 04:33:50 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/DataportConnector.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/DataportConnector.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/DataportConnector.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.10.24 at 04:33:50 Χ΋ JST 
+// Generated on: 2008.10.24 at 04:33:50 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/DataportConnectorExt.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/DataportConnectorExt.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/DataportConnectorExt.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.10.24 at 04:33:50 Χ΋ JST 
+// Generated on: 2008.10.24 at 04:33:50 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/DataportExt.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/DataportExt.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/DataportExt.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.10.24 at 04:33:50 Χ΋ JST 
+// Generated on: 2008.10.24 at 04:33:50 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Deactivation.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Deactivation.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Deactivation.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.10.24 at 04:33:50 Χ΋ JST 
+// Generated on: 2008.10.24 at 04:33:50 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/ExecutionContext.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/ExecutionContext.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/ExecutionContext.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.10.24 at 04:33:50 Χ΋ JST 
+// Generated on: 2008.10.24 at 04:33:50 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/ExecutionContextExt.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/ExecutionContextExt.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/ExecutionContextExt.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.10.24 at 04:33:50 Χ΋ JST 
+// Generated on: 2008.10.24 at 04:33:50 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Finalize.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Finalize.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Finalize.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.10.24 at 04:33:50 Χ΋ JST 
+// Generated on: 2008.10.24 at 04:33:50 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Initialize.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Initialize.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Initialize.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.10.24 at 04:33:50 Χ΋ JST 
+// Generated on: 2008.10.24 at 04:33:50 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Location.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Location.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Location.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.10.24 at 04:33:50 Χ΋ JST 
+// Generated on: 2008.10.24 at 04:33:50 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/MessageSending.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/MessageSending.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/MessageSending.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.10.24 at 04:33:50 Χ΋ JST 
+// Generated on: 2008.10.24 at 04:33:50 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/ObjectFactory.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/ObjectFactory.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/ObjectFactory.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2009.01.06 at 10:42:01 Œß‘O JST 
+// Generated on: 2009.01.06 at 10:42:01 午前 JST 
 //
 
 
@@ -338,7 +338,7 @@
 
     /**
      * Create an instance of {@link JAXBElement }{@code <}{@link RtsProfile }{@code >}}
-     * RtsProfileExt‚̃Cƒ“ƒXƒ^ƒ“ƒX‚ð•Ô‚·‚悤‚ÉŽèC³ 2009.01.06
+     * RtsProfileExtのインスタンスを返すように手修正 2009.01.06
      */
     @XmlElementDecl(namespace = "http://www.openrtp.org/namespaces/rts", name = "RtsProfile")
     public JAXBElement<RtsProfileExt> createRtsProfile(RtsProfileExt value) {

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Participants.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Participants.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Participants.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.10.24 at 04:33:50 Χ΋ JST 
+// Generated on: 2008.10.24 at 04:33:50 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Preceding.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Preceding.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Preceding.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.10.24 at 04:33:50 Χ΋ JST 
+// Generated on: 2008.10.24 at 04:33:50 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Property.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Property.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Property.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.10.24 at 04:33:50 Χ΋ JST 
+// Generated on: 2008.10.24 at 04:33:50 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Resetting.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Resetting.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Resetting.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.10.24 at 04:33:50 Χ΋ JST 
+// Generated on: 2008.10.24 at 04:33:50 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/RtsProfile.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/RtsProfile.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/RtsProfile.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.10.24 at 04:33:50 Χ΋ JST 
+// Generated on: 2008.10.24 at 04:33:50 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/RtsProfileExt.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/RtsProfileExt.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/RtsProfileExt.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.10.24 at 04:33:50 Χ΋ JST 
+// Generated on: 2008.10.24 at 04:33:50 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Serviceport.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Serviceport.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Serviceport.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.10.24 at 04:33:50 Χ΋ JST 
+// Generated on: 2008.10.24 at 04:33:50 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/ServiceportConnector.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/ServiceportConnector.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/ServiceportConnector.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.10.24 at 04:33:50 Χ΋ JST 
+// Generated on: 2008.10.24 at 04:33:50 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/ServiceportConnectorExt.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/ServiceportConnectorExt.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/ServiceportConnectorExt.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.10.24 at 04:33:50 Χ΋ JST 
+// Generated on: 2008.10.24 at 04:33:50 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/ServiceportExt.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/ServiceportExt.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/ServiceportExt.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.10.24 at 04:33:50 Χ΋ JST 
+// Generated on: 2008.10.24 at 04:33:50 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Shutdown.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Shutdown.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Shutdown.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.10.24 at 04:33:50 Χ΋ JST 
+// Generated on: 2008.10.24 at 04:33:50 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Startup.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Startup.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Startup.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.10.24 at 04:33:50 Χ΋ JST 
+// Generated on: 2008.10.24 at 04:33:50 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/TargetComponent.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/TargetComponent.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/TargetComponent.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.10.24 at 04:33:50 Χ΋ JST 
+// Generated on: 2008.10.24 at 04:33:50 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/TargetComponentExt.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/TargetComponentExt.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/TargetComponentExt.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.10.24 at 04:33:50 Χ΋ JST 
+// Generated on: 2008.10.24 at 04:33:50 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/TargetExecutioncontext.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/TargetExecutioncontext.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/TargetExecutioncontext.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.10.24 at 04:33:50 Χ΋ JST 
+// Generated on: 2008.10.24 at 04:33:50 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/TargetPort.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/TargetPort.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/TargetPort.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.10.24 at 04:33:50 Χ΋ JST 
+// Generated on: 2008.10.24 at 04:33:50 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/TargetPortExt.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/TargetPortExt.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/TargetPortExt.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.10.24 at 04:33:50 Χ΋ JST 
+// Generated on: 2008.10.24 at 04:33:50 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Waittime.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Waittime.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/Waittime.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.10.24 at 04:33:50 Χ΋ JST 
+// Generated on: 2008.10.24 at 04:33:50 午後 JST 
 //
 
 

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/package-info.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/package-info.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rts/version02/package-info.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.10.24 at 04:33:50 Χ΋ JST 
+// Generated on: 2008.10.24 at 04:33:50 午後 JST 
 //
 
 @javax.xml.bind.annotation.XmlSchema(namespace = "http://www.openrtp.org/namespaces/rts", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/test/jp/go/aist/rtm/toolscommon/profiles/_test/ConstraintParseTest2.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/test/jp/go/aist/rtm/toolscommon/profiles/_test/ConstraintParseTest2.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/test/jp/go/aist/rtm/toolscommon/profiles/_test/ConstraintParseTest2.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -11,7 +11,8 @@
 		String resourceFile = rootPath +  "\\resource\\RTC\\Constraint\\Hash2.xml";
 		String expected = readFile(resourceFile,"\n");
 
-		ConstraintType type = XmlHandler.convertToXmlConstraint("{key0:(ichi,one),key1:0.0<x<10.0}");
+//		ConstraintType type = XmlHandler.convertToXmlConstraint("{key0:(ichi,one),key1:0.0<x<10.0}");
+		ConstraintType type = XmlHandler.convertToXmlConstraint("{el1:100<=x,el2:150}");
 		RtcProfile profile = createConstraintBase(type);
 		XmlHandler handler = new XmlHandler();
 		String result = handler.convertToXmlRtc(profile);

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/test/jp/go/aist/rtm/toolscommon/profiles/_test/TestBase.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/test/jp/go/aist/rtm/toolscommon/profiles/_test/TestBase.java	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles/test/jp/go/aist/rtm/toolscommon/profiles/_test/TestBase.java	2013-01-29 10:39:20 UTC (rev 394)
@@ -326,7 +326,7 @@
 		assertEquals("param_def2", param2.getDefaultValue());
 		//
 		LanguageExt lang = (LanguageExt)profile.getLanguage();
-		assertEquals("java", lang.getKind());
+		assertEquals("Java", lang.getKind());
 		assertEquals("library1", lang.getTargets().get(0).getLibraries().get(0).getName());
 	}
 	

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles.nl1/META-INF/MANIFEST.MF
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles.nl1/META-INF/MANIFEST.MF	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles.nl1/META-INF/MANIFEST.MF	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,6 +1,12 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Nl1 Fragment
-Bundle-SymbolicName: jp.go.aist.rtm.toolscommon.profiles.nl1
-Bundle-Version: 1.1.0.v20110411
-Fragment-Host: jp.go.aist.rtm.toolscommon.profiles;bundle-version="0.0.0"
+Manifest-Version: 1.0
+Ant-Version: Apache Ant 1.7.1
+Created-By: 20.0-b12 (Sun Microsystems Inc.)
+Bundle-ManifestVersion: 2
+Bundle-Name: Nl1 Fragment
+Bundle-SymbolicName: jp.go.aist.rtm.toolscommon.profiles.nl1
+Bundle-Version: 1.1.0.rc4v20130124
+Fragment-Host: jp.go.aist.rtm.toolscommon.profiles;bundle-version="1.1
+ .0"
+Built-By: n-ando
+Built-Date: 2013/01/25 00:46:59
+

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles.nl1/build.xml
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles.nl1/build.xml	2013-01-29 05:42:49 UTC (rev 393)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.toolscommon.profiles.nl1/build.xml	2013-01-29 10:39:20 UTC (rev 394)
@@ -1,6 +1,8 @@
-<project name="jp.go.aist.rtm.toolscommon.profiles.nl1_1.0.0" default="jar">
-	<property name="target.name" value="jp.go.aist.rtm.toolscommon.profiles.nl1_1.0.0"/>
+<project name="jp.go.aist.rtm.toolscommon.profiles.nl1" default="jar">
+	<property name="target.name" value="jp.go.aist.rtm.toolscommon.profiles.nl1" />
 
+	<taskdef name="manifesttask" classname="aist.ManifestTask" />
+
 	<property name="source" value="src"/>
 
 	<property name="dist.dir" value="jar" />
@@ -14,6 +16,9 @@
 	<property name="targetPlatformLocation" value="${eclipse.home}" />
 	<property name="workspace" value="${basedir}/.." />
 	<property name="project.name" value="jp.go.aist.rtm.toolscommon" />
+	<tstamp>
+		<format property="built.date" pattern="yyyy/MM/dd HH:mm:ss" />
+	</tstamp>
 
 	<target name="buildAll">
 		<!--
@@ -25,27 +30,46 @@
 
 
 	<target name="clean" description="ビルドで生成されたファイルを削除します">
-		<delete includeEmptyDirs="true">
+		<delete includeEmptyDirs="true" quiet="true">
 			<fileset dir="${build.dir}" includes="**/*.class" />
 		</delete>
+		<delete dir="${dist.dir}" quiet="true"/>
 	</target>
 
 	<target name="compile" description="ソースをコンパイルします">
 		<getEclipseClasspath pathid="build.classpath" targetplatformlocation="${targetPlatformLocation}"
 					workspace="${workspace}" projectname="${project.name}"/>
 		<javac srcdir="${source}" destdir="${build.dir}"
-			classpathref="build.classpath" classpath="lib/commons-lang-2.2.jar" encoding="Shift_JIS" />
+			classpathref="build.classpath" classpath="lib/commons-lang-2.2.jar" encoding="UTF-8" />
 	</target>
 
 	<target name="jar" description="jarファイルを作成します">
 		<mkdir dir="${dist.dir}" />
-		<delete file="${dist.dir}/${target.name}.jar" />
-
-		<jar destfile="${dist.dir}/${target.name}.jar" manifest="META-INF/MANIFEST.MF">
+		<delete>
+			<fileset dir="${dist.dir}" includes="${target.name}_*.jar" />
+		</delete>
+		<!-- Version settings -->
+		<manifesttask file="META-INF/MANIFEST.MF" key="Bundle-Version" property="manifest.project.version" />
+		<condition property="project.version"
+                   value="${env.PROJECT_VERSION}"
+                   else="${manifest.project.version}">
+			<isset property="env.PROJECT_VERSION" />
+		</condition>
+		<property name="jar.version" value="_${project.version}"/>
+		<property name="jar.name" value="${target.name}${jar.version}"/>
+		<!-- Updating MANIFEST.MF -->
+		<manifest file="META-INF/MANIFEST.MF" mode="update">
+			<attribute name="Bundle-Version" value="${project.version}"/>
+			<attribute name="Built-By" value="${user.name}"/>
+			<attribute name="Built-Date" value="${built.date}"/>
+		</manifest>
+		<!-- Creating a jar file -->
+		<jar destfile="${dist.dir}/${jar.name}.jar" manifest="META-INF/MANIFEST.MF">
 			<fileset dir="${source}" />
 			<fileset dir=".">
 				<include name="plugin_ja.properties" />
 			</fileset>
 		</jar>
 	</target>
+
 </project>

Copied: branches/RELENG_1_1/rtmtools/openrtp (from rev 393, trunk/rtmtools/openrtp)
===================================================================
--- branches/RELENG_1_1/rtmtools/openrtp	                        (rev 0)
+++ branches/RELENG_1_1/rtmtools/openrtp	2013-01-29 10:39:20 UTC (rev 394)
@@ -0,0 +1,249 @@
+#!/bin/sh
+
+# RTM_ROOT
+#
+# This is used to find IDL files. Default IDL file directory is
+# $RTM_ROOT/rtm/idl (in Windows)
+# In the generic Linux environment, IDL directory is
+# $prefix/include/openrtm-x.y/rtm/idl
+# Therefore RTM_ROOT should be $prefix/include/openrtm-x.y
+#
+# RTM_JAVA_ROOT
+#
+# This is used to find OpenRTM-aist-Java jar files. No generic
+# rules exist.
+#
+
+
+#============================================================
+# functions
+#============================================================
+SCRIPT_NAME=$(basename $0)
+SCRIPT_DIR=$(dirname $0)
+DEBUG=""
+debug_echo () {
+    if test "x$DEBUG" = "xTRUE"; then
+        echo $*
+    fi
+}
+
+#------------------------------------------------------------
+# Usage
+#------------------------------------------------------------
+usage()
+{
+    echo "Usage: $script_name [Eclipse options]"
+    echo ""
+}
+
+#------------------------------------------------------------
+# set_RTM_ROOT
+#
+# This functions set RTM_ROOT environmental variable
+# 1. If RTM_ROOT is set, it checks RTM_ROOT validity.
+# 2. If it is not set, find IDL file by using rtm-config
+#    and set valid RTM_ROOT.
+#------------------------------------------------------------
+set_RTM_ROOT()
+{
+    if test "x$RTM_ROOT" = "x"; then
+        debug_echo "RTM_ROOT is not set."
+        if ! find_RTM_ROOT ; then
+            echo "No OpenRTM-aist (C++) installed found."
+            echo "Please install OpenRTM-aist (C++) and set RTM_ROOT"
+            echo "  ex. export RTM_ROOT=/usr/include/openrtm-1.1/"
+            echo ""
+            exit 1
+        fi
+    fi
+
+    # Now RTM_ROOT is set
+
+    if ! check_RTM_ROOT ; then
+        echo "Environmental variable RTM_ROOT = $RTM_ROOT is invalid."
+        echo "Please check RTM_JAVA_ROOT and OpenRTM-aist C++ installation."
+        echo ""
+        echo "  ex."
+        echo " If /usr/include/openrtm-1.1/rtm/idl/BasicDataType.idl exists,"
+        echo " RTM_ROOT should be /usr/include/openrtm-1.1"
+        echo ""
+        exit 1
+    fi
+    debug_echo "Result: RTM_ROOT = " $RTM_ROOT
+    export RTM_ROOT=$RTM_ROOT
+}
+
+#------------------------------------------------------------
+# find_RTM_ROOT
+#------------------------------------------------------------
+find_RTM_ROOT()
+{
+    debug_echo "TRACE: find_RTM_ROOT"
+    # find RTM_ROOT by rtm-config
+    rtm_config=`which rtm-config`
+    if test "x$rtm_config" = "x" ; then
+        # rtm-config not found
+        return 1
+    fi
+    debug_echo "rtm_config: " $rtm_config
+
+    # check rtm-config version
+    ver=`grep rtm-idldir $rtm_config`
+    if test "x$var" = "x" ; then
+        # old version: no --rtm-idldir option
+        RTM_ROOT=`rtm-config --cflags | sed -e 's/.*\-I\(\/.*\)\/rtm\/idl/\1/'`
+        debug_echo "RTM_ROOT: " $RTM_ROOT
+        return 0
+    else
+        # new version: --rtm-idldir available
+        RTM_ROOT=`rtm-config --rtm-idldir | sed -e 's/\/rtm\/idl$//'`
+        debug_echo "RTM_ROOT: " $RTM_ROOT
+        return 0
+    fi
+}
+
+#------------------------------------------------------------
+# check_RTM_ROOT
+#
+# This function check if RTM_ROOT environmental variable is valid.
+#
+#------------------------------------------------------------
+check_RTM_ROOT()
+{
+    debug_echo "TRACE: check_RTM_ROOT"
+    idl_files="BasicDataType.idl ExtendedDataTypes.idl InterfaceDataTypes.idl"
+    idl_dir=$RTM_ROOT/
+
+    debug_echo "Finding IDL files under: " $idl_dir
+    for idl in $idl_files; do
+        idl_path=`find $RTM_ROOT -name $idl`
+        debug_echo "idl_path: " $idl_path
+        if test "x$idl_path" = "x" ; then
+            echo "IDL file: " $idl " not found under \$RTM_ROOT"
+            echo "\$RTM_ROOT = " $RTM_ROOT
+            return 1
+        fi
+    done
+    return 0
+}
+
+#------------------------------------------------------------
+# set_RTM_JAVA_ROOT
+#
+# This functions set RTM_JAVA_ROOT environmental variable
+# 1. If RTM_JAVA_ROOT is set, it checks RTM_ROOT validity.
+# 2. If it is not set, find jar file and set valid RTM_JAVA_ROOT.
+#------------------------------------------------------------
+set_RTM_JAVA_ROOT ()
+{
+    if test "x$RTM_JAVA_ROOT" = "x"; then
+        debug_echo "RTM_JAVA_ROOT is not set."
+        if ! find_RTM_JAVA_ROOT ; then
+            echo "No OpenRTM-aist (Java) installed found."
+            echo "Please install OpenRTM-aist (Java) and set RTM_JAVA_ROOT"
+            echo "  ex. export RTM_JAVA_ROOT=/usr/include/openrtm-1.1/"
+            echo ""
+            exit 1
+        fi
+    fi
+
+    # Now RTM_JAVA_ROOT is set
+
+    if ! check_RTM_JAVA_ROOT ; then
+        echo "env RTM_JAVA_ROOT is invalid"
+        echo "Please set RTM_JAVA_ROOT correctly."
+        echo "  ex. export RTM_JAVA_ROOT=/usr/include/openrtm-1.1/"
+        echo ""
+        exit 1
+    fi
+    debug_echo "Result: RTM_JAVA_ROOT = " $RTM_JAVA_ROOT
+    export RTM_JAVA_ROOT=$RTM_JAVA_ROOT
+}
+
+#------------------------------------------------------------
+# get_openrtm_dirs
+#
+# This function gets possible OpenRTM-aist-Java installation
+# directories.
+#------------------------------------------------------------
+get_openrtm_dirs()
+{
+    usr_lib=`ls -d /usr/lib/[oO]pen[rR][tT][mM]* 2> /dev/null`
+    usr_local_lib=`ls -d /usr/local/lib/[oO]pen[rR][tT][mM]* 2> /dev/null`
+    opt_lib=`ls -d /opt/lib/[oO]pen[rR][tT][mM]* 2> /dev/null`
+    opt_local_lib=`ls -d /opt/local/lib/[oO]pen[rR][tT][mM]* 2> /dev/null`
+
+    echo $usr_lib $usr_local_lib $opt_lib $opt_local_lib
+}
+
+
+#------------------------------------------------------------
+# find_RTM_JAVA_ROOT
+#------------------------------------------------------------
+find_RTM_JAVA_ROOT()
+{
+    debug_echo "TRACE: find_RTM_JAVA_ROOT"
+    # find RTM_JAVA_ROOT
+    openrtm_dirs=`get_openrtm_dirs`
+    debug_echo "OpenRTM dirs: " $openrtm_dirs
+
+    for d in $openrtm_dirs ; do
+        openrtm_jar=`find $d -name '[oO]pen[rR][tT][mM]*.jar'`
+        if test ! "x$openrtm_jar" = "x" ; then
+            break
+        fi
+    done
+
+    if test "x$openrtm_jar" = "x" ; then
+        debug_echo "jar file not found"
+        echo "No OpenRTM-aist installation found. Aborting."
+        exit 1
+    fi
+    debug_echo "jar file found: " $openrtm_jar
+
+    RTM_JAVA_ROOT=`dirname $openrtm_jar | sed -e 's/\/jar$//'`
+    debug_echo "RTM_JAVA_ROOT: " $RTM_JAVA_ROOT
+    
+}
+
+#------------------------------------------------------------
+# check_RTM_JAVA_ROOT
+#
+# This function check if RTM_JAVA_ROOT environmental variable is valid.
+#
+#------------------------------------------------------------
+check_RTM_JAVA_ROOT()
+{
+    debug_echo "TRACE: check_RTM_JAVA_ROOT"
+    jar_file=`ls $RTM_JAVA_ROOT/jar/[oO]pen[rR][tT][mM]-*.jar 2> /dev/null`
+    debug_echo "jar_file: " $jar_file
+
+    if test "x$jar_file" = "x" ; then
+        echo "Environmental variable RTM_JAVA_ROOT = $RTM_JAVA_ROOT is invalid."
+        echo "Please check RTM_JAVA_ROOT and OpenRTM-aist Java installation."
+        echo ""
+        echo "ex."
+        echo "If /usr/lib/OpenRTM-aist/1.0/jar/OpenRTM-1.0.0.jar exists,"
+        echo "RTM_JAVA_ROOT should be /usr/lib/OpenRTM-aist/1.0"
+        echo ""
+        exit 1
+    fi
+    return 0
+}
+
+#------------------------------
+# main
+#------------------------------
+set_RTM_ROOT
+set_RTM_JAVA_ROOT
+
+echo "Launching eclipse with the following environmental variables."
+echo "  RTM_ROOT     : " $RTM_ROOT
+echo "  RTM_JAVA_ROOT: " $RTM_JAVA_ROOT
+
+if test ! -x $SCRIPT_DIR/eclipse ; then
+    echo "No eclipse executable found. Aborting."
+    exit 1
+fi
+export GDK_NATIVE_WINDOWS=1
+$SCRIPT_DIR/eclipse $*

Copied: branches/RELENG_1_1/rtmtools/version (from rev 393, trunk/rtmtools/version)
===================================================================
--- branches/RELENG_1_1/rtmtools/version	                        (rev 0)
+++ branches/RELENG_1_1/rtmtools/version	2013-01-29 10:39:20 UTC (rev 394)
@@ -0,0 +1,2 @@
+VERSION=1.1.0
+PROJECT_VERSION=${VERSION}.rc4v$(date +%Y%m%d)

• 前の記事 [openrtm-commit:00955] r60 - trunk
• 次の記事 [openrtm-commit:00957] r395 - trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]