[overlord-commits] Overlord SVN: r275 - in cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb: META-INF and 28 other directories.
overlord-commits at lists.jboss.org
overlord-commits at lists.jboss.org
Tue Aug 26 11:57:32 EDT 2008
Author: objectiser
Date: 2008-08-26 11:57:32 -0400 (Tue, 26 Aug 2008)
New Revision: 275
Added:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/actions/
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/dialogs/
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/eclipse/
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/editor/
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/ConversionContext.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultConversionContext.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultESBLanguageModel.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultESBService.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/ESBAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/ESBActionFactory.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/ESBLanguageModel.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/ESBLink.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/ESBService.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/Messages.properties
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/AbstractESBAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/util/
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/util/ESBModelUtil.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/parser/
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/validation/
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/generator/
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultConversionContextTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultESBLanguageModelTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultESBServiceTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/TestESBAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/TestESBLanguageModel.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/TestESBService.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/TestModelListener.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/change/
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/util/
Removed:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/AbstractESBAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/actions/
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/dialogs/
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/eclipse/
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/editor/
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/generator/
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ConversionContext.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultConversionContext.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultESBLanguageModel.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultESBService.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBActionFactory.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBLanguageModel.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBLink.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBService.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/Messages.properties
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/AbstractESBAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/CreateSessionAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/IfAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/MessageRouterAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/Messages.properties
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/ParallelAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/PerformAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/ReceiveMessageAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/RetrieveSessionAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/ScheduleStateAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SendMessageAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SetMessageAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SetStateAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SwitchAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/UnsupportedAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/WhenAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/WhileAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/util/ClasspathUtil.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/util/ConversationUtil.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/util/ESBModelUtil.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/util/IdentityUtil.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/util/InteractionUtil.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/util/ProblemDefinitions.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/parser/
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/validation/
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/generator/
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/DefaultConversionContextTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/DefaultESBLanguageModelTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/DefaultESBServiceTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/TestESBAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/TestESBLanguageModel.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/TestESBService.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/TestModelListener.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/change/
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/util/
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/META-INF/MANIFEST.MF
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/plugin.xml
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/actions/GenerateAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/dialogs/GenerateDialog.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/eclipse/Activator.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/editor/JBossESBConfigEditorManager.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/AntBuildSystem.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/BuildConfigurationGenerator.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/BuildSystem.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/BusinessObjectTypeGenerator.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/ConversationBasedGenerator.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/DeploymentFileGenerator.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/Generator.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/GeneratorException.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/GeneratorUtil.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/JBMQConfigurationGenerator.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/MavenBuildSystem.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/ModelBasedGenerator.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/TypeMapper.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/CreateSessionAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/IfAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/MessageRouterAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/ParallelAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/PerformAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/ReceiveMessageAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/RetrieveSessionAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/ScheduleStateAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/SendMessageAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/SetMessageAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/SetStateAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/SwitchAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/UnsupportedAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/WhenAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/WhileAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/ConversationInteractionModelChangeRule.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/ConversationModelChangeRule.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/IfModelChangeRule.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/LanguageToConversationModelChangeRule.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/ParallelModelChangeRule.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/RunModelChangeRule.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/SpawnModelChangeRule.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/WhenModelChangeRule.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/WhileModelChangeRule.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/util/ClasspathUtil.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/util/ConversationUtil.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/util/IdentityUtil.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/util/InteractionUtil.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/util/ProblemDefinitions.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/parser/JBossESBNotation.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/parser/JBossESBParser.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/validation/ESBLanguageModelValidationRule.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/generator/TypeMapperTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/CreateSessionActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/ESBActionTestUtil.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/IfActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/MessageRouterActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/ParallelActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/PerformActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/ReceiveMessageActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/RetrieveSessionActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/ScheduleStateActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/SendMessageActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/SetMessageActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/SetStateActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/SwitchActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/TestActivity.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/WhenActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/WhileActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/change/ConversationInteractionModelChangeRuleTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/change/IfModelChangeRuleTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/change/ParallelModelChangeRuleTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/change/RunModelChangeRuleTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/change/WhenModelChangeRuleTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/change/WhileModelChangeRuleTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/util/ESBModelUtilTest.java
Log:
Refactored package name to include 'cdl' component, inline with the change to the plugin name.
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/META-INF/MANIFEST.MF
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/META-INF/MANIFEST.MF 2008-08-26 14:01:00 UTC (rev 274)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/META-INF/MANIFEST.MF 2008-08-26 15:57:32 UTC (rev 275)
@@ -4,7 +4,7 @@
Bundle-SymbolicName: org.jboss.tools.overlord.cdl.jbossesb;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
-Bundle-Activator: org.jboss.tools.overlord.jbossesb.eclipse.Activator
+Bundle-Activator: org.jboss.tools.overlord.cdl.jbossesb.eclipse.Activator
Bundle-Vendor: www.jboss.org
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
@@ -17,17 +17,17 @@
org.eclipse.jface.text,
org.eclipse.ui.workbench.texteditor;bundle-version="3.4.0",
org.eclipse.ui.ide;bundle-version="3.4.0"
-Scribble-Extensions: org.jboss.tools.overlord.jbossesb.parser.JBossESBParser,
- org.jboss.tools.overlord.jbossesb.parser.JBossESBNotation,
- org.jboss.tools.overlord.jbossesb.editor.JBossESBConfigEditorManager,
- org.jboss.tools.overlord.jbossesb.validation.ESBLanguageModelValidationRule,
- org.jboss.tools.overlord.jbossesb.model.change.LanguageToConversationModelChangeRule,
- org.jboss.tools.overlord.jbossesb.model.change.ConversationModelChangeRule,
- org.jboss.tools.overlord.jbossesb.model.change.ConversationInteractionModelChangeRule,
- org.jboss.tools.overlord.jbossesb.model.change.IfModelChangeRule,
- org.jboss.tools.overlord.jbossesb.model.change.ParallelModelChangeRule,
- org.jboss.tools.overlord.jbossesb.model.change.RunModelChangeRule,
- org.jboss.tools.overlord.jbossesb.model.change.SpawnModelChangeRule,
- org.jboss.tools.overlord.jbossesb.model.change.WhenModelChangeRule,
- org.jboss.tools.overlord.jbossesb.model.change.WhileModelChangeRule
+Scribble-Extensions: org.jboss.tools.overlord.cdl.jbossesb.parser.JBossESBParser,
+ org.jboss.tools.overlord.cdl.jbossesb.parser.JBossESBNotation,
+ org.jboss.tools.overlord.cdl.jbossesb.editor.JBossESBConfigEditorManager,
+ org.jboss.tools.overlord.cdl.jbossesb.validation.ESBLanguageModelValidationRule,
+ org.jboss.tools.overlord.cdl.jbossesb.model.change.LanguageToConversationModelChangeRule,
+ org.jboss.tools.overlord.cdl.jbossesb.model.change.ConversationModelChangeRule,
+ org.jboss.tools.overlord.cdl.jbossesb.model.change.ConversationInteractionModelChangeRule,
+ org.jboss.tools.overlord.cdl.jbossesb.model.change.IfModelChangeRule,
+ org.jboss.tools.overlord.cdl.jbossesb.model.change.ParallelModelChangeRule,
+ org.jboss.tools.overlord.cdl.jbossesb.model.change.RunModelChangeRule,
+ org.jboss.tools.overlord.cdl.jbossesb.model.change.SpawnModelChangeRule,
+ org.jboss.tools.overlord.cdl.jbossesb.model.change.WhenModelChangeRule,
+ org.jboss.tools.overlord.cdl.jbossesb.model.change.WhileModelChangeRule
Bundle-ActivationPolicy: lazy
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/plugin.xml
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/plugin.xml 2008-08-26 14:01:00 UTC (rev 274)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/plugin.xml 2008-08-26 15:57:32 UTC (rev 275)
@@ -2,14 +2,14 @@
<?eclipse version="3.2"?>
<plugin>
<extension
- id="org.jboss.tools.overlord.jbossesb.extension"
- name="JBossESB model extension"
+ id="org.jboss.tools.overlord.cdl.jbossesb.extension"
+ name="Overlord CDL JBossESB model extension"
point="org.scribble.extension">
</extension>
<extension point="org.eclipse.ui.popupMenus">
<objectContribution
- id="org.jboss.tools.overlord.jbossesb.object.contribution"
+ id="org.jboss.tools.overlord.cdl.jbossesb.object.contribution"
objectClass="org.eclipse.core.resources.IFile"
nameFilter="*.cdm">
<menu
@@ -26,10 +26,10 @@
</menu>
<action
label="Generate"
- class="org.jboss.tools.overlord.jbossesb.actions.GenerateAction"
+ class="org.jboss.tools.overlord.cdl.jbossesb.actions.GenerateAction"
menubarPath="org.jboss.tools.overlord.menu/jbossesb.menu/group2"
enablesFor="1"
- id="org.jboss.tools.overlord.jbossesb.actions.GenerateAction">
+ id="org.jboss.tools.overlord.cdl.jbossesb.actions.GenerateAction">
</action>
</objectContribution>
</extension>
Copied: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/actions (from rev 260, cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/actions)
Property changes on: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/actions
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/actions/GenerateAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/actions/GenerateAction.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/actions/GenerateAction.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,7 +15,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.actions;
+package org.jboss.tools.overlord.cdl.jbossesb.actions;
import java.util.logging.Logger;
@@ -31,7 +31,7 @@
import org.scribble.osgi.util.*;
-import org.jboss.tools.overlord.jbossesb.dialogs.*;
+import org.jboss.tools.overlord.cdl.jbossesb.dialogs.*;
/**
* This class implements the action to generate the choreography
@@ -109,7 +109,7 @@
mbox.open();
}
- private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.jbossesb.actions");
+ private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.jbossesb.actions");
private ISelection m_selection=null;
private IWorkbenchPart m_targetPart=null;
Copied: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/dialogs (from rev 260, cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/dialogs)
Property changes on: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/dialogs
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/dialogs/GenerateDialog.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/dialogs/GenerateDialog.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/dialogs/GenerateDialog.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,7 +15,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.dialogs;
+package org.jboss.tools.overlord.cdl.jbossesb.dialogs;
import java.util.logging.Logger;
@@ -25,7 +25,7 @@
import org.eclipse.swt.events.*;
import org.eclipse.swt.layout.*;
import org.eclipse.swt.widgets.*;
-import org.jboss.tools.overlord.jbossesb.generator.*;
+import org.jboss.tools.overlord.cdl.jbossesb.generator.*;
import org.scribble.conversation.model.ConversationModel;
import org.scribble.extensions.RegistryFactory;
import org.scribble.model.*;
@@ -352,7 +352,7 @@
*/
public void error(String mesg, Exception ex) {
- org.jboss.tools.overlord.jbossesb.eclipse.Activator.logError(mesg, ex);
+ org.jboss.tools.overlord.cdl.jbossesb.eclipse.Activator.logError(mesg, ex);
MessageBox mbox=new MessageBox(getShell(),
SWT.ICON_ERROR|SWT.OK);
@@ -362,7 +362,7 @@
logger.log(java.util.logging.Level.SEVERE, mesg, ex);
}
- private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.jbossesb.dialogs");
+ private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.jbossesb.dialogs");
private IFile m_file=null;
private ConversationModel m_conversationModel=null;
Copied: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/eclipse (from rev 260, cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/eclipse)
Property changes on: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/eclipse
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/eclipse/Activator.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/eclipse/Activator.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/eclipse/Activator.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,7 +15,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.eclipse;
+package org.jboss.tools.overlord.cdl.jbossesb.eclipse;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
Copied: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/editor (from rev 260, cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/editor)
Property changes on: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/editor
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/editor/JBossESBConfigEditorManager.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/editor/JBossESBConfigEditorManager.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/editor/JBossESBConfigEditorManager.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -17,13 +17,13 @@
* Change History:
* 19 Jun 2008 : Initial version created by gary
*/
-package org.jboss.tools.overlord.jbossesb.editor;
+package org.jboss.tools.overlord.cdl.jbossesb.editor;
import org.scribble.extensions.RegistryInfo;
import org.scribble.model.SourceRef;
import org.scribble.editor.AbstractEditorManager;
import org.scribble.editor.EditorManager;
-import org.jboss.tools.overlord.jbossesb.model.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.*;
/**
* This is the JBossESB config implementation of the EditorManager
Copied: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator (from rev 260, cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/generator)
Property changes on: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/AntBuildSystem.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/generator/AntBuildSystem.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/AntBuildSystem.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,7 +15,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.generator;
+package org.jboss.tools.overlord.cdl.jbossesb.generator;
/**
* This class represents the Ant build system.
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/BuildConfigurationGenerator.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/generator/BuildConfigurationGenerator.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/BuildConfigurationGenerator.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,13 +15,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.generator;
+package org.jboss.tools.overlord.cdl.jbossesb.generator;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.eclipse.jdt.core.IJavaProject;
-import org.jboss.tools.overlord.jbossesb.model.ESBLanguageModel;
+import org.jboss.tools.overlord.cdl.jbossesb.model.ESBLanguageModel;
/**
* This class implements the model based generator to generate
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/BuildSystem.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/generator/BuildSystem.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/BuildSystem.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,7 +15,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.generator;
+package org.jboss.tools.overlord.cdl.jbossesb.generator;
/**
* This interface represents a build system used when
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/BusinessObjectTypeGenerator.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/generator/BusinessObjectTypeGenerator.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/BusinessObjectTypeGenerator.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,7 +15,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.generator;
+package org.jboss.tools.overlord.cdl.jbossesb.generator;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.IPath;
@@ -40,8 +40,8 @@
import org.eclipse.jdt.core.dom.TypeDeclaration;
import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
import org.eclipse.jdt.core.dom.Modifier.ModifierKeyword;
-import org.jboss.tools.overlord.jbossesb.model.util.ConversationUtil;
-import org.jboss.tools.overlord.jbossesb.model.util.InteractionUtil;
+import org.jboss.tools.overlord.cdl.jbossesb.model.util.ConversationUtil;
+import org.jboss.tools.overlord.cdl.jbossesb.model.util.InteractionUtil;
import org.scribble.conversation.model.Conversation;
import org.scribble.conversation.model.Variable;
import org.scribble.conversation.model.VariableList;
@@ -57,7 +57,7 @@
*/
public class BusinessObjectTypeGenerator implements ConversationBasedGenerator {
- private static final String GENERATOR_MESSAGES = "org.jboss.tools.overlord.jbossesb.generator.Messages";
+ private static final String GENERATOR_MESSAGES = "org.jboss.tools.overlord.cdl.jbossesb.generator.Messages";
/**
* This method generates the relevant artefacts based on
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/ConversationBasedGenerator.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/generator/ConversationBasedGenerator.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/ConversationBasedGenerator.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,7 +15,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.generator;
+package org.jboss.tools.overlord.cdl.jbossesb.generator;
import org.eclipse.jdt.core.IJavaProject;
import org.scribble.conversation.model.Conversation;
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/DeploymentFileGenerator.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/generator/DeploymentFileGenerator.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/DeploymentFileGenerator.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,7 +15,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.generator;
+package org.jboss.tools.overlord.cdl.jbossesb.generator;
import java.util.logging.Logger;
@@ -23,8 +23,8 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.eclipse.jdt.core.IJavaProject;
-import org.jboss.tools.overlord.jbossesb.model.ESBLanguageModel;
-import org.jboss.tools.overlord.jbossesb.model.ESBService;
+import org.jboss.tools.overlord.cdl.jbossesb.model.ESBLanguageModel;
+import org.jboss.tools.overlord.cdl.jbossesb.model.ESBService;
/**
* This class implements the model based generator to generate
@@ -84,5 +84,5 @@
}
}
- private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.jbossesb.generator");
+ private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.jbossesb.generator");
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/Generator.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/generator/Generator.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/Generator.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,7 +15,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.generator;
+package org.jboss.tools.overlord.cdl.jbossesb.generator;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -26,8 +26,8 @@
import javax.xml.transform.stream.StreamResult;
import org.eclipse.core.resources.IFile;
-import org.jboss.tools.overlord.jbossesb.generator.BuildSystem;
-import org.jboss.tools.overlord.jbossesb.model.*;
+import org.jboss.tools.overlord.cdl.jbossesb.generator.BuildSystem;
+import org.jboss.tools.overlord.cdl.jbossesb.model.*;
import org.scribble.conversation.model.ConversationModel;
import org.scribble.extensions.RegistryFactory;
import org.scribble.model.*;
@@ -430,7 +430,7 @@
return(m_buildSystem);
}
- private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.jbossesb.generator");
+ private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.jbossesb.generator");
private IFile m_file=null;
private java.util.List<Role> m_roles=null;
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/GeneratorException.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/generator/GeneratorException.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/GeneratorException.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,7 +15,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.generator;
+package org.jboss.tools.overlord.cdl.jbossesb.generator;
public class GeneratorException extends Exception {
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/GeneratorUtil.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/generator/GeneratorUtil.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/GeneratorUtil.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,7 +15,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.generator;
+package org.jboss.tools.overlord.cdl.jbossesb.generator;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IResource;
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/JBMQConfigurationGenerator.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/generator/JBMQConfigurationGenerator.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/JBMQConfigurationGenerator.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,7 +15,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.generator;
+package org.jboss.tools.overlord.cdl.jbossesb.generator;
import java.util.logging.Logger;
@@ -23,8 +23,8 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.eclipse.jdt.core.IJavaProject;
-import org.jboss.tools.overlord.jbossesb.model.ESBLanguageModel;
-import org.jboss.tools.overlord.jbossesb.model.ESBService;
+import org.jboss.tools.overlord.cdl.jbossesb.model.ESBLanguageModel;
+import org.jboss.tools.overlord.cdl.jbossesb.model.ESBService;
/**
* This class implements the model based generator to generate
@@ -87,5 +87,5 @@
}
}
- private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.jbossesb.generator");
+ private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.jbossesb.generator");
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/MavenBuildSystem.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/generator/MavenBuildSystem.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/MavenBuildSystem.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,7 +15,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.generator;
+package org.jboss.tools.overlord.cdl.jbossesb.generator;
/**
* This class represents the Ant build system.
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/ModelBasedGenerator.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/generator/ModelBasedGenerator.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/ModelBasedGenerator.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,10 +15,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.generator;
+package org.jboss.tools.overlord.cdl.jbossesb.generator;
import org.eclipse.jdt.core.IJavaProject;
-import org.jboss.tools.overlord.jbossesb.model.ESBLanguageModel;
+import org.jboss.tools.overlord.cdl.jbossesb.model.ESBLanguageModel;
/**
* This interface represents a module that generates artefacts
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/TypeMapper.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/generator/TypeMapper.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/TypeMapper.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,7 +15,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.generator;
+package org.jboss.tools.overlord.cdl.jbossesb.generator;
public class TypeMapper {
Copied: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/ConversionContext.java (from rev 260, cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ConversionContext.java)
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/ConversionContext.java (rev 0)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/ConversionContext.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2005-8 Pi4 Technologies Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *
+ * Change History:
+ * 25 Jun 2008 : Initial version created by gary
+ */
+package org.jboss.tools.overlord.cdl.jbossesb.model;
+
+public interface ConversionContext {
+
+ /**
+ * This method returns the role associated with the
+ * endpoint being converted.
+ *
+ *@return The role
+ */
+ public String getRole();
+
+ /**
+ * This method is invoked when an ESB service is being processed.
+ *
+ * @param service The service
+ */
+ public void processing(ESBService service);
+
+ /**
+ * This method is invoked when an ESB service has been processed.
+ *
+ * @param service The service
+ */
+ public void processed(ESBService service);
+
+ /**
+ * Push service on the stack of services in which the current
+ * context is contained.
+ *
+ * @param service The service
+ */
+ public void push(ESBService service);
+
+ /**
+ * Pop service from the stack of services in which the current
+ * context is contained.
+ *
+ * @param service The service
+ */
+ public void pop(ESBService service);
+
+ /**
+ * This method determines whether the supplied service is on
+ * the stack of services in which the current context is
+ * contained.
+ *
+ * @param service The service
+ * @return Whether the service is on the stack
+ */
+ public boolean isOnStack(ESBService service);
+
+ /**
+ * This method marks an ESB service as being a join state.
+ *
+ * @param service The service
+ */
+ public void markJoin(ESBService service);
+
+ /**
+ * This method determines whether the ESB service is a join
+ * state.
+ *
+ * @param service The serviice
+ * @return Whether the service is a join state
+ */
+ public boolean isJoin(ESBService service);
+
+}
Property changes on: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/ConversionContext.java
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultConversionContext.java (from rev 260, cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultConversionContext.java)
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultConversionContext.java (rev 0)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultConversionContext.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -0,0 +1,129 @@
+/*
+ * Copyright 2005-8 Pi4 Technologies Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *
+ * Change History:
+ * 25 Jun 2008 : Initial version created by gary
+ */
+package org.jboss.tools.overlord.cdl.jbossesb.model;
+
+import java.util.logging.Logger;
+
+public class DefaultConversionContext implements ConversionContext {
+
+ /**
+ * This constructor initializes the role associated with
+ * the conversion.
+ *
+ * @param role The role
+ */
+ public DefaultConversionContext(String role) {
+ m_role = role;
+ }
+
+ /**
+ * This method returns the role associated with the
+ * endpoint being converted.
+ *
+ *@return The role
+ */
+ public String getRole() {
+ return(m_role);
+ }
+
+ /**
+ * This method is invoked when an ESB service is being processed.
+ *
+ * @param service The service
+ */
+ public void processing(ESBService service) {
+ m_joins.remove(service);
+ }
+
+ /**
+ * This method is invoked when an ESB service has been processed.
+ *
+ * @param service The service
+ */
+ public void processed(ESBService service) {
+
+ }
+
+ /**
+ * Push service on the stack of services in which the current
+ * context is contained.
+ *
+ * @param service The service
+ */
+ public void push(ESBService service) {
+ m_serviceStack.add(service);
+ }
+
+ /**
+ * Pop service from the stack of services in which the current
+ * context is contained.
+ *
+ * @param service The service
+ */
+ public void pop(ESBService service) {
+
+ // Check if the service is the last element on the stack
+ if (m_serviceStack.size() == 0 ||
+ m_serviceStack.get(m_serviceStack.size()-1) != service) {
+ logger.severe("Request to pop service '"+service+
+ "' that is not the most recent entry on the stack");
+ }
+
+ m_serviceStack.remove(service);
+ }
+
+ /**
+ * This method determines whether the supplied service is on
+ * the stack of services in which the current context is
+ * contained.
+ *
+ * @param service The service
+ * @return Whether the service is on the stack
+ */
+ public boolean isOnStack(ESBService service) {
+ return(m_serviceStack.contains(service));
+ }
+
+ /**
+ * This method marks an ESB service as being a join state.
+ *
+ * @param service The service
+ */
+ public void markJoin(ESBService service) {
+ m_joins.add(service);
+ }
+
+ /**
+ * This method determines whether the ESB service is a join
+ * state.
+ *
+ * @param service The service
+ * @return Whether the service is a join state
+ */
+ public boolean isJoin(ESBService service) {
+ return(m_joins.contains(service));
+ }
+
+ private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.jbossesb.model");
+
+ private java.util.List<ESBService> m_serviceStack=new java.util.Vector<ESBService>();
+ private java.util.List<ESBService> m_joins=new java.util.Vector<ESBService>();
+ private String m_role=null;
+}
Property changes on: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultConversionContext.java
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultESBLanguageModel.java (from rev 263, cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultESBLanguageModel.java)
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultESBLanguageModel.java (rev 0)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultESBLanguageModel.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -0,0 +1,669 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.tools.overlord.cdl.jbossesb.model;
+
+import java.util.logging.Logger;
+
+import org.scribble.conversation.model.*;
+import org.scribble.extensions.RegistryFactory;
+import org.scribble.model.*;
+
+/**
+ * This class represents an ESB model.
+ *
+ * @author gary
+ */
+public class DefaultESBLanguageModel extends org.scribble.lang.model.LanguageModel
+ implements ESBLanguageModel {
+
+ private static final String SERVICE_NAME_SEPARATOR = "__";
+ public static final String DEST_NAME_PREFIX = "queue/";
+ public static final String DEST_NAME_ATTR = "dest-name";
+ public static final String DEST_TYPE_VALUE = "QUEUE";
+ public static final String DEST_TYPE_ATTR = "dest-type";
+ public static final String JMS_MESSAGE_FILTER_ELEMENT = "jms-message-filter";
+ public static final String JMS_BUS_ELEMENT = "jms-bus";
+ public static final String BUSID_ATTR = "busid";
+ public static final String JBOSSESB_XML_NAMESPACE = "http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd";
+ public static final String XMLNS = "xmlns";
+ public static final String TOP_LEVEL_ELEMENT = "jbossesb";
+ public static final String PARAMETER_RELOAD_SECS_ATTR = "parameterReloadSecs";
+ public static final String PROVIDERS_ELEMENT = "providers";
+ public static final String JMS_PROVIDER_ELEMENT = "jms-provider";
+ public static final String JAVA_NOTATION = "java";
+ public static final String SERVICE_ELEMENT = "service";
+ public static final String SERVICES_ELEMENT = "services";
+
+ public static final String JBOSSESB_NOTATION = "jboss-esb.xml";
+
+ /**
+ * This constructor is initialized with the ESB configuration.
+ *
+ * @param source The model reference for the JBossESB configuration source
+ * @param elem The ESB configuration
+ * @param contents The textual contents
+ */
+ public DefaultESBLanguageModel(ModelReference source, org.w3c.dom.Element elem,
+ String contents) {
+ m_source = source;
+ m_esbConfig = elem;
+ m_contents = contents;
+
+ // Extract service action pipelines
+ initializeExistingConfig();
+ }
+
+ /**
+ * This constructor initializes a new ESB configuration.
+ *
+ * @param source The model reference for the JBossESB configuration
+ */
+ public DefaultESBLanguageModel(ModelReference source) {
+ m_source = source;
+
+ initializeNewConfig();
+ }
+
+ /**
+ * This method creates a new ESB configuration.
+ */
+ protected void initializeNewConfig() {
+
+ org.w3c.dom.Document doc=null;
+
+ // Create an empty document
+ try {
+ doc = javax.xml.parsers.DocumentBuilderFactory.
+ newInstance().newDocumentBuilder().newDocument();
+
+ m_esbConfig = doc.createElement(TOP_LEVEL_ELEMENT);
+
+ m_esbConfig.setAttribute(XMLNS,
+ JBOSSESB_XML_NAMESPACE);
+ m_esbConfig.setAttribute(PARAMETER_RELOAD_SECS_ATTR,"5000");
+
+ doc.appendChild(m_esbConfig);
+
+ // Create provider information
+ org.w3c.dom.Element providers=doc.createElement(PROVIDERS_ELEMENT);
+ m_esbConfig.appendChild(providers);
+
+ m_jmsProviderElem = doc.createElement(JMS_PROVIDER_ELEMENT);
+ providers.appendChild(m_jmsProviderElem);
+
+ // Configure the jms provider
+ m_jmsProviderElem.setAttribute("name", "JBossMQ");
+ m_jmsProviderElem.setAttribute("connection-factory", "ConnectionFactory");
+ m_jmsProviderElem.setAttribute("jndi-context-factory", "org.jnp.interfaces.NamingContextFactory");
+ m_jmsProviderElem.setAttribute("jndi-URL", "localhost");
+
+ // Create services element
+ m_servicesElem = doc.createElement(SERVICES_ELEMENT);
+ m_esbConfig.appendChild(m_servicesElem);
+
+ } catch(Exception e) {
+ logger.severe("Failed to create initial jbossesb document: "+e);
+ }
+
+ }
+
+ /**
+ * This method initializes the ESB Model.
+ */
+ protected void initializeExistingConfig() {
+ org.w3c.dom.NodeList services=
+ m_esbConfig.getElementsByTagName(SERVICES_ELEMENT);
+
+ org.scribble.model.DependencyManager dm=
+ (org.scribble.model.DependencyManager)
+ org.scribble.extensions.RegistryFactory.getRegistry().getExtension(
+ org.scribble.model.DependencyManager.class, null);
+
+ ModelName mname=new ModelName();
+ mname.setName(m_source.getLocalpart());
+
+ setModelName(mname);
+
+ Namespace ns=new Namespace();
+ ns.setName(m_source.getNamespace());
+ setNamespace(ns);
+
+ if (services != null && services.getLength() == 1 &&
+ services.item(0) instanceof org.w3c.dom.Element) {
+ org.w3c.dom.NodeList nl=((org.w3c.dom.Element)
+ services.item(0)).getChildNodes();
+
+ for (int i=0; i < nl.getLength(); i++) {
+
+ if (nl.item(i) instanceof org.w3c.dom.Element &&
+ nl.item(i).getNodeName().equals(SERVICE_ELEMENT)) {
+
+ ESBService service=new DefaultESBService(this,
+ (org.w3c.dom.Element)nl.item(i));
+ String key=getKey(service.getCategory(),
+ service.getName());
+
+ m_services.put(key, service);
+ }
+ }
+
+ java.util.Iterator<ESBService> iter=m_services.values().iterator();
+
+ while (iter.hasNext()) {
+ iter.next().initializeLinks();
+ }
+
+ // Initialize the conversations
+ java.util.List<String> sessionClasses=new java.util.Vector<String>();
+ java.util.Iterator<ESBService> serviter=getServices().iterator();
+
+ while (serviter.hasNext()) {
+ ESBService service=serviter.next();
+
+ if (service.isRoot()) {
+
+ /*
+ String convType=service.getConversationType();
+ String role=null;
+
+ if (convType != null) {
+ int index=convType.indexOf('@');
+
+ if (index != -1) {
+ // TODO: Need to think whether this should be
+ // 'implements' reference. If so, then need to change
+ // Java Lang Model parser and also Lang Model conformance
+ // rule.
+ ImplementsReference iref=
+ new ImplementsReference(ConversationModel.CONVERSATION);
+ //ConformanceReference iref=
+ // new ConformanceReference(ConversationModel.CONVERSATION);
+
+ role = convType.substring(index+1);
+
+ iref.setLocatedRole(role);
+
+ // Need to locate the model name
+ modelName.setLocatedRole(new Role(iref.getLocatedRole()));
+
+ String mainpart=convType.substring(0, index);
+
+ index = mainpart.lastIndexOf(".");
+
+ if (index == -1) {
+ iref.setNamespace("");
+ iref.setLocalpart(mainpart);
+ } else {
+ iref.setNamespace(mainpart.substring(0, index));
+ iref.setLocalpart(mainpart.substring(index+1));
+ }
+
+ conv.getImplements().add(iref);
+ //conv.getConformsTo().add(iref);
+
+ dm.recordDependency(m_source, iref,
+ DependencyType.Implements);
+
+ } else {
+ logger.warning("Conversation type does not " +
+ "contain '@' located role separator");
+ }
+ } else {
+ logger.warning("No conversation type specified");
+ }
+
+ conv.setBlock(new Block());
+
+ service.convert(conv.getBlock().getContents(),
+ new DefaultConversionContext(role));
+
+ */
+
+ Conversation conv=service.convert(null);
+
+ if (conv != null) {
+ getConversations().add(conv);
+ }
+ }
+
+ //Add session class to list
+ String sessionClass=service.getSessionName();
+
+ if (sessionClass != null &&
+ sessionClasses.contains(sessionClass) == false) {
+ sessionClasses.add(sessionClass);
+ }
+ }
+
+ // Add dependency on session classes
+ for (int i=0; i < sessionClasses.size(); i++) {
+ String sessionClass=sessionClasses.get(i);
+ int index=sessionClass.lastIndexOf('.');
+ String nspace="";
+ String local=sessionClass;
+
+ if (index != -1) {
+ nspace = sessionClass.substring(0, index);
+ local = sessionClass.substring(index+1);
+
+ dm.recordDependency(getModelReference(),
+ new ModelReference(nspace, local,
+ null, JAVA_NOTATION),
+ DependencyType.Uses);
+ }
+ }
+ }
+
+ if (logger.isLoggable(java.util.logging.Level.FINEST)) {
+
+ org.scribble.export.Exporter exporter=
+ (org.scribble.export.Exporter)
+ RegistryFactory.getRegistry().getExtension(
+ org.scribble.export.Exporter.class, null);
+
+ try {
+ for (int i=0; i < getConversations().size(); i++) {
+ ConversationModel model=new ConversationModel();
+
+ model.setConversation(getConversations().get(i));
+
+ org.scribble.export.text.TextFormatter formatter=
+ new org.scribble.export.text.TextFormatter();
+
+ java.io.ByteArrayOutputStream os=
+ new java.io.ByteArrayOutputStream();
+
+ formatter.setOutputStream(os);
+
+ exporter.export(model, formatter);
+
+ String str=new String(os.toByteArray());
+
+ System.out.println("EXPORTED JBOSS-ESB TEXT:");
+ System.out.println(str);
+ }
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ @Override
+ public String getNotation() {
+ return(JBOSSESB_NOTATION);
+ }
+
+ /**
+ * This method returns the source model reference.
+ *
+ * @return The source model reference
+ */
+ public ModelReference getModelReference() {
+ return(m_source);
+ }
+
+ /**
+ * Generate a key for use in accessing the service related to
+ * the supplied category and name.
+ *
+ * @param category The category
+ * @param name The service name
+ * @return The key
+ */
+ protected String getKey(String category, String name) {
+ return(category+"/"+name);
+ }
+
+ /**
+ * This method validates the ESB model and reports warnings or
+ * errors to the supplied model listener.
+ *
+ * @param l The model listener
+ */
+ public void validate(ModelListener l) {
+
+ java.util.Iterator<ESBService> iter=m_services.values().iterator();
+
+ while (iter.hasNext()) {
+ ESBService service=iter.next();
+
+ service.validate(l);
+ }
+ }
+
+ /**
+ * This method returns the ESB service for the supplied
+ * category and name.
+ *
+ * @param category The service category
+ * @param name The service name
+ * @return The ESB service, or null if not found
+ */
+ public ESBService getService(String category, String name) {
+ return(m_services.get(getKey(category, name)));
+ }
+
+ /**
+ * This method returns the collection of ESB services associated
+ * with the model.
+ *
+ * @return The collection of ESB services
+ */
+ public java.util.Collection<ESBService> getServices() {
+ return(m_services.values());
+ }
+
+ /**
+ * This method creates a new ESB service.
+ *
+ * @param category The category
+ * @param name The name
+ * @return The new ESB service
+ */
+ public ESBService createService(String category, String name) {
+ return(new DefaultESBService(this, category, name));
+ }
+
+ /**
+ * This method adds a new service to the model.
+ *
+ * @param service The service
+ */
+ public void addService(ESBService service) {
+ m_services.put(getKey(service.getCategory(), service.getName()),
+ service);
+
+ // Add service
+ if (service.getService() != null) {
+ m_servicesElem.appendChild(service.getService());
+ }
+
+ // Add provider information
+ String busId=service.getJMSBusIdRef();
+
+ // Check if busId is unique
+ if (busId == null || findJMSBus(busId) != null) {
+ busId = getUniqueBusId();
+ service.setJMSBusIdRef(busId);
+ }
+
+ if (busId != null) {
+ addJMSBus(busId, getJMSDestination(service.getCategory(),
+ service.getName()));
+ } else {
+ logger.severe("Service '"+service+
+ "' does not have a bus Id");
+ }
+ }
+
+ protected String getUniqueBusId() {
+ int index=1;
+ String ret="busId"+index;
+
+ while (findJMSBus(ret) != null) {
+ index++;
+ ret = "busId"+index;
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method returns the JMS destination associated with
+ * the supplied JMS Bus Id.
+ *
+ * @param jmsBusId The JMS bus id
+ * @return The JMS definition, or null if not found
+ */
+ public String getJMSDefinition(String jmsBusId) {
+ String ret=null;
+
+ org.w3c.dom.Element elem=findJMSBus(jmsBusId);
+
+ if (elem != null) {
+ org.w3c.dom.NodeList nl=
+ elem.getElementsByTagName(JMS_MESSAGE_FILTER_ELEMENT);
+
+ if (nl.getLength() != 0 &&
+ nl.item(0) instanceof org.w3c.dom.Element) {
+ org.w3c.dom.Element filter=(org.w3c.dom.Element)
+ nl.item(0);
+
+ if (filter.hasAttribute(DEST_NAME_ATTR)) {
+ ret = filter.getAttribute(DEST_NAME_ATTR);
+
+ // If prefixed, then strip prefix away
+ if (ret.startsWith(DEST_NAME_PREFIX)) {
+ ret = ret.substring(DEST_NAME_PREFIX.length());
+ }
+ }
+ }
+ }
+
+ return(ret);
+ }
+
+ protected void addJMSBus(String jmsBusId, String dest) {
+
+ org.w3c.dom.Element jmsBus=
+ m_esbConfig.getOwnerDocument().createElement(JMS_BUS_ELEMENT);
+ m_jmsProviderElem.appendChild(jmsBus);
+
+ jmsBus.setAttribute(BUSID_ATTR, jmsBusId);
+
+ org.w3c.dom.Element mesgFilter=
+ m_esbConfig.getOwnerDocument().createElement(JMS_MESSAGE_FILTER_ELEMENT);
+ jmsBus.appendChild(mesgFilter);
+
+ mesgFilter.setAttribute(DEST_TYPE_ATTR, DEST_TYPE_VALUE);
+ mesgFilter.setAttribute(DEST_NAME_ATTR, DEST_NAME_PREFIX+dest);
+ }
+
+ protected org.w3c.dom.Element findJMSBus(String jmsBusId) {
+ org.w3c.dom.Element ret=null;
+
+ org.w3c.dom.NodeList nl=m_jmsProviderElem.getChildNodes();
+ for (int i=0; i < nl.getLength(); i++) {
+ if (nl.item(i) instanceof org.w3c.dom.Element &&
+ nl.item(i).getNodeName().equals(JMS_BUS_ELEMENT) &&
+ ((org.w3c.dom.Element)nl.item(i)).
+ getAttribute(BUSID_ATTR).equals(jmsBusId)) {
+ ret = (org.w3c.dom.Element)nl.item(i);
+ }
+ }
+
+ return(ret);
+ }
+
+ protected void removeJMSBus(String jmsBusId) {
+ org.w3c.dom.Element bus=findJMSBus(jmsBusId);
+
+ if (bus != null) {
+ m_jmsProviderElem.removeChild(bus);
+ } else {
+ logger.severe("Remove JMS bus '"+jmsBusId+
+ "' failed, unable to find bus");
+ }
+ }
+
+ protected String getJMSDestination(String category, String name) {
+ String ret=category.replace('.', '_');
+
+ ret += "_"+name;
+
+ return(ret);
+ }
+
+ /**
+ * This method removes a service from the model.
+ *
+ * @param service The service
+ */
+ public void removeService(ESBService service) {
+ m_services.remove(getKey(service.getCategory(),
+ service.getName()));
+
+ // Remove provider information
+ String busId=service.getJMSBusIdRef();
+
+ if (busId != null) {
+ removeJMSBus(busId);
+ } else {
+ logger.severe("Service '"+service+
+ "' does not have a bus Id");
+ }
+ }
+
+ /**
+ * This textual contents of the model.
+ *
+ * @return The textual contents
+ */
+ public String getOriginalContents() {
+ return(m_contents);
+ }
+
+ /**
+ * This method returns a unique service name within
+ * the supplied category.
+ *
+ * @param category The category
+ * @param currentServiceName The name of the service creating
+ * the new service
+ * @return The unique service name
+ */
+ public String getUniqueServiceName(String category, String currentServiceName) {
+ String ret=null;
+
+ int index=currentServiceName.indexOf(SERVICE_NAME_SEPARATOR);
+ if (index != -1) {
+ currentServiceName = currentServiceName.substring(0, index);
+ }
+
+ index = 0;
+ do {
+ index++;
+ ret = currentServiceName+SERVICE_NAME_SEPARATOR+index;
+ } while(getService(category, ret) != null);
+
+ return(ret);
+ }
+
+ /**
+ * This method returns the gateway service.
+ *
+ * @return The gateway service, or null if not found
+ */
+ public ESBService getGatewayService() {
+ ESBService ret=null;
+
+ java.util.Iterator<ESBService> iter=getServices().iterator();
+ while (ret == null && iter.hasNext()) {
+ ret = iter.next();
+
+ if (ret.isGateway() == false) {
+ ret = null;
+ }
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method returns the reference to the DOM
+ * representation of the ESB configuration.
+ *
+ * @return The ESB configuration
+ */
+ public org.w3c.dom.Element getESBConfiguration() {
+ return(m_esbConfig);
+ }
+
+ /**
+ * This method returns a custom classloader that uses the project's
+ * classpath to locate classes referenced by the ESB config file.
+ *
+ * @see http://dev.eclipse.org/newslists/news.eclipse.tools.jdt/msg17769.html
+ *
+ * @return The classloader
+ * @throws Exception Failed to obtain the classloader
+ */
+ public synchronized ClassLoader getModelClassLoader() throws Exception {
+
+ if (m_classLoader == null) {
+ m_classLoader = org.jboss.tools.overlord.cdl.jbossesb.model.util.ClasspathUtil.createClassLoader(getModelReference());
+ }
+
+ return(m_classLoader);
+ }
+
+
+ private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.jbossesb.model");
+
+ private ModelReference m_source=null;
+ private org.w3c.dom.Element m_esbConfig=null;
+ private org.w3c.dom.Element m_jmsProviderElem=null;
+ private org.w3c.dom.Element m_servicesElem=null;
+ private String m_contents=null;
+ private java.util.Map<String,ESBService> m_services=new java.util.Hashtable<String,ESBService>();
+ private ClassLoader m_classLoader=null;
+
+ public class InnerModelListener implements ModelListener {
+
+ public InnerModelListener(ModelListener l) {
+ m_listener = l;
+ }
+
+ public void error(ModelObject src, String mesg, java.util.Map<String,Object> props) {
+
+ if (props == null) {
+ props = new java.util.HashMap<String,Object>();
+ }
+
+ props.put(ModelListener.RESOLUTIONS, ModelListener.SHOW_REFERENCE_DESCRIPTION_RESOLUTION);
+ props.put(ModelListener.REFERENCE_MODEL, m_source);
+ props.put(ModelListener.REFERENCE_MODEL_START_POSITION, src.getSource().getStartPosition());
+ props.put(ModelListener.REFERENCE_MODEL_END_POSITION, src.getSource().getEndPosition());
+ if (src.getSource().getComponentURI() != null) {
+ props.put(ModelListener.REFERENCE_MODEL_COMPONENT,
+ src.getSource().getComponentURI());
+ }
+
+ m_listener.error(src, mesg, props);
+ }
+
+ public void warning(ModelObject src, String mesg, java.util.Map<String,Object> props) {
+ if (props == null) {
+ props = new java.util.HashMap<String,Object>();
+ }
+
+ props.put(ModelListener.RESOLUTIONS, ModelListener.SHOW_REFERENCE_DESCRIPTION_RESOLUTION);
+ props.put(ModelListener.REFERENCE_MODEL, m_source);
+ props.put(ModelListener.REFERENCE_MODEL_START_POSITION, src.getSource().getStartPosition());
+ props.put(ModelListener.REFERENCE_MODEL_END_POSITION, src.getSource().getEndPosition());
+ if (src.getSource().getComponentURI() != null) {
+ props.put(ModelListener.REFERENCE_MODEL_COMPONENT,
+ src.getSource().getComponentURI());
+ }
+
+ m_listener.warning(src, mesg, props);
+ }
+
+ private ModelListener m_listener=null;
+ }
+}
Property changes on: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultESBLanguageModel.java
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultESBService.java (from rev 263, cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultESBService.java)
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultESBService.java (rev 0)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultESBService.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -0,0 +1,848 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.tools.overlord.cdl.jbossesb.model;
+
+import java.util.logging.Logger;
+
+import org.jboss.tools.overlord.cdl.jbossesb.model.util.ESBModelUtil;
+import org.scribble.model.*;
+import org.scribble.conversation.model.*;
+
+/**
+ * This class represents an ESB service.
+ *
+ * @author gary
+ */
+public class DefaultESBService extends ModelObject implements ESBService {
+
+ public static final String LISTENERS_ELEMENT = "listeners";
+ public static final String BUSIDREF_ATTR = "busidref";
+ public static final String JMS_LISTENER_ELEMENT = "jms-listener";
+ public static final String MAX_THREADS_ATTR = "maxThreads";
+ public static final String NAME_ATTR = "name";
+ public static final String CATEGORY_ATTR = "category";
+ public static final String ROOT_PROPERTY = "root";
+ public static final String BUSINESS_OBJECT_TYPE_PROPERTY = "session";
+ public static final String CONVERSATION_TYPE_PROPERTY = "conversationType";
+ public static final String SERVICE_DESCRIPTION_NAME_PROPERTY = "serviceDescriptionName";
+ public static final String SERVICE_ANNOTATION = "org.jboss.soa.overlord.jbossesb.actions.Service";
+ public static final String SERVICE_ELEMENT = "service";
+ public static final String RETRIEVE_SESSION_ACTION_CLASS = "org.jboss.soa.overlord.jbossesb.actions.RetrieveSessionAction";
+ public static final String ACTION_ELEMENT = "action";
+ public static final String ACTIONS_ELEMENT = "actions";
+
+ /**
+ * This is the constructor for the ESB service. This construct
+ * creates a new DOM element, contained within the supplied
+ * model, to represent the service associated with the
+ * supplied category and name.
+ *
+ * @param model The ESB model in which the service has been defined
+ * @param service The XML configuration of the service
+ */
+ public DefaultESBService(ESBLanguageModel model,
+ String category, String name) {
+ m_model = model;
+
+ // Create new element for the service
+ initializeNewServiceElement(category, name);
+ }
+
+ /**
+ * This is the constructor for the ESB service. This construct
+ * creates a wrapper around the supplied DOM representation of
+ * the existing service element within an ESB configuration.
+ *
+ * @param model The ESB model in which the service has been defined
+ * @param service The XML configuration of the service
+ */
+ public DefaultESBService(ESBLanguageModel model, org.w3c.dom.Element service) {
+ m_model = model;
+ m_service = service;
+
+ if (m_model != null && m_service != null) {
+ initializeExistingServiceElement();
+ }
+ }
+
+ protected void initializeNewServiceElement(String category, String name) {
+
+ m_service = m_model.getESBConfiguration().
+ getOwnerDocument().createElement(SERVICE_ELEMENT);
+
+ m_service.setAttribute(CATEGORY_ATTR, category);
+ m_service.setAttribute(NAME_ATTR, name);
+
+ m_actionsElem = m_model.getESBConfiguration().
+ getOwnerDocument().createElement(ACTIONS_ELEMENT);
+ m_service.appendChild(m_actionsElem);
+ }
+
+ /**
+ * This method initializes the service.
+ */
+ protected void initializeExistingServiceElement() {
+ // Check if relevant action
+ org.w3c.dom.NodeList actions=m_service.getElementsByTagName(ACTIONS_ELEMENT);
+
+ if (actions != null && actions.getLength() == 1 &&
+ actions.item(0) instanceof org.w3c.dom.Element) {
+
+ m_actionsElem = (org.w3c.dom.Element)actions.item(0);
+
+ org.w3c.dom.NodeList nl=((org.w3c.dom.Element)
+ actions.item(0)).getChildNodes();
+
+ for (int i=0; i < nl.getLength(); i++) {
+ if (nl.item(i) instanceof org.w3c.dom.Element &&
+ nl.item(i).getNodeName().equals(ACTION_ELEMENT)) {
+ m_actions.add(ESBActionFactory.createAction(this,
+ ((org.w3c.dom.Element)nl.item(i))));
+ }
+ }
+ }
+
+ // Find positional information
+ int servCount=getServicePosition();
+
+ String str=getModel().getOriginalContents();
+
+ if (str != null) {
+ int startPosition=str.indexOf("<service ");
+ int endPosition=-1;
+ int loggedEndPosition=-1;
+
+ while (startPosition != -1 && servCount > 0) {
+ servCount--;
+
+ loggedEndPosition = str.indexOf('>', startPosition);
+
+ endPosition = str.indexOf("</service>", startPosition);
+
+ if (servCount > 0) {
+ startPosition=str.indexOf("<service ", endPosition);
+ }
+ }
+
+ if (startPosition != -1) {
+ endPosition = str.indexOf("</service>", startPosition);
+
+ getSource().setStartPosition(startPosition);
+ getSource().setEndPosition(loggedEndPosition);
+
+ getSource().getProperties().put("path",
+ ESBModelUtil.getPath(m_service));
+ }
+ }
+
+ // Get jms listener
+ org.w3c.dom.NodeList nl=m_service.getElementsByTagName(DefaultESBService.JMS_LISTENER_ELEMENT);
+
+ if (nl.getLength() > 0 && nl.item(0) instanceof org.w3c.dom.Element) {
+ m_jmsListenerElem = (org.w3c.dom.Element)nl.item(0);
+ }
+ }
+
+ /**
+ * This method initializes the links.
+ */
+ public void initializeLinks() {
+
+ // Work through actions requesting them to
+ // establish their links
+ for (int i=0; i < m_actions.size(); i++) {
+ m_actions.get(i).initializeLinks();
+ }
+ }
+
+ /**
+ * This method validates the ESB service and reports warnings or
+ * errors to the supplied model listener.
+ *
+ * @param l The model listener
+ */
+ public void validate(ModelListener l) {
+
+ // Check that the service specifies a session
+ if (isSessionBased() && getSessionClass() == null) {
+
+ // Find first conversation based action to use as
+ // focus - if not found then use the service itself
+ ESBAction focus=getFirstSessionBasedAction();
+ ModelObject src=this;
+
+ if (focus instanceof ModelObject) {
+ src = (ModelObject)focus;
+ }
+
+ l.error(src, org.scribble.util.MessageUtil.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.jboss.tools.overlord.cdl.jbossesb.model.Messages"),
+ "_NOT_SPECIFIED_SESSION_CLASS",
+ new String[]{}), null);
+ }
+
+ for (int i=0; i < m_actions.size(); i++) {
+ m_actions.get(i).validate(l);
+ }
+ }
+
+ /**
+ * This method returns the ESB model.
+ *
+ * @return The ESB model
+ */
+ public ESBLanguageModel getModel() {
+ return(m_model);
+ }
+
+ /**
+ * This method returns the category associated with the service
+ * descriptor.
+ *
+ * @return The service category
+ */
+ public String getCategory() {
+ return(m_service.getAttribute(CATEGORY_ATTR));
+ }
+
+ /**
+ * This method returns the name associated with the service
+ * descriptor.
+ *
+ * @return The service name
+ */
+ public String getName() {
+ return(m_service.getAttribute(NAME_ATTR));
+ }
+
+ /**
+ * This method returns the XML configuration representation of the service.
+ *
+ * @return The XML configuration for the service
+ */
+ public org.w3c.dom.Element getService() {
+ return(m_service);
+ }
+
+ /**
+ * This method returns the list of ESB actions.
+ *
+ * @return The ESB actions
+ */
+ public java.util.List<ESBAction> getActions() {
+ return(m_actions);
+ }
+
+ /**
+ * This method adds an action to the service.
+ *
+ * @param action The action to be added
+ * @param pos The position to add, or -1 if at the end
+ */
+ public void addAction(ESBAction action, int pos) {
+ // If position specified, then find element at
+ // the position and insert after the previous
+ // element
+
+ if (action.getAction() != null) {
+
+ if (pos == -1 || pos >= m_actions.size()) {
+ m_actionsElem.appendChild(action.getAction());
+ m_actions.add(action);
+ } else {
+ org.w3c.dom.NodeList nl=m_actionsElem.getChildNodes();
+ org.w3c.dom.Element elem=null;
+ int cur=-1;
+
+ for (int i=0; i < nl.getLength(); i++) {
+ if (nl.item(i) instanceof org.w3c.dom.Element &&
+ nl.item(i).getNodeName().equals(ACTION_ELEMENT)) {
+ cur++;
+
+ if (cur == pos) {
+ elem = (org.w3c.dom.Element)nl.item(i);
+ }
+ }
+ }
+
+ if (elem != null) {
+ m_actionsElem.insertBefore(action.getAction(), elem);
+ } else {
+ m_actionsElem.appendChild(action.getAction());
+ }
+
+ m_actions.add(pos, action);
+ }
+ }
+ }
+
+ /**
+ * This method removes an action from the service.
+ *
+ * @param action The action to be removed
+ * @return Whether the action was removed
+ */
+ public boolean removeAction(ESBAction action) {
+ return(false);
+ }
+
+ protected java.lang.annotation.Annotation getServiceAnnotation(String session) {
+ java.lang.annotation.Annotation ret=null;
+
+ try {
+ ClassLoader cl=
+ org.jboss.tools.overlord.cdl.jbossesb.model.util.ClasspathUtil.getClassLoader(getModel());
+
+ Class<?> cls=Class.forName(session, true, cl);
+
+ // TODO: This should be replaced by direct lookup
+ // of Service annotation - but library not available
+ // at the moment
+ java.lang.annotation.Annotation[] annotations=
+ cls.getAnnotations();
+ for (int i=0; ret == null &&
+ i < annotations.length; i++) {
+ try {
+ if (annotations[i].annotationType().getName().equals(
+ SERVICE_ANNOTATION)) {
+ ret = annotations[i];
+ }
+ } catch(Throwable ex) {
+ logger.log(java.util.logging.Level.SEVERE,
+ "ANNOTATION: "+
+ annotations[i].annotationType(), ex);
+ }
+ }
+
+ } catch(Exception e) {
+ logger.log(java.util.logging.Level.SEVERE,
+ "Failed to get session class '"+session+"'", e);
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method determines whether the ESB service represents a
+ * loop construct.
+ *
+ * @return Whether the service represents a loop
+ */
+ public boolean isLoop() {
+ boolean ret=false;
+ ESBAction action=getFirstSessionBasedAction();
+
+ if (action != null) {
+ ret = action.isLoop();
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method determines whether the ESB service descriptor represents
+ * a 'root' conversation.
+ *
+ * @return Whether the ESB service is associated with a root conversation
+ */
+ public boolean isRoot() {
+ boolean ret=false;
+ ESBAction action=getFirstSessionBasedAction();
+
+ if (action != null) {
+ if (action.isCreateSession()) {
+ String bool=action.getPropertyValue(ROOT_PROPERTY);
+ if (bool != null) {
+ ret = bool.equalsIgnoreCase("true");
+ } else {
+ String session=action.getPropertyValue(BUSINESS_OBJECT_TYPE_PROPERTY);
+
+ java.lang.annotation.Annotation annotation=
+ getServiceAnnotation(session);
+
+ if (annotation != null) {
+ try {
+ java.lang.reflect.Method method=
+ annotation.getClass().getMethod(ROOT_PROPERTY,
+ (Class<?>[])null);
+
+ Object val=method.invoke(annotation, (Object[])null);
+
+ if (val instanceof Boolean) {
+ ret = ((Boolean)val).booleanValue();
+ }
+ } catch(Throwable t) {
+ logger.log(java.util.logging.Level.SEVERE,
+ "Failed to get 'root' annotation value", t);
+ }
+ }
+ }
+ }
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method determines whether the ESB service descriptor
+ * starts with a CreateSessionAction.
+ *
+ * @return Whether the service has a CreateSessionAction
+ */
+ public boolean isCreateSession() {
+ boolean ret=false;
+ ESBAction action=getFirstSessionBasedAction();
+
+ if (action != null) {
+ ret = action.isCreateSession();
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method determines whether the service is a gateway
+ * for inbound requests.
+ *
+ * @return Whether the service is a gateway
+ */
+ public boolean isGateway() {
+ boolean ret=false;
+
+ for (int i=0; ret == false && i < m_actions.size(); i++) {
+ ret = m_actions.get(i).isGateway();
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method returns the gateway action if this is a
+ * gateway service.
+ *
+ * @return The gateway action
+ */
+ public ESBAction getGatewayAction() {
+ ESBAction ret=null;
+
+ for (int i=0; ret == null && i < m_actions.size(); i++) {
+ if (m_actions.get(i).isGateway()) {
+ ret = m_actions.get(i);
+ }
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method returns the first session based action in the
+ * service descriptor.
+ *
+ * @return The first session based action, or null if none exist
+ */
+ public ESBAction getFirstSessionBasedAction() {
+ ESBAction ret=null;
+
+ for (int i=0; ret == null && i < m_actions.size(); i++) {
+ ret=m_actions.get(i);
+
+ if (ret.isSessionBased() == false) {
+ ret = null;
+ }
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method returns the service description name associated with the
+ * ESB service.
+ *
+ * @return The service description name
+ */
+ public String getServiceDescriptionName() {
+ String ret=null;
+ ESBAction action=getFirstSessionBasedAction();
+
+ if (action != null) {
+ if (action.isCreateSession() || (action.getActionClass() != null &&
+ action.getActionClass().equals(RETRIEVE_SESSION_ACTION_CLASS))) {
+ ret = action.getPropertyValue(SERVICE_DESCRIPTION_NAME_PROPERTY);
+
+ if (ret == null) {
+ String session=action.getPropertyValue(BUSINESS_OBJECT_TYPE_PROPERTY);
+
+ java.lang.annotation.Annotation annotation=
+ getServiceAnnotation(session);
+
+ if (annotation != null) {
+ try {
+ java.lang.reflect.Method method=
+ annotation.getClass().getMethod(NAME_ATTR, (Class<?>[])null);
+
+ Object val=method.invoke(annotation, (Object[])null);
+
+ if (val instanceof String) {
+ ret = (String)val;
+ }
+ } catch(Throwable t) {
+ logger.log(java.util.logging.Level.SEVERE,
+ "Failed to get 'name' annotation value", t);
+ }
+ }
+ }
+ }
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method returns the conversation type associated with the
+ * ESB service.
+ *
+ * @return The conversation type
+ */
+ public String getConversationType() {
+ String ret=null;
+ ESBAction action=getFirstSessionBasedAction();
+
+ if (action != null) {
+ if (action.isCreateSession()) {
+ ret = action.getPropertyValue(CONVERSATION_TYPE_PROPERTY);
+
+ if (ret == null) {
+ String session=action.getPropertyValue(BUSINESS_OBJECT_TYPE_PROPERTY);
+
+ java.lang.annotation.Annotation annotation=
+ getServiceAnnotation(session);
+
+ if (annotation != null) {
+ try {
+ java.lang.reflect.Method method=
+ annotation.getClass().getMethod(CONVERSATION_TYPE_PROPERTY,
+ (Class<?>[])null);
+
+ Object val=method.invoke(annotation, (Object[])null);
+
+ if (val instanceof String) {
+ ret = (String)val;
+ }
+ } catch(Throwable t) {
+ logger.log(java.util.logging.Level.SEVERE,
+ "Failed to get 'name' annotation value", t);
+ }
+ }
+ }
+ }
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method returns the session name associated with the service
+ * descriptor.
+ *
+ * @return The session name
+ */
+ public String getSessionName() {
+ String ret=null;
+ ESBAction action=getFirstSessionBasedAction();
+
+ if (action != null) {
+ ret = action.getPropertyValue(BUSINESS_OBJECT_TYPE_PROPERTY);
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method returns the session class associated with the service
+ * descriptor.
+ *
+ * @return The session class
+ */
+ public Class<?> getSessionClass() {
+ Class<?> ret=null;
+ String session=getSessionName();
+
+ if (session != null) {
+ try {
+ ClassLoader cl=
+ org.jboss.tools.overlord.cdl.jbossesb.model.util.ClasspathUtil.getClassLoader(getModel());
+
+ ret = Class.forName(session, true, cl);
+
+ } catch(Exception e) {
+ logger.log(java.util.logging.Level.SEVERE,
+ "Failed to get session class '"+session+"'", e);
+ }
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method determines whether the service is related to a behavioural
+ * session.
+ *
+ * @return Whether the service is session based
+ */
+ public boolean isSessionBased() {
+ boolean ret=false;
+
+ for (int i=0; ret == false && i < m_actions.size(); i++) {
+ ret = m_actions.get(i).isSessionBased();
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method converts the ESB service into a Conversation, if
+ * the service represents a conversation.
+ *
+ * @param context The conversion context, or null if this is the
+ * root conversation
+ * @return The conversation
+ */
+ public Conversation convert(ConversionContext context) {
+ Conversation ret=null;
+
+ if (isCreateSession()) {
+ ret = new Conversation();
+
+ ret.derivedFrom(this);
+
+ ModelName modelName=new ModelName();
+ modelName.setName(getServiceDescriptionName());
+
+ ret.setModelName(modelName);
+
+ String convType=getConversationType();
+ String role=null;
+
+ if (convType != null) {
+ int index=convType.indexOf('@');
+
+ if (index != -1) {
+ // TODO: Need to think whether this should be
+ // 'implements' reference. If so, then need to change
+ // Java Lang Model parser and also Lang Model conformance
+ // rule.
+ ImplementsReference iref=
+ new ImplementsReference(ConversationModel.CONVERSATION);
+
+ role = convType.substring(index+1);
+
+ iref.setLocatedRole(role);
+
+ // Need to locate the model name
+ modelName.setLocatedRole(new Role(iref.getLocatedRole()));
+
+ String mainpart=convType.substring(0, index);
+
+ index = mainpart.lastIndexOf(".");
+
+ if (index == -1) {
+ iref.setNamespace("");
+ iref.setLocalpart(mainpart);
+ } else {
+ iref.setNamespace(mainpart.substring(0, index));
+ iref.setLocalpart(mainpart.substring(index+1));
+ }
+
+ ret.getImplements().add(iref);
+ //ret.getConformsTo().add(iref);
+
+ org.scribble.model.DependencyManager dm=
+ (org.scribble.model.DependencyManager)
+ org.scribble.extensions.RegistryFactory.getRegistry().getExtension(
+ org.scribble.model.DependencyManager.class, null);
+
+ if (dm != null) {
+ dm.recordDependency(getModel().getModelReference(),
+ iref, DependencyType.Implements);
+ }
+
+ } else {
+ logger.warning("Conversation type does not " +
+ "contain '@' located role separator");
+ }
+ } else {
+ logger.warning("No conversation type specified");
+ }
+
+ ret.setBlock(new Block());
+
+ context = new DefaultConversionContext(role);
+
+ context.processing(this);
+
+ for (int i=0; i < m_actions.size(); i++) {
+ ((ESBAction)m_actions.get(i)).convert(
+ ret.getBlock().getContents(), context);
+ }
+
+ context.processed(this);
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method converts the actions associated with the ESB service into
+ * activities that can be checked for conformance against a conversation
+ * type.
+ *
+ * @param activities The target list of activities associated with the
+ * ESB actions being converted
+ * @param context The conversion context
+ */
+ public void convert(java.util.List<Activity> activities,
+ ConversionContext context) {
+ context.processing(this);
+
+ for (int i=0; i < m_actions.size(); i++) {
+ ((ESBAction)m_actions.get(i)).convert(
+ activities, context);
+ }
+
+ context.processed(this);
+ }
+
+ /**
+ * This method returns the position of the service node within the
+ * ESB configuration.
+ *
+ * @return The service node position
+ */
+ public int getServicePosition() {
+ org.w3c.dom.Node services=m_service.getParentNode();
+ int servCount=0;
+ boolean f_end=false;
+
+ for (int i=0; f_end == false &&
+ i < services.getChildNodes().getLength(); i++) {
+ org.w3c.dom.Node serv=services.getChildNodes().item(i);
+
+ if (serv.getNodeName().equals(SERVICE_ELEMENT)) {
+ servCount++;
+ if (serv == m_service) {
+ f_end = true;
+ }
+ }
+ }
+
+ return(servCount);
+ }
+
+ /**
+ * This method returns the JMS Bus Id Ref associated with the
+ * service's JMS listener.
+ *
+ * @return The JMS Bus Id Ref
+ */
+ public String getJMSBusIdRef() {
+ String ret=null;
+
+ if (m_jmsListenerElem != null) {
+ ret = m_jmsListenerElem.getAttribute(BUSIDREF_ATTR);
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method sets the JMS Bus Id Ref associated with the
+ * service's JMS listener.
+ *
+ * @param busId The JMS Bus Id Ref
+ */
+ public void setJMSBusIdRef(String busId) {
+ if (m_jmsListenerElem == null) {
+ m_jmsListenerElem = m_service.getOwnerDocument().createElement(JMS_LISTENER_ELEMENT);
+
+ org.w3c.dom.NodeList nl=m_service.getElementsByTagName(LISTENERS_ELEMENT);
+ org.w3c.dom.Element listeners=null;
+
+ if (nl.getLength() > 0) {
+ listeners = (org.w3c.dom.Element)nl.item(0);
+ } else {
+ listeners = m_service.getOwnerDocument().createElement(LISTENERS_ELEMENT);
+
+ if (m_service.getFirstChild() != null) {
+ m_service.insertBefore(listeners,
+ m_service.getFirstChild());
+ } else {
+ m_service.appendChild(listeners);
+ }
+ }
+
+ if (listeners != null) {
+ listeners.appendChild(m_jmsListenerElem);
+ }
+ }
+
+ if (m_jmsListenerElem != null) {
+ m_jmsListenerElem.setAttribute(BUSIDREF_ATTR,
+ busId);
+
+ if (m_jmsListenerElem.hasAttribute(NAME_ATTR) == false) {
+ m_jmsListenerElem.setAttribute(NAME_ATTR,
+ getCategory()+"-"+getName());
+ }
+
+ if (m_jmsListenerElem.hasAttribute(MAX_THREADS_ATTR) == false) {
+ m_jmsListenerElem.setAttribute(MAX_THREADS_ATTR, "1");
+ }
+ }
+ }
+
+ public int hashCode() {
+ return(m_service.hashCode());
+ }
+
+ public boolean equals(Object obj) {
+ boolean ret=false;
+
+ if (obj instanceof DefaultESBService) {
+ DefaultESBService other=(DefaultESBService)obj;
+
+ if (m_service == other.m_service) {
+ ret = true;
+ }
+ }
+
+ return(ret);
+ }
+
+ public String toString() {
+ return("ESBService: "+getCategory()+"/"+getName()+"["+getSource()+"]");
+ }
+
+ private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.jbossesb.model");
+
+ private ESBLanguageModel m_model=null;
+ private org.w3c.dom.Element m_service=null;
+ private org.w3c.dom.Element m_jmsListenerElem=null;
+ private org.w3c.dom.Element m_actionsElem=null;
+ private java.util.List<ESBAction> m_actions=new java.util.Vector<ESBAction>();
+}
Property changes on: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultESBService.java
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/ESBAction.java (from rev 260, cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBAction.java)
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/ESBAction.java (rev 0)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/ESBAction.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -0,0 +1,125 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.tools.overlord.cdl.jbossesb.model;
+
+import org.scribble.model.*;
+
+/**
+ * This interface represents the generic ESB action class.
+ *
+ * @author gary
+ */
+public interface ESBAction {
+
+ /**
+ * This method initializes the links with the ESB service descriptors
+ * identified in each path of the action.
+ */
+ public void initializeLinks();
+
+ /**
+ * This method validates the ESB action and reports warnings or
+ * errors to the supplied model listener.
+ *
+ * @param l The model listener
+ */
+ public void validate(ModelListener l);
+
+ /**
+ * This method determines if the action represents a loop construct.
+ *
+ * @return Whether the action represents a loop construct
+ */
+ public boolean isLoop();
+
+ /**
+ * This method determines whether the action is related to a behavioural
+ * session.
+ *
+ * @return Whether the action is session based
+ */
+ public boolean isSessionBased();
+
+ /**
+ * This method determines whether the ESB action represents
+ * a CreateSessionAction.
+ *
+ * @return Whether the action is a CreateSessionAction
+ */
+ public boolean isCreateSession();
+
+ /**
+ * This method determines whether the action is a gateway
+ * for inbound requests.
+ *
+ * @return Whether the action is a gateway
+ */
+ public boolean isGateway();
+
+ /**
+ * This method indicates whether this action performs another
+ * sub-conversation.
+ *
+ * @return Whether the action is a 'perform'
+ */
+ public boolean isPerform();
+
+ /**
+ * This method returns the action's class name.
+ *
+ * @return The action's class name
+ */
+ public String getActionClass();
+
+ /**
+ * This method returns the property value associated
+ * with the supplied name.
+ *
+ * @param property The property name
+ * @return The property value, or null if not found
+ */
+ public String getPropertyValue(String property);
+
+ /**
+ * This method determines the property value, associated
+ * with the supplied name, is defined.
+ *
+ * @param property The property name
+ * @return Whether the property has been defined
+ */
+ public boolean hasProperty(String property);
+
+ /**
+ * This method returns the XML configuration representation of the action.
+ *
+ * @return The XML configuration for the action
+ */
+ public org.w3c.dom.Element getAction();
+
+ /**
+ * This method converts the ESB action into an equivalent
+ * behavioural description for conformance checking.
+ *
+ * @param activities The list of activities that will contain
+ * the converted action(s)
+ * @param context The conversion context
+ */
+ public void convert(java.util.List<Activity> activities,
+ ConversionContext context);
+
+}
Property changes on: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/ESBAction.java
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/ESBActionFactory.java (from rev 260, cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBActionFactory.java)
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/ESBActionFactory.java (rev 0)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/ESBActionFactory.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -0,0 +1,108 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.tools.overlord.cdl.jbossesb.model;
+
+import java.util.logging.Logger;
+
+import org.jboss.tools.overlord.cdl.jbossesb.model.actions.UnsupportedAction;
+
+/**
+ * This class provides a factory for ESBAction instances.
+ *
+ * @author gary
+ */
+public class ESBActionFactory {
+
+ public static final String MODEL_ACTION_PACKAGE =
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions";
+ public static final String CLASS_ATTR = "class";
+ public static final String CONVERSATION_ACTION_PACKAGE =
+ "org.jboss.soa.overlord.jbossesb.actions";
+
+ /**
+ * This method creates an ESBAction instance relevant to the
+ * supplied JBossESB action, associated with the supplied
+ * service.
+ *
+ * @param service The service
+ * @param action The XML configuration of the action
+ * @return The ESBAction instance
+ */
+ public static ESBAction createAction(ESBService service,
+ org.w3c.dom.Element action) {
+ ESBAction ret=null;
+ String actionType=action.getAttribute(CLASS_ATTR);
+
+ // Check that it is a conversation based ESB action
+ if (actionType.startsWith(CONVERSATION_ACTION_PACKAGE)) {
+ int index=actionType.lastIndexOf('.');
+ if (index != -1) {
+ String actionName=actionType.substring(index+1);
+
+ try {
+ Class<?> cls=(Class<?>)
+ Class.forName(MODEL_ACTION_PACKAGE+"."+actionName);
+
+ java.lang.reflect.Constructor<?> con=
+ cls.getConstructor(new Class<?>[]{ESBService.class,
+ org.w3c.dom.Element.class});
+
+ ret = (ESBAction)con.newInstance(new Object[]{service, action});
+
+ } catch(Exception e) {
+ logger.log(java.util.logging.Level.SEVERE,
+ "Unable to find action class '"+
+ MODEL_ACTION_PACKAGE+"."+actionName+"'", e);
+ }
+ }
+ }
+
+ if (ret == null) {
+ // Unrecognised or unsupported action
+ ret = new UnsupportedAction(service, action);
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method determines the runtime action class based on
+ * the ESB model action class.
+ *
+ * @param cls The ESB model action class
+ * @return The conversation action class
+ */
+ public static String getConversationAction(Class<?> cls) {
+ String actionType=cls.getName();
+ String ret=null;
+
+ // Check that it is a conversation based ESB action
+ if (actionType.startsWith(MODEL_ACTION_PACKAGE)) {
+ int index=actionType.lastIndexOf('.');
+ if (index != -1) {
+ String actionName=actionType.substring(index+1);
+
+ ret = CONVERSATION_ACTION_PACKAGE+"."+actionName;
+ }
+ }
+
+ return(ret);
+ }
+
+ private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.jbossesb.model");
+}
Property changes on: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/ESBActionFactory.java
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/ESBLanguageModel.java (from rev 260, cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBLanguageModel.java)
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/ESBLanguageModel.java (rev 0)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/ESBLanguageModel.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -0,0 +1,130 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.tools.overlord.cdl.jbossesb.model;
+
+import org.scribble.model.*;
+
+/**
+ * This class represents an ESB model.
+ *
+ * @author gary
+ */
+public interface ESBLanguageModel {
+
+ public static final String JBOSSESB_NOTATION = "jboss-esb.xml";
+
+ /**
+ * This method validates the ESB model and reports warnings or
+ * errors to the supplied model listener.
+ *
+ * @param l The model listener
+ */
+ public void validate(ModelListener l);
+
+ /**
+ * This method returns the source model reference.
+ *
+ * @return The source model reference
+ */
+ public ModelReference getModelReference();
+
+ /**
+ * This method returns the ESB service for the supplied
+ * category and name.
+ *
+ * @param category The service category
+ * @param name The service name
+ * @return The ESB service, or null if not found
+ */
+ public ESBService getService(String category, String name);
+
+ /**
+ * This method returns the collection of ESB services associated
+ * with the model.
+ *
+ * @return The collection of ESB services
+ */
+ public java.util.Collection<ESBService> getServices();
+
+ /**
+ * This textual contents of the model.
+ *
+ * @return The textual contents
+ */
+ public String getOriginalContents();
+
+ /**
+ * This method returns the gateway service.
+ *
+ * @return The gateway service, or null if not found
+ */
+ public ESBService getGatewayService();
+
+ /**
+ * This method creates a new ESB service.
+ *
+ * @param category The category
+ * @param name The name
+ * @return The new ESB service
+ */
+ public ESBService createService(String category, String name);
+
+ /**
+ * This method adds a new service to the model.
+ *
+ * @param service The service
+ */
+ public void addService(ESBService service);
+
+ /**
+ * This method removes a service from the model.
+ *
+ * @param service The service
+ */
+ public void removeService(ESBService service);
+
+ /**
+ * This method returns a unique service name within
+ * the supplied category.
+ *
+ * @param category The category
+ * @param currentServiceName The name of the service creating
+ * the new service
+ * @return The unique service name
+ */
+ public String getUniqueServiceName(String category,
+ String currentServiceName);
+
+ /**
+ * This method returns the reference to the DOM
+ * representation of the ESB configuration.
+ *
+ * @return The ESB configuration
+ */
+ public org.w3c.dom.Element getESBConfiguration();
+
+ /**
+ * This method returns the JMS destination associated with
+ * the supplied JMS Bus Id.
+ *
+ * @param jmsBusId The JMS bus id
+ * @return The JMS definition, or null if not found
+ */
+ public String getJMSDefinition(String jmsBusId);
+
+}
Property changes on: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/ESBLanguageModel.java
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/ESBLink.java (from rev 260, cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBLink.java)
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/ESBLink.java (rev 0)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/ESBLink.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -0,0 +1,117 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.tools.overlord.cdl.jbossesb.model;
+
+/**
+ * This class represents the link from a ESB action to a service
+ * descriptor.
+ *
+ * @author gary
+ */
+public class ESBLink {
+
+ /**
+ * This is the constructor for the link.
+ *
+ * @param category The service category of the target service descriptor
+ * @param name The service name of the target descriptor
+ * @param service A reference to the service model containing the action
+ * that links to the service descriptor
+ * @param control Whether the link is a control link, if not then it
+ * represents a message link (i.e. to another service)
+ */
+ public ESBLink(String category, String name,
+ ESBService service, boolean control) {
+ this(category, name, service, control, false);
+ }
+
+ /**
+ * This is the constructor for the link.
+ *
+ * @param category The service category of the target service descriptor
+ * @param name The service name of the target descriptor
+ * @param service A reference to the service model containing the action
+ * that links to the service descriptor
+ * @param control Whether the link is a control link, if not then it
+ * represents a message link (i.e. to another service)
+ * @param remote Whether the link is to a remote service
+ */
+ public ESBLink(String category, String name,
+ ESBService service, boolean control, boolean remote) {
+ m_category = category;
+ m_name = name;
+ m_service = service;
+ m_control = control;
+ m_remote = remote;
+ }
+
+ /**
+ * This method indicates whether this is a control
+ * link, as opposed to a message link.
+ *
+ * @return Whether the link is a control link
+ */
+ public boolean isControl() {
+ return(m_control);
+ }
+
+ /**
+ * This method indicates whether this is a
+ * link to a remote service.
+ *
+ * @return Whether the link is to a remote service
+ */
+ public boolean isRemote() {
+ return(m_remote);
+ }
+
+ /**
+ * This method returns the service category.
+ *
+ * @return The service category
+ */
+ public String getCategory() {
+ return(m_category);
+ }
+
+ /**
+ * This method returns the service name.
+ *
+ * @return The service name
+ */
+ public String getName() {
+ return(m_name);
+ }
+
+ /**
+ * This method returns the reference to ESB Service
+ * model containing the action that links to the
+ * target service descriptor.
+ *
+ * @return The ESB service
+ */
+ public ESBService getService() {
+ return(m_service);
+ }
+
+ private String m_category=null;
+ private String m_name=null;
+ private ESBService m_service=null;
+ private boolean m_control=false;
+ private boolean m_remote=false;
+}
Property changes on: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/ESBLink.java
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/ESBService.java (from rev 260, cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBService.java)
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/ESBService.java (rev 0)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/ESBService.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -0,0 +1,230 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.tools.overlord.cdl.jbossesb.model;
+
+import org.scribble.conversation.model.Conversation;
+import org.scribble.model.*;
+
+/**
+ * This interface represents an ESB service.
+ *
+ * @author gary
+ */
+public interface ESBService {
+
+ /**
+ * This method initializes the links.
+ */
+ public void initializeLinks();
+
+ /**
+ * This method validates the ESB service and reports warnings or
+ * errors to the supplied model listener.
+ *
+ * @param l The model listener
+ */
+ public void validate(ModelListener l);
+
+ /**
+ * This method returns the category associated with the service
+ * descriptor.
+ *
+ * @return The service category
+ */
+ public String getCategory();
+
+ /**
+ * This method returns the name associated with the service
+ * descriptor.
+ *
+ * @return The service name
+ */
+ public String getName();
+
+ /**
+ * This method returns the ESB model.
+ *
+ * @return The ESB model
+ */
+ public ESBLanguageModel getModel();
+
+ /**
+ * This method returns the XML configuration representation of the service.
+ *
+ * @return The XML configuration for the service
+ */
+ public org.w3c.dom.Element getService();
+
+ /**
+ * This method returns the list of ESB actions.
+ *
+ * @return The ESB actions
+ */
+ public java.util.List<ESBAction> getActions();
+
+ /**
+ * This method adds an action to the service.
+ *
+ * @param action The action to be added
+ * @param pos The position to add, or -1 if at the end
+ */
+ public void addAction(ESBAction action, int pos);
+
+ /**
+ * This method removes an action from the service.
+ *
+ * @param action The action to be removed
+ * @return Whether the action was removed
+ */
+ public boolean removeAction(ESBAction action);
+
+ /**
+ * This method determines whether the ESB service represents a
+ * loop construct.
+ *
+ * @return Whether the service represents a loop
+ */
+ public boolean isLoop();
+
+ /**
+ * This method determines whether the ESB service descriptor represents
+ * a 'root' conversation.
+ *
+ * @return Whether the ESB service is associated with a root conversation
+ */
+ public boolean isRoot();
+
+ /**
+ * This method determines whether the ESB service descriptor
+ * starts with a CreateSessionAction.
+ *
+ * @return Whether the service has a CreateSessionAction
+ */
+ public boolean isCreateSession();
+
+ /**
+ * This method determines whether the service is a gateway
+ * for inbound requests.
+ *
+ * @return Whether the service is a gateway
+ */
+ public boolean isGateway();
+
+ /**
+ * This method returns the gateway action if this is a
+ * gateway service.
+ *
+ * @return The gateway action
+ */
+ public ESBAction getGatewayAction();
+
+ /**
+ * This method returns the service description name associated with the
+ * ESB service.
+ *
+ * @return The service description name
+ */
+ public String getServiceDescriptionName();
+
+ /**
+ * This method returns the conversation type associated with the
+ * ESB service.
+ *
+ * @return The conversation type
+ */
+ public String getConversationType();
+
+ /**
+ * This method returns the session name associated with the service
+ * descriptor.
+ *
+ * @return The session name
+ */
+ public String getSessionName();
+
+ /**
+ * This method returns the session class associated with the service
+ * descriptor.
+ *
+ * @return The session class
+ */
+ public Class<?> getSessionClass();
+
+ /**
+ * This method determines whether the service is related to a behavioural
+ * session.
+ *
+ * @return Whether the service is session based
+ */
+ public boolean isSessionBased();
+
+ /**
+ * This method returns the first session based action in the
+ * service descriptor.
+ *
+ * @return The first session based action, or null if none exist
+ */
+ public ESBAction getFirstSessionBasedAction();
+
+ /**
+ * This method converts the actions associated with the ESB service into
+ * activities that can be checked for conformance against a conversation
+ * type.
+ *
+ * @param activities The target list of activities associated with the
+ * ESB actions being converted
+ * @param context The conversion context
+ */
+ public void convert(java.util.List<Activity> activities,
+ ConversionContext context);
+
+ /**
+ * This method converts the ESB service into a Conversation, if
+ * the service represents a conversation.
+ *
+ * @param context The conversion context, or null if this is the
+ * root conversation
+ * @return The conversation
+ */
+ public Conversation convert(ConversionContext context);
+
+ /**
+ * This method returns the position of the service node within the
+ * ESB configuration.
+ *
+ * @return The service node position
+ */
+ public int getServicePosition();
+
+ /**
+ * This method returns the JMS Bus Id Ref associated with the
+ * service's JMS listener.
+ *
+ * @return The JMS Bus Id Ref
+ */
+ public String getJMSBusIdRef();
+
+ /**
+ * This method sets the JMS Bus Id Ref associated with the
+ * service's JMS listener.
+ *
+ * @param busId The JMS Bus Id Ref
+ */
+ public void setJMSBusIdRef(String busId);
+
+}
Property changes on: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/ESBService.java
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/Messages.properties (from rev 260, cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/Messages.properties)
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/Messages.properties (rev 0)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/Messages.properties 2008-08-26 15:57:32 UTC (rev 275)
@@ -0,0 +1,21 @@
+# /*
+# * JBoss, Home of Professional Open Source
+# * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+# * by the @authors tag. All rights reserved.
+# * See the copyright.txt in the distribution for a
+# * full listing of individual contributors.
+# * This copyrighted material is made available to anyone wishing to use,
+# * modify, copy, or redistribute it subject to the terms and conditions
+# * of the GNU Lesser General Public License, v. 2.1.
+# * This program is distributed in the hope that it will be useful, but WITHOUT A
+# * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+# * You should have received a copy of the GNU Lesser General Public License,
+# * v.2.1 along with this distribution; if not, write to the Free Software
+# * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# * MA 02110-1301, USA.
+# */
+
+_NOT_FOUND_BUSINESS_OBJECT_TYPE=Business object type '{0}' could not be found
+_NOT_FOUND_SERVICE_DESCRIPTOR=Service descriptor for category '{0}' and name '{1}' not found
+_NOT_SPECIFIED_SESSION_CLASS=First conversation action must specify a valid session class
Property changes on: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/Messages.properties
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions (from rev 260, cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions)
Property changes on: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/AbstractESBAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/AbstractESBAction.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/AbstractESBAction.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -1,577 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.tools.overlord.jbossesb.model.actions;
-
-import java.util.logging.Logger;
-
-import org.scribble.model.*;
-import org.jboss.tools.overlord.jbossesb.model.*;
-import org.jboss.tools.overlord.jbossesb.model.util.ProblemDefinitions;
-
-/**
- * This is the generic ESB action class.
- *
- * @author gary
- */
-public abstract class AbstractESBAction extends ModelObject
- implements ESBAction {
-
- public static final String IDENTITIES = "identities";
- public static final String ACTION_ELEMENT = "action";
- public static final String VALUE_ATTR = "value";
- public static final String NAME_ATTR = "name";
- public static final String PROPERTY_ELEMENT = "property";
- public static final String CLASS_PROPERTY = "class";
-
- /**
- * The constructor for initializing the action based on
- * an existing DOM element.
- */
- protected AbstractESBAction(ESBService service,
- org.w3c.dom.Element action) {
- initExistingAction(service, action);
- }
-
- /**
- * The contructor for initializing a new action.
- */
- protected AbstractESBAction(ESBService service,
- String actionClass) {
- initNewAction(service, actionClass);
- }
-
- /**
- * This method initializes the action.
- *
- * @param service The reference to the service in which
- * the action is contained
- * @param actionClass The action class
- */
- protected void initNewAction(ESBService service,
- String actionClass) {
- m_service = service;
-
- m_action = service.getService().
- getOwnerDocument().createElement(ACTION_ELEMENT);
-
- m_action.setAttribute(CLASS_PROPERTY, actionClass);
- }
-
- /**
- * This method initializes the action.
- *
- * @param service The reference to the service in which
- * the action is contained
- * @param action The XML configuration details for the action
- */
- protected void initExistingAction(ESBService service,
- org.w3c.dom.Element action) {
- m_service = service;
- m_action = action;
-
- int servicesStartPos=-1;
-
- if (m_service.getModel() != null &&
- m_service.getModel().getOriginalContents() != null &&
- (servicesStartPos=m_service.getModel().
- getOriginalContents().indexOf("<services>")) != -1) {
-
- // Find positional information
- int servCount=m_service.getServicePosition();
- int actionCount=getActionPosition();
-
- String str=m_service.getModel().getOriginalContents();
-
- int startPosition=str.indexOf("<service", servicesStartPos+2);
- int endPosition=-1;
- int loggedEndPosition=-1;
-
- while (startPosition != -1 && servCount > 0) {
- servCount--;
-
- endPosition = str.indexOf("</service>", startPosition);
-
- if (servCount > 0) {
- startPosition=str.indexOf("<service", endPosition);
- }
- }
-
- int actionsStartPos=-1;
-
- if (actionCount > 0 &&
- startPosition != -1 && endPosition != -1 &&
- (actionsStartPos=str.indexOf("<actions",
- startPosition)) != -1 &&
- actionsStartPos < endPosition) {
- startPosition=str.indexOf("<action", actionsStartPos+2);
- endPosition=-1;
-
- while (startPosition != -1 && actionCount > 0) {
- actionCount--;
-
- loggedEndPosition = str.indexOf('>', startPosition);
-
- endPosition = str.indexOf("</action>", startPosition);
-
- if (actionCount > 0) {
- startPosition=str.indexOf("<action", endPosition);
- }
- }
-
- // Check whether single line element
- int inlineEndPos=str.indexOf("/>", startPosition);
- int nextStartPos=str.indexOf("<", startPosition+1);
-
- if (inlineEndPos != -1 && inlineEndPos < nextStartPos) {
- endPosition = inlineEndPos;
- }
- }
-
- getSource().setStartPosition(startPosition);
- getSource().setEndPosition(loggedEndPosition);
- }
- }
-
- /**
- * This method initializes the links with the ESB service descriptors
- * identified in each path of the action.
- */
- public void initializeLinks() {
- }
-
- /**
- * This method validates the ESB action and reports warnings or
- * errors to the supplied model listener.
- *
- * @param l The model listener
- */
- public void validate(ModelListener l) {
-
- java.util.List<String> mandatory=getMandatoryProperties();
-
- for (int i=0; i < mandatory.size(); i++) {
- if (getPropertyValue(mandatory.get(i)) == null) {
- java.util.Properties props=new java.util.Properties();
- props.setProperty(ProblemDefinitions.PROBLEM_PROPERTY,
- mandatory.get(i));
- l.error(this, org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
- "_NOT_SPECIFIED_PROPERTY",
- new String[]{mandatory.get(i)}), props);
- }
- }
-
- java.util.List<String> propNames=getPropertyNames();
-
- for (int i=0; i < propNames.size(); i++) {
- String propName=propNames.get(i);
-
- if (getOptionalProperties().contains(propName) == false &&
- getMandatoryProperties().contains(propName) == false) {
- l.error(this, org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
- "_UNKNOWN_PROPERTY",
- new String[]{propName}), null);
- }
- }
-
- String session=getPropertyValue(DefaultESBService.BUSINESS_OBJECT_TYPE_PROPERTY);
-
- if (session != null) {
- // Validate that the business object type exists
- try {
- ClassLoader cl=
- org.jboss.tools.overlord.jbossesb.model.util.ClasspathUtil.getClassLoader(getService().getModel());
-
- try {
- Class.forName(session, true, cl);
- } catch(ClassNotFoundException cfne) {
- l.error(this, org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
- "_NOT_FOUND_BUSINESS_OBJECT_TYPE",
- new String[]{session}), null);
- }
-
- } catch(Exception e) {
- logger.log(java.util.logging.Level.SEVERE,
- "Failed to load business class '"+session+"'", e);
- }
- }
-
- // Validate links
- for (int i=0; i < m_links.size(); i++) {
- ESBLink link=(ESBLink)m_links.get(i);
-
- if (link.getService() == null) {
- // If target service not found, then report error
- // unless it is a remote service, so defined in a
- // different file
- if (link.isRemote() == false) {
- l.error(this, org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
- "_NOT_FOUND_SERVICE_DESCRIPTOR",
- new String[]{link.getCategory(),link.getName()}), null);
- }
- } else if (getService().getSessionName() != null &&
- isPerform() == false && link.isRemote() == false &&
- link.getService().getSessionName() != null &&
- getService().getSessionName().equals(
- link.getService().getSessionName()) == false) {
-
- java.util.Properties props=new java.util.Properties();
- props.setProperty(ProblemDefinitions.PROBLEM_PROPERTY,
- DefaultESBService.BUSINESS_OBJECT_TYPE_PROPERTY);
-
- l.error(this, org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
- "_MISMATCH_SESSION_CLASS",
- new String[]{link.getCategory(),link.getName()}), props);
- }
- }
- }
-
- /**
- * This method determines if the action represents a loop construct.
- *
- * @return Whether the action represents a loop construct
- */
- public boolean isLoop() {
- return(false);
- }
-
- /**
- * This method determines whether the action is related to a behavioural
- * session.
- *
- * @return Whether the action is session based
- */
- public boolean isSessionBased() {
- return(true);
- }
-
- /**
- * This method determines whether the ESB action represents
- * a CreateSessionAction.
- *
- * @return Whether the action is a CreateSessionAction
- */
- public boolean isCreateSession() {
- return(false);
- }
-
- /**
- * This method determines whether the action is a gateway
- * for inbound requests.
- *
- * @return Whether the action is a gateway
- */
- public boolean isGateway() {
- return(false);
- }
-
- /**
- * This method indicates whether this action performs another
- * sub-conversation.
- *
- * @return Whether the action is a 'perform'
- */
- public boolean isPerform() {
- return(false);
- }
-
- /**
- * This method returns the mandatory property names.
- *
- * @return The mandatory property names
- */
- protected java.util.List<String> getMandatoryProperties() {
- java.util.List<String> ret=new java.util.Vector<String>();
- return(ret);
- }
-
- /**
- * This method returns the optional property names.
- *
- * @return The optional property names
- */
- protected java.util.List<String> getOptionalProperties() {
- java.util.List<String> ret=new java.util.Vector<String>();
- ret.add(DefaultESBService.BUSINESS_OBJECT_TYPE_PROPERTY);
- ret.add(IDENTITIES);
- ret.add(DefaultESBService.SERVICE_DESCRIPTION_NAME_PROPERTY);
- return(ret);
- }
-
- /**
- * This method returns the action's class name.
- *
- * @return The action's class name
- */
- public String getActionClass() {
- String ret=null;
-
- if (m_action != null) {
- ret = m_action.getAttribute(CLASS_PROPERTY);
- }
-
- return(ret);
- }
-
- /**
- * This method returns the property value associated
- * with the supplied name.
- *
- * @param property The property name
- * @return The property value, or null if not found
- */
- public String getPropertyValue(String property) {
- String ret=null;
-
- if (m_action != null) {
- org.w3c.dom.NodeList nl=m_action.getChildNodes();
-
- for (int i=0; ret == null && i < nl.getLength(); i++) {
- if (nl.item(i) instanceof org.w3c.dom.Element &&
- nl.item(i).getNodeName().equals(PROPERTY_ELEMENT) &&
- ((org.w3c.dom.Element)nl.item(i)).getAttribute(NAME_ATTR).
- equals(property)) {
- ret = ((org.w3c.dom.Element)nl.item(i)).getAttribute(VALUE_ATTR);
- }
- }
- }
-
- return(ret);
- }
-
- /**
- * This method determines the property value, associated
- * with the supplied name, is defined.
- *
- * @param property The property name
- * @return Whether the property has been defined
- */
- public boolean hasProperty(String property) {
- boolean ret=false;
-
- if (m_action != null) {
- org.w3c.dom.NodeList nl=m_action.getChildNodes();
-
- for (int i=0; ret == false && i < nl.getLength(); i++) {
- if (nl.item(i) instanceof org.w3c.dom.Element &&
- nl.item(i).getNodeName().equals(PROPERTY_ELEMENT) &&
- ((org.w3c.dom.Element)nl.item(i)).getAttribute(NAME_ATTR).
- equals(property)) {
- ret = true;
- }
- }
- }
-
- return(ret);
- }
-
- /**
- * This method returns the element associated with the
- * requested property. If the property does not exist, then
- * it will be created.
- *
- * @param property The property
- * @return The element
- */
- public org.w3c.dom.Element getPropertyElement(String property) {
- org.w3c.dom.Element ret=null;
-
- if (m_action != null) {
- org.w3c.dom.NodeList nl=
- getAction().getElementsByTagName(PROPERTY_ELEMENT);
-
- for (int i=0; ret == null && i < nl.getLength(); i++) {
- if (nl.item(i) instanceof org.w3c.dom.Element) {
- String propName=((org.w3c.dom.Element)nl.item(i)).getAttribute(NAME_ATTR);
-
- if (propName != null && propName.equals(property)) {
- ret = (org.w3c.dom.Element)nl.item(i);
- }
- }
- }
-
- if (ret == null) {
- ret = getAction().getOwnerDocument().createElement(PROPERTY_ELEMENT);
- ret.setAttribute(NAME_ATTR, property);
-
- m_action.appendChild(ret);
- }
- }
-
- return(ret);
- }
-
- /**
- * This method returns the list of property names defined for
- * this action.
- *
- * @return The list of property names
- */
- public java.util.List<String> getPropertyNames() {
- java.util.List<String> ret=new java.util.Vector<String>();
-
- if (m_action != null) {
- org.w3c.dom.NodeList nl=m_action.getChildNodes();
-
- for (int i=0; i < nl.getLength(); i++) {
- if (nl.item(i) instanceof org.w3c.dom.Element &&
- nl.item(i).getNodeName().equals(PROPERTY_ELEMENT)) {
- ret.add(((org.w3c.dom.Element)nl.item(i)).getAttribute(NAME_ATTR));
- }
- }
- }
-
- return(ret);
- }
-
- /**
- * This method returns the 'property' child nodes, associated with the
- * supplied property name, within the action configuration.
- *
- * @param property The property name
- * @return The list of child nodes
- */
- public org.w3c.dom.NodeList getPropertyChildNodes(String property) {
- org.w3c.dom.NodeList ret=null;
-
- org.w3c.dom.NodeList nl=m_action.getChildNodes();
-
- for (int i=0; ret == null && i < nl.getLength(); i++) {
- if (nl.item(i) instanceof org.w3c.dom.Element &&
- nl.item(i).getNodeName().equals(PROPERTY_ELEMENT) &&
- ((org.w3c.dom.Element)nl.item(i)).getAttribute(NAME_ATTR).
- equals(property)) {
- ret = ((org.w3c.dom.Element)nl.item(i)).getChildNodes();
- }
- }
-
- return(ret);
- }
-
- /**
- * This method returns the reference to the service that contains the
- * action.
- *
- * @return The service
- */
- protected ESBService getService() {
- return(m_service);
- }
-
- /**
- * This method sets the service description name property.
- *
- * @param name The service description name
- */
- public void setServiceDescriptionName(String name) {
-
- org.w3c.dom.Element prop=getPropertyElement(
- DefaultESBService.SERVICE_DESCRIPTION_NAME_PROPERTY);
-
- if (prop != null) {
- prop.setAttribute(VALUE_ATTR, name);
- }
- }
-
- /**
- * This method sets the business object type property.
- *
- * @param name The business object type
- */
- public void setBusinessObjectType(String type) {
-
- org.w3c.dom.Element prop=getPropertyElement(
- DefaultESBService.BUSINESS_OBJECT_TYPE_PROPERTY);
-
- if (prop != null) {
- prop.setAttribute(VALUE_ATTR, type);
- }
- }
-
- /**
- * This method returns the XML configuration representation of the action.
- *
- * @return The XML configuration for the action
- */
- public org.w3c.dom.Element getAction() {
- return(m_action);
- }
-
- /**
- * This method returns the list of links established by this action.
- *
- * @return The list of links
- */
- protected java.util.List<ESBLink> getLinks() {
- return(m_links);
- }
-
- /**
- * This method converts the ESB action into an equivalent
- * behavioural description for conformance checking.
- *
- * @param activities The list of activities that will contain
- * the converted action(s)
- * @param context The conversion context
- */
- public abstract void convert(java.util.List<Activity> activities,
- ConversionContext context);
-
- /**
- * This method returns the node position of the action configuration
- * within the service descriptor.
- *
- * @return The action position
- */
- protected int getActionPosition() {
- org.w3c.dom.Element service=(org.w3c.dom.Element)
- getAction().getParentNode().getParentNode();
-
- int actionCount=0;
- boolean f_end=false;
-
- org.w3c.dom.NodeList acts=service.getElementsByTagName(ACTION_ELEMENT);
-
- for (int i=0; f_end == false &&
- i < acts.getLength(); i++) {
- org.w3c.dom.Node act=acts.item(i);
-
- actionCount++;
- if (act == getAction()) {
- f_end = true;
- }
- }
-
- return(actionCount);
- }
-
- private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.jbossesb.model");
-
- private ESBService m_service=null;
- private org.w3c.dom.Element m_action=null;
- private java.util.List<ESBLink> m_links=new java.util.Vector<ESBLink>();
-}
Copied: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/AbstractESBAction.java (from rev 263, cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/AbstractESBAction.java)
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/AbstractESBAction.java (rev 0)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/AbstractESBAction.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -0,0 +1,581 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.tools.overlord.cdl.jbossesb.model.actions;
+
+import java.util.logging.Logger;
+
+import org.scribble.model.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.util.ESBModelUtil;
+import org.jboss.tools.overlord.cdl.jbossesb.model.util.ProblemDefinitions;
+
+/**
+ * This is the generic ESB action class.
+ *
+ * @author gary
+ */
+public abstract class AbstractESBAction extends ModelObject
+ implements ESBAction {
+
+ public static final String IDENTITIES = "identities";
+ public static final String ACTION_ELEMENT = "action";
+ public static final String VALUE_ATTR = "value";
+ public static final String NAME_ATTR = "name";
+ public static final String PROPERTY_ELEMENT = "property";
+ public static final String CLASS_PROPERTY = "class";
+
+ /**
+ * The constructor for initializing the action based on
+ * an existing DOM element.
+ */
+ protected AbstractESBAction(ESBService service,
+ org.w3c.dom.Element action) {
+ initExistingAction(service, action);
+ }
+
+ /**
+ * The contructor for initializing a new action.
+ */
+ protected AbstractESBAction(ESBService service,
+ String actionClass) {
+ initNewAction(service, actionClass);
+ }
+
+ /**
+ * This method initializes the action.
+ *
+ * @param service The reference to the service in which
+ * the action is contained
+ * @param actionClass The action class
+ */
+ protected void initNewAction(ESBService service,
+ String actionClass) {
+ m_service = service;
+
+ m_action = service.getService().
+ getOwnerDocument().createElement(ACTION_ELEMENT);
+
+ m_action.setAttribute(CLASS_PROPERTY, actionClass);
+ }
+
+ /**
+ * This method initializes the action.
+ *
+ * @param service The reference to the service in which
+ * the action is contained
+ * @param action The XML configuration details for the action
+ */
+ protected void initExistingAction(ESBService service,
+ org.w3c.dom.Element action) {
+ m_service = service;
+ m_action = action;
+
+ int servicesStartPos=-1;
+
+ if (m_service.getModel() != null &&
+ m_service.getModel().getOriginalContents() != null &&
+ (servicesStartPos=m_service.getModel().
+ getOriginalContents().indexOf("<services>")) != -1) {
+
+ // Find positional information
+ int servCount=m_service.getServicePosition();
+ int actionCount=getActionPosition();
+
+ String str=m_service.getModel().getOriginalContents();
+
+ int startPosition=str.indexOf("<service", servicesStartPos+2);
+ int endPosition=-1;
+ int loggedEndPosition=-1;
+
+ while (startPosition != -1 && servCount > 0) {
+ servCount--;
+
+ endPosition = str.indexOf("</service>", startPosition);
+
+ if (servCount > 0) {
+ startPosition=str.indexOf("<service", endPosition);
+ }
+ }
+
+ int actionsStartPos=-1;
+
+ if (actionCount > 0 &&
+ startPosition != -1 && endPosition != -1 &&
+ (actionsStartPos=str.indexOf("<actions",
+ startPosition)) != -1 &&
+ actionsStartPos < endPosition) {
+ startPosition=str.indexOf("<action", actionsStartPos+2);
+ endPosition=-1;
+
+ while (startPosition != -1 && actionCount > 0) {
+ actionCount--;
+
+ loggedEndPosition = str.indexOf('>', startPosition);
+
+ endPosition = str.indexOf("</action>", startPosition);
+
+ if (actionCount > 0) {
+ startPosition=str.indexOf("<action", endPosition);
+ }
+ }
+
+ // Check whether single line element
+ int inlineEndPos=str.indexOf("/>", startPosition);
+ int nextStartPos=str.indexOf("<", startPosition+1);
+
+ if (inlineEndPos != -1 && inlineEndPos < nextStartPos) {
+ endPosition = inlineEndPos;
+ }
+ }
+
+ getSource().setStartPosition(startPosition);
+ getSource().setEndPosition(loggedEndPosition);
+
+ getSource().getProperties().put("path",
+ ESBModelUtil.getPath(m_action));
+ }
+ }
+
+ /**
+ * This method initializes the links with the ESB service descriptors
+ * identified in each path of the action.
+ */
+ public void initializeLinks() {
+ }
+
+ /**
+ * This method validates the ESB action and reports warnings or
+ * errors to the supplied model listener.
+ *
+ * @param l The model listener
+ */
+ public void validate(ModelListener l) {
+
+ java.util.List<String> mandatory=getMandatoryProperties();
+
+ for (int i=0; i < mandatory.size(); i++) {
+ if (getPropertyValue(mandatory.get(i)) == null) {
+ java.util.Map<String,Object> props=new java.util.HashMap<String,Object>();
+ props.put(ProblemDefinitions.PROBLEM_PROPERTY,
+ mandatory.get(i));
+ l.error(this, org.scribble.util.MessageUtil.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
+ "_NOT_SPECIFIED_PROPERTY",
+ new String[]{mandatory.get(i)}), props);
+ }
+ }
+
+ java.util.List<String> propNames=getPropertyNames();
+
+ for (int i=0; i < propNames.size(); i++) {
+ String propName=propNames.get(i);
+
+ if (getOptionalProperties().contains(propName) == false &&
+ getMandatoryProperties().contains(propName) == false) {
+ l.error(this, org.scribble.util.MessageUtil.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
+ "_UNKNOWN_PROPERTY",
+ new String[]{propName}), null);
+ }
+ }
+
+ String session=getPropertyValue(DefaultESBService.BUSINESS_OBJECT_TYPE_PROPERTY);
+
+ if (session != null) {
+ // Validate that the business object type exists
+ try {
+ ClassLoader cl=
+ org.jboss.tools.overlord.cdl.jbossesb.model.util.ClasspathUtil.getClassLoader(getService().getModel());
+
+ try {
+ Class.forName(session, true, cl);
+ } catch(ClassNotFoundException cfne) {
+ l.error(this, org.scribble.util.MessageUtil.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.jboss.tools.overlord.cdl.jbossesb.model.Messages"),
+ "_NOT_FOUND_BUSINESS_OBJECT_TYPE",
+ new String[]{session}), null);
+ }
+
+ } catch(Exception e) {
+ logger.log(java.util.logging.Level.SEVERE,
+ "Failed to load business class '"+session+"'", e);
+ }
+ }
+
+ // Validate links
+ for (int i=0; i < m_links.size(); i++) {
+ ESBLink link=(ESBLink)m_links.get(i);
+
+ if (link.getService() == null) {
+ // If target service not found, then report error
+ // unless it is a remote service, so defined in a
+ // different file
+ if (link.isRemote() == false) {
+ l.error(this, org.scribble.util.MessageUtil.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.jboss.tools.overlord.cdl.jbossesb.model.Messages"),
+ "_NOT_FOUND_SERVICE_DESCRIPTOR",
+ new String[]{link.getCategory(),link.getName()}), null);
+ }
+ } else if (getService().getSessionName() != null &&
+ isPerform() == false && link.isRemote() == false &&
+ link.getService().getSessionName() != null &&
+ getService().getSessionName().equals(
+ link.getService().getSessionName()) == false) {
+
+ java.util.Map<String,Object> props=new java.util.HashMap<String,Object>();
+ props.put(ProblemDefinitions.PROBLEM_PROPERTY,
+ DefaultESBService.BUSINESS_OBJECT_TYPE_PROPERTY);
+
+ l.error(this, org.scribble.util.MessageUtil.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
+ "_MISMATCH_SESSION_CLASS",
+ new String[]{link.getCategory(),link.getName()}), props);
+ }
+ }
+ }
+
+ /**
+ * This method determines if the action represents a loop construct.
+ *
+ * @return Whether the action represents a loop construct
+ */
+ public boolean isLoop() {
+ return(false);
+ }
+
+ /**
+ * This method determines whether the action is related to a behavioural
+ * session.
+ *
+ * @return Whether the action is session based
+ */
+ public boolean isSessionBased() {
+ return(true);
+ }
+
+ /**
+ * This method determines whether the ESB action represents
+ * a CreateSessionAction.
+ *
+ * @return Whether the action is a CreateSessionAction
+ */
+ public boolean isCreateSession() {
+ return(false);
+ }
+
+ /**
+ * This method determines whether the action is a gateway
+ * for inbound requests.
+ *
+ * @return Whether the action is a gateway
+ */
+ public boolean isGateway() {
+ return(false);
+ }
+
+ /**
+ * This method indicates whether this action performs another
+ * sub-conversation.
+ *
+ * @return Whether the action is a 'perform'
+ */
+ public boolean isPerform() {
+ return(false);
+ }
+
+ /**
+ * This method returns the mandatory property names.
+ *
+ * @return The mandatory property names
+ */
+ protected java.util.List<String> getMandatoryProperties() {
+ java.util.List<String> ret=new java.util.Vector<String>();
+ return(ret);
+ }
+
+ /**
+ * This method returns the optional property names.
+ *
+ * @return The optional property names
+ */
+ protected java.util.List<String> getOptionalProperties() {
+ java.util.List<String> ret=new java.util.Vector<String>();
+ ret.add(DefaultESBService.BUSINESS_OBJECT_TYPE_PROPERTY);
+ ret.add(IDENTITIES);
+ ret.add(DefaultESBService.SERVICE_DESCRIPTION_NAME_PROPERTY);
+ return(ret);
+ }
+
+ /**
+ * This method returns the action's class name.
+ *
+ * @return The action's class name
+ */
+ public String getActionClass() {
+ String ret=null;
+
+ if (m_action != null) {
+ ret = m_action.getAttribute(CLASS_PROPERTY);
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method returns the property value associated
+ * with the supplied name.
+ *
+ * @param property The property name
+ * @return The property value, or null if not found
+ */
+ public String getPropertyValue(String property) {
+ String ret=null;
+
+ if (m_action != null) {
+ org.w3c.dom.NodeList nl=m_action.getChildNodes();
+
+ for (int i=0; ret == null && i < nl.getLength(); i++) {
+ if (nl.item(i) instanceof org.w3c.dom.Element &&
+ nl.item(i).getNodeName().equals(PROPERTY_ELEMENT) &&
+ ((org.w3c.dom.Element)nl.item(i)).getAttribute(NAME_ATTR).
+ equals(property)) {
+ ret = ((org.w3c.dom.Element)nl.item(i)).getAttribute(VALUE_ATTR);
+ }
+ }
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method determines the property value, associated
+ * with the supplied name, is defined.
+ *
+ * @param property The property name
+ * @return Whether the property has been defined
+ */
+ public boolean hasProperty(String property) {
+ boolean ret=false;
+
+ if (m_action != null) {
+ org.w3c.dom.NodeList nl=m_action.getChildNodes();
+
+ for (int i=0; ret == false && i < nl.getLength(); i++) {
+ if (nl.item(i) instanceof org.w3c.dom.Element &&
+ nl.item(i).getNodeName().equals(PROPERTY_ELEMENT) &&
+ ((org.w3c.dom.Element)nl.item(i)).getAttribute(NAME_ATTR).
+ equals(property)) {
+ ret = true;
+ }
+ }
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method returns the element associated with the
+ * requested property. If the property does not exist, then
+ * it will be created.
+ *
+ * @param property The property
+ * @return The element
+ */
+ public org.w3c.dom.Element getPropertyElement(String property) {
+ org.w3c.dom.Element ret=null;
+
+ if (m_action != null) {
+ org.w3c.dom.NodeList nl=
+ getAction().getElementsByTagName(PROPERTY_ELEMENT);
+
+ for (int i=0; ret == null && i < nl.getLength(); i++) {
+ if (nl.item(i) instanceof org.w3c.dom.Element) {
+ String propName=((org.w3c.dom.Element)nl.item(i)).getAttribute(NAME_ATTR);
+
+ if (propName != null && propName.equals(property)) {
+ ret = (org.w3c.dom.Element)nl.item(i);
+ }
+ }
+ }
+
+ if (ret == null) {
+ ret = getAction().getOwnerDocument().createElement(PROPERTY_ELEMENT);
+ ret.setAttribute(NAME_ATTR, property);
+
+ m_action.appendChild(ret);
+ }
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method returns the list of property names defined for
+ * this action.
+ *
+ * @return The list of property names
+ */
+ public java.util.List<String> getPropertyNames() {
+ java.util.List<String> ret=new java.util.Vector<String>();
+
+ if (m_action != null) {
+ org.w3c.dom.NodeList nl=m_action.getChildNodes();
+
+ for (int i=0; i < nl.getLength(); i++) {
+ if (nl.item(i) instanceof org.w3c.dom.Element &&
+ nl.item(i).getNodeName().equals(PROPERTY_ELEMENT)) {
+ ret.add(((org.w3c.dom.Element)nl.item(i)).getAttribute(NAME_ATTR));
+ }
+ }
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method returns the 'property' child nodes, associated with the
+ * supplied property name, within the action configuration.
+ *
+ * @param property The property name
+ * @return The list of child nodes
+ */
+ public org.w3c.dom.NodeList getPropertyChildNodes(String property) {
+ org.w3c.dom.NodeList ret=null;
+
+ org.w3c.dom.NodeList nl=m_action.getChildNodes();
+
+ for (int i=0; ret == null && i < nl.getLength(); i++) {
+ if (nl.item(i) instanceof org.w3c.dom.Element &&
+ nl.item(i).getNodeName().equals(PROPERTY_ELEMENT) &&
+ ((org.w3c.dom.Element)nl.item(i)).getAttribute(NAME_ATTR).
+ equals(property)) {
+ ret = ((org.w3c.dom.Element)nl.item(i)).getChildNodes();
+ }
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method returns the reference to the service that contains the
+ * action.
+ *
+ * @return The service
+ */
+ protected ESBService getService() {
+ return(m_service);
+ }
+
+ /**
+ * This method sets the service description name property.
+ *
+ * @param name The service description name
+ */
+ public void setServiceDescriptionName(String name) {
+
+ org.w3c.dom.Element prop=getPropertyElement(
+ DefaultESBService.SERVICE_DESCRIPTION_NAME_PROPERTY);
+
+ if (prop != null) {
+ prop.setAttribute(VALUE_ATTR, name);
+ }
+ }
+
+ /**
+ * This method sets the business object type property.
+ *
+ * @param name The business object type
+ */
+ public void setBusinessObjectType(String type) {
+
+ org.w3c.dom.Element prop=getPropertyElement(
+ DefaultESBService.BUSINESS_OBJECT_TYPE_PROPERTY);
+
+ if (prop != null) {
+ prop.setAttribute(VALUE_ATTR, type);
+ }
+ }
+
+ /**
+ * This method returns the XML configuration representation of the action.
+ *
+ * @return The XML configuration for the action
+ */
+ public org.w3c.dom.Element getAction() {
+ return(m_action);
+ }
+
+ /**
+ * This method returns the list of links established by this action.
+ *
+ * @return The list of links
+ */
+ protected java.util.List<ESBLink> getLinks() {
+ return(m_links);
+ }
+
+ /**
+ * This method converts the ESB action into an equivalent
+ * behavioural description for conformance checking.
+ *
+ * @param activities The list of activities that will contain
+ * the converted action(s)
+ * @param context The conversion context
+ */
+ public abstract void convert(java.util.List<Activity> activities,
+ ConversionContext context);
+
+ /**
+ * This method returns the node position of the action configuration
+ * within the service descriptor.
+ *
+ * @return The action position
+ */
+ protected int getActionPosition() {
+ org.w3c.dom.Element service=(org.w3c.dom.Element)
+ getAction().getParentNode().getParentNode();
+
+ int actionCount=0;
+ boolean f_end=false;
+
+ org.w3c.dom.NodeList acts=service.getElementsByTagName(ACTION_ELEMENT);
+
+ for (int i=0; f_end == false &&
+ i < acts.getLength(); i++) {
+ org.w3c.dom.Node act=acts.item(i);
+
+ actionCount++;
+ if (act == getAction()) {
+ f_end = true;
+ }
+ }
+
+ return(actionCount);
+ }
+
+ private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.jbossesb.model");
+
+ private ESBService m_service=null;
+ private org.w3c.dom.Element m_action=null;
+ private java.util.List<ESBLink> m_links=new java.util.Vector<ESBLink>();
+}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/CreateSessionAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/CreateSessionAction.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/CreateSessionAction.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,12 +15,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.actions;
+package org.jboss.tools.overlord.cdl.jbossesb.model.actions;
-import org.jboss.tools.overlord.jbossesb.model.ConversionContext;
-import org.jboss.tools.overlord.jbossesb.model.ESBAction;
-import org.jboss.tools.overlord.jbossesb.model.ESBActionFactory;
-import org.jboss.tools.overlord.jbossesb.model.ESBService;
+import org.jboss.tools.overlord.cdl.jbossesb.model.ConversionContext;
+import org.jboss.tools.overlord.cdl.jbossesb.model.ESBAction;
+import org.jboss.tools.overlord.cdl.jbossesb.model.ESBActionFactory;
+import org.jboss.tools.overlord.cdl.jbossesb.model.ESBService;
import org.scribble.model.*;
/**
@@ -98,7 +98,7 @@
if (act != this) {
l.error(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_MUST_BE_FIRST_ACTION",
new String[]{"CreateSession"}), null);
}
@@ -109,7 +109,7 @@
if (getService().getConversationType() == null) {
l.error(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_CONVERSATION_TYPE",
new String[]{}), null);
} else {
@@ -119,7 +119,7 @@
if (index == -1 || index == convType.length()-1) {
l.error(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_CONVERSATION_TYPE_ROLE",
new String[]{convType}), null);
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/IfAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/IfAction.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/IfAction.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,9 +15,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.actions;
+package org.jboss.tools.overlord.cdl.jbossesb.model.actions;
-import org.jboss.tools.overlord.jbossesb.model.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.*;
import org.scribble.model.*;
import org.scribble.conversation.model.*;
@@ -197,7 +197,7 @@
if (nl != null && (f_if == false || f_orderWrong)) {
l.error(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_IF_ORDER_WRONG",
new String[]{}), null);
}
@@ -205,7 +205,7 @@
if (f_serviceDetailsMissing) {
l.error(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_PATH_SERVICE_DETAILS_MISSING",
new String[]{}), null);
}
@@ -213,7 +213,7 @@
if (f_immediateInvalid) {
l.error(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_BOOLEAN",
new String[]{IMMEDIATE}), null);
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/MessageRouterAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/MessageRouterAction.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/MessageRouterAction.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,15 +15,15 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.actions;
+package org.jboss.tools.overlord.cdl.jbossesb.model.actions;
import java.util.logging.Logger;
-import org.jboss.tools.overlord.jbossesb.model.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.change.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.util.IdentityUtil;
import org.scribble.conversation.model.*;
import org.scribble.model.*;
-import org.jboss.tools.overlord.jbossesb.model.change.*;
-import org.jboss.tools.overlord.jbossesb.model.util.IdentityUtil;
/**
* The model component for the 'MessageRouterAction'. Although
@@ -249,7 +249,7 @@
if (getService().isSessionBased()) {
l.error(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_CANNOT_SESSION_BASED_ACTIONS_WITH_ROUTER",
new String[]{}), null);
}
@@ -262,7 +262,7 @@
if (service.isRoot() == false) {
l.error(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_CANNOT_INITIATE_NON_ROOT",
new String[]{service.getCategory(),
service.getName()}), null);
@@ -277,7 +277,7 @@
if (service.isRoot()) {
l.error(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_MUST_INITIATE_ROOT",
new String[]{service.getCategory(),
service.getName()}), null);
@@ -308,7 +308,7 @@
if (nl != null && routeCount < 1) {
l.error(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_ROUTER_ONE_OR_MORE_PATHS",
new String[]{}), null);
}
@@ -316,7 +316,7 @@
if (f_serviceDetailsMissing) {
l.error(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_PATH_SERVICE_DETAILS_MISSING",
new String[]{}), null);
}
@@ -335,7 +335,7 @@
ConversionContext context) {
}
- private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.jbossesb.model.actions");
+ private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.jbossesb.model.actions");
private java.util.List<ESBService> m_initiateServices=new java.util.Vector<ESBService>();
private java.util.List<ESBService> m_services=new java.util.Vector<ESBService>();
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/ParallelAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/ParallelAction.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/ParallelAction.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,9 +15,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.actions;
+package org.jboss.tools.overlord.cdl.jbossesb.model.actions;
-import org.jboss.tools.overlord.jbossesb.model.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.*;
import org.scribble.model.*;
import org.scribble.conversation.model.*;
@@ -186,7 +186,7 @@
if (nl != null && pathCount < 2) {
l.error(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_PARALLEL_MORE_THAN_TWO_PATHS",
new String[]{}), null);
}
@@ -194,7 +194,7 @@
if (f_pathAfterJoin) {
l.error(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_PARALLEL_PATH_AFTER_JOIN",
new String[]{}), null);
}
@@ -202,7 +202,7 @@
if (f_multipleJoins) {
l.error(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_MULTIPLE_JOINS",
new String[]{}), null);
}
@@ -210,7 +210,7 @@
if (f_serviceDetailsMissing) {
l.error(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_PATH_SERVICE_DETAILS_MISSING",
new String[]{}), null);
}
@@ -218,7 +218,7 @@
if (f_immediateInvalid) {
l.error(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_BOOLEAN",
new String[]{IMMEDIATE}), null);
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/PerformAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/PerformAction.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/PerformAction.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,9 +15,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.actions;
+package org.jboss.tools.overlord.cdl.jbossesb.model.actions;
-import org.jboss.tools.overlord.jbossesb.model.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.*;
import org.scribble.model.*;
import org.scribble.conversation.model.*;
@@ -139,7 +139,7 @@
if (m_service.isCreateSession() == false) {
l.error(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_NOT_FOUND_PERFORM_CREATE_SESSION",
new String[]{}), null);
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/ReceiveMessageAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/ReceiveMessageAction.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/ReceiveMessageAction.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,9 +15,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.actions;
+package org.jboss.tools.overlord.cdl.jbossesb.model.actions;
-import org.jboss.tools.overlord.jbossesb.model.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.*;
import org.scribble.conversation.model.*;
import org.scribble.model.*;
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/RetrieveSessionAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/RetrieveSessionAction.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/RetrieveSessionAction.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,9 +15,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.actions;
+package org.jboss.tools.overlord.cdl.jbossesb.model.actions;
-import org.jboss.tools.overlord.jbossesb.model.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.*;
import org.scribble.model.*;
/**
@@ -71,7 +71,7 @@
if (act != this) {
l.error(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_MUST_BE_FIRST_ACTION",
new String[]{"RetrieveSession"}), null);
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/ScheduleStateAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/ScheduleStateAction.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/ScheduleStateAction.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,11 +15,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.actions;
+package org.jboss.tools.overlord.cdl.jbossesb.model.actions;
-import org.jboss.tools.overlord.jbossesb.model.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.*;
import org.scribble.model.*;
-import org.jboss.tools.overlord.jbossesb.model.ESBService;
/**
* The model component for the 'ScheduleStateAction'.
@@ -115,7 +114,7 @@
immediate.equalsIgnoreCase("false") == false) {
l.error(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_BOOLEAN",
new String[]{IMMEDIATE}), null);
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/SendMessageAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SendMessageAction.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/SendMessageAction.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,9 +15,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.actions;
+package org.jboss.tools.overlord.cdl.jbossesb.model.actions;
-import org.jboss.tools.overlord.jbossesb.model.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.*;
import org.scribble.conversation.model.*;
import org.scribble.model.*;
@@ -154,7 +154,7 @@
} else {
l.error(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_REQ_RESP_EPR",
new String[]{}), null);
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/SetMessageAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SetMessageAction.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/SetMessageAction.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,9 +15,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.actions;
+package org.jboss.tools.overlord.cdl.jbossesb.model.actions;
-import org.jboss.tools.overlord.jbossesb.model.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.*;
import org.scribble.model.*;
/**
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/SetStateAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SetStateAction.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/SetStateAction.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,11 +15,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.actions;
+package org.jboss.tools.overlord.cdl.jbossesb.model.actions;
import java.util.logging.Logger;
-import org.jboss.tools.overlord.jbossesb.model.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.*;
import org.scribble.model.*;
/**
@@ -111,13 +111,13 @@
if (variable.equals(token)) {
l.error(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_NOT_FOUND_VARIABLE",
new String[]{variable, cls.getName()}), null);
} else {
l.error(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_NOT_FOUND_VARIABLE_PROPERTY",
new String[]{variable, token, cls.getName()}), null);
}
@@ -126,7 +126,7 @@
if (pd.getReadMethod() == null) {
l.error(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_NOT_READABLE_PROPERTY",
new String[]{pd.getName(), cls.getName()}), null);
}
@@ -135,7 +135,7 @@
if (pd.getWriteMethod() == null) {
l.error(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_NOT_WRITABLE_PROPERTY",
new String[]{pd.getName(), cls.getName()}), null);
}
@@ -162,7 +162,7 @@
(stateExpression != null && messageExpression != null)) {
l.error(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_MUST_SPECIFY_STATE_OR_MESSAGE_EXPRESSION",
new String[]{}), null);
}
@@ -181,5 +181,5 @@
ConversionContext context) {
}
- private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.jbossesb.model.actions");
+ private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.jbossesb.model.actions");
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/SwitchAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SwitchAction.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/SwitchAction.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,10 +15,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.actions;
+package org.jboss.tools.overlord.cdl.jbossesb.model.actions;
-import org.jboss.tools.overlord.jbossesb.model.*;
-import org.jboss.tools.overlord.jbossesb.model.util.InteractionUtil;
+import org.jboss.tools.overlord.cdl.jbossesb.model.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.util.InteractionUtil;
import org.scribble.model.*;
import org.scribble.conversation.model.*;
@@ -138,7 +138,7 @@
if (nl != null && pathCount < 1) {
l.error(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_SWITCH_ONE_OR_MORE_PATHS",
new String[]{}), null);
}
@@ -146,7 +146,7 @@
if (f_serviceDetailsMissing) {
l.error(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_PATH_SERVICE_DETAILS_MISSING",
new String[]{}), null);
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/UnsupportedAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/UnsupportedAction.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/UnsupportedAction.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,9 +15,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.actions;
+package org.jboss.tools.overlord.cdl.jbossesb.model.actions;
-import org.jboss.tools.overlord.jbossesb.model.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.*;
import org.scribble.model.*;
/**
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/WhenAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/WhenAction.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/WhenAction.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,9 +15,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.actions;
+package org.jboss.tools.overlord.cdl.jbossesb.model.actions;
-import org.jboss.tools.overlord.jbossesb.model.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.*;
import org.scribble.model.*;
import org.scribble.conversation.model.*;
@@ -144,7 +144,7 @@
if (nl != null && pathCount < 1) {
l.error(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_WHEN_ONE_OR_MORE_PATHS",
new String[]{}), null);
}
@@ -152,7 +152,7 @@
if (f_serviceDetailsMissing) {
l.error(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_PATH_SERVICE_DETAILS_MISSING",
new String[]{}), null);
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/WhileAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/WhileAction.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/actions/WhileAction.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,9 +15,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.actions;
+package org.jboss.tools.overlord.cdl.jbossesb.model.actions;
-import org.jboss.tools.overlord.jbossesb.model.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.*;
import org.scribble.model.*;
import org.scribble.conversation.model.*;
@@ -153,7 +153,7 @@
if (act != this) {
l.error(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_MUST_BE_FIRST_ACTION",
new String[]{"While"}), null);
}
@@ -232,7 +232,7 @@
if (nl != null && (f_while == false || f_multipleWhiles)) {
l.error(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_MUST_DEFINE_SINGLE_WHILE_PATH",
new String[]{}), null);
}
@@ -240,7 +240,7 @@
if (nl != null && (f_exit == false || f_multipleExits)) {
l.error(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_MUST_DEFINE_SINGLE_WHILE_EXIT",
new String[]{}), null);
}
@@ -248,7 +248,7 @@
if (f_pathAfterExit) {
l.error(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_WHILE_PATH_AFTER_EXIT",
new String[]{}), null);
}
@@ -256,7 +256,7 @@
if (f_serviceDetailsMissing) {
l.error(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_PATH_SERVICE_DETAILS_MISSING",
new String[]{}), null);
}
@@ -264,7 +264,7 @@
if (f_immediateInvalid) {
l.error(this, org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_BOOLEAN",
new String[]{IMMEDIATE}), null);
}
Copied: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change (from rev 260, cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change)
Property changes on: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/ConversationInteractionModelChangeRule.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/ConversationInteractionModelChangeRule.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/ConversationInteractionModelChangeRule.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,13 +15,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.change;
+package org.jboss.tools.overlord.cdl.jbossesb.model.change;
-import org.jboss.tools.overlord.jbossesb.model.*;
-import org.jboss.tools.overlord.jbossesb.model.actions.*;
-import org.jboss.tools.overlord.jbossesb.model.util.ConversationUtil;
-import org.jboss.tools.overlord.jbossesb.model.util.IdentityUtil;
-import org.jboss.tools.overlord.jbossesb.model.util.InteractionUtil;
+import org.jboss.tools.overlord.cdl.jbossesb.model.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.actions.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.util.ConversationUtil;
+import org.jboss.tools.overlord.cdl.jbossesb.model.util.IdentityUtil;
+import org.jboss.tools.overlord.cdl.jbossesb.model.util.InteractionUtil;
import org.scribble.model.*;
import org.scribble.model.change.*;
import org.scribble.conversation.model.*;
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/ConversationModelChangeRule.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/ConversationModelChangeRule.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/ConversationModelChangeRule.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,11 +15,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.change;
+package org.jboss.tools.overlord.cdl.jbossesb.model.change;
-import org.jboss.tools.overlord.jbossesb.model.*;
-import org.jboss.tools.overlord.jbossesb.model.actions.*;
-import org.jboss.tools.overlord.jbossesb.model.util.ConversationUtil;
+import org.jboss.tools.overlord.cdl.jbossesb.model.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.actions.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.util.ConversationUtil;
import org.scribble.model.*;
import org.scribble.model.change.*;
import org.scribble.conversation.model.*;
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/IfModelChangeRule.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/IfModelChangeRule.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/IfModelChangeRule.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,14 +15,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.change;
+package org.jboss.tools.overlord.cdl.jbossesb.model.change;
import java.util.logging.Logger;
-import org.jboss.tools.overlord.jbossesb.model.*;
-import org.jboss.tools.overlord.jbossesb.model.actions.*;
-import org.jboss.tools.overlord.jbossesb.model.util.ConversationUtil;
-import org.jboss.tools.overlord.jbossesb.model.util.InteractionUtil;
+import org.jboss.tools.overlord.cdl.jbossesb.model.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.actions.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.util.ConversationUtil;
+import org.jboss.tools.overlord.cdl.jbossesb.model.util.InteractionUtil;
import org.scribble.model.*;
import org.scribble.model.change.*;
import org.scribble.model.analysis.*;
@@ -340,5 +340,5 @@
return(true);
}
- private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.jbossesb.model.change");
+ private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.jbossesb.model.change");
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/LanguageToConversationModelChangeRule.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/LanguageToConversationModelChangeRule.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/LanguageToConversationModelChangeRule.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,10 +15,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.change;
+package org.jboss.tools.overlord.cdl.jbossesb.model.change;
-import org.jboss.tools.overlord.jbossesb.model.*;
-import org.jboss.tools.overlord.jbossesb.model.actions.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.actions.*;
import org.scribble.model.*;
import org.scribble.model.change.*;
import org.scribble.conversation.model.*;
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/ParallelModelChangeRule.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/ParallelModelChangeRule.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/ParallelModelChangeRule.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,13 +15,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.change;
+package org.jboss.tools.overlord.cdl.jbossesb.model.change;
import java.util.logging.Logger;
-import org.jboss.tools.overlord.jbossesb.model.*;
-import org.jboss.tools.overlord.jbossesb.model.actions.*;
-import org.jboss.tools.overlord.jbossesb.model.util.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.actions.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.util.*;
import org.scribble.model.*;
import org.scribble.model.change.*;
import org.scribble.model.analysis.*;
@@ -163,5 +163,5 @@
return(true);
}
- private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.jbossesb.model.change");
+ private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.jbossesb.model.change");
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/RunModelChangeRule.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/RunModelChangeRule.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/RunModelChangeRule.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,13 +15,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.change;
+package org.jboss.tools.overlord.cdl.jbossesb.model.change;
import java.util.logging.Logger;
-import org.jboss.tools.overlord.jbossesb.model.*;
-import org.jboss.tools.overlord.jbossesb.model.actions.*;
-import org.jboss.tools.overlord.jbossesb.model.util.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.actions.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.util.*;
import org.scribble.model.*;
import org.scribble.model.change.*;
import org.scribble.model.analysis.*;
@@ -112,5 +112,5 @@
return(true);
}
- private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.jbossesb.model.change");
+ private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.jbossesb.model.change");
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/SpawnModelChangeRule.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/SpawnModelChangeRule.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/SpawnModelChangeRule.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,13 +15,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.change;
+package org.jboss.tools.overlord.cdl.jbossesb.model.change;
//import java.util.logging.Logger;
-import org.jboss.tools.overlord.jbossesb.model.*;
-import org.jboss.tools.overlord.jbossesb.model.actions.*;
-import org.jboss.tools.overlord.jbossesb.model.util.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.actions.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.util.*;
import org.scribble.model.*;
import org.scribble.model.change.*;
import org.scribble.conversation.model.*;
@@ -97,5 +97,5 @@
return(true);
}
- //private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.jbossesb.model.change");
+ //private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.jbossesb.model.change");
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/WhenModelChangeRule.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/WhenModelChangeRule.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/WhenModelChangeRule.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,13 +15,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.change;
+package org.jboss.tools.overlord.cdl.jbossesb.model.change;
import java.util.logging.Logger;
-import org.jboss.tools.overlord.jbossesb.model.*;
-import org.jboss.tools.overlord.jbossesb.model.actions.*;
-import org.jboss.tools.overlord.jbossesb.model.util.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.actions.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.util.*;
import org.scribble.model.*;
import org.scribble.model.change.*;
import org.scribble.model.analysis.*;
@@ -243,5 +243,5 @@
return(true);
}
- private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.jbossesb.model.change");
+ private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.jbossesb.model.change");
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/WhileModelChangeRule.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/change/WhileModelChangeRule.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/WhileModelChangeRule.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,13 +15,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.change;
+package org.jboss.tools.overlord.cdl.jbossesb.model.change;
import java.util.logging.Logger;
-import org.jboss.tools.overlord.jbossesb.model.*;
-import org.jboss.tools.overlord.jbossesb.model.actions.*;
-import org.jboss.tools.overlord.jbossesb.model.util.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.actions.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.util.*;
import org.scribble.model.*;
import org.scribble.model.change.*;
import org.scribble.model.analysis.*;
@@ -213,5 +213,5 @@
return(true);
}
- private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.jbossesb.model.change");
+ private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.jbossesb.model.change");
}
Copied: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/util (from rev 260, cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/util)
Property changes on: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/util
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/util/ClasspathUtil.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/util/ClasspathUtil.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/util/ClasspathUtil.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,7 +15,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.util;
+package org.jboss.tools.overlord.cdl.jbossesb.model.util;
import org.scribble.model.*;
import org.scribble.osgi.model.OSGIModelRepository;
@@ -26,7 +26,7 @@
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
-import org.jboss.tools.overlord.jbossesb.model.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.*;
public class ClasspathUtil {
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/util/ConversationUtil.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/util/ConversationUtil.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/util/ConversationUtil.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,7 +15,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.util;
+package org.jboss.tools.overlord.cdl.jbossesb.model.util;
import org.scribble.conversation.model.*;
import org.scribble.model.Model;
Copied: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/util/ESBModelUtil.java (from rev 263, cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/util/ESBModelUtil.java)
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/util/ESBModelUtil.java (rev 0)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/util/ESBModelUtil.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2005-8 Pi4 Technologies Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *
+ * Change History:
+ * 21 Aug 2008 : Initial version created by gary
+ */
+package org.jboss.tools.overlord.cdl.jbossesb.model.util;
+
+public class ESBModelUtil {
+
+ public static String getPath(org.w3c.dom.Element elem) {
+ String ret="";
+
+ if (elem != null) {
+ if (elem.hasAttribute("name")) {
+ ret = elem.getAttribute("name");
+ } else {
+ ret = elem.getNodeName();
+ }
+
+ if (elem.getParentNode() instanceof org.w3c.dom.Element) {
+ String parentPath=getPath((org.w3c.dom.Element)
+ elem.getParentNode());
+
+ if (parentPath != null && parentPath.trim().length() > 0) {
+ ret = parentPath+"/"+ret;
+ }
+ }
+ }
+
+ return(ret);
+ }
+}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/util/IdentityUtil.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/util/IdentityUtil.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/util/IdentityUtil.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,7 +15,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.util;
+package org.jboss.tools.overlord.cdl.jbossesb.model.util;
import org.scribble.model.*;
import org.scribble.conversation.model.*;
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/util/InteractionUtil.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/util/InteractionUtil.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/util/InteractionUtil.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,7 +15,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.util;
+package org.jboss.tools.overlord.cdl.jbossesb.model.util;
import org.scribble.model.*;
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/util/ProblemDefinitions.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/util/ProblemDefinitions.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/util/ProblemDefinitions.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,7 +15,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.util;
+package org.jboss.tools.overlord.cdl.jbossesb.model.util;
public class ProblemDefinitions {
Copied: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/parser (from rev 260, cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/parser)
Property changes on: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/parser
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/parser/JBossESBNotation.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/parser/JBossESBNotation.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/parser/JBossESBNotation.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,11 +15,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.parser;
+package org.jboss.tools.overlord.cdl.jbossesb.parser;
import org.scribble.extensions.*;
import org.scribble.model.ModelReference;
-import org.jboss.tools.overlord.jbossesb.model.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.*;
/**
*
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/parser/JBossESBParser.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/parser/JBossESBParser.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/parser/JBossESBParser.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,7 +15,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.parser;
+package org.jboss.tools.overlord.cdl.jbossesb.parser;
import java.io.InputStream;
import java.util.logging.Level;
@@ -25,7 +25,7 @@
import javax.xml.parsers.DocumentBuilderFactory;
import org.scribble.model.*;
-import org.jboss.tools.overlord.jbossesb.model.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.*;
import org.scribble.extensions.*;
import org.scribble.parser.Parser;
@@ -97,5 +97,5 @@
return(ret);
}
- private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.jbossesb.parser");
+ private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.jbossesb.parser");
}
Copied: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/validation (from rev 260, cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/validation)
Property changes on: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/validation
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/validation/ESBLanguageModelValidationRule.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/validation/ESBLanguageModelValidationRule.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/validation/ESBLanguageModelValidationRule.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,12 +15,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.validation;
+package org.jboss.tools.overlord.cdl.jbossesb.validation;
import org.scribble.validation.*;
import org.scribble.extensions.*;
import org.scribble.model.*;
-import org.jboss.tools.overlord.jbossesb.model.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.*;
/**
* This class implements the validation rule for the
Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ConversionContext.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ConversionContext.java 2008-08-26 14:01:00 UTC (rev 274)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ConversionContext.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -1,88 +0,0 @@
-/*
- * Copyright 2005-8 Pi4 Technologies Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- *
- * Change History:
- * 25 Jun 2008 : Initial version created by gary
- */
-package org.jboss.tools.overlord.jbossesb.model;
-
-public interface ConversionContext {
-
- /**
- * This method returns the role associated with the
- * endpoint being converted.
- *
- *@return The role
- */
- public String getRole();
-
- /**
- * This method is invoked when an ESB service is being processed.
- *
- * @param service The service
- */
- public void processing(ESBService service);
-
- /**
- * This method is invoked when an ESB service has been processed.
- *
- * @param service The service
- */
- public void processed(ESBService service);
-
- /**
- * Push service on the stack of services in which the current
- * context is contained.
- *
- * @param service The service
- */
- public void push(ESBService service);
-
- /**
- * Pop service from the stack of services in which the current
- * context is contained.
- *
- * @param service The service
- */
- public void pop(ESBService service);
-
- /**
- * This method determines whether the supplied service is on
- * the stack of services in which the current context is
- * contained.
- *
- * @param service The service
- * @return Whether the service is on the stack
- */
- public boolean isOnStack(ESBService service);
-
- /**
- * This method marks an ESB service as being a join state.
- *
- * @param service The service
- */
- public void markJoin(ESBService service);
-
- /**
- * This method determines whether the ESB service is a join
- * state.
- *
- * @param service The serviice
- * @return Whether the service is a join state
- */
- public boolean isJoin(ESBService service);
-
-}
Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultConversionContext.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultConversionContext.java 2008-08-26 14:01:00 UTC (rev 274)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultConversionContext.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -1,129 +0,0 @@
-/*
- * Copyright 2005-8 Pi4 Technologies Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- *
- * Change History:
- * 25 Jun 2008 : Initial version created by gary
- */
-package org.jboss.tools.overlord.jbossesb.model;
-
-import java.util.logging.Logger;
-
-public class DefaultConversionContext implements ConversionContext {
-
- /**
- * This constructor initializes the role associated with
- * the conversion.
- *
- * @param role The role
- */
- public DefaultConversionContext(String role) {
- m_role = role;
- }
-
- /**
- * This method returns the role associated with the
- * endpoint being converted.
- *
- *@return The role
- */
- public String getRole() {
- return(m_role);
- }
-
- /**
- * This method is invoked when an ESB service is being processed.
- *
- * @param service The service
- */
- public void processing(ESBService service) {
- m_joins.remove(service);
- }
-
- /**
- * This method is invoked when an ESB service has been processed.
- *
- * @param service The service
- */
- public void processed(ESBService service) {
-
- }
-
- /**
- * Push service on the stack of services in which the current
- * context is contained.
- *
- * @param service The service
- */
- public void push(ESBService service) {
- m_serviceStack.add(service);
- }
-
- /**
- * Pop service from the stack of services in which the current
- * context is contained.
- *
- * @param service The service
- */
- public void pop(ESBService service) {
-
- // Check if the service is the last element on the stack
- if (m_serviceStack.size() == 0 ||
- m_serviceStack.get(m_serviceStack.size()-1) != service) {
- logger.severe("Request to pop service '"+service+
- "' that is not the most recent entry on the stack");
- }
-
- m_serviceStack.remove(service);
- }
-
- /**
- * This method determines whether the supplied service is on
- * the stack of services in which the current context is
- * contained.
- *
- * @param service The service
- * @return Whether the service is on the stack
- */
- public boolean isOnStack(ESBService service) {
- return(m_serviceStack.contains(service));
- }
-
- /**
- * This method marks an ESB service as being a join state.
- *
- * @param service The service
- */
- public void markJoin(ESBService service) {
- m_joins.add(service);
- }
-
- /**
- * This method determines whether the ESB service is a join
- * state.
- *
- * @param service The service
- * @return Whether the service is a join state
- */
- public boolean isJoin(ESBService service) {
- return(m_joins.contains(service));
- }
-
- private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.jbossesb.model");
-
- private java.util.List<ESBService> m_serviceStack=new java.util.Vector<ESBService>();
- private java.util.List<ESBService> m_joins=new java.util.Vector<ESBService>();
- private String m_role=null;
-}
Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultESBLanguageModel.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultESBLanguageModel.java 2008-08-26 14:01:00 UTC (rev 274)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultESBLanguageModel.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -1,669 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.tools.overlord.jbossesb.model;
-
-import java.util.logging.Logger;
-
-import org.scribble.conversation.model.*;
-import org.scribble.extensions.RegistryFactory;
-import org.scribble.model.*;
-
-/**
- * This class represents an ESB model.
- *
- * @author gary
- */
-public class DefaultESBLanguageModel extends org.scribble.lang.model.LanguageModel
- implements ESBLanguageModel {
-
- private static final String SERVICE_NAME_SEPARATOR = "__";
- public static final String DEST_NAME_PREFIX = "queue/";
- public static final String DEST_NAME_ATTR = "dest-name";
- public static final String DEST_TYPE_VALUE = "QUEUE";
- public static final String DEST_TYPE_ATTR = "dest-type";
- public static final String JMS_MESSAGE_FILTER_ELEMENT = "jms-message-filter";
- public static final String JMS_BUS_ELEMENT = "jms-bus";
- public static final String BUSID_ATTR = "busid";
- public static final String JBOSSESB_XML_NAMESPACE = "http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd";
- public static final String XMLNS = "xmlns";
- public static final String TOP_LEVEL_ELEMENT = "jbossesb";
- public static final String PARAMETER_RELOAD_SECS_ATTR = "parameterReloadSecs";
- public static final String PROVIDERS_ELEMENT = "providers";
- public static final String JMS_PROVIDER_ELEMENT = "jms-provider";
- public static final String JAVA_NOTATION = "java";
- public static final String SERVICE_ELEMENT = "service";
- public static final String SERVICES_ELEMENT = "services";
-
- public static final String JBOSSESB_NOTATION = "jboss-esb.xml";
-
- /**
- * This constructor is initialized with the ESB configuration.
- *
- * @param source The model reference for the JBossESB configuration source
- * @param elem The ESB configuration
- * @param contents The textual contents
- */
- public DefaultESBLanguageModel(ModelReference source, org.w3c.dom.Element elem,
- String contents) {
- m_source = source;
- m_esbConfig = elem;
- m_contents = contents;
-
- // Extract service action pipelines
- initializeExistingConfig();
- }
-
- /**
- * This constructor initializes a new ESB configuration.
- *
- * @param source The model reference for the JBossESB configuration
- */
- public DefaultESBLanguageModel(ModelReference source) {
- m_source = source;
-
- initializeNewConfig();
- }
-
- /**
- * This method creates a new ESB configuration.
- */
- protected void initializeNewConfig() {
-
- org.w3c.dom.Document doc=null;
-
- // Create an empty document
- try {
- doc = javax.xml.parsers.DocumentBuilderFactory.
- newInstance().newDocumentBuilder().newDocument();
-
- m_esbConfig = doc.createElement(TOP_LEVEL_ELEMENT);
-
- m_esbConfig.setAttribute(XMLNS,
- JBOSSESB_XML_NAMESPACE);
- m_esbConfig.setAttribute(PARAMETER_RELOAD_SECS_ATTR,"5000");
-
- doc.appendChild(m_esbConfig);
-
- // Create provider information
- org.w3c.dom.Element providers=doc.createElement(PROVIDERS_ELEMENT);
- m_esbConfig.appendChild(providers);
-
- m_jmsProviderElem = doc.createElement(JMS_PROVIDER_ELEMENT);
- providers.appendChild(m_jmsProviderElem);
-
- // Configure the jms provider
- m_jmsProviderElem.setAttribute("name", "JBossMQ");
- m_jmsProviderElem.setAttribute("connection-factory", "ConnectionFactory");
- m_jmsProviderElem.setAttribute("jndi-context-factory", "org.jnp.interfaces.NamingContextFactory");
- m_jmsProviderElem.setAttribute("jndi-URL", "localhost");
-
- // Create services element
- m_servicesElem = doc.createElement(SERVICES_ELEMENT);
- m_esbConfig.appendChild(m_servicesElem);
-
- } catch(Exception e) {
- logger.severe("Failed to create initial jbossesb document: "+e);
- }
-
- }
-
- /**
- * This method initializes the ESB Model.
- */
- protected void initializeExistingConfig() {
- org.w3c.dom.NodeList services=
- m_esbConfig.getElementsByTagName(SERVICES_ELEMENT);
-
- org.scribble.model.DependencyManager dm=
- (org.scribble.model.DependencyManager)
- org.scribble.extensions.RegistryFactory.getRegistry().getExtension(
- org.scribble.model.DependencyManager.class, null);
-
- ModelName mname=new ModelName();
- mname.setName(m_source.getLocalpart());
-
- setModelName(mname);
-
- Namespace ns=new Namespace();
- ns.setName(m_source.getNamespace());
- setNamespace(ns);
-
- if (services != null && services.getLength() == 1 &&
- services.item(0) instanceof org.w3c.dom.Element) {
- org.w3c.dom.NodeList nl=((org.w3c.dom.Element)
- services.item(0)).getChildNodes();
-
- for (int i=0; i < nl.getLength(); i++) {
-
- if (nl.item(i) instanceof org.w3c.dom.Element &&
- nl.item(i).getNodeName().equals(SERVICE_ELEMENT)) {
-
- ESBService service=new DefaultESBService(this,
- (org.w3c.dom.Element)nl.item(i));
- String key=getKey(service.getCategory(),
- service.getName());
-
- m_services.put(key, service);
- }
- }
-
- java.util.Iterator<ESBService> iter=m_services.values().iterator();
-
- while (iter.hasNext()) {
- iter.next().initializeLinks();
- }
-
- // Initialize the conversations
- java.util.List<String> sessionClasses=new java.util.Vector<String>();
- java.util.Iterator<ESBService> serviter=getServices().iterator();
-
- while (serviter.hasNext()) {
- ESBService service=serviter.next();
-
- if (service.isRoot()) {
-
- /*
- String convType=service.getConversationType();
- String role=null;
-
- if (convType != null) {
- int index=convType.indexOf('@');
-
- if (index != -1) {
- // TODO: Need to think whether this should be
- // 'implements' reference. If so, then need to change
- // Java Lang Model parser and also Lang Model conformance
- // rule.
- ImplementsReference iref=
- new ImplementsReference(ConversationModel.CONVERSATION);
- //ConformanceReference iref=
- // new ConformanceReference(ConversationModel.CONVERSATION);
-
- role = convType.substring(index+1);
-
- iref.setLocatedRole(role);
-
- // Need to locate the model name
- modelName.setLocatedRole(new Role(iref.getLocatedRole()));
-
- String mainpart=convType.substring(0, index);
-
- index = mainpart.lastIndexOf(".");
-
- if (index == -1) {
- iref.setNamespace("");
- iref.setLocalpart(mainpart);
- } else {
- iref.setNamespace(mainpart.substring(0, index));
- iref.setLocalpart(mainpart.substring(index+1));
- }
-
- conv.getImplements().add(iref);
- //conv.getConformsTo().add(iref);
-
- dm.recordDependency(m_source, iref,
- DependencyType.Implements);
-
- } else {
- logger.warning("Conversation type does not " +
- "contain '@' located role separator");
- }
- } else {
- logger.warning("No conversation type specified");
- }
-
- conv.setBlock(new Block());
-
- service.convert(conv.getBlock().getContents(),
- new DefaultConversionContext(role));
-
- */
-
- Conversation conv=service.convert(null);
-
- if (conv != null) {
- getConversations().add(conv);
- }
- }
-
- //Add session class to list
- String sessionClass=service.getSessionName();
-
- if (sessionClass != null &&
- sessionClasses.contains(sessionClass) == false) {
- sessionClasses.add(sessionClass);
- }
- }
-
- // Add dependency on session classes
- for (int i=0; i < sessionClasses.size(); i++) {
- String sessionClass=sessionClasses.get(i);
- int index=sessionClass.lastIndexOf('.');
- String nspace="";
- String local=sessionClass;
-
- if (index != -1) {
- nspace = sessionClass.substring(0, index);
- local = sessionClass.substring(index+1);
-
- dm.recordDependency(getModelReference(),
- new ModelReference(nspace, local,
- null, JAVA_NOTATION),
- DependencyType.Uses);
- }
- }
- }
-
- if (logger.isLoggable(java.util.logging.Level.FINEST)) {
-
- org.scribble.export.Exporter exporter=
- (org.scribble.export.Exporter)
- RegistryFactory.getRegistry().getExtension(
- org.scribble.export.Exporter.class, null);
-
- try {
- for (int i=0; i < getConversations().size(); i++) {
- ConversationModel model=new ConversationModel();
-
- model.setConversation(getConversations().get(i));
-
- org.scribble.export.text.TextFormatter formatter=
- new org.scribble.export.text.TextFormatter();
-
- java.io.ByteArrayOutputStream os=
- new java.io.ByteArrayOutputStream();
-
- formatter.setOutputStream(os);
-
- exporter.export(model, formatter);
-
- String str=new String(os.toByteArray());
-
- System.out.println("EXPORTED JBOSS-ESB TEXT:");
- System.out.println(str);
- }
- } catch(Exception e) {
- e.printStackTrace();
- }
- }
- }
-
- @Override
- public String getNotation() {
- return(JBOSSESB_NOTATION);
- }
-
- /**
- * This method returns the source model reference.
- *
- * @return The source model reference
- */
- public ModelReference getModelReference() {
- return(m_source);
- }
-
- /**
- * Generate a key for use in accessing the service related to
- * the supplied category and name.
- *
- * @param category The category
- * @param name The service name
- * @return The key
- */
- protected String getKey(String category, String name) {
- return(category+"/"+name);
- }
-
- /**
- * This method validates the ESB model and reports warnings or
- * errors to the supplied model listener.
- *
- * @param l The model listener
- */
- public void validate(ModelListener l) {
-
- java.util.Iterator<ESBService> iter=m_services.values().iterator();
-
- while (iter.hasNext()) {
- ESBService service=iter.next();
-
- service.validate(l);
- }
- }
-
- /**
- * This method returns the ESB service for the supplied
- * category and name.
- *
- * @param category The service category
- * @param name The service name
- * @return The ESB service, or null if not found
- */
- public ESBService getService(String category, String name) {
- return(m_services.get(getKey(category, name)));
- }
-
- /**
- * This method returns the collection of ESB services associated
- * with the model.
- *
- * @return The collection of ESB services
- */
- public java.util.Collection<ESBService> getServices() {
- return(m_services.values());
- }
-
- /**
- * This method creates a new ESB service.
- *
- * @param category The category
- * @param name The name
- * @return The new ESB service
- */
- public ESBService createService(String category, String name) {
- return(new DefaultESBService(this, category, name));
- }
-
- /**
- * This method adds a new service to the model.
- *
- * @param service The service
- */
- public void addService(ESBService service) {
- m_services.put(getKey(service.getCategory(), service.getName()),
- service);
-
- // Add service
- if (service.getService() != null) {
- m_servicesElem.appendChild(service.getService());
- }
-
- // Add provider information
- String busId=service.getJMSBusIdRef();
-
- // Check if busId is unique
- if (busId == null || findJMSBus(busId) != null) {
- busId = getUniqueBusId();
- service.setJMSBusIdRef(busId);
- }
-
- if (busId != null) {
- addJMSBus(busId, getJMSDestination(service.getCategory(),
- service.getName()));
- } else {
- logger.severe("Service '"+service+
- "' does not have a bus Id");
- }
- }
-
- protected String getUniqueBusId() {
- int index=1;
- String ret="busId"+index;
-
- while (findJMSBus(ret) != null) {
- index++;
- ret = "busId"+index;
- }
-
- return(ret);
- }
-
- /**
- * This method returns the JMS destination associated with
- * the supplied JMS Bus Id.
- *
- * @param jmsBusId The JMS bus id
- * @return The JMS definition, or null if not found
- */
- public String getJMSDefinition(String jmsBusId) {
- String ret=null;
-
- org.w3c.dom.Element elem=findJMSBus(jmsBusId);
-
- if (elem != null) {
- org.w3c.dom.NodeList nl=
- elem.getElementsByTagName(JMS_MESSAGE_FILTER_ELEMENT);
-
- if (nl.getLength() != 0 &&
- nl.item(0) instanceof org.w3c.dom.Element) {
- org.w3c.dom.Element filter=(org.w3c.dom.Element)
- nl.item(0);
-
- if (filter.hasAttribute(DEST_NAME_ATTR)) {
- ret = filter.getAttribute(DEST_NAME_ATTR);
-
- // If prefixed, then strip prefix away
- if (ret.startsWith(DEST_NAME_PREFIX)) {
- ret = ret.substring(DEST_NAME_PREFIX.length());
- }
- }
- }
- }
-
- return(ret);
- }
-
- protected void addJMSBus(String jmsBusId, String dest) {
-
- org.w3c.dom.Element jmsBus=
- m_esbConfig.getOwnerDocument().createElement(JMS_BUS_ELEMENT);
- m_jmsProviderElem.appendChild(jmsBus);
-
- jmsBus.setAttribute(BUSID_ATTR, jmsBusId);
-
- org.w3c.dom.Element mesgFilter=
- m_esbConfig.getOwnerDocument().createElement(JMS_MESSAGE_FILTER_ELEMENT);
- jmsBus.appendChild(mesgFilter);
-
- mesgFilter.setAttribute(DEST_TYPE_ATTR, DEST_TYPE_VALUE);
- mesgFilter.setAttribute(DEST_NAME_ATTR, DEST_NAME_PREFIX+dest);
- }
-
- protected org.w3c.dom.Element findJMSBus(String jmsBusId) {
- org.w3c.dom.Element ret=null;
-
- org.w3c.dom.NodeList nl=m_jmsProviderElem.getChildNodes();
- for (int i=0; i < nl.getLength(); i++) {
- if (nl.item(i) instanceof org.w3c.dom.Element &&
- nl.item(i).getNodeName().equals(JMS_BUS_ELEMENT) &&
- ((org.w3c.dom.Element)nl.item(i)).
- getAttribute(BUSID_ATTR).equals(jmsBusId)) {
- ret = (org.w3c.dom.Element)nl.item(i);
- }
- }
-
- return(ret);
- }
-
- protected void removeJMSBus(String jmsBusId) {
- org.w3c.dom.Element bus=findJMSBus(jmsBusId);
-
- if (bus != null) {
- m_jmsProviderElem.removeChild(bus);
- } else {
- logger.severe("Remove JMS bus '"+jmsBusId+
- "' failed, unable to find bus");
- }
- }
-
- protected String getJMSDestination(String category, String name) {
- String ret=category.replace('.', '_');
-
- ret += "_"+name;
-
- return(ret);
- }
-
- /**
- * This method removes a service from the model.
- *
- * @param service The service
- */
- public void removeService(ESBService service) {
- m_services.remove(getKey(service.getCategory(),
- service.getName()));
-
- // Remove provider information
- String busId=service.getJMSBusIdRef();
-
- if (busId != null) {
- removeJMSBus(busId);
- } else {
- logger.severe("Service '"+service+
- "' does not have a bus Id");
- }
- }
-
- /**
- * This textual contents of the model.
- *
- * @return The textual contents
- */
- public String getOriginalContents() {
- return(m_contents);
- }
-
- /**
- * This method returns a unique service name within
- * the supplied category.
- *
- * @param category The category
- * @param currentServiceName The name of the service creating
- * the new service
- * @return The unique service name
- */
- public String getUniqueServiceName(String category, String currentServiceName) {
- String ret=null;
-
- int index=currentServiceName.indexOf(SERVICE_NAME_SEPARATOR);
- if (index != -1) {
- currentServiceName = currentServiceName.substring(0, index);
- }
-
- index = 0;
- do {
- index++;
- ret = currentServiceName+SERVICE_NAME_SEPARATOR+index;
- } while(getService(category, ret) != null);
-
- return(ret);
- }
-
- /**
- * This method returns the gateway service.
- *
- * @return The gateway service, or null if not found
- */
- public ESBService getGatewayService() {
- ESBService ret=null;
-
- java.util.Iterator<ESBService> iter=getServices().iterator();
- while (ret == null && iter.hasNext()) {
- ret = iter.next();
-
- if (ret.isGateway() == false) {
- ret = null;
- }
- }
-
- return(ret);
- }
-
- /**
- * This method returns the reference to the DOM
- * representation of the ESB configuration.
- *
- * @return The ESB configuration
- */
- public org.w3c.dom.Element getESBConfiguration() {
- return(m_esbConfig);
- }
-
- /**
- * This method returns a custom classloader that uses the project's
- * classpath to locate classes referenced by the ESB config file.
- *
- * @see http://dev.eclipse.org/newslists/news.eclipse.tools.jdt/msg17769.html
- *
- * @return The classloader
- * @throws Exception Failed to obtain the classloader
- */
- public synchronized ClassLoader getModelClassLoader() throws Exception {
-
- if (m_classLoader == null) {
- m_classLoader = org.jboss.tools.overlord.jbossesb.model.util.ClasspathUtil.createClassLoader(getModelReference());
- }
-
- return(m_classLoader);
- }
-
-
- private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.jbossesb.model");
-
- private ModelReference m_source=null;
- private org.w3c.dom.Element m_esbConfig=null;
- private org.w3c.dom.Element m_jmsProviderElem=null;
- private org.w3c.dom.Element m_servicesElem=null;
- private String m_contents=null;
- private java.util.Map<String,ESBService> m_services=new java.util.Hashtable<String,ESBService>();
- private ClassLoader m_classLoader=null;
-
- public class InnerModelListener implements ModelListener {
-
- public InnerModelListener(ModelListener l) {
- m_listener = l;
- }
-
- public void error(ModelObject src, String mesg, java.util.Map<String,Object> props) {
-
- if (props == null) {
- props = new java.util.HashMap<String,Object>();
- }
-
- props.put(ModelListener.RESOLUTIONS, ModelListener.SHOW_REFERENCE_DESCRIPTION_RESOLUTION);
- props.put(ModelListener.REFERENCE_MODEL, m_source);
- props.put(ModelListener.REFERENCE_MODEL_START_POSITION, src.getSource().getStartPosition());
- props.put(ModelListener.REFERENCE_MODEL_END_POSITION, src.getSource().getEndPosition());
- if (src.getSource().getComponentURI() != null) {
- props.put(ModelListener.REFERENCE_MODEL_COMPONENT,
- src.getSource().getComponentURI());
- }
-
- m_listener.error(src, mesg, props);
- }
-
- public void warning(ModelObject src, String mesg, java.util.Map<String,Object> props) {
- if (props == null) {
- props = new java.util.HashMap<String,Object>();
- }
-
- props.put(ModelListener.RESOLUTIONS, ModelListener.SHOW_REFERENCE_DESCRIPTION_RESOLUTION);
- props.put(ModelListener.REFERENCE_MODEL, m_source);
- props.put(ModelListener.REFERENCE_MODEL_START_POSITION, src.getSource().getStartPosition());
- props.put(ModelListener.REFERENCE_MODEL_END_POSITION, src.getSource().getEndPosition());
- if (src.getSource().getComponentURI() != null) {
- props.put(ModelListener.REFERENCE_MODEL_COMPONENT,
- src.getSource().getComponentURI());
- }
-
- m_listener.warning(src, mesg, props);
- }
-
- private ModelListener m_listener=null;
- }
-}
Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultESBService.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultESBService.java 2008-08-26 14:01:00 UTC (rev 274)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultESBService.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -1,848 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.tools.overlord.jbossesb.model;
-
-import java.util.logging.Logger;
-
-import org.jboss.tools.overlord.jbossesb.model.util.ESBModelUtil;
-import org.scribble.model.*;
-import org.scribble.conversation.model.*;
-
-/**
- * This class represents an ESB service.
- *
- * @author gary
- */
-public class DefaultESBService extends ModelObject implements ESBService {
-
- public static final String LISTENERS_ELEMENT = "listeners";
- public static final String BUSIDREF_ATTR = "busidref";
- public static final String JMS_LISTENER_ELEMENT = "jms-listener";
- public static final String MAX_THREADS_ATTR = "maxThreads";
- public static final String NAME_ATTR = "name";
- public static final String CATEGORY_ATTR = "category";
- public static final String ROOT_PROPERTY = "root";
- public static final String BUSINESS_OBJECT_TYPE_PROPERTY = "session";
- public static final String CONVERSATION_TYPE_PROPERTY = "conversationType";
- public static final String SERVICE_DESCRIPTION_NAME_PROPERTY = "serviceDescriptionName";
- public static final String SERVICE_ANNOTATION = "org.jboss.soa.overlord.jbossesb.actions.Service";
- public static final String SERVICE_ELEMENT = "service";
- public static final String RETRIEVE_SESSION_ACTION_CLASS = "org.jboss.soa.overlord.jbossesb.actions.RetrieveSessionAction";
- public static final String ACTION_ELEMENT = "action";
- public static final String ACTIONS_ELEMENT = "actions";
-
- /**
- * This is the constructor for the ESB service. This construct
- * creates a new DOM element, contained within the supplied
- * model, to represent the service associated with the
- * supplied category and name.
- *
- * @param model The ESB model in which the service has been defined
- * @param service The XML configuration of the service
- */
- public DefaultESBService(ESBLanguageModel model,
- String category, String name) {
- m_model = model;
-
- // Create new element for the service
- initializeNewServiceElement(category, name);
- }
-
- /**
- * This is the constructor for the ESB service. This construct
- * creates a wrapper around the supplied DOM representation of
- * the existing service element within an ESB configuration.
- *
- * @param model The ESB model in which the service has been defined
- * @param service The XML configuration of the service
- */
- public DefaultESBService(ESBLanguageModel model, org.w3c.dom.Element service) {
- m_model = model;
- m_service = service;
-
- if (m_model != null && m_service != null) {
- initializeExistingServiceElement();
- }
- }
-
- protected void initializeNewServiceElement(String category, String name) {
-
- m_service = m_model.getESBConfiguration().
- getOwnerDocument().createElement(SERVICE_ELEMENT);
-
- m_service.setAttribute(CATEGORY_ATTR, category);
- m_service.setAttribute(NAME_ATTR, name);
-
- m_actionsElem = m_model.getESBConfiguration().
- getOwnerDocument().createElement(ACTIONS_ELEMENT);
- m_service.appendChild(m_actionsElem);
- }
-
- /**
- * This method initializes the service.
- */
- protected void initializeExistingServiceElement() {
- // Check if relevant action
- org.w3c.dom.NodeList actions=m_service.getElementsByTagName(ACTIONS_ELEMENT);
-
- if (actions != null && actions.getLength() == 1 &&
- actions.item(0) instanceof org.w3c.dom.Element) {
-
- m_actionsElem = (org.w3c.dom.Element)actions.item(0);
-
- org.w3c.dom.NodeList nl=((org.w3c.dom.Element)
- actions.item(0)).getChildNodes();
-
- for (int i=0; i < nl.getLength(); i++) {
- if (nl.item(i) instanceof org.w3c.dom.Element &&
- nl.item(i).getNodeName().equals(ACTION_ELEMENT)) {
- m_actions.add(ESBActionFactory.createAction(this,
- ((org.w3c.dom.Element)nl.item(i))));
- }
- }
- }
-
- // Find positional information
- int servCount=getServicePosition();
-
- String str=getModel().getOriginalContents();
-
- if (str != null) {
- int startPosition=str.indexOf("<service ");
- int endPosition=-1;
- int loggedEndPosition=-1;
-
- while (startPosition != -1 && servCount > 0) {
- servCount--;
-
- loggedEndPosition = str.indexOf('>', startPosition);
-
- endPosition = str.indexOf("</service>", startPosition);
-
- if (servCount > 0) {
- startPosition=str.indexOf("<service ", endPosition);
- }
- }
-
- if (startPosition != -1) {
- endPosition = str.indexOf("</service>", startPosition);
-
- getSource().setStartPosition(startPosition);
- getSource().setEndPosition(loggedEndPosition);
-
- getSource().getProperties().put("path",
- ESBModelUtil.getPath(m_service));
- }
- }
-
- // Get jms listener
- org.w3c.dom.NodeList nl=m_service.getElementsByTagName(DefaultESBService.JMS_LISTENER_ELEMENT);
-
- if (nl.getLength() > 0 && nl.item(0) instanceof org.w3c.dom.Element) {
- m_jmsListenerElem = (org.w3c.dom.Element)nl.item(0);
- }
- }
-
- /**
- * This method initializes the links.
- */
- public void initializeLinks() {
-
- // Work through actions requesting them to
- // establish their links
- for (int i=0; i < m_actions.size(); i++) {
- m_actions.get(i).initializeLinks();
- }
- }
-
- /**
- * This method validates the ESB service and reports warnings or
- * errors to the supplied model listener.
- *
- * @param l The model listener
- */
- public void validate(ModelListener l) {
-
- // Check that the service specifies a session
- if (isSessionBased() && getSessionClass() == null) {
-
- // Find first conversation based action to use as
- // focus - if not found then use the service itself
- ESBAction focus=getFirstSessionBasedAction();
- ModelObject src=this;
-
- if (focus instanceof ModelObject) {
- src = (ModelObject)focus;
- }
-
- l.error(src, org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
- "_NOT_SPECIFIED_SESSION_CLASS",
- new String[]{}), null);
- }
-
- for (int i=0; i < m_actions.size(); i++) {
- m_actions.get(i).validate(l);
- }
- }
-
- /**
- * This method returns the ESB model.
- *
- * @return The ESB model
- */
- public ESBLanguageModel getModel() {
- return(m_model);
- }
-
- /**
- * This method returns the category associated with the service
- * descriptor.
- *
- * @return The service category
- */
- public String getCategory() {
- return(m_service.getAttribute(CATEGORY_ATTR));
- }
-
- /**
- * This method returns the name associated with the service
- * descriptor.
- *
- * @return The service name
- */
- public String getName() {
- return(m_service.getAttribute(NAME_ATTR));
- }
-
- /**
- * This method returns the XML configuration representation of the service.
- *
- * @return The XML configuration for the service
- */
- public org.w3c.dom.Element getService() {
- return(m_service);
- }
-
- /**
- * This method returns the list of ESB actions.
- *
- * @return The ESB actions
- */
- public java.util.List<ESBAction> getActions() {
- return(m_actions);
- }
-
- /**
- * This method adds an action to the service.
- *
- * @param action The action to be added
- * @param pos The position to add, or -1 if at the end
- */
- public void addAction(ESBAction action, int pos) {
- // If position specified, then find element at
- // the position and insert after the previous
- // element
-
- if (action.getAction() != null) {
-
- if (pos == -1 || pos >= m_actions.size()) {
- m_actionsElem.appendChild(action.getAction());
- m_actions.add(action);
- } else {
- org.w3c.dom.NodeList nl=m_actionsElem.getChildNodes();
- org.w3c.dom.Element elem=null;
- int cur=-1;
-
- for (int i=0; i < nl.getLength(); i++) {
- if (nl.item(i) instanceof org.w3c.dom.Element &&
- nl.item(i).getNodeName().equals(ACTION_ELEMENT)) {
- cur++;
-
- if (cur == pos) {
- elem = (org.w3c.dom.Element)nl.item(i);
- }
- }
- }
-
- if (elem != null) {
- m_actionsElem.insertBefore(action.getAction(), elem);
- } else {
- m_actionsElem.appendChild(action.getAction());
- }
-
- m_actions.add(pos, action);
- }
- }
- }
-
- /**
- * This method removes an action from the service.
- *
- * @param action The action to be removed
- * @return Whether the action was removed
- */
- public boolean removeAction(ESBAction action) {
- return(false);
- }
-
- protected java.lang.annotation.Annotation getServiceAnnotation(String session) {
- java.lang.annotation.Annotation ret=null;
-
- try {
- ClassLoader cl=
- org.jboss.tools.overlord.jbossesb.model.util.ClasspathUtil.getClassLoader(getModel());
-
- Class<?> cls=Class.forName(session, true, cl);
-
- // TODO: This should be replaced by direct lookup
- // of Service annotation - but library not available
- // at the moment
- java.lang.annotation.Annotation[] annotations=
- cls.getAnnotations();
- for (int i=0; ret == null &&
- i < annotations.length; i++) {
- try {
- if (annotations[i].annotationType().getName().equals(
- SERVICE_ANNOTATION)) {
- ret = annotations[i];
- }
- } catch(Throwable ex) {
- logger.log(java.util.logging.Level.SEVERE,
- "ANNOTATION: "+
- annotations[i].annotationType(), ex);
- }
- }
-
- } catch(Exception e) {
- logger.log(java.util.logging.Level.SEVERE,
- "Failed to get session class '"+session+"'", e);
- }
-
- return(ret);
- }
-
- /**
- * This method determines whether the ESB service represents a
- * loop construct.
- *
- * @return Whether the service represents a loop
- */
- public boolean isLoop() {
- boolean ret=false;
- ESBAction action=getFirstSessionBasedAction();
-
- if (action != null) {
- ret = action.isLoop();
- }
-
- return(ret);
- }
-
- /**
- * This method determines whether the ESB service descriptor represents
- * a 'root' conversation.
- *
- * @return Whether the ESB service is associated with a root conversation
- */
- public boolean isRoot() {
- boolean ret=false;
- ESBAction action=getFirstSessionBasedAction();
-
- if (action != null) {
- if (action.isCreateSession()) {
- String bool=action.getPropertyValue(ROOT_PROPERTY);
- if (bool != null) {
- ret = bool.equalsIgnoreCase("true");
- } else {
- String session=action.getPropertyValue(BUSINESS_OBJECT_TYPE_PROPERTY);
-
- java.lang.annotation.Annotation annotation=
- getServiceAnnotation(session);
-
- if (annotation != null) {
- try {
- java.lang.reflect.Method method=
- annotation.getClass().getMethod(ROOT_PROPERTY,
- (Class<?>[])null);
-
- Object val=method.invoke(annotation, (Object[])null);
-
- if (val instanceof Boolean) {
- ret = ((Boolean)val).booleanValue();
- }
- } catch(Throwable t) {
- logger.log(java.util.logging.Level.SEVERE,
- "Failed to get 'root' annotation value", t);
- }
- }
- }
- }
- }
-
- return(ret);
- }
-
- /**
- * This method determines whether the ESB service descriptor
- * starts with a CreateSessionAction.
- *
- * @return Whether the service has a CreateSessionAction
- */
- public boolean isCreateSession() {
- boolean ret=false;
- ESBAction action=getFirstSessionBasedAction();
-
- if (action != null) {
- ret = action.isCreateSession();
- }
-
- return(ret);
- }
-
- /**
- * This method determines whether the service is a gateway
- * for inbound requests.
- *
- * @return Whether the service is a gateway
- */
- public boolean isGateway() {
- boolean ret=false;
-
- for (int i=0; ret == false && i < m_actions.size(); i++) {
- ret = m_actions.get(i).isGateway();
- }
-
- return(ret);
- }
-
- /**
- * This method returns the gateway action if this is a
- * gateway service.
- *
- * @return The gateway action
- */
- public ESBAction getGatewayAction() {
- ESBAction ret=null;
-
- for (int i=0; ret == null && i < m_actions.size(); i++) {
- if (m_actions.get(i).isGateway()) {
- ret = m_actions.get(i);
- }
- }
-
- return(ret);
- }
-
- /**
- * This method returns the first session based action in the
- * service descriptor.
- *
- * @return The first session based action, or null if none exist
- */
- public ESBAction getFirstSessionBasedAction() {
- ESBAction ret=null;
-
- for (int i=0; ret == null && i < m_actions.size(); i++) {
- ret=m_actions.get(i);
-
- if (ret.isSessionBased() == false) {
- ret = null;
- }
- }
-
- return(ret);
- }
-
- /**
- * This method returns the service description name associated with the
- * ESB service.
- *
- * @return The service description name
- */
- public String getServiceDescriptionName() {
- String ret=null;
- ESBAction action=getFirstSessionBasedAction();
-
- if (action != null) {
- if (action.isCreateSession() || (action.getActionClass() != null &&
- action.getActionClass().equals(RETRIEVE_SESSION_ACTION_CLASS))) {
- ret = action.getPropertyValue(SERVICE_DESCRIPTION_NAME_PROPERTY);
-
- if (ret == null) {
- String session=action.getPropertyValue(BUSINESS_OBJECT_TYPE_PROPERTY);
-
- java.lang.annotation.Annotation annotation=
- getServiceAnnotation(session);
-
- if (annotation != null) {
- try {
- java.lang.reflect.Method method=
- annotation.getClass().getMethod(NAME_ATTR, (Class<?>[])null);
-
- Object val=method.invoke(annotation, (Object[])null);
-
- if (val instanceof String) {
- ret = (String)val;
- }
- } catch(Throwable t) {
- logger.log(java.util.logging.Level.SEVERE,
- "Failed to get 'name' annotation value", t);
- }
- }
- }
- }
- }
-
- return(ret);
- }
-
- /**
- * This method returns the conversation type associated with the
- * ESB service.
- *
- * @return The conversation type
- */
- public String getConversationType() {
- String ret=null;
- ESBAction action=getFirstSessionBasedAction();
-
- if (action != null) {
- if (action.isCreateSession()) {
- ret = action.getPropertyValue(CONVERSATION_TYPE_PROPERTY);
-
- if (ret == null) {
- String session=action.getPropertyValue(BUSINESS_OBJECT_TYPE_PROPERTY);
-
- java.lang.annotation.Annotation annotation=
- getServiceAnnotation(session);
-
- if (annotation != null) {
- try {
- java.lang.reflect.Method method=
- annotation.getClass().getMethod(CONVERSATION_TYPE_PROPERTY,
- (Class<?>[])null);
-
- Object val=method.invoke(annotation, (Object[])null);
-
- if (val instanceof String) {
- ret = (String)val;
- }
- } catch(Throwable t) {
- logger.log(java.util.logging.Level.SEVERE,
- "Failed to get 'name' annotation value", t);
- }
- }
- }
- }
- }
-
- return(ret);
- }
-
- /**
- * This method returns the session name associated with the service
- * descriptor.
- *
- * @return The session name
- */
- public String getSessionName() {
- String ret=null;
- ESBAction action=getFirstSessionBasedAction();
-
- if (action != null) {
- ret = action.getPropertyValue(BUSINESS_OBJECT_TYPE_PROPERTY);
- }
-
- return(ret);
- }
-
- /**
- * This method returns the session class associated with the service
- * descriptor.
- *
- * @return The session class
- */
- public Class<?> getSessionClass() {
- Class<?> ret=null;
- String session=getSessionName();
-
- if (session != null) {
- try {
- ClassLoader cl=
- org.jboss.tools.overlord.jbossesb.model.util.ClasspathUtil.getClassLoader(getModel());
-
- ret = Class.forName(session, true, cl);
-
- } catch(Exception e) {
- logger.log(java.util.logging.Level.SEVERE,
- "Failed to get session class '"+session+"'", e);
- }
- }
-
- return(ret);
- }
-
- /**
- * This method determines whether the service is related to a behavioural
- * session.
- *
- * @return Whether the service is session based
- */
- public boolean isSessionBased() {
- boolean ret=false;
-
- for (int i=0; ret == false && i < m_actions.size(); i++) {
- ret = m_actions.get(i).isSessionBased();
- }
-
- return(ret);
- }
-
- /**
- * This method converts the ESB service into a Conversation, if
- * the service represents a conversation.
- *
- * @param context The conversion context, or null if this is the
- * root conversation
- * @return The conversation
- */
- public Conversation convert(ConversionContext context) {
- Conversation ret=null;
-
- if (isCreateSession()) {
- ret = new Conversation();
-
- ret.derivedFrom(this);
-
- ModelName modelName=new ModelName();
- modelName.setName(getServiceDescriptionName());
-
- ret.setModelName(modelName);
-
- String convType=getConversationType();
- String role=null;
-
- if (convType != null) {
- int index=convType.indexOf('@');
-
- if (index != -1) {
- // TODO: Need to think whether this should be
- // 'implements' reference. If so, then need to change
- // Java Lang Model parser and also Lang Model conformance
- // rule.
- ImplementsReference iref=
- new ImplementsReference(ConversationModel.CONVERSATION);
-
- role = convType.substring(index+1);
-
- iref.setLocatedRole(role);
-
- // Need to locate the model name
- modelName.setLocatedRole(new Role(iref.getLocatedRole()));
-
- String mainpart=convType.substring(0, index);
-
- index = mainpart.lastIndexOf(".");
-
- if (index == -1) {
- iref.setNamespace("");
- iref.setLocalpart(mainpart);
- } else {
- iref.setNamespace(mainpart.substring(0, index));
- iref.setLocalpart(mainpart.substring(index+1));
- }
-
- ret.getImplements().add(iref);
- //ret.getConformsTo().add(iref);
-
- org.scribble.model.DependencyManager dm=
- (org.scribble.model.DependencyManager)
- org.scribble.extensions.RegistryFactory.getRegistry().getExtension(
- org.scribble.model.DependencyManager.class, null);
-
- if (dm != null) {
- dm.recordDependency(getModel().getModelReference(),
- iref, DependencyType.Implements);
- }
-
- } else {
- logger.warning("Conversation type does not " +
- "contain '@' located role separator");
- }
- } else {
- logger.warning("No conversation type specified");
- }
-
- ret.setBlock(new Block());
-
- context = new DefaultConversionContext(role);
-
- context.processing(this);
-
- for (int i=0; i < m_actions.size(); i++) {
- ((ESBAction)m_actions.get(i)).convert(
- ret.getBlock().getContents(), context);
- }
-
- context.processed(this);
- }
-
- return(ret);
- }
-
- /**
- * This method converts the actions associated with the ESB service into
- * activities that can be checked for conformance against a conversation
- * type.
- *
- * @param activities The target list of activities associated with the
- * ESB actions being converted
- * @param context The conversion context
- */
- public void convert(java.util.List<Activity> activities,
- ConversionContext context) {
- context.processing(this);
-
- for (int i=0; i < m_actions.size(); i++) {
- ((ESBAction)m_actions.get(i)).convert(
- activities, context);
- }
-
- context.processed(this);
- }
-
- /**
- * This method returns the position of the service node within the
- * ESB configuration.
- *
- * @return The service node position
- */
- public int getServicePosition() {
- org.w3c.dom.Node services=m_service.getParentNode();
- int servCount=0;
- boolean f_end=false;
-
- for (int i=0; f_end == false &&
- i < services.getChildNodes().getLength(); i++) {
- org.w3c.dom.Node serv=services.getChildNodes().item(i);
-
- if (serv.getNodeName().equals(SERVICE_ELEMENT)) {
- servCount++;
- if (serv == m_service) {
- f_end = true;
- }
- }
- }
-
- return(servCount);
- }
-
- /**
- * This method returns the JMS Bus Id Ref associated with the
- * service's JMS listener.
- *
- * @return The JMS Bus Id Ref
- */
- public String getJMSBusIdRef() {
- String ret=null;
-
- if (m_jmsListenerElem != null) {
- ret = m_jmsListenerElem.getAttribute(BUSIDREF_ATTR);
- }
-
- return(ret);
- }
-
- /**
- * This method sets the JMS Bus Id Ref associated with the
- * service's JMS listener.
- *
- * @param busId The JMS Bus Id Ref
- */
- public void setJMSBusIdRef(String busId) {
- if (m_jmsListenerElem == null) {
- m_jmsListenerElem = m_service.getOwnerDocument().createElement(JMS_LISTENER_ELEMENT);
-
- org.w3c.dom.NodeList nl=m_service.getElementsByTagName(LISTENERS_ELEMENT);
- org.w3c.dom.Element listeners=null;
-
- if (nl.getLength() > 0) {
- listeners = (org.w3c.dom.Element)nl.item(0);
- } else {
- listeners = m_service.getOwnerDocument().createElement(LISTENERS_ELEMENT);
-
- if (m_service.getFirstChild() != null) {
- m_service.insertBefore(listeners,
- m_service.getFirstChild());
- } else {
- m_service.appendChild(listeners);
- }
- }
-
- if (listeners != null) {
- listeners.appendChild(m_jmsListenerElem);
- }
- }
-
- if (m_jmsListenerElem != null) {
- m_jmsListenerElem.setAttribute(BUSIDREF_ATTR,
- busId);
-
- if (m_jmsListenerElem.hasAttribute(NAME_ATTR) == false) {
- m_jmsListenerElem.setAttribute(NAME_ATTR,
- getCategory()+"-"+getName());
- }
-
- if (m_jmsListenerElem.hasAttribute(MAX_THREADS_ATTR) == false) {
- m_jmsListenerElem.setAttribute(MAX_THREADS_ATTR, "1");
- }
- }
- }
-
- public int hashCode() {
- return(m_service.hashCode());
- }
-
- public boolean equals(Object obj) {
- boolean ret=false;
-
- if (obj instanceof DefaultESBService) {
- DefaultESBService other=(DefaultESBService)obj;
-
- if (m_service == other.m_service) {
- ret = true;
- }
- }
-
- return(ret);
- }
-
- public String toString() {
- return("ESBService: "+getCategory()+"/"+getName()+"["+getSource()+"]");
- }
-
- private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.jbossesb.model");
-
- private ESBLanguageModel m_model=null;
- private org.w3c.dom.Element m_service=null;
- private org.w3c.dom.Element m_jmsListenerElem=null;
- private org.w3c.dom.Element m_actionsElem=null;
- private java.util.List<ESBAction> m_actions=new java.util.Vector<ESBAction>();
-}
Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBAction.java 2008-08-26 14:01:00 UTC (rev 274)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBAction.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -1,125 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.tools.overlord.jbossesb.model;
-
-import org.scribble.model.*;
-
-/**
- * This interface represents the generic ESB action class.
- *
- * @author gary
- */
-public interface ESBAction {
-
- /**
- * This method initializes the links with the ESB service descriptors
- * identified in each path of the action.
- */
- public void initializeLinks();
-
- /**
- * This method validates the ESB action and reports warnings or
- * errors to the supplied model listener.
- *
- * @param l The model listener
- */
- public void validate(ModelListener l);
-
- /**
- * This method determines if the action represents a loop construct.
- *
- * @return Whether the action represents a loop construct
- */
- public boolean isLoop();
-
- /**
- * This method determines whether the action is related to a behavioural
- * session.
- *
- * @return Whether the action is session based
- */
- public boolean isSessionBased();
-
- /**
- * This method determines whether the ESB action represents
- * a CreateSessionAction.
- *
- * @return Whether the action is a CreateSessionAction
- */
- public boolean isCreateSession();
-
- /**
- * This method determines whether the action is a gateway
- * for inbound requests.
- *
- * @return Whether the action is a gateway
- */
- public boolean isGateway();
-
- /**
- * This method indicates whether this action performs another
- * sub-conversation.
- *
- * @return Whether the action is a 'perform'
- */
- public boolean isPerform();
-
- /**
- * This method returns the action's class name.
- *
- * @return The action's class name
- */
- public String getActionClass();
-
- /**
- * This method returns the property value associated
- * with the supplied name.
- *
- * @param property The property name
- * @return The property value, or null if not found
- */
- public String getPropertyValue(String property);
-
- /**
- * This method determines the property value, associated
- * with the supplied name, is defined.
- *
- * @param property The property name
- * @return Whether the property has been defined
- */
- public boolean hasProperty(String property);
-
- /**
- * This method returns the XML configuration representation of the action.
- *
- * @return The XML configuration for the action
- */
- public org.w3c.dom.Element getAction();
-
- /**
- * This method converts the ESB action into an equivalent
- * behavioural description for conformance checking.
- *
- * @param activities The list of activities that will contain
- * the converted action(s)
- * @param context The conversion context
- */
- public void convert(java.util.List<Activity> activities,
- ConversionContext context);
-
-}
Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBActionFactory.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBActionFactory.java 2008-08-26 14:01:00 UTC (rev 274)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBActionFactory.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -1,108 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.tools.overlord.jbossesb.model;
-
-import java.util.logging.Logger;
-
-import org.jboss.tools.overlord.jbossesb.model.actions.UnsupportedAction;
-
-/**
- * This class provides a factory for ESBAction instances.
- *
- * @author gary
- */
-public class ESBActionFactory {
-
- public static final String MODEL_ACTION_PACKAGE =
- "org.jboss.tools.overlord.jbossesb.model.actions";
- public static final String CLASS_ATTR = "class";
- public static final String CONVERSATION_ACTION_PACKAGE =
- "org.jboss.soa.overlord.jbossesb.actions";
-
- /**
- * This method creates an ESBAction instance relevant to the
- * supplied JBossESB action, associated with the supplied
- * service.
- *
- * @param service The service
- * @param action The XML configuration of the action
- * @return The ESBAction instance
- */
- public static ESBAction createAction(ESBService service,
- org.w3c.dom.Element action) {
- ESBAction ret=null;
- String actionType=action.getAttribute(CLASS_ATTR);
-
- // Check that it is a conversation based ESB action
- if (actionType.startsWith(CONVERSATION_ACTION_PACKAGE)) {
- int index=actionType.lastIndexOf('.');
- if (index != -1) {
- String actionName=actionType.substring(index+1);
-
- try {
- Class<?> cls=(Class<?>)
- Class.forName(MODEL_ACTION_PACKAGE+"."+actionName);
-
- java.lang.reflect.Constructor<?> con=
- cls.getConstructor(new Class<?>[]{ESBService.class,
- org.w3c.dom.Element.class});
-
- ret = (ESBAction)con.newInstance(new Object[]{service, action});
-
- } catch(Exception e) {
- logger.log(java.util.logging.Level.SEVERE,
- "Unable to find action class '"+
- MODEL_ACTION_PACKAGE+"."+actionName+"'", e);
- }
- }
- }
-
- if (ret == null) {
- // Unrecognised or unsupported action
- ret = new UnsupportedAction(service, action);
- }
-
- return(ret);
- }
-
- /**
- * This method determines the runtime action class based on
- * the ESB model action class.
- *
- * @param cls The ESB model action class
- * @return The conversation action class
- */
- public static String getConversationAction(Class<?> cls) {
- String actionType=cls.getName();
- String ret=null;
-
- // Check that it is a conversation based ESB action
- if (actionType.startsWith(MODEL_ACTION_PACKAGE)) {
- int index=actionType.lastIndexOf('.');
- if (index != -1) {
- String actionName=actionType.substring(index+1);
-
- ret = CONVERSATION_ACTION_PACKAGE+"."+actionName;
- }
- }
-
- return(ret);
- }
-
- private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.jbossesb.model");
-}
Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBLanguageModel.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBLanguageModel.java 2008-08-26 14:01:00 UTC (rev 274)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBLanguageModel.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -1,130 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.tools.overlord.jbossesb.model;
-
-import org.scribble.model.*;
-
-/**
- * This class represents an ESB model.
- *
- * @author gary
- */
-public interface ESBLanguageModel {
-
- public static final String JBOSSESB_NOTATION = "jboss-esb.xml";
-
- /**
- * This method validates the ESB model and reports warnings or
- * errors to the supplied model listener.
- *
- * @param l The model listener
- */
- public void validate(ModelListener l);
-
- /**
- * This method returns the source model reference.
- *
- * @return The source model reference
- */
- public ModelReference getModelReference();
-
- /**
- * This method returns the ESB service for the supplied
- * category and name.
- *
- * @param category The service category
- * @param name The service name
- * @return The ESB service, or null if not found
- */
- public ESBService getService(String category, String name);
-
- /**
- * This method returns the collection of ESB services associated
- * with the model.
- *
- * @return The collection of ESB services
- */
- public java.util.Collection<ESBService> getServices();
-
- /**
- * This textual contents of the model.
- *
- * @return The textual contents
- */
- public String getOriginalContents();
-
- /**
- * This method returns the gateway service.
- *
- * @return The gateway service, or null if not found
- */
- public ESBService getGatewayService();
-
- /**
- * This method creates a new ESB service.
- *
- * @param category The category
- * @param name The name
- * @return The new ESB service
- */
- public ESBService createService(String category, String name);
-
- /**
- * This method adds a new service to the model.
- *
- * @param service The service
- */
- public void addService(ESBService service);
-
- /**
- * This method removes a service from the model.
- *
- * @param service The service
- */
- public void removeService(ESBService service);
-
- /**
- * This method returns a unique service name within
- * the supplied category.
- *
- * @param category The category
- * @param currentServiceName The name of the service creating
- * the new service
- * @return The unique service name
- */
- public String getUniqueServiceName(String category,
- String currentServiceName);
-
- /**
- * This method returns the reference to the DOM
- * representation of the ESB configuration.
- *
- * @return The ESB configuration
- */
- public org.w3c.dom.Element getESBConfiguration();
-
- /**
- * This method returns the JMS destination associated with
- * the supplied JMS Bus Id.
- *
- * @param jmsBusId The JMS bus id
- * @return The JMS definition, or null if not found
- */
- public String getJMSDefinition(String jmsBusId);
-
-}
Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBLink.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBLink.java 2008-08-26 14:01:00 UTC (rev 274)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBLink.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -1,117 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.tools.overlord.jbossesb.model;
-
-/**
- * This class represents the link from a ESB action to a service
- * descriptor.
- *
- * @author gary
- */
-public class ESBLink {
-
- /**
- * This is the constructor for the link.
- *
- * @param category The service category of the target service descriptor
- * @param name The service name of the target descriptor
- * @param service A reference to the service model containing the action
- * that links to the service descriptor
- * @param control Whether the link is a control link, if not then it
- * represents a message link (i.e. to another service)
- */
- public ESBLink(String category, String name,
- ESBService service, boolean control) {
- this(category, name, service, control, false);
- }
-
- /**
- * This is the constructor for the link.
- *
- * @param category The service category of the target service descriptor
- * @param name The service name of the target descriptor
- * @param service A reference to the service model containing the action
- * that links to the service descriptor
- * @param control Whether the link is a control link, if not then it
- * represents a message link (i.e. to another service)
- * @param remote Whether the link is to a remote service
- */
- public ESBLink(String category, String name,
- ESBService service, boolean control, boolean remote) {
- m_category = category;
- m_name = name;
- m_service = service;
- m_control = control;
- m_remote = remote;
- }
-
- /**
- * This method indicates whether this is a control
- * link, as opposed to a message link.
- *
- * @return Whether the link is a control link
- */
- public boolean isControl() {
- return(m_control);
- }
-
- /**
- * This method indicates whether this is a
- * link to a remote service.
- *
- * @return Whether the link is to a remote service
- */
- public boolean isRemote() {
- return(m_remote);
- }
-
- /**
- * This method returns the service category.
- *
- * @return The service category
- */
- public String getCategory() {
- return(m_category);
- }
-
- /**
- * This method returns the service name.
- *
- * @return The service name
- */
- public String getName() {
- return(m_name);
- }
-
- /**
- * This method returns the reference to ESB Service
- * model containing the action that links to the
- * target service descriptor.
- *
- * @return The ESB service
- */
- public ESBService getService() {
- return(m_service);
- }
-
- private String m_category=null;
- private String m_name=null;
- private ESBService m_service=null;
- private boolean m_control=false;
- private boolean m_remote=false;
-}
Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBService.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBService.java 2008-08-26 14:01:00 UTC (rev 274)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBService.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -1,230 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.tools.overlord.jbossesb.model;
-
-import org.scribble.conversation.model.Conversation;
-import org.scribble.model.*;
-
-/**
- * This interface represents an ESB service.
- *
- * @author gary
- */
-public interface ESBService {
-
- /**
- * This method initializes the links.
- */
- public void initializeLinks();
-
- /**
- * This method validates the ESB service and reports warnings or
- * errors to the supplied model listener.
- *
- * @param l The model listener
- */
- public void validate(ModelListener l);
-
- /**
- * This method returns the category associated with the service
- * descriptor.
- *
- * @return The service category
- */
- public String getCategory();
-
- /**
- * This method returns the name associated with the service
- * descriptor.
- *
- * @return The service name
- */
- public String getName();
-
- /**
- * This method returns the ESB model.
- *
- * @return The ESB model
- */
- public ESBLanguageModel getModel();
-
- /**
- * This method returns the XML configuration representation of the service.
- *
- * @return The XML configuration for the service
- */
- public org.w3c.dom.Element getService();
-
- /**
- * This method returns the list of ESB actions.
- *
- * @return The ESB actions
- */
- public java.util.List<ESBAction> getActions();
-
- /**
- * This method adds an action to the service.
- *
- * @param action The action to be added
- * @param pos The position to add, or -1 if at the end
- */
- public void addAction(ESBAction action, int pos);
-
- /**
- * This method removes an action from the service.
- *
- * @param action The action to be removed
- * @return Whether the action was removed
- */
- public boolean removeAction(ESBAction action);
-
- /**
- * This method determines whether the ESB service represents a
- * loop construct.
- *
- * @return Whether the service represents a loop
- */
- public boolean isLoop();
-
- /**
- * This method determines whether the ESB service descriptor represents
- * a 'root' conversation.
- *
- * @return Whether the ESB service is associated with a root conversation
- */
- public boolean isRoot();
-
- /**
- * This method determines whether the ESB service descriptor
- * starts with a CreateSessionAction.
- *
- * @return Whether the service has a CreateSessionAction
- */
- public boolean isCreateSession();
-
- /**
- * This method determines whether the service is a gateway
- * for inbound requests.
- *
- * @return Whether the service is a gateway
- */
- public boolean isGateway();
-
- /**
- * This method returns the gateway action if this is a
- * gateway service.
- *
- * @return The gateway action
- */
- public ESBAction getGatewayAction();
-
- /**
- * This method returns the service description name associated with the
- * ESB service.
- *
- * @return The service description name
- */
- public String getServiceDescriptionName();
-
- /**
- * This method returns the conversation type associated with the
- * ESB service.
- *
- * @return The conversation type
- */
- public String getConversationType();
-
- /**
- * This method returns the session name associated with the service
- * descriptor.
- *
- * @return The session name
- */
- public String getSessionName();
-
- /**
- * This method returns the session class associated with the service
- * descriptor.
- *
- * @return The session class
- */
- public Class<?> getSessionClass();
-
- /**
- * This method determines whether the service is related to a behavioural
- * session.
- *
- * @return Whether the service is session based
- */
- public boolean isSessionBased();
-
- /**
- * This method returns the first session based action in the
- * service descriptor.
- *
- * @return The first session based action, or null if none exist
- */
- public ESBAction getFirstSessionBasedAction();
-
- /**
- * This method converts the actions associated with the ESB service into
- * activities that can be checked for conformance against a conversation
- * type.
- *
- * @param activities The target list of activities associated with the
- * ESB actions being converted
- * @param context The conversion context
- */
- public void convert(java.util.List<Activity> activities,
- ConversionContext context);
-
- /**
- * This method converts the ESB service into a Conversation, if
- * the service represents a conversation.
- *
- * @param context The conversion context, or null if this is the
- * root conversation
- * @return The conversation
- */
- public Conversation convert(ConversionContext context);
-
- /**
- * This method returns the position of the service node within the
- * ESB configuration.
- *
- * @return The service node position
- */
- public int getServicePosition();
-
- /**
- * This method returns the JMS Bus Id Ref associated with the
- * service's JMS listener.
- *
- * @return The JMS Bus Id Ref
- */
- public String getJMSBusIdRef();
-
- /**
- * This method sets the JMS Bus Id Ref associated with the
- * service's JMS listener.
- *
- * @param busId The JMS Bus Id Ref
- */
- public void setJMSBusIdRef(String busId);
-
-}
Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/Messages.properties
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/Messages.properties 2008-08-26 14:01:00 UTC (rev 274)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/Messages.properties 2008-08-26 15:57:32 UTC (rev 275)
@@ -1,21 +0,0 @@
-# /*
-# * JBoss, Home of Professional Open Source
-# * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
-# * by the @authors tag. All rights reserved.
-# * See the copyright.txt in the distribution for a
-# * full listing of individual contributors.
-# * This copyrighted material is made available to anyone wishing to use,
-# * modify, copy, or redistribute it subject to the terms and conditions
-# * of the GNU Lesser General Public License, v. 2.1.
-# * This program is distributed in the hope that it will be useful, but WITHOUT A
-# * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-# * You should have received a copy of the GNU Lesser General Public License,
-# * v.2.1 along with this distribution; if not, write to the Free Software
-# * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# * MA 02110-1301, USA.
-# */
-
-_NOT_FOUND_BUSINESS_OBJECT_TYPE=Business object type '{0}' could not be found
-_NOT_FOUND_SERVICE_DESCRIPTOR=Service descriptor for category '{0}' and name '{1}' not found
-_NOT_SPECIFIED_SESSION_CLASS=First conversation action must specify a valid session class
Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/AbstractESBAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/AbstractESBAction.java 2008-08-26 14:01:00 UTC (rev 274)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/AbstractESBAction.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -1,581 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.tools.overlord.jbossesb.model.actions;
-
-import java.util.logging.Logger;
-
-import org.scribble.model.*;
-import org.jboss.tools.overlord.jbossesb.model.*;
-import org.jboss.tools.overlord.jbossesb.model.util.ESBModelUtil;
-import org.jboss.tools.overlord.jbossesb.model.util.ProblemDefinitions;
-
-/**
- * This is the generic ESB action class.
- *
- * @author gary
- */
-public abstract class AbstractESBAction extends ModelObject
- implements ESBAction {
-
- public static final String IDENTITIES = "identities";
- public static final String ACTION_ELEMENT = "action";
- public static final String VALUE_ATTR = "value";
- public static final String NAME_ATTR = "name";
- public static final String PROPERTY_ELEMENT = "property";
- public static final String CLASS_PROPERTY = "class";
-
- /**
- * The constructor for initializing the action based on
- * an existing DOM element.
- */
- protected AbstractESBAction(ESBService service,
- org.w3c.dom.Element action) {
- initExistingAction(service, action);
- }
-
- /**
- * The contructor for initializing a new action.
- */
- protected AbstractESBAction(ESBService service,
- String actionClass) {
- initNewAction(service, actionClass);
- }
-
- /**
- * This method initializes the action.
- *
- * @param service The reference to the service in which
- * the action is contained
- * @param actionClass The action class
- */
- protected void initNewAction(ESBService service,
- String actionClass) {
- m_service = service;
-
- m_action = service.getService().
- getOwnerDocument().createElement(ACTION_ELEMENT);
-
- m_action.setAttribute(CLASS_PROPERTY, actionClass);
- }
-
- /**
- * This method initializes the action.
- *
- * @param service The reference to the service in which
- * the action is contained
- * @param action The XML configuration details for the action
- */
- protected void initExistingAction(ESBService service,
- org.w3c.dom.Element action) {
- m_service = service;
- m_action = action;
-
- int servicesStartPos=-1;
-
- if (m_service.getModel() != null &&
- m_service.getModel().getOriginalContents() != null &&
- (servicesStartPos=m_service.getModel().
- getOriginalContents().indexOf("<services>")) != -1) {
-
- // Find positional information
- int servCount=m_service.getServicePosition();
- int actionCount=getActionPosition();
-
- String str=m_service.getModel().getOriginalContents();
-
- int startPosition=str.indexOf("<service", servicesStartPos+2);
- int endPosition=-1;
- int loggedEndPosition=-1;
-
- while (startPosition != -1 && servCount > 0) {
- servCount--;
-
- endPosition = str.indexOf("</service>", startPosition);
-
- if (servCount > 0) {
- startPosition=str.indexOf("<service", endPosition);
- }
- }
-
- int actionsStartPos=-1;
-
- if (actionCount > 0 &&
- startPosition != -1 && endPosition != -1 &&
- (actionsStartPos=str.indexOf("<actions",
- startPosition)) != -1 &&
- actionsStartPos < endPosition) {
- startPosition=str.indexOf("<action", actionsStartPos+2);
- endPosition=-1;
-
- while (startPosition != -1 && actionCount > 0) {
- actionCount--;
-
- loggedEndPosition = str.indexOf('>', startPosition);
-
- endPosition = str.indexOf("</action>", startPosition);
-
- if (actionCount > 0) {
- startPosition=str.indexOf("<action", endPosition);
- }
- }
-
- // Check whether single line element
- int inlineEndPos=str.indexOf("/>", startPosition);
- int nextStartPos=str.indexOf("<", startPosition+1);
-
- if (inlineEndPos != -1 && inlineEndPos < nextStartPos) {
- endPosition = inlineEndPos;
- }
- }
-
- getSource().setStartPosition(startPosition);
- getSource().setEndPosition(loggedEndPosition);
-
- getSource().getProperties().put("path",
- ESBModelUtil.getPath(m_action));
- }
- }
-
- /**
- * This method initializes the links with the ESB service descriptors
- * identified in each path of the action.
- */
- public void initializeLinks() {
- }
-
- /**
- * This method validates the ESB action and reports warnings or
- * errors to the supplied model listener.
- *
- * @param l The model listener
- */
- public void validate(ModelListener l) {
-
- java.util.List<String> mandatory=getMandatoryProperties();
-
- for (int i=0; i < mandatory.size(); i++) {
- if (getPropertyValue(mandatory.get(i)) == null) {
- java.util.Map<String,Object> props=new java.util.HashMap<String,Object>();
- props.put(ProblemDefinitions.PROBLEM_PROPERTY,
- mandatory.get(i));
- l.error(this, org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
- "_NOT_SPECIFIED_PROPERTY",
- new String[]{mandatory.get(i)}), props);
- }
- }
-
- java.util.List<String> propNames=getPropertyNames();
-
- for (int i=0; i < propNames.size(); i++) {
- String propName=propNames.get(i);
-
- if (getOptionalProperties().contains(propName) == false &&
- getMandatoryProperties().contains(propName) == false) {
- l.error(this, org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
- "_UNKNOWN_PROPERTY",
- new String[]{propName}), null);
- }
- }
-
- String session=getPropertyValue(DefaultESBService.BUSINESS_OBJECT_TYPE_PROPERTY);
-
- if (session != null) {
- // Validate that the business object type exists
- try {
- ClassLoader cl=
- org.jboss.tools.overlord.jbossesb.model.util.ClasspathUtil.getClassLoader(getService().getModel());
-
- try {
- Class.forName(session, true, cl);
- } catch(ClassNotFoundException cfne) {
- l.error(this, org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
- "_NOT_FOUND_BUSINESS_OBJECT_TYPE",
- new String[]{session}), null);
- }
-
- } catch(Exception e) {
- logger.log(java.util.logging.Level.SEVERE,
- "Failed to load business class '"+session+"'", e);
- }
- }
-
- // Validate links
- for (int i=0; i < m_links.size(); i++) {
- ESBLink link=(ESBLink)m_links.get(i);
-
- if (link.getService() == null) {
- // If target service not found, then report error
- // unless it is a remote service, so defined in a
- // different file
- if (link.isRemote() == false) {
- l.error(this, org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
- "_NOT_FOUND_SERVICE_DESCRIPTOR",
- new String[]{link.getCategory(),link.getName()}), null);
- }
- } else if (getService().getSessionName() != null &&
- isPerform() == false && link.isRemote() == false &&
- link.getService().getSessionName() != null &&
- getService().getSessionName().equals(
- link.getService().getSessionName()) == false) {
-
- java.util.Map<String,Object> props=new java.util.HashMap<String,Object>();
- props.put(ProblemDefinitions.PROBLEM_PROPERTY,
- DefaultESBService.BUSINESS_OBJECT_TYPE_PROPERTY);
-
- l.error(this, org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
- "_MISMATCH_SESSION_CLASS",
- new String[]{link.getCategory(),link.getName()}), props);
- }
- }
- }
-
- /**
- * This method determines if the action represents a loop construct.
- *
- * @return Whether the action represents a loop construct
- */
- public boolean isLoop() {
- return(false);
- }
-
- /**
- * This method determines whether the action is related to a behavioural
- * session.
- *
- * @return Whether the action is session based
- */
- public boolean isSessionBased() {
- return(true);
- }
-
- /**
- * This method determines whether the ESB action represents
- * a CreateSessionAction.
- *
- * @return Whether the action is a CreateSessionAction
- */
- public boolean isCreateSession() {
- return(false);
- }
-
- /**
- * This method determines whether the action is a gateway
- * for inbound requests.
- *
- * @return Whether the action is a gateway
- */
- public boolean isGateway() {
- return(false);
- }
-
- /**
- * This method indicates whether this action performs another
- * sub-conversation.
- *
- * @return Whether the action is a 'perform'
- */
- public boolean isPerform() {
- return(false);
- }
-
- /**
- * This method returns the mandatory property names.
- *
- * @return The mandatory property names
- */
- protected java.util.List<String> getMandatoryProperties() {
- java.util.List<String> ret=new java.util.Vector<String>();
- return(ret);
- }
-
- /**
- * This method returns the optional property names.
- *
- * @return The optional property names
- */
- protected java.util.List<String> getOptionalProperties() {
- java.util.List<String> ret=new java.util.Vector<String>();
- ret.add(DefaultESBService.BUSINESS_OBJECT_TYPE_PROPERTY);
- ret.add(IDENTITIES);
- ret.add(DefaultESBService.SERVICE_DESCRIPTION_NAME_PROPERTY);
- return(ret);
- }
-
- /**
- * This method returns the action's class name.
- *
- * @return The action's class name
- */
- public String getActionClass() {
- String ret=null;
-
- if (m_action != null) {
- ret = m_action.getAttribute(CLASS_PROPERTY);
- }
-
- return(ret);
- }
-
- /**
- * This method returns the property value associated
- * with the supplied name.
- *
- * @param property The property name
- * @return The property value, or null if not found
- */
- public String getPropertyValue(String property) {
- String ret=null;
-
- if (m_action != null) {
- org.w3c.dom.NodeList nl=m_action.getChildNodes();
-
- for (int i=0; ret == null && i < nl.getLength(); i++) {
- if (nl.item(i) instanceof org.w3c.dom.Element &&
- nl.item(i).getNodeName().equals(PROPERTY_ELEMENT) &&
- ((org.w3c.dom.Element)nl.item(i)).getAttribute(NAME_ATTR).
- equals(property)) {
- ret = ((org.w3c.dom.Element)nl.item(i)).getAttribute(VALUE_ATTR);
- }
- }
- }
-
- return(ret);
- }
-
- /**
- * This method determines the property value, associated
- * with the supplied name, is defined.
- *
- * @param property The property name
- * @return Whether the property has been defined
- */
- public boolean hasProperty(String property) {
- boolean ret=false;
-
- if (m_action != null) {
- org.w3c.dom.NodeList nl=m_action.getChildNodes();
-
- for (int i=0; ret == false && i < nl.getLength(); i++) {
- if (nl.item(i) instanceof org.w3c.dom.Element &&
- nl.item(i).getNodeName().equals(PROPERTY_ELEMENT) &&
- ((org.w3c.dom.Element)nl.item(i)).getAttribute(NAME_ATTR).
- equals(property)) {
- ret = true;
- }
- }
- }
-
- return(ret);
- }
-
- /**
- * This method returns the element associated with the
- * requested property. If the property does not exist, then
- * it will be created.
- *
- * @param property The property
- * @return The element
- */
- public org.w3c.dom.Element getPropertyElement(String property) {
- org.w3c.dom.Element ret=null;
-
- if (m_action != null) {
- org.w3c.dom.NodeList nl=
- getAction().getElementsByTagName(PROPERTY_ELEMENT);
-
- for (int i=0; ret == null && i < nl.getLength(); i++) {
- if (nl.item(i) instanceof org.w3c.dom.Element) {
- String propName=((org.w3c.dom.Element)nl.item(i)).getAttribute(NAME_ATTR);
-
- if (propName != null && propName.equals(property)) {
- ret = (org.w3c.dom.Element)nl.item(i);
- }
- }
- }
-
- if (ret == null) {
- ret = getAction().getOwnerDocument().createElement(PROPERTY_ELEMENT);
- ret.setAttribute(NAME_ATTR, property);
-
- m_action.appendChild(ret);
- }
- }
-
- return(ret);
- }
-
- /**
- * This method returns the list of property names defined for
- * this action.
- *
- * @return The list of property names
- */
- public java.util.List<String> getPropertyNames() {
- java.util.List<String> ret=new java.util.Vector<String>();
-
- if (m_action != null) {
- org.w3c.dom.NodeList nl=m_action.getChildNodes();
-
- for (int i=0; i < nl.getLength(); i++) {
- if (nl.item(i) instanceof org.w3c.dom.Element &&
- nl.item(i).getNodeName().equals(PROPERTY_ELEMENT)) {
- ret.add(((org.w3c.dom.Element)nl.item(i)).getAttribute(NAME_ATTR));
- }
- }
- }
-
- return(ret);
- }
-
- /**
- * This method returns the 'property' child nodes, associated with the
- * supplied property name, within the action configuration.
- *
- * @param property The property name
- * @return The list of child nodes
- */
- public org.w3c.dom.NodeList getPropertyChildNodes(String property) {
- org.w3c.dom.NodeList ret=null;
-
- org.w3c.dom.NodeList nl=m_action.getChildNodes();
-
- for (int i=0; ret == null && i < nl.getLength(); i++) {
- if (nl.item(i) instanceof org.w3c.dom.Element &&
- nl.item(i).getNodeName().equals(PROPERTY_ELEMENT) &&
- ((org.w3c.dom.Element)nl.item(i)).getAttribute(NAME_ATTR).
- equals(property)) {
- ret = ((org.w3c.dom.Element)nl.item(i)).getChildNodes();
- }
- }
-
- return(ret);
- }
-
- /**
- * This method returns the reference to the service that contains the
- * action.
- *
- * @return The service
- */
- protected ESBService getService() {
- return(m_service);
- }
-
- /**
- * This method sets the service description name property.
- *
- * @param name The service description name
- */
- public void setServiceDescriptionName(String name) {
-
- org.w3c.dom.Element prop=getPropertyElement(
- DefaultESBService.SERVICE_DESCRIPTION_NAME_PROPERTY);
-
- if (prop != null) {
- prop.setAttribute(VALUE_ATTR, name);
- }
- }
-
- /**
- * This method sets the business object type property.
- *
- * @param name The business object type
- */
- public void setBusinessObjectType(String type) {
-
- org.w3c.dom.Element prop=getPropertyElement(
- DefaultESBService.BUSINESS_OBJECT_TYPE_PROPERTY);
-
- if (prop != null) {
- prop.setAttribute(VALUE_ATTR, type);
- }
- }
-
- /**
- * This method returns the XML configuration representation of the action.
- *
- * @return The XML configuration for the action
- */
- public org.w3c.dom.Element getAction() {
- return(m_action);
- }
-
- /**
- * This method returns the list of links established by this action.
- *
- * @return The list of links
- */
- protected java.util.List<ESBLink> getLinks() {
- return(m_links);
- }
-
- /**
- * This method converts the ESB action into an equivalent
- * behavioural description for conformance checking.
- *
- * @param activities The list of activities that will contain
- * the converted action(s)
- * @param context The conversion context
- */
- public abstract void convert(java.util.List<Activity> activities,
- ConversionContext context);
-
- /**
- * This method returns the node position of the action configuration
- * within the service descriptor.
- *
- * @return The action position
- */
- protected int getActionPosition() {
- org.w3c.dom.Element service=(org.w3c.dom.Element)
- getAction().getParentNode().getParentNode();
-
- int actionCount=0;
- boolean f_end=false;
-
- org.w3c.dom.NodeList acts=service.getElementsByTagName(ACTION_ELEMENT);
-
- for (int i=0; f_end == false &&
- i < acts.getLength(); i++) {
- org.w3c.dom.Node act=acts.item(i);
-
- actionCount++;
- if (act == getAction()) {
- f_end = true;
- }
- }
-
- return(actionCount);
- }
-
- private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.jbossesb.model");
-
- private ESBService m_service=null;
- private org.w3c.dom.Element m_action=null;
- private java.util.List<ESBLink> m_links=new java.util.Vector<ESBLink>();
-}
Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/CreateSessionAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/CreateSessionAction.java 2008-08-26 14:01:00 UTC (rev 274)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/CreateSessionAction.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -1,170 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.tools.overlord.jbossesb.model.actions;
-
-import org.jboss.tools.overlord.jbossesb.model.ConversionContext;
-import org.jboss.tools.overlord.jbossesb.model.ESBAction;
-import org.jboss.tools.overlord.jbossesb.model.ESBActionFactory;
-import org.jboss.tools.overlord.jbossesb.model.ESBService;
-import org.scribble.model.*;
-
-/**
- * The model component for the 'CreateSessionAction'.
- *
- * @author gary
- */
-public class CreateSessionAction extends AbstractESBAction {
-
- public static final String ROOT = "root";
- public static final String CONVERSATION_TYPE = "conversationType";
-
- /**
- * The constructor for the action.
- *
- * @param service The reference to the service in which
- * the action is contained
- * @param action The XML configuration details for the action
- */
- public CreateSessionAction(ESBService service,
- org.w3c.dom.Element action) {
- super(service, action);
- }
-
- /**
- * This constructor initializes the DOM element for
- * the action.
- *
- * @param service The reference to the service in which
- * the action will be contained
- */
- public CreateSessionAction(ESBService service) {
- super(service, ESBActionFactory.getConversationAction(
- CreateSessionAction.class));
- }
-
- /**
- * This method determines whether the ESB action represents
- * a CreateSessionAction.
- *
- * @return Whether the action is a CreateSessionAction
- */
- public boolean isCreateSession() {
- return(true);
- }
-
- /**
- * This method returns the optional property names.
- *
- * @return The optional property names
- */
- @Override
- protected java.util.List<String> getOptionalProperties() {
- java.util.List<String> ret=super.getOptionalProperties();
- ret.add(CONVERSATION_TYPE);
- ret.add(ROOT);
- return(ret);
- }
-
- /**
- * This method validates the ESB action and reports warnings or
- * errors to the supplied model listener.
- *
- * @param l The model listener
- */
- @Override
- public void validate(ModelListener l) {
- super.validate(l);
-
- // Action must be first conversation based action in
- // the service
- if (getService() != null && getService().getActions().size() > 0) {
- ESBAction act=getService().getActions().get(0);
-
- if (act != this) {
- l.error(this, org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
- "_MUST_BE_FIRST_ACTION",
- new String[]{"CreateSession"}), null);
- }
- }
-
- // If service is root, then need to defined conversation type
- if (getService().isRoot()) {
- if (getService().getConversationType() == null) {
- l.error(this, org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
- "_NOT_SPECIFIED_CONVERSATION_TYPE",
- new String[]{}), null);
- } else {
- int index=getService().getConversationType().indexOf('@');
- String convType=getService().getConversationType().trim();
-
- if (index == -1 || index == convType.length()-1) {
- l.error(this, org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
- "_NOT_SPECIFIED_CONVERSATION_TYPE_ROLE",
- new String[]{convType}), null);
- }
- }
- }
- }
-
- /**
- * This method converts the ESB action into an equivalent
- * behavioural description for conformance checking.
- *
- * @param activities The list of activities that will contain
- * the converted action(s)
- * @param context The conversion context
- */
- @Override
- public void convert(java.util.List<Activity> activities,
- ConversionContext context) {
- }
-
- /**
- * This method sets the root property.
- *
- * @param root The root
- */
- public void setRoot(boolean root) {
-
- org.w3c.dom.Element prop=getPropertyElement(ROOT);
-
- if (prop != null) {
- prop.setAttribute(VALUE_ATTR, ""+root);
- }
- }
-
- /**
- * This method sets the conversation type property.
- *
- * @param name The conversation type
- */
- public void setConversationType(String type) {
-
- org.w3c.dom.Element prop=getPropertyElement(CONVERSATION_TYPE);
-
- if (prop != null) {
- prop.setAttribute(VALUE_ATTR, type);
- }
- }
-}
Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/IfAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/IfAction.java 2008-08-26 14:01:00 UTC (rev 274)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/IfAction.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -1,322 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.tools.overlord.jbossesb.model.actions;
-
-import org.jboss.tools.overlord.jbossesb.model.*;
-import org.scribble.model.*;
-import org.scribble.conversation.model.*;
-
-/**
- * The model component for the 'IfAction'.
- *
- * @author gary
- */
-public class IfAction extends AbstractESBAction {
-
- public static final String SERVICE_NAME = "service-name";
- public static final String SERVICE_CATEGORY = "service-category";
- public static final String IMMEDIATE = "immediate";
- public static final String EXPRESSION = "expression";
- public static final String ELSE = "else";
- public static final String ELSEIF = "elseif";
- public static final String IF = "if";
- public static final String PATHS = "paths";
-
- /**
- * The constructor for the action.
- *
- * @param service The reference to the service in which
- * the action is contained
- * @param action The XML configuration details for the action
- */
- public IfAction(ESBService service,
- org.w3c.dom.Element action) {
- super(service, action);
- }
-
- /**
- * This constructor initializes the DOM element for
- * the action.
- *
- * @param service The reference to the service in which
- * the action will be contained
- */
- public IfAction(ESBService service) {
- super(service, ESBActionFactory.getConversationAction(
- IfAction.class));
- }
-
- /**
- * This method initializes the links with the ESB service descriptors
- * identified in each path of the action.
- */
- @Override
- public void initializeLinks() {
- super.initializeLinks();
-
- org.w3c.dom.NodeList nl=getPropertyChildNodes(PATHS);
-
- for (int i=0; i < nl.getLength(); i++) {
-
- org.w3c.dom.Node n=nl.item(i);
-
- if (n instanceof org.w3c.dom.Element &&
- (n.getNodeName().equals(IF) ||
- n.getNodeName().equals(ELSEIF) ||
- n.getNodeName().equals(ELSE))) {
- if (((org.w3c.dom.Element)n).hasAttribute(SERVICE_CATEGORY) &&
- ((org.w3c.dom.Element)n).hasAttribute(SERVICE_NAME)) {
- String category=((org.w3c.dom.Element)n).getAttribute(SERVICE_CATEGORY);
- String name=((org.w3c.dom.Element)n).getAttribute(SERVICE_NAME);
-
- // Lookup service associated with category and name
- ESBService service=getService().getModel().getService(category, name);
-
- String immediate=((org.w3c.dom.Element)n).getAttribute(IMMEDIATE);
-
- // Initialize link, even if service is null - this will be
- // reported as a validation error later
- getLinks().add(new ESBLink(category, name, service,
- (immediate != null && immediate.equalsIgnoreCase("true"))));
- }
- }
- }
- }
-
- /**
- * This method returns the mandatory property names.
- *
- * @return The mandatory property names
- */
- @Override
- protected java.util.List<String> getMandatoryProperties() {
- java.util.List<String> ret=super.getMandatoryProperties();
- ret.add(PATHS);
- return(ret);
- }
-
- /**
- * This method validates the ESB action and reports warnings or
- * errors to the supplied model listener.
- *
- * @param l The model listener
- */
- @Override
- public void validate(ModelListener l) {
- super.validate(l);
-
- org.w3c.dom.NodeList nl=getPropertyChildNodes(PATHS);
- boolean f_if=false;
- boolean f_else=false;
- boolean f_orderWrong=false;
- boolean f_serviceDetailsMissing=false;
- boolean f_immediateInvalid=false;
-
- for (int i=0; nl != null && i < nl.getLength(); i++) {
-
- org.w3c.dom.Node n=nl.item(i);
-
- if (n instanceof org.w3c.dom.Element) {
- if (n.getNodeName().equals(IF)) {
- if (f_if) {
- f_orderWrong = true;
- }
-
- f_if = true;
-
- if (((org.w3c.dom.Element)n).hasAttribute(SERVICE_CATEGORY) == false ||
- ((org.w3c.dom.Element)n).hasAttribute(SERVICE_NAME) == false) {
- f_serviceDetailsMissing = true;
- }
-
- String immediate=((org.w3c.dom.Element)n).getAttribute(IMMEDIATE);
-
- if (((org.w3c.dom.Element)n).hasAttribute(IMMEDIATE) &&
- immediate.equalsIgnoreCase("true") == false &&
- immediate.equalsIgnoreCase("false") == false) {
- f_immediateInvalid = true;
- }
- } else if (n.getNodeName().equals(ELSEIF)) {
-
- if (f_if == false || f_else) {
- f_orderWrong = true;
- }
-
- if (((org.w3c.dom.Element)n).hasAttribute(SERVICE_CATEGORY) == false ||
- ((org.w3c.dom.Element)n).hasAttribute(SERVICE_NAME) == false) {
- f_serviceDetailsMissing = true;
- }
-
- String immediate=((org.w3c.dom.Element)n).getAttribute(IMMEDIATE);
-
- if (((org.w3c.dom.Element)n).hasAttribute(IMMEDIATE) &&
- immediate.equalsIgnoreCase("true") == false &&
- immediate.equalsIgnoreCase("false") == false) {
- f_immediateInvalid = true;
- }
- } else if (n.getNodeName().equals(ELSE)) {
-
- if (f_if == false || f_else) {
- f_orderWrong = true;
- }
-
- f_else = true;
-
- if (((org.w3c.dom.Element)n).hasAttribute(SERVICE_CATEGORY) == false ||
- ((org.w3c.dom.Element)n).hasAttribute(SERVICE_NAME) == false) {
- f_serviceDetailsMissing = true;
- }
-
- String immediate=((org.w3c.dom.Element)n).getAttribute(IMMEDIATE);
-
- if (((org.w3c.dom.Element)n).hasAttribute(IMMEDIATE) &&
- immediate.equalsIgnoreCase("true") == false &&
- immediate.equalsIgnoreCase("false") == false) {
- f_immediateInvalid = true;
- }
- }
- }
- }
-
- // Report any errors
- if (nl != null && (f_if == false || f_orderWrong)) {
- l.error(this, org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
- "_IF_ORDER_WRONG",
- new String[]{}), null);
- }
-
- if (f_serviceDetailsMissing) {
- l.error(this, org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
- "_PATH_SERVICE_DETAILS_MISSING",
- new String[]{}), null);
- }
-
- if (f_immediateInvalid) {
- l.error(this, org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
- "_BOOLEAN",
- new String[]{IMMEDIATE}), null);
- }
- }
-
- /**
- * This method converts the ESB action into an equivalent
- * behavioural description for conformance checking.
- *
- * @param activities The list of activities that will contain
- * the converted action(s)
- * @param context The conversion context
- */
- @Override
- public void convert(java.util.List<Activity> activities,
- ConversionContext context) {
-
- org.w3c.dom.NodeList nl=getPropertyChildNodes(PATHS);
-
- If choice=new If();
- activities.add(choice);
-
- for (int i=0; i < nl.getLength(); i++) {
-
- org.w3c.dom.Node n=nl.item(i);
-
- if (n instanceof org.w3c.dom.Element) {
- if (n.getNodeName().equals(IF) ||
- n.getNodeName().equals(ELSEIF)) {
- String category=((org.w3c.dom.Element)n).getAttribute(SERVICE_CATEGORY);
- String name=((org.w3c.dom.Element)n).getAttribute(SERVICE_NAME);
-
- // TODO: Convert the conditional expression if defined
-
- ConditionalBlock cond=new ConditionalBlock();
- choice.getConditionalBlocks().add(cond);
-
- ESBService service=getService().getModel().getService(category, name);
-
- if (service != null) {
- service.convert(cond.getContents(), context);
- }
- } else if (n.getNodeName().equals(ELSE)) {
- String category=((org.w3c.dom.Element)n).getAttribute(SERVICE_CATEGORY);
- String name=((org.w3c.dom.Element)n).getAttribute(SERVICE_NAME);
-
- Block block=new Block();
- choice.setElseBlock(block);
-
- ESBService service=getService().getModel().getService(category, name);
-
- if (service != null) {
- service.convert(block.getContents(), context);
- }
- }
- }
- }
- }
-
- /**
- * This method adds a path to the if action.
- *
- * @param type The type of path (IF, ELSEIF or ELSE)
- * @param category The service category
- * @param name The service name
- * @param immediate Whether invocation should be immediate
- * @param expr The expression, if type is IF or ELSEIF
- * @param position The position, if type is ELSEIF
- */
- public void addPath(String type, String category, String name,
- boolean immediate, String expr, int position) {
-
- org.w3c.dom.NodeList nl=
- getAction().getElementsByTagName(PROPERTY_ELEMENT);
-
- org.w3c.dom.Element paths=null;
-
- for (int i=0; paths == null && i < nl.getLength(); i++) {
- if (nl.item(i) instanceof org.w3c.dom.Element) {
- String propName=((org.w3c.dom.Element)nl.item(i)).getAttribute(NAME_ATTR);
-
- if (propName != null && propName.equals(PATHS)) {
- paths = (org.w3c.dom.Element)nl.item(i);
- }
- }
- }
-
- if (paths == null) {
- paths = getAction().getOwnerDocument().createElement(PROPERTY_ELEMENT);
- paths.setAttribute(NAME_ATTR, PATHS);
-
- getAction().appendChild(paths);
- }
-
- org.w3c.dom.Element path=getAction().getOwnerDocument().createElement(type);
- path.setAttribute(SERVICE_CATEGORY, category);
- path.setAttribute(SERVICE_NAME, name);
- path.setAttribute(IMMEDIATE, ""+immediate);
-
- if (expr != null && (type == IF || type == ELSEIF)) {
- path.setAttribute(EXPRESSION, expr);
- }
-
- paths.appendChild(path);
- }
-}
Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/MessageRouterAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/MessageRouterAction.java 2008-08-26 14:01:00 UTC (rev 274)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/MessageRouterAction.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -1,342 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.tools.overlord.jbossesb.model.actions;
-
-import java.util.logging.Logger;
-
-import org.jboss.tools.overlord.jbossesb.model.*;
-import org.scribble.conversation.model.*;
-import org.scribble.model.*;
-import org.jboss.tools.overlord.jbossesb.model.change.*;
-import org.jboss.tools.overlord.jbossesb.model.util.IdentityUtil;
-
-/**
- * The model component for the 'MessageRouterAction'. Although
- * not an integral part of the behaviour of a service, it provides
- * a behavioural gateway to ensure that messages sent to a
- * specific endpoint reference are routed to the appropriate
- * ESB service descriptor. Therefore the routing configuration
- * needs to be synchronized with the definition of the service
- * descriptors representing the various behavioural states associated
- * with a service.
- *
- * @author gary
- */
-public class MessageRouterAction extends AbstractESBAction {
-
- public static final String IDENTITIES_ELEMENT = "identities";
- public static final String INITIATE = "initiate";
- public static final String SERVICE_NAME = "service-name";
- public static final String SERVICE_CATEGORY = "service-category";
- public static final String ROUTE = "route";
- public static final String PATHS = "paths";
- public static final String MESSAGE_ELEMENT="message";
- public static final String TYPE_ATTR="type";
-
- /**
- * The constructor for the action.
- *
- * @param service The reference to the service in which
- * the action is contained
- * @param action The XML configuration details for the action
- */
- public MessageRouterAction(ESBService service,
- org.w3c.dom.Element action) {
- super(service, action);
- }
-
- /**
- * This constructor initializes the DOM element for
- * the action.
- *
- * @param service The reference to the service in which
- * the action will be contained
- */
- public MessageRouterAction(ESBService service) {
- super(service, ESBActionFactory.getConversationAction(
- MessageRouterAction.class));
- }
-
- /**
- * This method initializes the links with the ESB service descriptors
- * identified in each path of the action.
- */
- @Override
- public void initializeLinks() {
- super.initializeLinks();
-
- org.w3c.dom.NodeList nl=getPropertyChildNodes(PATHS);
-
- for (int i=0; nl != null && i < nl.getLength(); i++) {
-
- org.w3c.dom.Node n=nl.item(i);
-
- if (n instanceof org.w3c.dom.Element) {
- if (n.getNodeName().equals(ROUTE)) {
- if (((org.w3c.dom.Element)n).hasAttribute(SERVICE_CATEGORY) &&
- ((org.w3c.dom.Element)n).hasAttribute(SERVICE_NAME)) {
- String category=((org.w3c.dom.Element)n).getAttribute(SERVICE_CATEGORY);
- String name=((org.w3c.dom.Element)n).getAttribute(SERVICE_NAME);
- String initiate=((org.w3c.dom.Element)n).getAttribute(INITIATE);
-
- // Lookup service associated with category and name
- ESBService service=getService().getModel().getService(category, name);
-
- // Initialize link, even if service is null - this will be
- // reported as a validation error later
- getLinks().add(new ESBLink(category, name, service, true));
-
- if (service != null) {
- if (initiate != null && initiate.equalsIgnoreCase("true")) {
- m_initiateServices.add(service);
- } else {
- m_services.add(service);
- }
- }
- }
- }
- }
- }
- }
-
- /**
- * This method determines whether the action is related to a behavioural
- * session.
- *
- * @return Whether the action is session based
- */
- public boolean isSessionBased() {
- return(false);
- }
-
- /**
- * This method determines whether the action is a gateway
- * for inbound requests.
- *
- * @return Whether the action is a gateway
- */
- public boolean isGateway() {
- return(true);
- }
-
- /**
- * This method adds a route to the message router action.
- *
- * @param category The service category
- * @param name The service name
- * @param initiate Whether the route initiates the service
- * @param messageTypes The list of message types
- */
- public void addRoute(String category, String name, boolean initiate,
- java.util.List<MessageSignature> messageTypes) {
-
- org.w3c.dom.Element paths=getPropertyElement(PATHS);
-
- org.w3c.dom.Element path=
- getAction().getOwnerDocument().createElement(ROUTE);
- path.setAttribute(SERVICE_CATEGORY, category);
- path.setAttribute(SERVICE_NAME, name);
-
- if (initiate) {
- path.setAttribute(INITIATE, Boolean.toString(initiate));
- }
-
- for (int i=0; i < messageTypes.size(); i++) {
- org.w3c.dom.Element mt=
- getAction().getOwnerDocument().createElement(MESSAGE_ELEMENT);
-
- if (messageTypes.get(i).getTypes().size() == 1) {
- TypeReference ref=messageTypes.get(i).getTypes().get(0);
- String type="";
-
- if (ref.getNamespace() != null) {
- type += "{"+ref.getNamespace()+"}";
- }
- type += ref.getLocalpart();
-
- mt.setAttribute(TYPE_ATTR, type);
-
- path.appendChild(mt);
-
- if (messageTypes.get(i).getParent() instanceof ConversationInteraction &&
- ((ConversationInteraction)messageTypes.get(i).getParent()).
- getEnclosingDefinition() instanceof Conversation &&
- ((ConversationInteraction)messageTypes.get(i).getParent()).
- getEnclosingDefinition().getModel()
- instanceof ConversationModel) {
-
- org.w3c.dom.Element identities=
- mt.getOwnerDocument().createElement(IDENTITIES_ELEMENT);
-
- java.util.List<Identity> ids=((Conversation)
- ((ConversationInteraction)messageTypes.get(i).getParent()).
- getEnclosingDefinition()).getIdentities();
-
- java.util.List<IdentityLocator> locators=
- ((ConversationModel)((ConversationInteraction)messageTypes.get(i).getParent()).
- getEnclosingDefinition().
- getModel()).getIdentityLocators();
-
- IdentityUtil.defineIdentities(identities, messageTypes.get(i),
- ids, locators);
-
- mt.appendChild(identities);
- }
-
- } else {
- logger.warning("Can only handle single type message signatures");
- }
- }
-
- paths.appendChild(path);
- }
-
- /**
- * This method returns the number of routes associated with
- * the message router.
- *
- * @return The number of routes
- */
- public int getNumberOfRoutes() {
- int ret=0;
-
- org.w3c.dom.NodeList nl=getAction().getElementsByTagName(ROUTE);
-
- ret = nl.getLength();
-
- return(ret);
- }
-
- /**
- * This method returns the mandatory property names.
- *
- * @return The mandatory property names
- */
- @Override
- protected java.util.List<String> getMandatoryProperties() {
- java.util.List<String> ret=super.getMandatoryProperties();
- ret.add(PATHS);
- return(ret);
- }
-
- /**
- * This method validates the ESB action and reports warnings or
- * errors to the supplied model listener.
- *
- * @param l The model listener
- */
- @Override
- public void validate(ModelListener l) {
- super.validate(l);
-
- // Check that message router has no other session based
- // ESB actions in the same service descriptor
- if (getService().isSessionBased()) {
- l.error(this, org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
- "_CANNOT_SESSION_BASED_ACTIONS_WITH_ROUTER",
- new String[]{}), null);
- }
-
- // Check that 'initate' services have a 'CreateSessionAction' and
- // represent the root behaviour
- for (int i=0; i < m_initiateServices.size(); i++) {
- ESBService service=m_initiateServices.get(i);
-
- if (service.isRoot() == false) {
- l.error(this, org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
- "_CANNOT_INITIATE_NON_ROOT",
- new String[]{service.getCategory(),
- service.getName()}), null);
- }
- }
-
- // Check that non-'initate' services don't have a 'CreateSessionAction' and
- // represent the root behaviour
- for (int i=0; i < m_services.size(); i++) {
- ESBService service=m_services.get(i);
-
- if (service.isRoot()) {
- l.error(this, org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
- "_MUST_INITIATE_ROOT",
- new String[]{service.getCategory(),
- service.getName()}), null);
- }
- }
-
- org.w3c.dom.NodeList nl=getPropertyChildNodes(PATHS);
- boolean f_serviceDetailsMissing=false;
- int routeCount=0;
-
- for (int i=0; nl != null && i < nl.getLength(); i++) {
-
- org.w3c.dom.Node n=nl.item(i);
-
- if (n instanceof org.w3c.dom.Element) {
- if (n.getNodeName().equals(ROUTE)) {
- routeCount++;
-
- if (((org.w3c.dom.Element)n).hasAttribute(SERVICE_CATEGORY) == false ||
- ((org.w3c.dom.Element)n).hasAttribute(SERVICE_NAME) == false) {
- f_serviceDetailsMissing = true;
- }
- }
- }
- }
-
- // Report any errors
- if (nl != null && routeCount < 1) {
- l.error(this, org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
- "_ROUTER_ONE_OR_MORE_PATHS",
- new String[]{}), null);
- }
-
- if (f_serviceDetailsMissing) {
- l.error(this, org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
- "_PATH_SERVICE_DETAILS_MISSING",
- new String[]{}), null);
- }
- }
-
- /**
- * This method converts the ESB action into an equivalent
- * behavioural description for conformance checking.
- *
- * @param activities The list of activities that will contain
- * the converted action(s)
- * @param context The conversion context
- */
- @Override
- public void convert(java.util.List<Activity> activities,
- ConversionContext context) {
- }
-
- private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.jbossesb.model.actions");
-
- private java.util.List<ESBService> m_initiateServices=new java.util.Vector<ESBService>();
- private java.util.List<ESBService> m_services=new java.util.Vector<ESBService>();
-}
Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/Messages.properties
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/Messages.properties 2008-08-26 14:01:00 UTC (rev 274)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/Messages.properties 2008-08-26 15:57:32 UTC (rev 275)
@@ -1,46 +0,0 @@
-# /*
-# * JBoss, Home of Professional Open Source
-# * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
-# * by the @authors tag. All rights reserved.
-# * See the copyright.txt in the distribution for a
-# * full listing of individual contributors.
-# * This copyrighted material is made available to anyone wishing to use,
-# * modify, copy, or redistribute it subject to the terms and conditions
-# * of the GNU Lesser General Public License, v. 2.1.
-# * This program is distributed in the hope that it will be useful, but WITHOUT A
-# * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-# * You should have received a copy of the GNU Lesser General Public License,
-# * v.2.1 along with this distribution; if not, write to the Free Software
-# * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# * MA 02110-1301, USA.
-# */
-
-_BOOLEAN=Boolean property '{0}' can only have a 'true' or 'false' value
-_CANNOT_INITIATE_NON_ROOT=Cannot 'initiate' non-root service descriptor for category '{0}' and name '{1}'
-_CANNOT_SESSION_BASED_ACTIONS_WITH_ROUTER=Cannot define MessageRouterAction with session based actions in service descriptor
-_IF_ORDER_WRONG=IfAction must have an 'if' path, followed by zero or more 'elseif' paths and ending with an optional 'else' path
-_MISMATCH_SESSION_CLASS=Session class mismatch with service descriptor for category '{0}' and name '{1}'
-_MULTIPLE_JOINS=Action has multiple joins
-_MUST_DEFINE_SINGLE_WHILE_PATH=While action must have a single 'while' path
-_MUST_DEFINE_SINGLE_WHILE_EXIT=While action must have a single 'exit' path
-_MUST_INITIATE_ROOT=Must 'initiate' root service descriptor for category '{0}' and name '{1}'
-_NOT_FOUND_VARIABLE=Variable '{0}' could not be found on class '{1}'
-_NOT_FOUND_VARIABLE_PROPERTY=Variable '{0}' contains property '{1}' that could not be found on class '{2}'
-_NOT_FOUND_PERFORM_CREATE_SESSION=Perform action can only invoke a service descriptor that starts with a CreateSessionAction
-_NOT_READABLE_PROPERTY=Property '{0}' on class '{1}' is not readable
-_NOT_SPECIFIED_CONVERSATION_TYPE=Conversation type must be specified on root service descriptor
-_NOT_SPECIFIED_CONVERSATION_TYPE_ROLE=Conversation type '{0}' must specify a role name following the '@' symbol
-_NOT_SPECIFIED_PROPERTY=Property '{0}' must be specified
-_NOT_SPECIFIED_REQ_RESP_EPR=Send does not contain request service category/name or response client EPR
-_NOT_WRITABLE_PROPERTY=Property '{0}' on class '{1}' is not writable
-_MUST_BE_FIRST_ACTION='{0}' action must be first in the service descriptor
-_MUST_SPECIFY_STATE_OR_MESSAGE_EXPRESSION=Must specify either a State OR Message based expression
-_PARALLEL_MORE_THAN_TWO_PATHS=Parallel action must specify two or more paths
-_PARALLEL_PATH_AFTER_JOIN=Parallel path must not be defined after a join
-_PATH_SERVICE_DETAILS_MISSING=One or more paths are missing the service cateogry and/or name
-_ROUTER_ONE_OR_MORE_PATHS=MessageRouter action must specify one or more routes
-_SWITCH_ONE_OR_MORE_PATHS=Switch action must specify atleast one case
-_UNKNOWN_PROPERTY=Property '{0}' is unknown for this action
-_WHEN_ONE_OR_MORE_PATHS=When action must specify atleast one entry
-_WHILE_PATH_AFTER_EXIT=While path must not be defined after an exit
Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/ParallelAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/ParallelAction.java 2008-08-26 14:01:00 UTC (rev 274)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/ParallelAction.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -1,325 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.tools.overlord.jbossesb.model.actions;
-
-import org.jboss.tools.overlord.jbossesb.model.*;
-import org.scribble.model.*;
-import org.scribble.conversation.model.*;
-
-/**
- * The model component for the 'ParallelAction'.
- *
- * @author gary
- */
-public class ParallelAction extends AbstractESBAction {
-
- public static final String SERVICE_NAME = "service-name";
- public static final String SERVICE_CATEGORY = "service-category";
- public static final String IMMEDIATE = "immediate";
- private static final String JOIN = "join";
- private static final String PATH = "path";
- private static final String PATHS = "paths";
-
- /**
- * The constructor for the action.
- *
- * @param service The reference to the service in which
- * the action is contained
- * @param action The XML configuration details for the action
- */
- public ParallelAction(ESBService service,
- org.w3c.dom.Element action) {
- super(service, action);
- }
-
- /**
- * This constructor initializes the DOM element for
- * the action.
- *
- * @param service The reference to the service in which
- * the action will be contained
- */
- public ParallelAction(ESBService service) {
- super(service, ESBActionFactory.getConversationAction(
- ParallelAction.class));
- }
-
- /**
- * This method initializes the links with the ESB service descriptors
- * identified in each path of the action.
- */
- @Override
- public void initializeLinks() {
- super.initializeLinks();
-
- org.w3c.dom.NodeList nl=getPropertyChildNodes(PATHS);
-
- for (int i=0; i < nl.getLength(); i++) {
-
- org.w3c.dom.Node n=nl.item(i);
-
- if (n instanceof org.w3c.dom.Element) {
- if (n.getNodeName().equals(PATH)) {
- if (((org.w3c.dom.Element)n).hasAttribute(SERVICE_CATEGORY) &&
- ((org.w3c.dom.Element)n).hasAttribute(SERVICE_NAME)) {
- String category=((org.w3c.dom.Element)n).getAttribute(SERVICE_CATEGORY);
- String name=((org.w3c.dom.Element)n).getAttribute(SERVICE_NAME);
-
- // Lookup service associated with category and name
- ESBService service=getService().getModel().getService(category, name);
-
- String immediate=((org.w3c.dom.Element)n).getAttribute(IMMEDIATE);
-
- // Initialize link, even if service is null - this will be
- // reported as a validation error later
- getLinks().add(new ESBLink(category, name, service,
- (immediate != null && immediate.equalsIgnoreCase("true"))));
-
- if (service != null) {
- m_services.add(service);
- }
- }
- } else if (n.getNodeName().equals(JOIN)) {
- if (((org.w3c.dom.Element)n).hasAttribute(SERVICE_CATEGORY) &&
- ((org.w3c.dom.Element)n).hasAttribute(SERVICE_NAME)) {
- m_joinCategory=((org.w3c.dom.Element)n).getAttribute(SERVICE_CATEGORY);
- m_joinName=((org.w3c.dom.Element)n).getAttribute(SERVICE_NAME);
-
- // Lookup service associated with category and name
- m_joinService=getService().getModel().getService(m_joinCategory, m_joinName);
-
- // Initialize link, even if service is null - this will be
- // reported as a validation error later
- getLinks().add(new ESBLink(m_joinCategory, m_joinName, m_joinService, true));
- }
- }
- }
- }
- }
-
- /**
- * This method returns the mandatory property names.
- *
- * @return The mandatory property names
- */
- @Override
- protected java.util.List<String> getMandatoryProperties() {
- java.util.List<String> ret=super.getMandatoryProperties();
- ret.add(PATHS);
- return(ret);
- }
-
- /**
- * This method validates the ESB action and reports warnings or
- * errors to the supplied model listener.
- *
- * @param l The model listener
- */
- @Override
- public void validate(ModelListener l) {
- super.validate(l);
-
- org.w3c.dom.NodeList nl=getPropertyChildNodes(PATHS);
- boolean f_joined=false;
- int pathCount=0;
- boolean f_pathAfterJoin=false;
- boolean f_multipleJoins=false;
- boolean f_serviceDetailsMissing=false;
- boolean f_immediateInvalid=false;
-
- for (int i=0; nl != null && i < nl.getLength(); i++) {
-
- org.w3c.dom.Node n=nl.item(i);
-
- if (n instanceof org.w3c.dom.Element) {
- if (n.getNodeName().equals(PATH)) {
- pathCount++;
-
- if (f_joined) {
- f_pathAfterJoin = true;
- }
-
- if (((org.w3c.dom.Element)n).hasAttribute(SERVICE_CATEGORY) == false ||
- ((org.w3c.dom.Element)n).hasAttribute(SERVICE_NAME) == false) {
- f_serviceDetailsMissing = true;
- }
-
- String immediate=((org.w3c.dom.Element)n).getAttribute(IMMEDIATE);
-
- if (((org.w3c.dom.Element)n).hasAttribute(IMMEDIATE) &&
- immediate.equalsIgnoreCase("true") == false &&
- immediate.equalsIgnoreCase("false") == false) {
- f_immediateInvalid = true;
- }
- } else if (n.getNodeName().equals(JOIN)) {
-
- if (f_joined) {
- f_multipleJoins = true;
- }
-
- f_joined = true;
-
- if (((org.w3c.dom.Element)n).hasAttribute(SERVICE_CATEGORY) == false ||
- ((org.w3c.dom.Element)n).hasAttribute(SERVICE_NAME) == false) {
- f_serviceDetailsMissing = true;
- }
- }
- }
- }
-
- // Report any errors
- if (nl != null && pathCount < 2) {
- l.error(this, org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
- "_PARALLEL_MORE_THAN_TWO_PATHS",
- new String[]{}), null);
- }
-
- if (f_pathAfterJoin) {
- l.error(this, org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
- "_PARALLEL_PATH_AFTER_JOIN",
- new String[]{}), null);
- }
-
- if (f_multipleJoins) {
- l.error(this, org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
- "_MULTIPLE_JOINS",
- new String[]{}), null);
- }
-
- if (f_serviceDetailsMissing) {
- l.error(this, org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
- "_PATH_SERVICE_DETAILS_MISSING",
- new String[]{}), null);
- }
-
- if (f_immediateInvalid) {
- l.error(this, org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
- "_BOOLEAN",
- new String[]{IMMEDIATE}), null);
- }
- }
-
- /**
- * This method converts the ESB action into an equivalent
- * behavioural description for conformance checking.
- *
- * @param activities The list of activities that will contain
- * the converted action(s)
- * @param context The conversion context
- */
- @Override
- public void convert(java.util.List<Activity> activities,
- ConversionContext context) {
-
- Parallel parallel=new Parallel();
- activities.add(parallel);
-
- parallel.derivedFrom(this);
-
- if (m_joinService != null) {
- context.markJoin(m_joinService);
- }
-
- for (int i=0; i < m_services.size(); i++) {
- Block block=new Block();
-
- ESBService service=m_services.get(i);
-
- if (service != null) {
- service.convert(block.getContents(), context);
- }
-
- // TODO: Only temporary check while conformance
- // check does not handle
- //if (block.getContents().size() > 0) {
- parallel.getBlocks().add(block);
- //}
- }
-
- // TODO: Only temporary check while conformance
- // check does not handle
- //if (parallel.getBlocks().size() == 0) {
- // activities.remove(parallel);
- //}
-
- if (m_joinService != null) {
- m_joinService.convert(activities, context);
- }
- }
-
- /**
- * This method adds a path to the parallel action.
- *
- * @param category The service category
- * @param name The service name
- * @param immediate Whether invocation should be immediate
- * @param join Whether the path is for the parallel, or join
- * @param position The position
- */
- public void addPath(String category, String name,
- boolean immediate, boolean join, int position) {
-
- org.w3c.dom.NodeList nl=
- getAction().getElementsByTagName(PROPERTY_ELEMENT);
-
- org.w3c.dom.Element paths=null;
-
- for (int i=0; paths == null && i < nl.getLength(); i++) {
- if (nl.item(i) instanceof org.w3c.dom.Element) {
- String propName=((org.w3c.dom.Element)nl.item(i)).getAttribute(NAME_ATTR);
-
- if (propName != null && propName.equals(PATHS)) {
- paths = (org.w3c.dom.Element)nl.item(i);
- }
- }
- }
-
- if (paths == null) {
- paths = getAction().getOwnerDocument().createElement(PROPERTY_ELEMENT);
- paths.setAttribute(NAME_ATTR, PATHS);
-
- getAction().appendChild(paths);
- }
-
- org.w3c.dom.Element path=
- getAction().getOwnerDocument().createElement(join ? JOIN : PATH);
- path.setAttribute(SERVICE_CATEGORY, category);
- path.setAttribute(SERVICE_NAME, name);
-
- if (immediate) {
- path.setAttribute(IMMEDIATE, Boolean.TRUE.toString());
- }
-
- paths.appendChild(path);
- }
-
- private java.util.List<ESBService> m_services=new java.util.Vector<ESBService>();
- private String m_joinCategory=null;
- private String m_joinName=null;
- private ESBService m_joinService=null;
-}
Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/PerformAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/PerformAction.java 2008-08-26 14:01:00 UTC (rev 274)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/PerformAction.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -1,238 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.tools.overlord.jbossesb.model.actions;
-
-import org.jboss.tools.overlord.jbossesb.model.*;
-import org.scribble.model.*;
-import org.scribble.conversation.model.*;
-
-/**
- * The model component for the 'WhenAction'.
- *
- * @author gary
- */
-public class PerformAction extends AbstractESBAction {
-
- public static final String SERVICE_NAME = "serviceName";
- public static final String SERVICE_CATEGORY = "serviceCategory";
- public static final String RETURN_SERVICE_NAME = "returnServiceName";
- public static final String RETURN_SERVICE_CATEGORY = "returnServiceCategory";
- public static final String BIND_DETAILS = "bindDetails";
-
- /**
- * The constructor for the action.
- *
- * @param service The reference to the service in which
- * the action is contained
- * @param action The XML configuration details for the action
- */
- public PerformAction(ESBService service,
- org.w3c.dom.Element action) {
- super(service, action);
- }
-
- /**
- * This constructor initializes the DOM element for
- * the action.
- *
- * @param service The reference to the service in which
- * the action will be contained
- */
- public PerformAction(ESBService service) {
- super(service, ESBActionFactory.getConversationAction(
- PerformAction.class));
- }
-
- /**
- * This method initializes the links with the ESB service descriptors
- * identified in each path of the action.
- */
- @Override
- public void initializeLinks() {
- super.initializeLinks();
-
- m_category=getPropertyValue(SERVICE_CATEGORY);
- m_name=getPropertyValue(SERVICE_NAME);
-
- if (m_category != null && m_name != null) {
- m_service=getService().getModel().getService(m_category, m_name);
-
- getLinks().add(new ESBLink(m_category, m_name, m_service, true));
- }
-
- m_joinCategory=getPropertyValue(RETURN_SERVICE_CATEGORY);
- m_joinName=getPropertyValue(RETURN_SERVICE_NAME);
-
- if (m_joinCategory != null && m_joinName != null) {
- m_joinService=getService().getModel().getService(m_joinCategory, m_joinName);
-
- getLinks().add(new ESBLink(m_joinCategory, m_joinName, m_joinService, true));
- }
- }
-
- /**
- * This method indicates whether this action performs another
- * sub-conversation.
- *
- * @return Whether the action is a 'perform'
- */
- @Override
- public boolean isPerform() {
- return(true);
- }
-
- /**
- * This method returns the mandatory property names.
- *
- * @return The mandatory property names
- */
- @Override
- protected java.util.List<String> getMandatoryProperties() {
- java.util.List<String> ret=super.getMandatoryProperties();
- ret.add(SERVICE_CATEGORY);
- ret.add(SERVICE_NAME);
- return(ret);
- }
-
- /**
- * This method returns the optional property names.
- *
- * @return The optional property names
- */
- @Override
- protected java.util.List<String> getOptionalProperties() {
- java.util.List<String> ret=super.getOptionalProperties();
- ret.add(RETURN_SERVICE_NAME);
- ret.add(RETURN_SERVICE_CATEGORY);
- ret.add(BIND_DETAILS);
- return(ret);
- }
-
- /**
- * This method validates the ESB action and reports warnings or
- * errors to the supplied model listener.
- *
- * @param l The model listener
- */
- @Override
- public void validate(ModelListener l) {
- super.validate(l);
-
- // Check if performed state starts with a create session action
- if (m_service != null) {
-
- if (m_service.isCreateSession() == false) {
- l.error(this, org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
- "_NOT_FOUND_PERFORM_CREATE_SESSION",
- new String[]{}), null);
- }
- }
- }
-
- /**
- * This method converts the ESB action into an equivalent
- * behavioural description for conformance checking.
- *
- * @param activities The list of activities that will contain
- * the converted action(s)
- * @param context The conversion context
- */
- @Override
- public void convert(java.util.List<Activity> activities,
- ConversionContext context) {
-
- Compose elem=null;
-
- // Check if perform is asynchronous
- if (hasProperty(RETURN_SERVICE_NAME)) {
- elem = new Run();
- } else {
- elem = new Spawn();
- }
-
- activities.add(elem);
-
- elem.derivedFrom(this);
-
- Conversation definition=new Conversation();
-
- elem.setInlineDefinition(definition);
-
- if (m_service != null) {
- // TODO: May need to be separate definition, in case the
- // same state is called from a number of different
- // places
- m_service.convert(definition.getBlock().getContents(), context);
- }
-
- if (m_joinService != null) {
- m_joinService.convert(activities, context);
- }
- }
-
- /**
- * This method sets the destination service descriptor properties.
- *
- * @param category The category
- * @param name The name
- */
- public void setDestination(String category, String name) {
-
- org.w3c.dom.Element prop=getPropertyElement(SERVICE_CATEGORY);
-
- if (prop != null) {
- prop.setAttribute(VALUE_ATTR, category);
- }
-
- prop = getPropertyElement(SERVICE_NAME);
-
- if (prop != null) {
- prop.setAttribute(VALUE_ATTR, name);
- }
- }
-
- /**
- * This method sets the return destination service descriptor properties.
- *
- * @param category The category
- * @param name The name
- */
- public void setReturnDestination(String category, String name) {
-
- org.w3c.dom.Element prop=getPropertyElement(RETURN_SERVICE_CATEGORY);
-
- if (prop != null) {
- prop.setAttribute(VALUE_ATTR, category);
- }
-
- prop = getPropertyElement(RETURN_SERVICE_NAME);
-
- if (prop != null) {
- prop.setAttribute(VALUE_ATTR, name);
- }
- }
-
- private String m_category=null;
- private String m_name=null;
- private ESBService m_service=null;
- private String m_joinCategory=null;
- private String m_joinName=null;
- private ESBService m_joinService=null;
-}
Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/ReceiveMessageAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/ReceiveMessageAction.java 2008-08-26 14:01:00 UTC (rev 274)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/ReceiveMessageAction.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -1,178 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.tools.overlord.jbossesb.model.actions;
-
-import org.jboss.tools.overlord.jbossesb.model.*;
-import org.scribble.conversation.model.*;
-import org.scribble.model.*;
-
-/**
- * The model component for the 'ReceiveMessageAction'.
- *
- * @author gary
- */
-public class ReceiveMessageAction extends AbstractESBAction {
-
- public static final String IDENTITIES = "identities";
- public static final String MESSAGE_TYPE = "messageType";
- public static final String OPERATION = "operation";
- public static final String CLIENT_EPR = "clientEPR";
-
- /**
- * The constructor for the action.
- *
- * @param service The reference to the service in which
- * the action is contained
- * @param action The XML configuration details for the action
- */
- public ReceiveMessageAction(ESBService service,
- org.w3c.dom.Element action) {
- super(service, action);
- }
-
- /**
- * This constructor initializes the DOM element for
- * the action.
- *
- * @param service The reference to the service in which
- * the action will be contained
- */
- public ReceiveMessageAction(ESBService service) {
- super(service, ESBActionFactory.getConversationAction(
- ReceiveMessageAction.class));
- }
-
- /**
- * This method returns the mandatory property names.
- *
- * @return The mandatory property names
- */
- @Override
- protected java.util.List<String> getMandatoryProperties() {
- java.util.List<String> ret=super.getMandatoryProperties();
- ret.add(MESSAGE_TYPE);
- ret.add(IDENTITIES);
- return(ret);
- }
-
- /**
- * This method returns the optional property names.
- *
- * @return The optional property names
- */
- @Override
- protected java.util.List<String> getOptionalProperties() {
- java.util.List<String> ret=super.getOptionalProperties();
- ret.add(OPERATION);
- ret.add(CLIENT_EPR);
- return(ret);
- }
-
- /**
- * This method converts the ESB action into an equivalent
- * behavioural description for conformance checking.
- *
- * @param activities The list of activities that will contain
- * the converted action(s)
- * @param context The conversion context
- */
- @Override
- public void convert(java.util.List<Activity> activities,
- ConversionContext context) {
-
- ConversationInteraction recv=new ConversationInteraction();
- activities.add(recv);
-
- recv.derivedFrom(this);
-
- MessageSignature ms=new MessageSignature();
- recv.setMessageSignature(ms);
-
- ms.setOperation(getPropertyValue(OPERATION));
-
- String type=getPropertyValue(MESSAGE_TYPE);
- if (type != null && type.length() > 0) {
- String ns=null;
- String local=type;
-
- if (type.charAt(0) == '{') {
- int endindex=type.indexOf('}');
-
- if (endindex != -1) {
- ns = type.substring(1, endindex);
- local = type.substring(endindex+1);
- }
- }
-
- TypeReference ref=new TypeReference();
- ref.setLocalpart(local);
- ref.setNamespace(ns);
-
- ref.derivedFrom(this);
-
- ms.getTypes().add(ref);
- }
-
- // Initialize the 'to' role to be this participant
- if (context.getRole() != null) {
- recv.setToRole(new Role(context.getRole()));
- }
- }
-
- /**
- * This method sets the operation property.
- *
- * @param operation The operation
- */
- public void setOperation(String operation) {
-
- org.w3c.dom.Element prop=getPropertyElement(OPERATION);
-
- if (prop != null) {
- prop.setAttribute(VALUE_ATTR, operation);
- }
- }
-
- /**
- * This method sets the message type.
- *
- * @param type The message type
- */
- public void setMessageType(String type) {
-
- org.w3c.dom.Element prop=getPropertyElement(MESSAGE_TYPE);
-
- if (prop != null) {
- prop.setAttribute(VALUE_ATTR, type);
- }
- }
-
- /**
- * This method sets the client's EPR label property.
- *
- * @param epr The client EPR label
- */
- public void setClientEPR(String epr) {
-
- org.w3c.dom.Element prop=getPropertyElement(CLIENT_EPR);
-
- if (prop != null) {
- prop.setAttribute(VALUE_ATTR, epr);
- }
- }
-}
Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/RetrieveSessionAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/RetrieveSessionAction.java 2008-08-26 14:01:00 UTC (rev 274)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/RetrieveSessionAction.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -1,94 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.tools.overlord.jbossesb.model.actions;
-
-import org.jboss.tools.overlord.jbossesb.model.*;
-import org.scribble.model.*;
-
-/**
- * The model component for the 'RetrieveSessionAction'.
- *
- * @author gary
- */
-public class RetrieveSessionAction extends AbstractESBAction {
-
- public static final String IDENTITIES = "identities";
-
- /**
- * The constructor for the action.
- *
- * @param service The reference to the service in which
- * the action is contained
- * @param action The XML configuration details for the action
- */
- public RetrieveSessionAction(ESBService service,
- org.w3c.dom.Element action) {
- super(service, action);
- }
-
- /**
- * This method returns the mandatory property names.
- *
- * @return The mandatory property names
- */
- @Override
- protected java.util.List<String> getMandatoryProperties() {
- java.util.List<String> ret=super.getMandatoryProperties();
- ret.add(IDENTITIES);
- return(ret);
- }
-
- /**
- * This method validates the ESB action and reports warnings or
- * errors to the supplied model listener.
- *
- * @param l The model listener
- */
- @Override
- public void validate(ModelListener l) {
- super.validate(l);
-
- // Action must be first conversation based action in
- // the service
- if (getService() != null && getService().getActions().size() > 0) {
- ESBAction act=getService().getActions().get(0);
-
- if (act != this) {
- l.error(this, org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
- "_MUST_BE_FIRST_ACTION",
- new String[]{"RetrieveSession"}), null);
- }
- }
- }
-
- /**
- * This method converts the ESB action into an equivalent
- * behavioural description for conformance checking.
- *
- * @param activities The list of activities that will contain
- * the converted action(s)
- * @param context The conversion context
- */
- @Override
- public void convert(java.util.List<Activity> activities,
- ConversionContext context) {
- }
-
-}
\ No newline at end of file
Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/ScheduleStateAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/ScheduleStateAction.java 2008-08-26 14:01:00 UTC (rev 274)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/ScheduleStateAction.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -1,183 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.tools.overlord.jbossesb.model.actions;
-
-import org.jboss.tools.overlord.jbossesb.model.*;
-import org.scribble.model.*;
-import org.jboss.tools.overlord.jbossesb.model.ESBService;
-
-/**
- * The model component for the 'ScheduleStateAction'.
- *
- * @author gary
- */
-public class ScheduleStateAction extends AbstractESBAction {
-
- public static final String IMMEDIATE = "immediate";
- public static final String SERVICE_NAME = "serviceName";
- public static final String SERVICE_CATEGORY = "serviceCategory";
-
- /**
- * The constructor for the action.
- *
- * @param service The reference to the service in which
- * the action is contained
- * @param action The XML configuration details for the action
- */
- public ScheduleStateAction(ESBService service,
- org.w3c.dom.Element action) {
- super(service, action);
- }
-
- /**
- * This constructor initializes the DOM element for
- * the action.
- *
- * @param service The reference to the service in which
- * the action will be contained
- */
- public ScheduleStateAction(ESBService service) {
- super(service, ESBActionFactory.getConversationAction(
- ScheduleStateAction.class));
- }
-
- /**
- * This method initializes the links with the ESB service descriptors
- * identified in each path of the action.
- */
- @Override
- public void initializeLinks() {
- super.initializeLinks();
-
- String serviceCategory=getPropertyValue(SERVICE_CATEGORY);
- String serviceName=getPropertyValue(SERVICE_NAME);
- String immediate=getPropertyValue(IMMEDIATE);
-
- m_service=getService().getModel().getService(serviceCategory, serviceName);
-
- getLinks().add(new ESBLink(serviceCategory, serviceName, m_service,
- (immediate != null && immediate.equalsIgnoreCase("true"))));
- }
-
- /**
- * This method returns the mandatory property names.
- *
- * @return The mandatory property names
- */
- @Override
- protected java.util.List<String> getMandatoryProperties() {
- java.util.List<String> ret=super.getMandatoryProperties();
- ret.add(SERVICE_CATEGORY);
- ret.add(SERVICE_NAME);
- return(ret);
- }
-
- /**
- * This method returns the optional property names.
- *
- * @return The optional property names
- */
- @Override
- protected java.util.List<String> getOptionalProperties() {
- java.util.List<String> ret=super.getOptionalProperties();
- ret.add(IMMEDIATE);
- return(ret);
- }
-
- /**
- * This method validates the ESB action and reports warnings or
- * errors to the supplied model listener.
- *
- * @param l The model listener
- */
- @Override
- public void validate(ModelListener l) {
- super.validate(l);
-
- String immediate=getPropertyValue(IMMEDIATE);
-
- if (immediate != null && immediate.equalsIgnoreCase("true") == false &&
- immediate.equalsIgnoreCase("false") == false) {
- l.error(this, org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
- "_BOOLEAN",
- new String[]{IMMEDIATE}), null);
- }
- }
-
- /**
- * This method converts the ESB action into an equivalent
- * behavioural description for conformance checking.
- *
- * @param activities The list of activities that will contain
- * the converted action(s)
- * @param context The conversion context
- */
- @Override
- public void convert(java.util.List<Activity> activities,
- ConversionContext context) {
-
- // If the service has been located, then convert its activities
- // if it is either not a loop construct (i.e. a while action), or
- // if it is a loop, then we need to ensure that it is not in the
- // current stack of ESB services that logically 'contain' this
- // action. If this action is within the scope of the loop, then
- // the default behaviour should be to return to the loop
- // condition (i.e. just let the loop return implicitly).
- if (m_service != null &&
- (m_service.isLoop() == false ||
- context.isOnStack(m_service) == false) &&
- context.isJoin(m_service) == false) {
- m_service.convert(activities, context);
- }
- }
-
- /**
- * This method sets the destination service descriptor properties.
- *
- * @param category The category
- * @param name The name
- * @param immediate Whether the invoke immediately
- */
- public void setDestination(String category, String name,
- boolean immediate) {
-
- org.w3c.dom.Element prop=getPropertyElement(SERVICE_CATEGORY);
-
- if (prop != null) {
- prop.setAttribute(VALUE_ATTR, category);
- }
-
- prop = getPropertyElement(SERVICE_NAME);
-
- if (prop != null) {
- prop.setAttribute(VALUE_ATTR, name);
- }
-
- if (immediate) {
- prop = getPropertyElement(IMMEDIATE);
-
- if (prop != null) {
- prop.setAttribute(VALUE_ATTR, Boolean.toString(immediate));
- }
- }
- }
-
- private ESBService m_service=null;
-}
\ No newline at end of file
Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SendMessageAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SendMessageAction.java 2008-08-26 14:01:00 UTC (rev 274)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SendMessageAction.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -1,344 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.tools.overlord.jbossesb.model.actions;
-
-import org.jboss.tools.overlord.jbossesb.model.*;
-import org.scribble.conversation.model.*;
-import org.scribble.model.*;
-
-/**
- * The model component for the 'SendMessageAction'.
- *
- * @author gary
- */
-public class SendMessageAction extends AbstractESBAction {
-
- public static final String CLIENT_EPR = "clientEPR";
- public static final String RESPONSE_SERVICE_NAME = "responseServiceName";
- public static final String RESPONSE_SERVICE_CATEGORY = "responseServiceCategory";
- public static final String SERVICE_NAME = "serviceName";
- public static final String SERVICE_CATEGORY = "serviceCategory";
- public static final String SERVICE_NAME_EXPRESSION = "serviceNameExpression";
- public static final String SERVICE_CATEGORY_EXPRESSION = "serviceCategoryExpression";
- public static final String MESSAGE_TYPE = "messageType";
- public static final String OPERATION = "operation";
-
- /**
- * The constructor for the action.
- *
- * @param service The reference to the service in which
- * the action is contained
- * @param action The XML configuration details for the action
- */
- public SendMessageAction(ESBService service,
- org.w3c.dom.Element action) {
- super(service, action);
- }
-
- /**
- * This constructor initializes the DOM element for
- * the action.
- *
- * @param service The reference to the service in which
- * the action will be contained
- */
- public SendMessageAction(ESBService service) {
- super(service, ESBActionFactory.getConversationAction(
- SendMessageAction.class));
- }
-
- /**
- * This method initializes the links with the ESB service descriptors
- * identified in each path of the action.
- */
- @Override
- public void initializeLinks() {
- super.initializeLinks();
-
- String serviceCategory=getPropertyValue(SERVICE_CATEGORY);
- String serviceName=getPropertyValue(SERVICE_NAME);
- String responseServiceCategory=getPropertyValue(RESPONSE_SERVICE_CATEGORY);
- String responseServiceName=getPropertyValue(RESPONSE_SERVICE_NAME);
-
- if (serviceCategory != null && serviceName != null) {
- ESBService service=getService().getModel().getService(
- serviceCategory, serviceName);
-
- getLinks().add(new ESBLink(serviceCategory, serviceName,
- service, true, true));
- }
-
- if (responseServiceCategory != null && responseServiceName != null) {
- ESBService service=getService().getModel().getService(
- responseServiceCategory, responseServiceName);
-
- getLinks().add(new ESBLink(responseServiceCategory,
- responseServiceName, service, false));
- }
- }
-
- /**
- * This method returns the mandatory property names.
- *
- * @return The mandatory property names
- */
- @Override
- protected java.util.List<String> getMandatoryProperties() {
- java.util.List<String> ret=super.getMandatoryProperties();
- ret.add(MESSAGE_TYPE);
- ret.add(IDENTITIES);
- return(ret);
- }
-
- /**
- * This method returns the optional property names.
- *
- * @return The optional property names
- */
- @Override
- protected java.util.List<String> getOptionalProperties() {
- java.util.List<String> ret=super.getOptionalProperties();
- ret.add(OPERATION);
- ret.add(CLIENT_EPR);
- ret.add(RESPONSE_SERVICE_NAME);
- ret.add(RESPONSE_SERVICE_CATEGORY);
- ret.add(SERVICE_NAME);
- ret.add(SERVICE_CATEGORY);
- ret.add(SERVICE_NAME_EXPRESSION);
- ret.add(SERVICE_CATEGORY_EXPRESSION);
- return(ret);
- }
-
- /**
- * This method validates the ESB action and reports warnings or
- * errors to the supplied model listener.
- *
- * @param l The model listener
- */
- @Override
- public void validate(ModelListener l) {
- super.validate(l);
-
- // If sending request, then category/name must be specified,
- // else a response requires the 'client epr'. Validate that
- // either case is true.
- if (getPropertyValue(SERVICE_CATEGORY) != null &&
- getPropertyValue(SERVICE_NAME) != null) {
- // Sending a request
-
- } else if (getPropertyValue(SERVICE_CATEGORY_EXPRESSION) != null &&
- getPropertyValue(SERVICE_NAME_EXPRESSION) != null) {
- // Sending a request to service derived from expression
- // on the pojo state
-
- } else if (getPropertyValue(CLIENT_EPR) != null) {
- // Sending a response
-
- // TODO: Validate that the client EPR has been sent on
- // a preceding received request
- } else {
- l.error(this, org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
- "_NOT_SPECIFIED_REQ_RESP_EPR",
- new String[]{}), null);
- }
- }
-
- /**
- * This method converts the ESB action into an equivalent
- * behavioural description for conformance checking.
- *
- * @param activities The list of activities that will contain
- * the converted action(s)
- * @param context The conversion context
- */
- @Override
- public void convert(java.util.List<Activity> activities,
- ConversionContext context) {
-
- ConversationInteraction send=new ConversationInteraction();
- activities.add(send);
-
- send.derivedFrom(this);
-
- MessageSignature ms=new MessageSignature();
- send.setMessageSignature(ms);
-
- ms.setOperation(getPropertyValue(OPERATION));
-
- String type=getPropertyValue(MESSAGE_TYPE);
- if (type != null && type.length() > 0) {
- String ns=null;
- String local=type;
-
- if (type.charAt(0) == '{') {
- int endindex=type.indexOf('}');
-
- if (endindex != -1) {
- ns = type.substring(1, endindex);
- local = type.substring(endindex+1);
- }
- }
-
- TypeReference ref=new TypeReference();
- ref.setLocalpart(local);
- ref.setNamespace(ns);
-
- ref.derivedFrom(this);
-
- ms.getTypes().add(ref);
- }
-
- // Initialize the 'from' role to be this participant
- // (for now until 'to' role can be set)
- if (context.getRole() != null) {
- send.setFromRole(new Role(context.getRole()));
- }
-
- // TODO: Initialize the 'to' role (possibly to a
- // namespace=service category and localpart=service
- // name. This would need to be mapped when doing
- // conformance checking - might be an issue, may
- // need to declare the name.
-
- // Check if a response control link has been
- // specified
- String responseServiceCategory=getPropertyValue(RESPONSE_SERVICE_CATEGORY);
- String responseServiceName=getPropertyValue(RESPONSE_SERVICE_NAME);
-
- if (responseServiceCategory != null && responseServiceName != null) {
- ESBService service=getService().getModel().getService(
- responseServiceCategory, responseServiceName);
-
- // Add activities from the 'response' service descriptor into
- // the set of activities. If service not found, then ignore
- // here as will be reported as part of the validation of links.
- if (service != null) {
- service.convert(activities, context);
- }
- }
- }
-
- /**
- * This method sets the operation property.
- *
- * @param operation The operation
- */
- public void setOperation(String operation) {
-
- org.w3c.dom.Element prop=getPropertyElement(OPERATION);
-
- if (prop != null) {
- prop.setAttribute(VALUE_ATTR, operation);
- }
- }
-
- /**
- * This method sets the client's EPR label property.
- *
- * @param epr The client EPR label
- */
- public void setClientEPR(String epr) {
-
- org.w3c.dom.Element prop=getPropertyElement(CLIENT_EPR);
-
- if (prop != null) {
- prop.setAttribute(VALUE_ATTR, epr);
- }
- }
-
- /**
- * This method sets the message type.
- *
- * @param type The message type
- */
- public void setMessageType(String type) {
-
- org.w3c.dom.Element prop=getPropertyElement(MESSAGE_TYPE);
-
- if (prop != null) {
- prop.setAttribute(VALUE_ATTR, type);
- }
- }
-
- /**
- * This method sets the destination service descriptor properties.
- *
- * @param category The category
- * @param name The name
- */
- public void setDestination(String category, String name) {
-
- org.w3c.dom.Element prop=getPropertyElement(SERVICE_CATEGORY);
-
- if (prop != null) {
- prop.setAttribute(VALUE_ATTR, category);
- }
-
- prop = getPropertyElement(SERVICE_NAME);
-
- if (prop != null) {
- prop.setAttribute(VALUE_ATTR, name);
- }
- }
-
- /**
- * This method sets the destination expressions for the
- * service descriptor properties.
- *
- * @param categoryExpr The category expression
- * @param nameExpr The name expression
- */
- public void setDestinationExpression(String categoryExpr,
- String nameExpr) {
-
- org.w3c.dom.Element prop=getPropertyElement(SERVICE_CATEGORY_EXPRESSION);
-
- if (prop != null) {
- prop.setAttribute(VALUE_ATTR, categoryExpr);
- }
-
- prop = getPropertyElement(SERVICE_NAME_EXPRESSION);
-
- if (prop != null) {
- prop.setAttribute(VALUE_ATTR, nameExpr);
- }
- }
-
- /**
- * This method sets the response service descriptor properties.
- *
- * @param category The category
- * @param name The name
- */
- public void setResponseDestination(String category, String name) {
-
- org.w3c.dom.Element prop=getPropertyElement(RESPONSE_SERVICE_CATEGORY);
-
- if (prop != null) {
- prop.setAttribute(VALUE_ATTR, category);
- }
-
- prop = getPropertyElement(RESPONSE_SERVICE_NAME);
-
- if (prop != null) {
- prop.setAttribute(VALUE_ATTR, name);
- }
- }
-}
Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SetMessageAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SetMessageAction.java 2008-08-26 14:01:00 UTC (rev 274)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SetMessageAction.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -1,93 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.tools.overlord.jbossesb.model.actions;
-
-import org.jboss.tools.overlord.jbossesb.model.*;
-import org.scribble.model.*;
-
-/**
- * The model component for the 'SetMessageAction'.
- *
- * @author gary
- */
-public class SetMessageAction extends AbstractESBAction {
-
- public static final String STATE_EXPRESSION = "stateExpression";
- public static final String HEADER_PROPERTY = "headerProperty";
-
- /**
- * The constructor for the action.
- *
- * @param service The reference to the service in which
- * the action is contained
- * @param action The XML configuration details for the action
- */
- public SetMessageAction(ESBService service,
- org.w3c.dom.Element action) {
- super(service, action);
- }
-
- /**
- * This method returns the mandatory property names.
- *
- * @return The mandatory property names
- */
- @Override
- protected java.util.List<String> getMandatoryProperties() {
- java.util.List<String> ret=super.getMandatoryProperties();
- ret.add(STATE_EXPRESSION);
- return(ret);
- }
-
- /**
- * This method returns the optional property names.
- *
- * @return The optional property names
- */
- @Override
- protected java.util.List<String> getOptionalProperties() {
- java.util.List<String> ret=super.getOptionalProperties();
- ret.add(HEADER_PROPERTY);
- return(ret);
- }
-
- /**
- * This method validates the ESB action and reports warnings or
- * errors to the supplied model listener.
- *
- * @param l The model listener
- */
- @Override
- public void validate(ModelListener l) {
- super.validate(l);
-
- }
-
- /**
- * This method converts the ESB action into an equivalent
- * behavioural description for conformance checking.
- *
- * @param activities The list of activities that will contain
- * the converted action(s)
- * @param context The conversion context
- */
- @Override
- public void convert(java.util.List<Activity> activities,
- ConversionContext context) {
- }
-}
Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SetStateAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SetStateAction.java 2008-08-26 14:01:00 UTC (rev 274)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SetStateAction.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -1,185 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.tools.overlord.jbossesb.model.actions;
-
-import java.util.logging.Logger;
-
-import org.jboss.tools.overlord.jbossesb.model.*;
-import org.scribble.model.*;
-
-/**
- * The model component for the 'SetStateAction'.
- *
- * @author gary
- */
-public class SetStateAction extends AbstractESBAction {
-
- public static final String STATE_EXPRESSION = "stateExpression";
- public static final String MESSAGE_EXPRESSION = "messageExpression";
- public static final String VARIABLE = "variable";
-
- /**
- * The constructor for the action.
- *
- * @param service The reference to the service in which
- * the action is contained
- * @param action The XML configuration details for the action
- */
- public SetStateAction(ESBService service,
- org.w3c.dom.Element action) {
- super(service, action);
- }
-
- /**
- * This method returns the mandatory property names.
- *
- * @return The mandatory property names
- */
- @Override
- protected java.util.List<String> getMandatoryProperties() {
- java.util.List<String> ret=super.getMandatoryProperties();
- ret.add(VARIABLE);
- return(ret);
- }
-
- /**
- * This method returns the optional property names.
- *
- * @return The optional property names
- */
- @Override
- protected java.util.List<String> getOptionalProperties() {
- java.util.List<String> ret=super.getOptionalProperties();
- ret.add(STATE_EXPRESSION);
- ret.add(MESSAGE_EXPRESSION);
- return(ret);
- }
-
- /**
- * This method validates the ESB action and reports warnings or
- * errors to the supplied model listener.
- *
- * @param l The model listener
- */
- @Override
- public void validate(ModelListener l) {
- super.validate(l);
-
- String variable=getPropertyValue(VARIABLE);
-
- if (variable != null) {
-
- // Check that variable defined on session class
- Class<?> cls=getService().getSessionClass();
-
- java.util.StringTokenizer st=new java.util.StringTokenizer(variable, ".");
-
- while (st.hasMoreTokens()) {
- String token=st.nextToken();
-
- if (cls != null) {
- try {
- java.beans.BeanInfo bi=java.beans.Introspector.getBeanInfo(cls);
-
- java.beans.PropertyDescriptor[] pds=bi.getPropertyDescriptors();
- java.beans.PropertyDescriptor pd=null;
-
- for (int i=0; pd == null && pds != null &&
- i < pds.length; i++) {
- if (pds[i].getName().equals(token)) {
- pd = pds[i];
- }
- }
-
- if (pd == null) {
-
- if (variable.equals(token)) {
- l.error(this, org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
- "_NOT_FOUND_VARIABLE",
- new String[]{variable, cls.getName()}), null);
- } else {
- l.error(this, org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
- "_NOT_FOUND_VARIABLE_PROPERTY",
- new String[]{variable, token, cls.getName()}), null);
- }
- } else if (st.hasMoreTokens()) {
- // Check property can be read
- if (pd.getReadMethod() == null) {
- l.error(this, org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
- "_NOT_READABLE_PROPERTY",
- new String[]{pd.getName(), cls.getName()}), null);
- }
- } else {
- // Check property can be written
- if (pd.getWriteMethod() == null) {
- l.error(this, org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
- "_NOT_WRITABLE_PROPERTY",
- new String[]{pd.getName(), cls.getName()}), null);
- }
- }
-
- if (pd != null) {
- cls = pd.getPropertyType();
- }
- } catch(Exception e) {
- logger.log(java.util.logging.Level.SEVERE,
- "Failed to check if variable '"+
- variable+"' exists on session class '"+
- cls+"'", e);
- }
- }
- }
- }
-
- // Check that state or message expression defined
- String stateExpression=getPropertyValue(STATE_EXPRESSION);
- String messageExpression=getPropertyValue(MESSAGE_EXPRESSION);
-
- if ((stateExpression == null && messageExpression == null) ||
- (stateExpression != null && messageExpression != null)) {
- l.error(this, org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
- "_MUST_SPECIFY_STATE_OR_MESSAGE_EXPRESSION",
- new String[]{}), null);
- }
- }
-
- /**
- * This method converts the ESB action into an equivalent
- * behavioural description for conformance checking.
- *
- * @param activities The list of activities that will contain
- * the converted action(s)
- * @param context The conversion context
- */
- @Override
- public void convert(java.util.List<Activity> activities,
- ConversionContext context) {
- }
-
- private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.jbossesb.model.actions");
-}
Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SwitchAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SwitchAction.java 2008-08-26 14:01:00 UTC (rev 274)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SwitchAction.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -1,238 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.tools.overlord.jbossesb.model.actions;
-
-import org.jboss.tools.overlord.jbossesb.model.*;
-import org.jboss.tools.overlord.jbossesb.model.util.InteractionUtil;
-import org.scribble.model.*;
-import org.scribble.conversation.model.*;
-
-/**
- * The model component for the 'SwitchAction'.
- *
- * @author gary
- */
-public class SwitchAction extends AbstractESBAction {
-
- public static final String TYPE_ATTR = "type";
- public static final String MESSAGE_ELEMENT = "message";
- private static final String SERVICE_NAME = "service-name";
- private static final String SERVICE_CATEGORY = "service-category";
- private static final String CASE = "case";
- private static final String PATHS = "paths";
-
- /**
- * The constructor for the action.
- *
- * @param service The reference to the service in which
- * the action is contained
- * @param action The XML configuration details for the action
- */
- public SwitchAction(ESBService service,
- org.w3c.dom.Element action) {
- super(service, action);
- }
-
- /**
- * This constructor initializes the DOM element for
- * the action.
- *
- * @param service The reference to the service in which
- * the action will be contained
- */
- public SwitchAction(ESBService service) {
- super(service, ESBActionFactory.getConversationAction(
- SwitchAction.class));
- }
-
- /**
- * This method initializes the links with the ESB service descriptors
- * identified in each path of the action.
- */
- @Override
- public void initializeLinks() {
- super.initializeLinks();
-
- org.w3c.dom.NodeList nl=getPropertyChildNodes(PATHS);
-
- for (int i=0; i < nl.getLength(); i++) {
-
- org.w3c.dom.Node n=nl.item(i);
-
- if (n instanceof org.w3c.dom.Element &&
- n.getNodeName().equals(CASE)) {
- if (((org.w3c.dom.Element)n).hasAttribute(SERVICE_CATEGORY) &&
- ((org.w3c.dom.Element)n).hasAttribute(SERVICE_NAME)) {
- String category=((org.w3c.dom.Element)n).getAttribute(SERVICE_CATEGORY);
- String name=((org.w3c.dom.Element)n).getAttribute(SERVICE_NAME);
-
- // Lookup service associated with category and name
- ESBService service=getService().getModel().getService(category, name);
-
- // Initialize link, even if service is null - this will be
- // reported as a validation error later
- getLinks().add(new ESBLink(category, name, service, true));
- }
- }
- }
- }
-
- /**
- * This method returns the mandatory property names.
- *
- * @return The mandatory property names
- */
- @Override
- protected java.util.List<String> getMandatoryProperties() {
- java.util.List<String> ret=super.getMandatoryProperties();
- ret.add(PATHS);
- return(ret);
- }
-
- /**
- * This method validates the ESB action and reports warnings or
- * errors to the supplied model listener.
- *
- * @param l The model listener
- */
- @Override
- public void validate(ModelListener l) {
- super.validate(l);
-
- org.w3c.dom.NodeList nl=getPropertyChildNodes(PATHS);
- int pathCount=0;
- boolean f_serviceDetailsMissing=false;
-
- for (int i=0; nl != null && i < nl.getLength(); i++) {
-
- org.w3c.dom.Node n=nl.item(i);
-
- if (n instanceof org.w3c.dom.Element) {
- if (n.getNodeName().equals(CASE)) {
- pathCount++;
-
- if (((org.w3c.dom.Element)n).hasAttribute(SERVICE_CATEGORY) == false ||
- ((org.w3c.dom.Element)n).hasAttribute(SERVICE_NAME) == false) {
- f_serviceDetailsMissing = true;
- }
- }
- }
- }
-
- // Report any errors
- if (nl != null && pathCount < 1) {
- l.error(this, org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
- "_SWITCH_ONE_OR_MORE_PATHS",
- new String[]{}), null);
- }
-
- if (f_serviceDetailsMissing) {
- l.error(this, org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
- "_PATH_SERVICE_DETAILS_MISSING",
- new String[]{}), null);
- }
- }
-
- /**
- * This method converts the ESB action into an equivalent
- * behavioural description for conformance checking.
- *
- * @param activities The list of activities that will contain
- * the converted action(s)
- * @param context The conversion context
- */
- @Override
- public void convert(java.util.List<Activity> activities,
- ConversionContext context) {
-
- org.w3c.dom.NodeList nl=getPropertyChildNodes(PATHS);
-
- If choice=new If();
- activities.add(choice);
-
- for (int i=0; i < nl.getLength(); i++) {
-
- org.w3c.dom.Node n=nl.item(i);
-
- if (n instanceof org.w3c.dom.Element &&
- n.getNodeName().equals(CASE)) {
- String category=((org.w3c.dom.Element)n).getAttribute(SERVICE_CATEGORY);
- String name=((org.w3c.dom.Element)n).getAttribute(SERVICE_NAME);
-
- // Conditional block with no expression - i.e. the
- // expression is non-observable, as the path will be
- // selected based on the next message that arrives
- ConditionalBlock block=new ConditionalBlock();
- choice.getConditionalBlocks().add(block);
-
- ESBService service=getService().getModel().getService(category, name);
-
- if (service != null) {
- service.convert(block.getContents(), context);
- }
- }
- }
- }
-
- /**
- * This method adds a path to the switch action.
- *
- * @param category The service category
- * @param name The service name
- * @param messageTypes The set of interactions
- * @param position The position
- */
- public void addCase(String category, String name,
- java.util.Set<Interaction> messageTypes, int position) {
-
- org.w3c.dom.Element paths=getPropertyElement(PATHS);
-
- org.w3c.dom.Element path=
- getAction().getOwnerDocument().createElement(CASE);
- path.setAttribute(SERVICE_CATEGORY, category);
- path.setAttribute(SERVICE_NAME, name);
-
- if (messageTypes != null) {
- java.util.Iterator<Interaction> iter=messageTypes.iterator();
-
- while (iter.hasNext()) {
- Interaction interaction=iter.next();
-
- //TODO: Only deals with single type for now
- if (InteractionUtil.isSend(interaction) == false &&
- interaction.getMessageSignature().getTypes().size()==1) {
- org.w3c.dom.Element mt=
- getAction().getOwnerDocument().createElement(MESSAGE_ELEMENT);
-
- mt.setAttribute(TYPE_ATTR,
- InteractionUtil.getTypeString(
- interaction.getMessageSignature().
- getTypes().get(0)));
-
- path.appendChild(mt);
- }
- }
- }
-
- paths.appendChild(path);
- }
-}
Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/UnsupportedAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/UnsupportedAction.java 2008-08-26 14:01:00 UTC (rev 274)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/UnsupportedAction.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -1,76 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.tools.overlord.jbossesb.model.actions;
-
-import org.jboss.tools.overlord.jbossesb.model.*;
-import org.scribble.model.*;
-
-/**
- * This class represents an unsupported (or custom) action within
- * the conversation based ESB service descriptor.
- *
- * @author gary
- */
-public class UnsupportedAction extends AbstractESBAction {
-
- /**
- * The constructor for the action.
- *
- * @param service The reference to the service in which
- * the action is contained
- * @param action The XML configuration details for the action
- */
- public UnsupportedAction(ESBService service,
- org.w3c.dom.Element action) {
- super(service, action);
- }
-
- /**
- * This method determines whether the action is related to a behavioural
- * session.
- *
- * @return Whether the action is session based
- */
- public boolean isSessionBased() {
- return(false);
- }
-
- /**
- * This method validates the ESB action and reports warnings or
- * errors to the supplied model listener.
- *
- * @param l The model listener
- */
- @Override
- public void validate(ModelListener l) {
- // Don't validate unsupported actions
- }
-
- /**
- * This method converts the ESB action into an equivalent
- * behavioural description for conformance checking.
- *
- * @param activities The list of activities that will contain
- * the converted action(s)
- * @param context The conversion context
- */
- public void convert(java.util.List<Activity> activities,
- ConversionContext context) {
- }
-
-}
Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/WhenAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/WhenAction.java 2008-08-26 14:01:00 UTC (rev 274)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/WhenAction.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -1,239 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.tools.overlord.jbossesb.model.actions;
-
-import org.jboss.tools.overlord.jbossesb.model.*;
-import org.scribble.model.*;
-import org.scribble.conversation.model.*;
-
-/**
- * The model component for the 'WhenAction'.
- *
- * @author gary
- */
-public class WhenAction extends AbstractESBAction {
-
- private static final String SERVICE_NAME = "service-name";
- private static final String SERVICE_CATEGORY = "service-category";
- private static final String WHEN = "when";
- private static final String PATHS = "paths";
-
- /**
- * The constructor for the action.
- *
- * @param service The reference to the service in which
- * the action is contained
- * @param action The XML configuration details for the action
- */
- public WhenAction(ESBService service,
- org.w3c.dom.Element action) {
- super(service, action);
- }
-
- /**
- * This constructor initializes the DOM element for
- * the action.
- *
- * @param service The reference to the service in which
- * the action will be contained
- */
- public WhenAction(ESBService service) {
- super(service, ESBActionFactory.getConversationAction(
- WhenAction.class));
- }
-
- /**
- * This method initializes the links with the ESB service descriptors
- * identified in each path of the action.
- */
- @Override
- public void initializeLinks() {
- super.initializeLinks();
-
- org.w3c.dom.NodeList nl=getPropertyChildNodes(PATHS);
-
- for (int i=0; i < nl.getLength(); i++) {
-
- org.w3c.dom.Node n=nl.item(i);
-
- if (n instanceof org.w3c.dom.Element) {
- if (n.getNodeName().equals(WHEN)) {
- if (((org.w3c.dom.Element)n).hasAttribute(SERVICE_CATEGORY) &&
- ((org.w3c.dom.Element)n).hasAttribute(SERVICE_NAME)) {
- String category=((org.w3c.dom.Element)n).getAttribute(SERVICE_CATEGORY);
- String name=((org.w3c.dom.Element)n).getAttribute(SERVICE_NAME);
-
- // Lookup service associated with category and name
- ESBService service=getService().getModel().getService(category, name);
-
- // Initialize link, even if service is null - this will be
- // reported as a validation error later
- getLinks().add(new ESBLink(category, name, service, true));
-
- if (service != null) {
- m_services.add(service);
- }
- }
- }
- }
- }
- }
-
- /**
- * This method returns the mandatory property names.
- *
- * @return The mandatory property names
- */
- @Override
- protected java.util.List<String> getMandatoryProperties() {
- java.util.List<String> ret=super.getMandatoryProperties();
- ret.add(PATHS);
- return(ret);
- }
-
- /**
- * This method validates the ESB action and reports warnings or
- * errors to the supplied model listener.
- *
- * @param l The model listener
- */
- @Override
- public void validate(ModelListener l) {
- super.validate(l);
-
- // TODO: Valid if decision-method
- // specified, that method exists, if expression, then
- // validate the expression etc.
-
- org.w3c.dom.NodeList nl=getPropertyChildNodes(PATHS);
- int pathCount=0;
- boolean f_serviceDetailsMissing=false;
-
- for (int i=0; nl != null && i < nl.getLength(); i++) {
-
- org.w3c.dom.Node n=nl.item(i);
-
- if (n instanceof org.w3c.dom.Element) {
- if (n.getNodeName().equals(WHEN)) {
- pathCount++;
-
- if (((org.w3c.dom.Element)n).hasAttribute(SERVICE_CATEGORY) == false ||
- ((org.w3c.dom.Element)n).hasAttribute(SERVICE_NAME) == false) {
- f_serviceDetailsMissing = true;
- }
- }
- }
- }
-
- // Report any errors
- if (nl != null && pathCount < 1) {
- l.error(this, org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
- "_WHEN_ONE_OR_MORE_PATHS",
- new String[]{}), null);
- }
-
- if (f_serviceDetailsMissing) {
- l.error(this, org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
- "_PATH_SERVICE_DETAILS_MISSING",
- new String[]{}), null);
- }
- }
-
- /**
- * This method converts the ESB action into an equivalent
- * behavioural description for conformance checking.
- *
- * @param activities The list of activities that will contain
- * the converted action(s)
- * @param context The conversion context
- */
- @Override
- public void convert(java.util.List<Activity> activities,
- ConversionContext context) {
-
- When elem=new When();
- activities.add(elem);
-
- elem.derivedFrom(this);
-
- if (m_joinService != null) {
- context.markJoin(m_joinService);
- }
-
- for (int i=0; i < m_services.size(); i++) {
- ConditionalBlock block=new ConditionalBlock();
-
- m_services.get(i).convert(block.getContents(), context);
-
- elem.getConditionalBlocks().add(block);
- }
-
- if (m_joinService != null) {
- m_joinService.convert(activities, context);
- }
- }
-
- /**
- * This method adds a path to the when action.
- *
- * @param category The service category
- * @param name The service name
- * @param position The position
- */
- public void addPath(String category, String name,
- int position) {
-
- org.w3c.dom.NodeList nl=
- getAction().getElementsByTagName(PROPERTY_ELEMENT);
-
- org.w3c.dom.Element paths=null;
-
- for (int i=0; paths == null && i < nl.getLength(); i++) {
- if (nl.item(i) instanceof org.w3c.dom.Element) {
- String propName=((org.w3c.dom.Element)nl.item(i)).getAttribute(NAME_ATTR);
-
- if (propName != null && propName.equals(PATHS)) {
- paths = (org.w3c.dom.Element)nl.item(i);
- }
- }
- }
-
- if (paths == null) {
- paths = getAction().getOwnerDocument().createElement(PROPERTY_ELEMENT);
- paths.setAttribute(NAME_ATTR, PATHS);
-
- getAction().appendChild(paths);
- }
-
- org.w3c.dom.Element path=
- getAction().getOwnerDocument().createElement(WHEN);
- path.setAttribute(SERVICE_CATEGORY, category);
- path.setAttribute(SERVICE_NAME, name);
-
- paths.appendChild(path);
- }
-
- private java.util.List<ESBService> m_services=new java.util.Vector<ESBService>();
- private String m_joinCategory=null;
- private String m_joinName=null;
- private ESBService m_joinService=null;
-}
Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/WhileAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/WhileAction.java 2008-08-26 14:01:00 UTC (rev 274)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/WhileAction.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -1,372 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.tools.overlord.jbossesb.model.actions;
-
-import org.jboss.tools.overlord.jbossesb.model.*;
-import org.scribble.model.*;
-import org.scribble.conversation.model.*;
-
-/**
- * The model component for the 'WhileAction'.
- *
- * @author gary
- */
-public class WhileAction extends AbstractESBAction {
-
- public static final String SERVICE_NAME = "service-name";
- public static final String SERVICE_CATEGORY = "service-category";
- public static final String IMMEDIATE = "immediate";
- private static final String WHILE = "while";
- private static final String EXIT = "exit";
- private static final String PATHS = "paths";
- public static final String MESSAGE_ELEMENT="message";
- public static final String TYPE_ATTR="type";
-
- /**
- * The constructor for the action.
- *
- * @param service The reference to the service in which
- * the action is contained
- * @param action The XML configuration details for the action
- */
- public WhileAction(ESBService service,
- org.w3c.dom.Element action) {
- super(service, action);
- }
-
- /**
- * This constructor initializes the DOM element for
- * the action.
- *
- * @param service The reference to the service in which
- * the action will be contained
- */
- public WhileAction(ESBService service) {
- super(service, ESBActionFactory.getConversationAction(
- WhileAction.class));
- }
-
- /**
- * This method initializes the links with the ESB service descriptors
- * identified in each path of the action.
- */
- @Override
- public void initializeLinks() {
- super.initializeLinks();
-
- org.w3c.dom.NodeList nl=getPropertyChildNodes(PATHS);
-
- for (int i=0; i < nl.getLength(); i++) {
-
- org.w3c.dom.Node n=nl.item(i);
-
- if (n instanceof org.w3c.dom.Element) {
- if (n.getNodeName().equals(WHILE)) {
- if (((org.w3c.dom.Element)n).hasAttribute(SERVICE_CATEGORY) &&
- ((org.w3c.dom.Element)n).hasAttribute(SERVICE_NAME)) {
- m_loopCategory=((org.w3c.dom.Element)n).getAttribute(SERVICE_CATEGORY);
- m_loopName=((org.w3c.dom.Element)n).getAttribute(SERVICE_NAME);
-
- // Lookup service associated with category and name
- m_loopService=getService().getModel().getService(m_loopCategory, m_loopName);
-
- String immediate=((org.w3c.dom.Element)n).getAttribute(IMMEDIATE);
-
- // Initialize link, even if service is null - this will be
- // reported as a validation error later
- getLinks().add(new ESBLink(m_loopCategory, m_loopName, m_loopService,
- (immediate != null && immediate.equalsIgnoreCase("true"))));
- }
- } else if (n.getNodeName().equals(EXIT)) {
- if (((org.w3c.dom.Element)n).hasAttribute(SERVICE_CATEGORY) &&
- ((org.w3c.dom.Element)n).hasAttribute(SERVICE_NAME)) {
- m_exitCategory=((org.w3c.dom.Element)n).getAttribute(SERVICE_CATEGORY);
- m_exitName=((org.w3c.dom.Element)n).getAttribute(SERVICE_NAME);
-
- // Lookup service associated with category and name
- m_exitService=getService().getModel().getService(m_exitCategory, m_exitName);
-
- String immediate=((org.w3c.dom.Element)n).getAttribute(IMMEDIATE);
-
- // Initialize link, even if service is null - this will be
- // reported as a validation error later
- getLinks().add(new ESBLink(m_exitCategory, m_exitName, m_exitService,
- (immediate != null && immediate.equalsIgnoreCase("true"))));
- }
- }
- }
- }
- }
-
- /**
- * This method determines if the action represents a loop construct.
- *
- * @return Whether the action represents a loop construct
- */
- @Override
- public boolean isLoop() {
- return(true);
- }
-
- /**
- * This method returns the mandatory property names.
- *
- * @return The mandatory property names
- */
- @Override
- protected java.util.List<String> getMandatoryProperties() {
- java.util.List<String> ret=super.getMandatoryProperties();
- ret.add(PATHS);
- return(ret);
- }
-
- /**
- * This method validates the ESB action and reports warnings or
- * errors to the supplied model listener.
- *
- * @param l The model listener
- */
- @Override
- public void validate(ModelListener l) {
- super.validate(l);
-
- // While action must be first conversation based action in
- // the service
- if (getService() != null && getService().getActions().size() > 0) {
- ESBAction act=getService().getActions().get(0);
-
- if (act != this) {
- l.error(this, org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
- "_MUST_BE_FIRST_ACTION",
- new String[]{"While"}), null);
- }
- }
-
- // TODO: Validate while/exit order, if decision-method
- // specified, that method exists, if expression, then
- // validate the expression etc.
-
- // TODO: Validate that the loop service returns back to the
- // while action for all paths
-
- org.w3c.dom.NodeList nl=getPropertyChildNodes(PATHS);
- boolean f_while=false;
- boolean f_exit=false;
- boolean f_multipleWhiles=false;
- boolean f_multipleExits=false;
- boolean f_serviceDetailsMissing=false;
- boolean f_pathAfterExit=false;
- boolean f_immediateInvalid=false;
-
- for (int i=0; nl != null && i < nl.getLength(); i++) {
-
- org.w3c.dom.Node n=nl.item(i);
-
- if (n instanceof org.w3c.dom.Element) {
- if (n.getNodeName().equals(WHILE)) {
-
- if (f_while) {
- f_multipleWhiles = true;
- }
-
- if (f_exit) {
- f_pathAfterExit = true;
- }
-
- f_while = true;
-
- if (((org.w3c.dom.Element)n).hasAttribute(SERVICE_CATEGORY) == false ||
- ((org.w3c.dom.Element)n).hasAttribute(SERVICE_NAME) == false) {
- f_serviceDetailsMissing = true;
- }
-
- String immediate=((org.w3c.dom.Element)n).getAttribute(IMMEDIATE);
-
- if (((org.w3c.dom.Element)n).hasAttribute(IMMEDIATE) &&
- immediate.equalsIgnoreCase("true") == false &&
- immediate.equalsIgnoreCase("false") == false) {
- f_immediateInvalid = true;
- }
- } else if (n.getNodeName().equals(EXIT)) {
-
- if (f_exit) {
- f_multipleExits = true;
- }
-
- f_exit = true;
-
- if (((org.w3c.dom.Element)n).hasAttribute(SERVICE_CATEGORY) == false ||
- ((org.w3c.dom.Element)n).hasAttribute(SERVICE_NAME) == false) {
- f_serviceDetailsMissing = true;
- }
-
- String immediate=((org.w3c.dom.Element)n).getAttribute(IMMEDIATE);
-
- if (((org.w3c.dom.Element)n).hasAttribute(IMMEDIATE) &&
- immediate.equalsIgnoreCase("true") == false &&
- immediate.equalsIgnoreCase("false") == false) {
- f_immediateInvalid = true;
- }
- }
- }
- }
-
- // Report any errors
- if (nl != null && (f_while == false || f_multipleWhiles)) {
- l.error(this, org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
- "_MUST_DEFINE_SINGLE_WHILE_PATH",
- new String[]{}), null);
- }
-
- if (nl != null && (f_exit == false || f_multipleExits)) {
- l.error(this, org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
- "_MUST_DEFINE_SINGLE_WHILE_EXIT",
- new String[]{}), null);
- }
-
- if (f_pathAfterExit) {
- l.error(this, org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
- "_WHILE_PATH_AFTER_EXIT",
- new String[]{}), null);
- }
-
- if (f_serviceDetailsMissing) {
- l.error(this, org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
- "_PATH_SERVICE_DETAILS_MISSING",
- new String[]{}), null);
- }
-
- if (f_immediateInvalid) {
- l.error(this, org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
- "_BOOLEAN",
- new String[]{IMMEDIATE}), null);
- }
- }
-
- /**
- * This method converts the ESB action into an equivalent
- * behavioural description for conformance checking.
- *
- * @param activities The list of activities that will contain
- * the converted action(s)
- * @param context The conversion context
- */
- @Override
- public void convert(java.util.List<Activity> activities,
- ConversionContext context) {
-
- While elem=new While();
- activities.add(elem);
-
- elem.derivedFrom(this);
-
- ConditionalBlock block=new ConditionalBlock();
- elem.setBlock(block);
-
- if (m_loopService != null) {
- context.push(getService());
-
- m_loopService.convert(elem.getBlock().getContents(), context);
-
- context.pop(getService());
- }
-
- if (m_exitService != null) {
- m_exitService.convert(activities, context);
- }
- }
-
- /**
- * This method adds a path to the when action.
- *
- * @param category The service category
- * @param name The service name
- * @param position The position
- */
- public void addPath(String category, String name, boolean exit,
- java.util.List<MessageSignature> messageTypes,
- int position) {
-
- org.w3c.dom.NodeList nl=
- getAction().getElementsByTagName(PROPERTY_ELEMENT);
-
- org.w3c.dom.Element paths=null;
-
- for (int i=0; paths == null && i < nl.getLength(); i++) {
- if (nl.item(i) instanceof org.w3c.dom.Element) {
- String propName=((org.w3c.dom.Element)nl.item(i)).getAttribute(NAME_ATTR);
-
- if (propName != null && propName.equals(PATHS)) {
- paths = (org.w3c.dom.Element)nl.item(i);
- }
- }
- }
-
- if (paths == null) {
- paths = getAction().getOwnerDocument().createElement(PROPERTY_ELEMENT);
- paths.setAttribute(NAME_ATTR, PATHS);
-
- getAction().appendChild(paths);
- }
-
- org.w3c.dom.Element path=
- getAction().getOwnerDocument().createElement(exit?EXIT:WHILE);
- path.setAttribute(SERVICE_CATEGORY, category);
- path.setAttribute(SERVICE_NAME, name);
-
- paths.appendChild(path);
-
- for (int i=0; i < messageTypes.size(); i++) {
- org.w3c.dom.Element mt=
- getAction().getOwnerDocument().createElement(MESSAGE_ELEMENT);
-
- if (messageTypes.get(i).getTypes().size() == 1) {
- TypeReference ref=messageTypes.get(i).getTypes().get(0);
- String type="";
-
- if (ref.getNamespace() != null) {
- type += "{"+ref.getNamespace()+"}";
- }
- type += ref.getLocalpart();
-
- mt.setAttribute(TYPE_ATTR, type);
-
- path.appendChild(mt);
- }
- }
- }
-
- private String m_loopCategory=null;
- private String m_loopName=null;
- private ESBService m_loopService=null;
- private String m_exitCategory=null;
- private String m_exitName=null;
- private ESBService m_exitService=null;
-}
Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/util/ClasspathUtil.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/util/ClasspathUtil.java 2008-08-26 14:01:00 UTC (rev 274)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/util/ClasspathUtil.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -1,109 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.tools.overlord.jbossesb.model.util;
-
-import org.scribble.model.*;
-import org.scribble.osgi.model.OSGIModelRepository;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.jboss.tools.overlord.jbossesb.model.*;
-
-public class ClasspathUtil {
-
- public static ClassLoader getClassLoader(ESBLanguageModel model)
- throws Exception {
- ClassLoader ret=null;
-
- if (model instanceof DefaultESBLanguageModel) {
- ret = ((DefaultESBLanguageModel)model).getModelClassLoader();
- } else {
- ret = createClassLoader(model.getModelReference());
- }
-
- return(ret);
- }
-
- public synchronized static ClassLoader createClassLoader(ModelReference ref)
- throws Exception {
- ClassLoader ret=null;
-
- IFile file=OSGIModelRepository.getFile(ref);
-
- if (file != null) {
- IJavaProject javaProject=JavaCore.create(file.getProject());
- java.util.List<java.net.URL> urls=new java.util.Vector<java.net.URL>();
-
- scanProjectForClasspath(javaProject, urls);
-
- java.net.URL[] urlarray=new java.net.URL[urls.size()];
- urls.toArray(urlarray);
-
- ret = new java.net.URLClassLoader(urlarray,
- String.class.getClassLoader());
- }
-
- return(ret);
- }
-
- protected static void scanProjectForClasspath(IJavaProject javaProject,
- java.util.List<java.net.URL> urls) throws Exception {
- IClasspathEntry[] entries = javaProject.getResolvedClasspath(true);
-
- IResource outres=ResourcesPlugin.getWorkspace().getRoot().findMember(javaProject.getOutputLocation());
- if (outres != null) {
- urls.add(new java.io.File(outres.getLocation().toPortableString()).toURL());
- }
-
- for (IClasspathEntry entry : entries) {
- if(entry.getEntryKind() == IClasspathEntry.CPE_PROJECT) {
- IResource project =
- ResourcesPlugin.getWorkspace().getRoot().findMember(entry.getPath());
-
- if (project instanceof IProject) {
- IJavaProject jproj=JavaCore.create((IProject)project);
-
- if (jproj != null) {
- scanProjectForClasspath(jproj, urls);
- }
- }
-
- } else {
-
- IResource res=ResourcesPlugin.getWorkspace().getRoot().findMember(entry.getPath());
-
- java.net.URL url=null;
-
- if (res != null) {
- url = new java.io.File(res.getLocation().
- toPortableString()).toURL();
- } else {
- url = entry.getPath().toFile().toURL();
- }
-
- if (url != null && urls.contains(url) == false) {
- urls.add(url);
- }
- }
- }
- }
-}
Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/util/ConversationUtil.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/util/ConversationUtil.java 2008-08-26 14:01:00 UTC (rev 274)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/util/ConversationUtil.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -1,149 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.tools.overlord.jbossesb.model.util;
-
-import org.scribble.conversation.model.*;
-import org.scribble.model.Model;
-
-/**
- * This class contains utility functions related to the
- * Conversation.
- */
-public class ConversationUtil {
-
- /**
- * This method returns the full class name associated with the
- * business object type for the supplied conversation.
- *
- * @param conversation The conversation
- * @return The business object type full class name
- */
- public static String getBusinessObjectType(Conversation conversation) {
- String ret=getBusinessObjectTypePackageName(conversation);
-
- ret += "."+getBusinessObjectTypeClassName(conversation);
-
- return(ret);
- }
-
- /**
- * This method returns the package name associated with the
- * business object type for the supplied conversation.
- *
- * @param conversation The conversation
- * @return The business object type package name
- */
- public static String getBusinessObjectTypePackageName(Conversation conversation) {
- String ret=null;
-
- if (conversation.getModel() != null &&
- conversation.getModel().getNamespace() != null) {
- ret = conversation.getModel().getNamespace().getName()+".";
- } else {
- ret = "";
- }
-
- if (conversation.getModelName().getLocatedRole() != null) {
- ret += conversation.getModelName().getLocatedRole();
- }
-
- ret = ret.toLowerCase();
-
- return(ret);
- }
-
- /**
- * This method returns the class name associated with the
- * business object type for the supplied conversation.
- *
- * @param conversation The conversation
- * @return The business object type class name
- */
- public static String getBusinessObjectTypeClassName(Conversation conversation) {
- String ret=conversation.getModelName().getName();
-
- return(ret);
- }
-
- /**
- * This method returns the business object type accessor method
- * for the variable's name.
- *
- * @param name The variable name
- * @return The accessor method
- */
- public static String getVariableAccessorMethod(String name) {
- String ret="get"+Character.toUpperCase(name.charAt(0))+name.substring(1);
-
- return(ret);
- }
-
- /**
- * This method returns the business object type modifier method
- * for the variable's name.
- *
- * @param name The variable name
- * @return The modifier method
- */
- public static String getVariableModifierMethod(String name) {
- String ret="set"+Character.toUpperCase(name.charAt(0))+name.substring(1);
-
- return(ret);
- }
-
- /**
- * This method returns the business object type method variable
- * name for the supplied variable's name.
- *
- * @param name The variable name
- * @return The member variable name
- */
- public static String getMemberVariableName(String name) {
- String ret="m_"+Character.toLowerCase(name.charAt(0))+name.substring(1);
-
- return(ret);
- }
-
- /**
- * This method returns the service category associated with
- * the supplied conversation.
- *
- * @param conv The conversation
- * @return The service category
- */
- public static String getServiceCategory(Conversation conv) {
- String ret=((Model)conv.getModel()).
- getNamespace().getName();
-
- return(ret);
- }
-
- /**
- * This method returns the service name associated with
- * the supplied conversation.
- *
- * @param conv The conversation
- * @return The service name
- */
- public static String getServiceName(Conversation conv) {
- String ret=conv.getModelName().getName()+"_"+
- conv.getModelName().getLocatedRole().getName();
-
- return(ret);
- }
-}
Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/util/ESBModelUtil.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/util/ESBModelUtil.java 2008-08-26 14:01:00 UTC (rev 274)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/util/ESBModelUtil.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -1,46 +0,0 @@
-/*
- * Copyright 2005-8 Pi4 Technologies Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- *
- * Change History:
- * 21 Aug 2008 : Initial version created by gary
- */
-package org.jboss.tools.overlord.jbossesb.model.util;
-
-public class ESBModelUtil {
-
- public static String getPath(org.w3c.dom.Element elem) {
- String ret="";
-
- if (elem != null) {
- if (elem.hasAttribute("name")) {
- ret = elem.getAttribute("name");
- } else {
- ret = elem.getNodeName();
- }
-
- if (elem.getParentNode() instanceof org.w3c.dom.Element) {
- String parentPath=getPath((org.w3c.dom.Element)
- elem.getParentNode());
-
- if (parentPath != null && parentPath.trim().length() > 0) {
- ret = parentPath+"/"+ret;
- }
- }
- }
-
- return(ret);
- }
-}
Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/util/IdentityUtil.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/util/IdentityUtil.java 2008-08-26 14:01:00 UTC (rev 274)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/util/IdentityUtil.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -1,84 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.tools.overlord.jbossesb.model.util;
-
-import org.scribble.model.*;
-import org.scribble.conversation.model.*;
-
-public class IdentityUtil {
-
- private static final String LOCATOR_ATTR = "locator";
- private static final String NAME_ATTR = "name";
- private static final String TOKEN_ELEMENT = "token";
- private static final String TYPE_ATTR = "type";
- private static final String IDENTITY_ELEMENT = "identity";
-
- public static void defineIdentities(org.w3c.dom.Element identities,
- MessageSignature message, java.util.List<Identity> ids,
- java.util.List<IdentityLocator> locators) {
-
- // Clear root child nodes
- while (identities.getFirstChild() != null) {
- identities.removeChild(identities.getFirstChild());
- }
-
- for (int i=0; i < ids.size(); i++) {
- org.w3c.dom.Element identity=
- identities.getOwnerDocument().createElement(IDENTITY_ELEMENT);
- identity.setAttribute(TYPE_ATTR,
- ids.get(i).getIdentityType().name().toLowerCase());
-
- boolean f_valid=true;
-
- for (int j=0; f_valid && j < ids.get(i).getNames().size(); j++) {
- String token=ids.get(i).getNames().get(j);
- String locator=null;
-
- for (int k=0; locator == null &&
- k < message.getTypes().size(); k++) {
-
- // Find locator for type
- for (int l=0; locator == null &&
- l < locators.size(); l++) {
- IdentityLocator il=locators.get(l);
-
- if (il.getType().equals(message.getTypes().get(k))) {
- locator = il.getLocator(token);
- }
- }
- }
-
- if (locator == null) {
- f_valid = false;
- } else {
- org.w3c.dom.Element tokenElem=
- identities.getOwnerDocument().createElement(TOKEN_ELEMENT);
-
- identity.appendChild(tokenElem);
-
- tokenElem.setAttribute(NAME_ATTR, token);
- tokenElem.setAttribute(LOCATOR_ATTR, locator);
- }
- }
-
- if (f_valid) {
- identities.appendChild(identity);
- }
- }
- }
-}
Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/util/InteractionUtil.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/util/InteractionUtil.java 2008-08-26 14:01:00 UTC (rev 274)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/util/InteractionUtil.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -1,136 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.tools.overlord.jbossesb.model.util;
-
-import org.scribble.model.*;
-
-/**
- * This class contains utility functions for dealing with Interactions.
- */
-public class InteractionUtil {
-
- private static final String SERVICE_NAME_ACCESSOR_SUFFIX = "ServiceName";
- private static final String SERVICE_CATEGORY_ACCESSOR_SUFFIX = "ServiceCategory";
-
- /**
- * This method returns the text representation of the
- * supplied type reference.
- *
- * @param ref The type reference
- * @return The text for the type
- */
- public static String getTypeString(TypeReference ref) {
- String ret="";
-
- if (ref.getNamespace() != null) {
- ret = "{"+ref.getNamespace()+"}";
- }
-
- ret += ref.getLocalpart();
-
- return(ret);
- }
-
- /**
- * This method determines whether the supplied interaction
- * is a send.
- *
- * @param interaction The interaction
- * @return Whether the interaction is a send
- */
- public static boolean isSend(Interaction interaction) {
- boolean ret=false;
- Role role=null;
-
- if (interaction.getEnclosingDefinition() != null) {
- role = interaction.getEnclosingDefinition().
- getModelName().getLocatedRole();
- }
-
- if (role != null && ((interaction.getFromRole() != null &&
- interaction.getFromRole().equals(
- role)) ||
- (interaction.getToRole() != null &&
- interaction.getToRole().equals(
- role) == false))) {
- ret = true;
- }
-
- return(ret);
- }
-
- /**
- * This method returns the business object type property
- * for the role's service category.
- *
- * @param roleName The role
- * @return The service category property
- */
- public static String getRoleServiceCategoryProperty(String roleName) {
- String ret=roleName+SERVICE_CATEGORY_ACCESSOR_SUFFIX;
-
- ret = Character.toLowerCase(ret.charAt(0))+ret.substring(1);
-
- return(ret);
- }
-
- /**
- * This method returns the business object type property
- * for the role's service name.
- *
- * @param roleName The role
- * @return The service name property
- */
- public static String getRoleServiceNameProperty(String roleName) {
- String ret=roleName+SERVICE_NAME_ACCESSOR_SUFFIX;
-
- ret = Character.toLowerCase(ret.charAt(0))+ret.substring(1);
-
- return(ret);
- }
-
- /**
- * This method returns the business object type accessor method
- * for the role's service category.
- *
- * @param roleName The role
- * @return The service category accessor method
- */
- public static String getRoleServiceCategoryAccessorMethod(String roleName) {
- String ret=roleName+SERVICE_CATEGORY_ACCESSOR_SUFFIX;
-
- ret = "get"+Character.toUpperCase(ret.charAt(0))+ret.substring(1);
-
- return(ret);
- }
-
- /**
- * This method returns the business object type accessor method
- * for the role's service name.
- *
- * @param roleName The role
- * @return The service name accessor method
- */
- public static String getRoleServiceNameAccessorMethod(String roleName) {
- String ret=roleName+SERVICE_NAME_ACCESSOR_SUFFIX;
-
- ret = "get"+Character.toUpperCase(ret.charAt(0))+ret.substring(1);
-
- return(ret);
- }
-}
Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/util/ProblemDefinitions.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/util/ProblemDefinitions.java 2008-08-26 14:01:00 UTC (rev 274)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/util/ProblemDefinitions.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -1,26 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.tools.overlord.jbossesb.model.util;
-
-public class ProblemDefinitions {
-
- // Defined when the error/warning relates to a property on
- // an ESB action
- public static final String PROBLEM_PROPERTY="ProblemProperty";
-
-}
Copied: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/generator (from rev 260, cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/generator)
Property changes on: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/generator
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/generator/TypeMapperTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/generator/TypeMapperTest.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/generator/TypeMapperTest.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,8 +15,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.generator;
+package org.jboss.tools.overlord.cdl.jbossesb.generator;
+import org.jboss.tools.overlord.cdl.jbossesb.generator.TypeMapper;
+
import junit.framework.TestCase;
public class TypeMapperTest extends TestCase {
Copied: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultConversionContextTest.java (from rev 260, cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/DefaultConversionContextTest.java)
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultConversionContextTest.java (rev 0)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultConversionContextTest.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -0,0 +1,116 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.tools.overlord.cdl.jbossesb.model;
+
+import org.jboss.tools.overlord.cdl.jbossesb.model.DefaultConversionContext;
+import org.jboss.tools.overlord.cdl.jbossesb.model.DefaultESBService;
+
+import junit.framework.TestCase;
+
+public class DefaultConversionContextTest extends TestCase {
+
+ public void testIsJoin() {
+ DefaultESBService service=new DefaultESBService(null, null);
+
+ DefaultConversionContext context=new DefaultConversionContext(null);
+ context.markJoin(service);
+
+ if (context.isJoin(service) == false) {
+ fail("Service should be join");
+ }
+ }
+
+ public void testIsJoinFalse() {
+ DefaultESBService service=new DefaultESBService(null, null);
+
+ DefaultConversionContext context=new DefaultConversionContext(null);
+
+ if (context.isJoin(service)) {
+ fail("Service should not be join");
+ }
+ }
+
+ public void testJoinProcessing() {
+ DefaultESBService service=new DefaultESBService(null, null);
+
+ DefaultConversionContext context=new DefaultConversionContext(null);
+ context.markJoin(service);
+
+ if (context.isJoin(service) == false) {
+ fail("Service should be join");
+ }
+
+ context.processing(service);
+
+ if (context.isJoin(service)) {
+ fail("Service should no longer be marked as join");
+ }
+ }
+
+ public void testIsOnStack() {
+ DefaultESBService service=new DefaultESBService(null, null);
+
+ DefaultConversionContext context=new DefaultConversionContext(null);
+ context.push(service);
+
+ if (context.isOnStack(service) == false) {
+ fail("Service should be on stack");
+ }
+ }
+
+ public void testIsOnStackFalse() {
+ DefaultESBService service=new DefaultESBService(null, null);
+
+ DefaultConversionContext context=new DefaultConversionContext(null);
+
+ if (context.isOnStack(service)) {
+ fail("Service should not be on stack");
+ }
+ }
+
+ public void testStackPushPop() {
+ DefaultESBService service=new DefaultESBService(null, null);
+
+ DefaultConversionContext context=new DefaultConversionContext(null);
+ context.push(service);
+
+ if (context.isOnStack(service) == false) {
+ fail("Service should be on stack");
+ }
+
+ context.pop(service);
+
+ if (context.isOnStack(service)) {
+ fail("Service should no longer be on stack after pop");
+ }
+ }
+
+ public void testGetRole() {
+ String role="myRole";
+
+ DefaultConversionContext context=new DefaultConversionContext(role);
+
+ if (context.getRole() == null) {
+ fail("Role is null");
+ }
+
+ if (context.getRole().equals(role) == false) {
+ fail("Role should be '"+role+"', but got: "+context.getRole());
+ }
+ }
+}
Property changes on: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultConversionContextTest.java
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultESBLanguageModelTest.java (from rev 260, cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/DefaultESBLanguageModelTest.java)
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultESBLanguageModelTest.java (rev 0)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultESBLanguageModelTest.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -0,0 +1,270 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.tools.overlord.cdl.jbossesb.model;
+
+import junit.framework.TestCase;
+
+import org.jboss.tools.overlord.cdl.jbossesb.model.DefaultESBLanguageModel;
+import org.jboss.tools.overlord.cdl.jbossesb.model.ESBLanguageModel;
+import org.scribble.model.*;
+
+public class DefaultESBLanguageModelTest extends TestCase {
+
+ public void testBaseConfiguration() {
+
+ ModelReference ref=new ModelReference(ESBLanguageModel.JBOSSESB_NOTATION);
+
+ DefaultESBLanguageModel model=new DefaultESBLanguageModel(ref);
+
+ org.w3c.dom.Element config=model.getESBConfiguration();
+
+ if (config.getNodeName().equals(DefaultESBLanguageModel.TOP_LEVEL_ELEMENT) == false) {
+ fail("Top level element should be '"+
+ DefaultESBLanguageModel.TOP_LEVEL_ELEMENT+"' but found: "+
+ config.getNodeName());
+ }
+
+ boolean f_providers=false;
+ boolean f_services=false;
+
+ org.w3c.dom.NodeList nl=config.getChildNodes();
+
+ for (int i=0; i < nl.getLength(); i++) {
+ if (nl.item(i) instanceof org.w3c.dom.Element) {
+ org.w3c.dom.Element elem=
+ (org.w3c.dom.Element)nl.item(i);
+
+ if (elem.getNodeName().equals(DefaultESBLanguageModel.PROVIDERS_ELEMENT)) {
+
+ if (f_providers) {
+ fail("Duplicate '"+DefaultESBLanguageModel.PROVIDERS_ELEMENT+"' elements");
+ } else {
+
+ // Check if jms provider defined
+ org.w3c.dom.NodeList nl2=
+ elem.getChildNodes();
+ boolean f_jmsProvider=false;
+
+ for (int j=0; j < nl2.getLength(); j++) {
+ if (nl2.item(j) instanceof org.w3c.dom.Element) {
+
+ if (nl2.item(j).getNodeName().equals(
+ DefaultESBLanguageModel.JMS_PROVIDER_ELEMENT)) {
+
+ if (f_jmsProvider) {
+ fail("JMS Provider already defined");
+ }
+
+ f_jmsProvider = true;
+ } else {
+ fail("Unknown provider element: "+
+ nl2.item(j).getNodeName());
+ }
+ }
+ }
+
+ if (f_jmsProvider == false) {
+ fail("JMS provider not defined");
+ }
+ }
+
+ f_providers = true;
+ } else if (elem.getNodeName().equals(DefaultESBLanguageModel.SERVICES_ELEMENT)) {
+
+ if (f_services) {
+ fail("Duplicate '"+DefaultESBLanguageModel.SERVICES_ELEMENT+"' elements");
+ }
+
+ f_services = true;
+ } else {
+ fail("Unknown element: "+nl.item(i).getNodeName());
+ }
+ }
+ }
+
+ if (f_providers == false) {
+ fail("Element '"+DefaultESBLanguageModel.PROVIDERS_ELEMENT+"' not found");
+ }
+
+ if (f_services == false) {
+ fail("Element '"+DefaultESBLanguageModel.SERVICES_ELEMENT+"' not found");
+ }
+ }
+
+ public void testAddService() {
+ String busId="TestBusId";
+ String category="category.one";
+ String name="serviceName";
+
+ ModelReference ref=new ModelReference(ESBLanguageModel.JBOSSESB_NOTATION);
+
+ DefaultESBLanguageModel model=new DefaultESBLanguageModel(ref);
+
+ org.w3c.dom.Element config=model.getESBConfiguration();
+
+ TestESBService service=new TestESBService();
+ service.setJMSBusIdRef(busId);
+ service.setCategory(category);
+ service.setName(name);
+
+ model.addService(service);
+
+ if (service.getJMSBusIdRef() == null) {
+ fail("JMS BusIdRef not set");
+ }
+
+ if (service.getJMSBusIdRef().equals(busId) == false) {
+ fail("Bus Id should be '"+busId+"', but got: "+service.getJMSBusIdRef());
+ }
+
+ // Check that the jms bus id has been created
+ org.w3c.dom.NodeList nl=config.getElementsByTagName(
+ DefaultESBLanguageModel.JMS_PROVIDER_ELEMENT);
+
+ if (nl.getLength() != 1) {
+ fail("JMS provider element not found");
+ }
+
+ org.w3c.dom.Element provider=(org.w3c.dom.Element)nl.item(0);
+
+ nl = provider.getElementsByTagName(
+ DefaultESBLanguageModel.JMS_BUS_ELEMENT);
+
+ if (nl.getLength() != 1) {
+ fail("JMS bus element not found");
+ }
+
+ org.w3c.dom.Element bus=(org.w3c.dom.Element)nl.item(0);
+
+ if (bus.getAttribute("busid").equals(busId) == false) {
+ fail("Bus had invalid busid '"+bus.getAttribute("busid")+
+ "', was expecting: "+busId);
+ }
+
+ if (bus.getParentNode() != provider) {
+ fail("Bus not contained directly within provider");
+ }
+
+ // Check bus retrieved directly
+ org.w3c.dom.Element bus2=model.findJMSBus(busId);
+
+ if (bus2 != bus) {
+ fail("Bus elements not the same");
+ }
+ }
+
+ public void testRemoveService() {
+ String busId="TestBusId";
+ String category="category.two";
+ String name="serviceName";
+
+ ModelReference ref=new ModelReference(ESBLanguageModel.JBOSSESB_NOTATION);
+
+ DefaultESBLanguageModel model=new DefaultESBLanguageModel(ref);
+
+ org.w3c.dom.Element config=model.getESBConfiguration();
+
+ TestESBService service=new TestESBService();
+ service.setJMSBusIdRef(busId);
+ service.setCategory(category);
+ service.setName(name);
+
+ model.addService(service);
+
+ // Check that the jms bus id has been created
+ org.w3c.dom.NodeList nl=config.getElementsByTagName(
+ DefaultESBLanguageModel.JMS_PROVIDER_ELEMENT);
+
+ if (nl.getLength() != 1) {
+ fail("JMS provider element not found");
+ }
+
+ org.w3c.dom.Element provider=(org.w3c.dom.Element)nl.item(0);
+
+ nl = provider.getElementsByTagName(
+ DefaultESBLanguageModel.JMS_BUS_ELEMENT);
+
+ if (nl.getLength() != 1) {
+ fail("JMS bus element not found");
+ }
+
+ // Remove the service and check that the bus entry
+ // is no longer there
+ model.removeService(service);
+
+ nl = provider.getElementsByTagName(
+ DefaultESBLanguageModel.JMS_BUS_ELEMENT);
+
+ if (nl.getLength() != 0) {
+ fail("JMS bus element should NOT be found");
+ }
+ }
+
+ public void testAddServiceWithNoBusId() {
+ String category="category.one";
+ String name="serviceName";
+
+ ModelReference ref=new ModelReference(ESBLanguageModel.JBOSSESB_NOTATION);
+
+ DefaultESBLanguageModel model=new DefaultESBLanguageModel(ref);
+
+ TestESBService service=new TestESBService();
+ service.setCategory(category);
+ service.setName(name);
+
+ model.addService(service);
+
+ if (service.getJMSBusIdRef() == null) {
+ fail("JMS BusIdRef not set");
+ }
+ }
+
+ public void testAddMultipleServiceWithNoBusId() {
+ String category="category.one";
+ String name1="serviceName1";
+ String name2="serviceName2";
+
+ ModelReference ref=new ModelReference(ESBLanguageModel.JBOSSESB_NOTATION);
+
+ DefaultESBLanguageModel model=new DefaultESBLanguageModel(ref);
+
+ TestESBService service1=new TestESBService();
+ service1.setCategory(category);
+ service1.setName(name1);
+
+ model.addService(service1);
+
+ if (service1.getJMSBusIdRef() == null) {
+ fail("JMS BusIdRef1 not set");
+ }
+
+ TestESBService service2=new TestESBService();
+ service2.setCategory(category);
+ service2.setName(name2);
+
+ model.addService(service2);
+
+ if (service2.getJMSBusIdRef() == null) {
+ fail("JMS BusIdRef2 not set");
+ }
+
+ if (service1.getJMSBusIdRef().equals(service2.getJMSBusIdRef())) {
+ fail("Service JMS bus ids should be unique");
+ }
+ }
+}
Property changes on: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultESBLanguageModelTest.java
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultESBServiceTest.java (from rev 260, cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/DefaultESBServiceTest.java)
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultESBServiceTest.java (rev 0)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultESBServiceTest.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -0,0 +1,365 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.tools.overlord.cdl.jbossesb.model;
+
+import junit.framework.TestCase;
+
+import org.jboss.tools.overlord.cdl.jbossesb.model.DefaultESBLanguageModel;
+import org.jboss.tools.overlord.cdl.jbossesb.model.DefaultESBService;
+import org.jboss.tools.overlord.cdl.jbossesb.model.actions.*;
+
+public class DefaultESBServiceTest extends TestCase {
+
+ public void testValidateSessionClassRequired() {
+ DefaultESBService service=new DefaultESBService(null, null);
+
+ TestESBAction act1=new TestESBAction();
+ act1.setSessionBased(true);
+
+ service.getActions().add(act1);
+
+ TestModelListener l=new TestModelListener();
+
+ l.addExpectedError(org.scribble.util.MessageUtil.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.jboss.tools.overlord.cdl.jbossesb.model.Messages"),
+ "_NOT_SPECIFIED_SESSION_CLASS",
+ new String[]{}));
+
+ service.validate(l);
+
+ if (l.isValid() == false) {
+ fail(l.invalidMessage());
+ }
+ }
+
+ public void testValidateSessionClassNotRequired() {
+ DefaultESBService service=new DefaultESBService(null, null);
+
+ TestModelListener l=new TestModelListener();
+
+ service.validate(l);
+
+ if (l.isValid() == false) {
+ fail(l.invalidMessage());
+ }
+ }
+
+ public void testIsLoop() {
+ DefaultESBService service=new DefaultESBService(null, null);
+
+ TestESBAction act1=new TestESBAction();
+ act1.setSessionBased(true);
+ act1.setLoop(true);
+
+ service.getActions().add(act1);
+
+ if (service.isLoop() == false) {
+ fail("Service should be loop");
+ }
+ }
+
+ public void testIsLoopFalse() {
+ DefaultESBService service=new DefaultESBService(null, null);
+
+ TestESBAction act1=new TestESBAction();
+ act1.setSessionBased(true);
+
+ service.getActions().add(act1);
+
+ if (service.isLoop()) {
+ fail("Service is not a loop");
+ }
+ }
+
+ public void testIsRoot() {
+ DefaultESBService service=new DefaultESBService(null, null);
+
+ TestESBAction act1=new TestESBAction();
+ act1.setSessionBased(true);
+ act1.setCreateSession(true);
+ act1.setPropertyValue(DefaultESBService.ROOT_PROPERTY, "true");
+
+ service.getActions().add(act1);
+
+ if (service.isRoot() == false) {
+ fail("Service should be root");
+ }
+ }
+
+ public void testIsRootFalse() {
+ DefaultESBService service=new DefaultESBService(null, null);
+
+ TestESBAction act1=new TestESBAction();
+
+ service.getActions().add(act1);
+
+ if (service.isRoot()) {
+ fail("Service should NOT be root");
+ }
+ }
+
+ public void testIsSessionBased() {
+ DefaultESBService service=new DefaultESBService(null, null);
+
+ TestESBAction act1=new TestESBAction();
+ act1.setSessionBased(true);
+
+ service.getActions().add(act1);
+
+ if (service.isSessionBased() == false) {
+ fail("Service should be SessionBased");
+ }
+ }
+
+ public void testIsSessionBasedFalse() {
+ DefaultESBService service=new DefaultESBService(null, null);
+
+ TestESBAction act1=new TestESBAction();
+
+ service.getActions().add(act1);
+
+ if (service.isSessionBased()) {
+ fail("Service should NOT be SessionBased");
+ }
+ }
+
+ public void testIsCreateSession() {
+ DefaultESBService service=new DefaultESBService(null, null);
+
+ TestESBAction act1=new TestESBAction();
+ act1.setSessionBased(true);
+ act1.setCreateSession(true);
+
+ service.getActions().add(act1);
+
+ if (service.isCreateSession() == false) {
+ fail("Service should be 'create session'");
+ }
+ }
+
+ public void testIsCreateSessionFalse() {
+ DefaultESBService service=new DefaultESBService(null, null);
+
+ TestESBAction act1=new TestESBAction();
+
+ service.getActions().add(act1);
+
+ if (service.isCreateSession()) {
+ fail("Service should NOT be 'create session'");
+ }
+ }
+
+ public void testGetServiceName() {
+ String name="serviceName1";
+
+ DefaultESBService service=new DefaultESBService(null, null);
+
+ TestESBAction act1=new TestESBAction();
+ act1.setSessionBased(true);
+ act1.setCreateSession(true);
+ act1.setPropertyValue(DefaultESBService.SERVICE_DESCRIPTION_NAME_PROPERTY,
+ name);
+
+ service.getActions().add(act1);
+
+ if (service.getServiceDescriptionName().equals(name) == false) {
+ fail("Service name '"+service.getServiceDescriptionName()+
+ "' invalid, expecting: "+name);
+ }
+ }
+
+ public void testGetConversationType() {
+ String name="convType1";
+
+ DefaultESBService service=new DefaultESBService(null, null);
+
+ TestESBAction act1=new TestESBAction();
+ act1.setSessionBased(true);
+ act1.setCreateSession(true);
+ act1.setPropertyValue(DefaultESBService.CONVERSATION_TYPE_PROPERTY,
+ name);
+
+ service.getActions().add(act1);
+
+ if (service.getConversationType().equals(name) == false) {
+ fail("Conversation type '"+service.getConversationType()+
+ "' invalid, expecting: "+name);
+ }
+ }
+
+ public void testGetSessionName() {
+ String name="session1";
+
+ DefaultESBService service=new DefaultESBService(null, null);
+
+ TestESBAction act1=new TestESBAction();
+ act1.setSessionBased(true);
+ act1.setPropertyValue(DefaultESBService.BUSINESS_OBJECT_TYPE_PROPERTY,
+ name);
+
+ service.getActions().add(act1);
+
+ if (service.getSessionName().equals(name) == false) {
+ fail("Session name '"+service.getSessionName()+
+ "' invalid, expecting: "+name);
+ }
+ }
+
+ public void testBaseConfiguration() {
+ String category="category";
+ String name="name";
+
+ DefaultESBService service=new DefaultESBService(new TestESBLanguageModel(),
+ category, name);
+
+ org.w3c.dom.Element servElem=service.getService();
+
+ if (servElem == null) {
+ fail("Service element is null");
+ }
+
+ if (servElem.getNodeName().equals(DefaultESBService.SERVICE_ELEMENT) == false) {
+ fail("Root element is incorrect: "+servElem.getNodeName());
+ }
+
+ if (servElem.getAttribute(DefaultESBService.CATEGORY_ATTR).equals(category) == false) {
+ fail("Category invalid: "+servElem.getAttribute(DefaultESBService.CATEGORY_ATTR));
+ }
+
+ if (servElem.getAttribute(DefaultESBService.NAME_ATTR).equals(name) == false) {
+ fail("Name invalid: "+servElem.getAttribute(DefaultESBService.NAME_ATTR));
+ }
+ }
+
+ public void testSetInitialBusIdRef() {
+ String category="category";
+ String name="name";
+ String busId="myBusId";
+
+ DefaultESBService service=new DefaultESBService(new TestESBLanguageModel(),
+ category, name);
+
+ org.w3c.dom.Element servElem=service.getService();
+
+ service.setJMSBusIdRef(busId);
+
+ if (service.getJMSBusIdRef() == null) {
+ fail("Bus id not set");
+ }
+
+ if (service.getJMSBusIdRef().equals(busId) == false) {
+ fail("Bus Id not '"+busId+"', got: "+service.getJMSBusIdRef());
+ }
+
+ org.w3c.dom.NodeList nl=servElem.getElementsByTagName(DefaultESBService.JMS_LISTENER_ELEMENT);
+
+ if (nl.getLength() != 1) {
+ fail("Expecting one JMS listener element, but got: "+
+ nl.getLength());
+ }
+
+ org.w3c.dom.Element jmslistener=(org.w3c.dom.Element)nl.item(0);
+
+ if (jmslistener.getParentNode().getNodeName().equals(DefaultESBService.LISTENERS_ELEMENT) == false) {
+ fail("JMS listener parent not expected");
+ }
+
+ if (jmslistener.getParentNode().getParentNode() != servElem) {
+ fail("JMS listener grandparent should be service");
+ }
+
+ if (jmslistener.getAttribute(DefaultESBService.BUSIDREF_ATTR).equals(busId) == false) {
+ fail("Bus Id not '"+busId+"', got: "+jmslistener.getAttribute(DefaultESBService.BUSIDREF_ATTR));
+ }
+
+ if (jmslistener.hasAttribute(DefaultESBService.NAME_ATTR) == false) {
+ fail("Name attribute not set on jms listener");
+ }
+
+ if (jmslistener.hasAttribute(DefaultESBService.MAX_THREADS_ATTR) == false) {
+ fail("Max Threads attribute not set on jms listener");
+ }
+ }
+
+ public void testChangeBusIdRef() {
+ String initialBusId="busId1";
+ String initialName="name1";
+ String initialMaxThreads="2";
+ String changedBusId="busId2";
+
+ org.w3c.dom.Element top=null;
+
+ // Create an empty document
+ org.w3c.dom.Document doc=null;
+ try {
+ doc = javax.xml.parsers.DocumentBuilderFactory.
+ newInstance().newDocumentBuilder().newDocument();
+
+ top = doc.createElement(DefaultESBLanguageModel.TOP_LEVEL_ELEMENT);
+
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
+
+ org.w3c.dom.Element services=doc.createElement(DefaultESBLanguageModel.SERVICES_ELEMENT);
+ top.appendChild(services);
+
+ org.w3c.dom.Element serviceElem=doc.createElement(DefaultESBLanguageModel.SERVICE_ELEMENT);
+ services.appendChild(serviceElem);
+
+ org.w3c.dom.Element listeners=doc.createElement(DefaultESBService.LISTENERS_ELEMENT);
+ serviceElem.appendChild(listeners);
+
+ org.w3c.dom.Element jmslistener=doc.createElement(DefaultESBService.JMS_LISTENER_ELEMENT);
+ listeners.appendChild(jmslistener);
+
+ jmslistener.setAttribute(DefaultESBService.BUSIDREF_ATTR, initialBusId);
+ jmslistener.setAttribute(DefaultESBService.NAME_ATTR, initialName);
+ jmslistener.setAttribute(DefaultESBService.MAX_THREADS_ATTR, initialMaxThreads);
+
+ DefaultESBService service=new DefaultESBService(new TestESBLanguageModel(),
+ serviceElem);
+
+ if (service.getJMSBusIdRef() == null) {
+ fail("JMS bus id not set");
+ }
+
+ if (service.getJMSBusIdRef().equals(initialBusId) == false) {
+ fail("JMS bus id not '"+initialBusId+"', got: "+service.getJMSBusIdRef());
+ }
+
+ service.setJMSBusIdRef(changedBusId);
+
+ if (service.getJMSBusIdRef().equals(changedBusId) == false) {
+ fail("Changed JMS bus id not '"+changedBusId+"', got: "+service.getJMSBusIdRef());
+ }
+
+ if (jmslistener.getAttribute(DefaultESBService.BUSIDREF_ATTR).equals(changedBusId)==false) {
+ fail("Changed bus id not reflected in element");
+ }
+
+ if (jmslistener.getAttribute(DefaultESBService.NAME_ATTR).equals(initialName)==false) {
+ fail("Name attribute incorrect");
+ }
+
+ if (jmslistener.getAttribute(DefaultESBService.MAX_THREADS_ATTR).equals(initialMaxThreads)==false) {
+ fail("MaxThreads attribute incorrect");
+ }
+ }
+}
Property changes on: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultESBServiceTest.java
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/TestESBAction.java (from rev 260, cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/TestESBAction.java)
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/TestESBAction.java (rev 0)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/TestESBAction.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -0,0 +1,106 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.tools.overlord.cdl.jbossesb.model;
+
+import java.util.List;
+
+import org.jboss.tools.overlord.cdl.jbossesb.model.ConversionContext;
+import org.jboss.tools.overlord.cdl.jbossesb.model.ESBAction;
+import org.scribble.model.Activity;
+import org.scribble.model.ModelListener;
+import org.w3c.dom.Element;
+
+public class TestESBAction implements ESBAction {
+
+ public void convert(List<Activity> activities, ConversionContext context) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public Element getAction() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public String getActionClass() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public String getPropertyValue(String property) {
+ return(m_property.get(property));
+ }
+
+ public void setPropertyValue(String property, String value) {
+ m_property.put(property, value);
+ }
+
+ public void initializeLinks() {
+ // TODO Auto-generated method stub
+
+ }
+
+ public boolean isLoop() {
+ return(m_loop);
+ }
+
+ public void setLoop(boolean bool) {
+ m_loop = bool;
+ }
+
+ public boolean isPerform() {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ public boolean isSessionBased() {
+ return(m_sessionBased);
+ }
+
+ public void setSessionBased(boolean bool) {
+ m_sessionBased = bool;
+ }
+
+ public boolean isCreateSession() {
+ return(m_createSession);
+ }
+
+ public void setCreateSession(boolean bool) {
+ m_createSession = bool;
+ }
+
+ public boolean isGateway() {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ public boolean hasProperty(String property) {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ public void validate(ModelListener l) {
+ // TODO Auto-generated method stub
+
+ }
+
+ private boolean m_sessionBased=false;
+ private boolean m_loop=false;
+ private boolean m_createSession=false;
+ private java.util.Map<String,String> m_property=new java.util.Hashtable<String, String>();
+}
Property changes on: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/TestESBAction.java
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/TestESBLanguageModel.java (from rev 260, cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/TestESBLanguageModel.java)
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/TestESBLanguageModel.java (rev 0)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/TestESBLanguageModel.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -0,0 +1,120 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.tools.overlord.cdl.jbossesb.model;
+
+import java.util.Collection;
+
+import org.jboss.tools.overlord.cdl.jbossesb.model.DefaultESBLanguageModel;
+import org.jboss.tools.overlord.cdl.jbossesb.model.DefaultESBService;
+import org.jboss.tools.overlord.cdl.jbossesb.model.ESBService;
+import org.scribble.model.ModelListener;
+import org.scribble.model.ModelReference;
+import org.w3c.dom.Element;
+
+public class TestESBLanguageModel extends org.scribble.lang.model.LanguageModel
+ implements org.jboss.tools.overlord.cdl.jbossesb.model.ESBLanguageModel {
+
+ public TestESBLanguageModel() {
+ org.w3c.dom.Document doc=null;
+
+ // Create an empty document
+ try {
+ doc = javax.xml.parsers.DocumentBuilderFactory.
+ newInstance().newDocumentBuilder().newDocument();
+
+ m_esbConfig = doc.createElement(DefaultESBLanguageModel.TOP_LEVEL_ELEMENT);
+
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
+ }
+ public String getOriginalContents() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public ModelReference getModelReference() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public ESBService createService(String category, String name) {
+ TestESBService ret=new TestESBService(category, name);
+
+ org.w3c.dom.Element service=m_esbConfig.getOwnerDocument().
+ createElement(DefaultESBService.SERVICE_ELEMENT);
+ m_esbConfig.appendChild(service);
+
+ ret.setService(service);
+
+ return(ret);
+ }
+
+ public void addService(ESBService service) {
+ m_services.put(service.getCategory()+":"+service.getName(), service);
+ }
+
+ public void removeService(ESBService service) {
+ m_services.remove(service.getCategory()+":"+service.getName());
+ }
+
+ public ESBService getService(String category, String name) {
+ return(m_services.get(category+":"+name));
+ }
+
+ public Collection<ESBService> getServices() {
+ return(m_services.values());
+ }
+
+ public ESBService getGatewayService() {
+ return(m_gatewayService);
+ }
+
+ public void setGatewayService(ESBService gw) {
+ m_gatewayService = gw;
+ }
+
+ public void validate(ModelListener l) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public String getUniqueServiceName(String category, String name) {
+ return("serviceName__"+m_count++);
+ }
+
+ public Element getESBConfiguration() {
+ return(m_esbConfig);
+ }
+
+ @Override
+ public String getNotation() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public String getJMSDefinition(String jmsBusId) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ private java.util.Map<String,ESBService> m_services=new java.util.Hashtable<String,ESBService>();
+ private ESBService m_gatewayService=null;
+ private org.w3c.dom.Element m_esbConfig=null;
+ private int m_count=0;
+}
Copied: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/TestESBService.java (from rev 260, cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/TestESBService.java)
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/TestESBService.java (rev 0)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/TestESBService.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -0,0 +1,218 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.tools.overlord.cdl.jbossesb.model;
+
+import java.util.List;
+
+import org.jboss.tools.overlord.cdl.jbossesb.model.ConversionContext;
+import org.jboss.tools.overlord.cdl.jbossesb.model.ESBAction;
+import org.jboss.tools.overlord.cdl.jbossesb.model.ESBLanguageModel;
+import org.scribble.conversation.model.*;
+import org.scribble.model.*;
+import org.w3c.dom.Element;
+
+public class TestESBService extends ModelObject
+ implements org.jboss.tools.overlord.cdl.jbossesb.model.ESBService {
+
+ public TestESBService() {
+ }
+
+ public TestESBService(String category, String name) {
+ m_category = category;
+ m_name = name;
+ }
+
+ public void convert(List<Activity> activities, ConversionContext context) {
+ activities.addAll(m_contents);
+ }
+
+ public Conversation convert(ConversionContext context) {
+ return(null);
+ }
+
+ public List<Activity> getContents() {
+ return(m_contents);
+ }
+
+ public List<ESBAction> getActions() {
+ return(m_actions);
+ }
+
+ public void setCategory(String cat) {
+ m_category = cat;
+ }
+
+ public String getCategory() {
+ return(m_category);
+ }
+
+ public void setConversationType(String type) {
+ m_conversationType = type;
+ }
+
+ public String getConversationType() {
+ return(m_conversationType);
+ }
+
+ public void setName(String name) {
+ m_name = name;
+ }
+
+ public String getName() {
+ return(m_name);
+ }
+
+ public void setModel(ESBLanguageModel model) {
+ m_model = model;
+ }
+
+ public ESBLanguageModel getModel() {
+ return(m_model);
+ }
+
+ public Element getService() {
+ return(m_service);
+ }
+
+ public void setService(Element service) {
+ m_service = service;
+ }
+
+ public ClassLoader getServiceClassLoader() throws Exception {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public String getServiceDescriptionName() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public int getServicePosition() {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ public void setSessionClass(Class<?> cls) {
+ m_sessionClass = cls;
+ }
+
+ public Class<?> getSessionClass() {
+ return(m_sessionClass);
+ }
+
+ public String getSessionName() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public void initializeLinks() {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void setLoop(boolean bool) {
+ m_loop = bool;
+ }
+
+ public boolean isLoop() {
+ return(m_loop);
+ }
+
+ public void setRoot(boolean bool) {
+ m_root = bool;
+ }
+
+ public boolean isRoot() {
+ return(m_root);
+ }
+
+ public void setCreateSession(boolean bool) {
+ m_createSession = bool;
+ }
+
+ public boolean isCreateSession() {
+ return(m_createSession);
+ }
+
+ public void setSessionBased(boolean bool) {
+ m_sessionBased = bool;
+ }
+
+ public boolean isSessionBased() {
+ return(m_sessionBased);
+ }
+
+ public ESBAction getFirstSessionBasedAction() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean isGateway() {
+ return(m_gateway);
+ }
+
+ public void setGateway(boolean gw) {
+ m_gateway = gw;
+ }
+
+ public ESBAction getGatewayAction() {
+ return(m_gatewayAction);
+ }
+
+ public void setGatewayAction(ESBAction act) {
+ m_gatewayAction = act;
+ }
+
+ public void validate(ModelListener l) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public String getJMSBusIdRef() {
+ return(m_jmsBusIdRef);
+ }
+
+ public void setJMSBusIdRef(String busId) {
+ m_jmsBusIdRef = busId;
+ }
+
+ public void addAction(ESBAction action, int pos) {
+ m_actions.add(action);
+ }
+
+ public boolean removeAction(ESBAction action) {
+ return(m_actions.remove(action));
+ }
+
+ private String m_category=null;
+ private String m_name=null;
+ private ESBLanguageModel m_model=null;
+ private Element m_service;
+ private List<ESBAction> m_actions=new java.util.Vector<ESBAction>();
+ private boolean m_root=false;
+ private boolean m_gateway=false;
+ private ESBAction m_gatewayAction=null;
+ private boolean m_loop=false;
+ private boolean m_sessionBased=false;
+ private boolean m_createSession=false;
+ private Class<?> m_sessionClass=null;
+ private String m_conversationType=null;
+ private List<Activity> m_contents=new java.util.Vector<Activity>();
+ private String m_jmsBusIdRef=null;
+}
Copied: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/TestModelListener.java (from rev 263, cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/TestModelListener.java)
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/TestModelListener.java (rev 0)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/TestModelListener.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -0,0 +1,84 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.tools.overlord.cdl.jbossesb.model;
+
+import org.scribble.model.ModelObject;
+
+public class TestModelListener implements org.scribble.model.ModelListener {
+
+ public void error(ModelObject modelObject, String mesg,
+ java.util.Map<String,Object> props) {
+ reported(mesg);
+ }
+
+ public void warning(ModelObject modelObject, String mesg,
+ java.util.Map<String,Object> props) {
+ reported(mesg);
+ }
+
+ protected void reported(String mesg) {
+ if (mesg != null) {
+
+ // Check if in the list of messages to be
+ // detected
+ if (m_errorsToDetect.contains(mesg)) {
+ m_errorsToDetect.remove(mesg);
+ } else {
+ m_unexpectedErrors.add(mesg);
+ }
+ }
+ }
+
+ public void addExpectedError(String mesg) {
+ m_errorsToDetect.add(mesg);
+ }
+
+ public boolean isValid() {
+ // If there are no more errors to detect, and no
+ // unexpected errors have been reported, then
+ // the expression has been validated as expected
+ return(m_errorsToDetect.size() == 0 &&
+ m_unexpectedErrors.size() == 0);
+ }
+
+ public String invalidMessage() {
+ String ret="\r\n";
+
+ if (m_errorsToDetect.size() > 0) {
+ ret += "Errors not detected:\r\n";
+
+ for (int i=0; i < m_errorsToDetect.size(); i++) {
+ ret += m_errorsToDetect.get(i)+"\r\n";
+ }
+ }
+
+ if (m_unexpectedErrors.size() > 0) {
+ ret += "Unexpected Errors:\r\n";
+
+ for (int i=0; i < m_unexpectedErrors.size(); i++) {
+ ret += m_unexpectedErrors.get(i)+"\r\n";
+ }
+ }
+
+ return(ret);
+ }
+
+ private java.util.List<String> m_errorsToDetect=new java.util.Vector<String>();
+ private java.util.List<String> m_unexpectedErrors=new java.util.Vector<String>();
+ private java.util.List<String> m_messages=new java.util.Vector<String>();
+}
Property changes on: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/TestModelListener.java
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions (from rev 260, cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions)
Property changes on: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/CreateSessionActionTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/CreateSessionActionTest.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/CreateSessionActionTest.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,11 +15,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.actions;
+package org.jboss.tools.overlord.cdl.jbossesb.model.actions;
-import org.jboss.tools.overlord.jbossesb.model.TestESBLanguageModel;
-import org.jboss.tools.overlord.jbossesb.model.TestESBService;
-import org.jboss.tools.overlord.jbossesb.model.TestModelListener;
+import org.jboss.tools.overlord.cdl.jbossesb.model.TestESBLanguageModel;
+import org.jboss.tools.overlord.cdl.jbossesb.model.TestESBService;
+import org.jboss.tools.overlord.cdl.jbossesb.model.TestModelListener;
+import org.jboss.tools.overlord.cdl.jbossesb.model.actions.CreateSessionAction;
+import org.jboss.tools.overlord.cdl.jbossesb.model.actions.UnsupportedAction;
import junit.framework.TestCase;
@@ -58,7 +60,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_MUST_BE_FIRST_ACTION",
new String[]{"CreateSession"}));
@@ -85,7 +87,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_CONVERSATION_TYPE",
new String[]{}));
@@ -154,7 +156,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_CONVERSATION_TYPE_ROLE",
new String[]{convType}));
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/ESBActionTestUtil.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/ESBActionTestUtil.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/ESBActionTestUtil.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,7 +15,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.actions;
+package org.jboss.tools.overlord.cdl.jbossesb.model.actions;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/IfActionTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/IfActionTest.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/IfActionTest.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,13 +15,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.actions;
+package org.jboss.tools.overlord.cdl.jbossesb.model.actions;
import junit.framework.TestCase;
-import org.jboss.tools.overlord.jbossesb.model.TestESBLanguageModel;
-import org.jboss.tools.overlord.jbossesb.model.TestESBService;
-import org.jboss.tools.overlord.jbossesb.model.TestModelListener;
+import org.jboss.tools.overlord.cdl.jbossesb.model.TestESBLanguageModel;
+import org.jboss.tools.overlord.cdl.jbossesb.model.TestESBService;
+import org.jboss.tools.overlord.cdl.jbossesb.model.TestModelListener;
+import org.jboss.tools.overlord.cdl.jbossesb.model.actions.IfAction;
import org.scribble.model.*;
import org.scribble.conversation.model.*;
@@ -42,7 +43,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{"paths"}));
@@ -78,17 +79,17 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.Messages"),
"_NOT_FOUND_SERVICE_DESCRIPTOR",
new String[]{"cat1","name1"}));
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.Messages"),
"_NOT_FOUND_SERVICE_DESCRIPTOR",
new String[]{"cat2","name2"}));
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.Messages"),
"_NOT_FOUND_SERVICE_DESCRIPTOR",
new String[]{"cat3","name3"}));
@@ -131,7 +132,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_IF_ORDER_WRONG",
new String[]{}));
@@ -183,7 +184,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_IF_ORDER_WRONG",
new String[]{}));
@@ -234,7 +235,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_IF_ORDER_WRONG",
new String[]{}));
@@ -285,7 +286,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_PATH_SERVICE_DETAILS_MISSING",
new String[]{}));
@@ -336,7 +337,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_BOOLEAN",
new String[]{IfAction.IMMEDIATE}));
@@ -387,7 +388,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_BOOLEAN",
new String[]{IfAction.IMMEDIATE}));
@@ -438,7 +439,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_BOOLEAN",
new String[]{IfAction.IMMEDIATE}));
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/MessageRouterActionTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/MessageRouterActionTest.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/MessageRouterActionTest.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,11 +15,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.actions;
+package org.jboss.tools.overlord.cdl.jbossesb.model.actions;
-import org.jboss.tools.overlord.jbossesb.model.TestESBLanguageModel;
-import org.jboss.tools.overlord.jbossesb.model.TestESBService;
-import org.jboss.tools.overlord.jbossesb.model.TestModelListener;
+import org.jboss.tools.overlord.cdl.jbossesb.model.TestESBLanguageModel;
+import org.jboss.tools.overlord.cdl.jbossesb.model.TestESBService;
+import org.jboss.tools.overlord.cdl.jbossesb.model.TestModelListener;
+import org.jboss.tools.overlord.cdl.jbossesb.model.actions.MessageRouterAction;
import junit.framework.TestCase;
@@ -40,7 +41,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{"paths"}));
@@ -69,7 +70,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_CANNOT_SESSION_BASED_ACTIONS_WITH_ROUTER",
new String[]{}));
@@ -103,7 +104,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.Messages"),
"_NOT_FOUND_SERVICE_DESCRIPTOR",
new String[]{"cat1","name1"}));
@@ -142,7 +143,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_CANNOT_INITIATE_NON_ROOT",
new String[]{other.getCategory(),
other.getName()}));
@@ -183,7 +184,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_MUST_INITIATE_ROOT",
new String[]{other.getCategory(),
other.getName()}));
@@ -211,7 +212,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_ROUTER_ONE_OR_MORE_PATHS",
new String[]{}));
@@ -238,7 +239,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_PATH_SERVICE_DETAILS_MISSING",
new String[]{}));
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/ParallelActionTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/ParallelActionTest.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/ParallelActionTest.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,11 +15,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.actions;
+package org.jboss.tools.overlord.cdl.jbossesb.model.actions;
import org.scribble.conversation.model.*;
import org.scribble.model.Activity;
-import org.jboss.tools.overlord.jbossesb.model.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.actions.ParallelAction;
import junit.framework.TestCase;
@@ -40,7 +41,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{"paths"}));
@@ -76,17 +77,17 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.Messages"),
"_NOT_FOUND_SERVICE_DESCRIPTOR",
new String[]{"cat1","name1"}));
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.Messages"),
"_NOT_FOUND_SERVICE_DESCRIPTOR",
new String[]{"cat2","name2"}));
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.Messages"),
"_NOT_FOUND_SERVICE_DESCRIPTOR",
new String[]{"cat3","name3"}));
@@ -131,7 +132,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_PARALLEL_MORE_THAN_TWO_PATHS",
new String[]{}));
@@ -183,7 +184,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_MULTIPLE_JOINS",
new String[]{}));
@@ -234,7 +235,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_PARALLEL_PATH_AFTER_JOIN",
new String[]{}));
@@ -285,7 +286,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_PATH_SERVICE_DETAILS_MISSING",
new String[]{}));
@@ -336,7 +337,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_BOOLEAN",
new String[]{ParallelAction.IMMEDIATE}));
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/PerformActionTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/PerformActionTest.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/PerformActionTest.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,11 +15,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.actions;
+package org.jboss.tools.overlord.cdl.jbossesb.model.actions;
-import org.jboss.tools.overlord.jbossesb.model.TestESBLanguageModel;
-import org.jboss.tools.overlord.jbossesb.model.TestESBService;
-import org.jboss.tools.overlord.jbossesb.model.TestModelListener;
+import org.jboss.tools.overlord.cdl.jbossesb.model.TestESBLanguageModel;
+import org.jboss.tools.overlord.cdl.jbossesb.model.TestESBService;
+import org.jboss.tools.overlord.cdl.jbossesb.model.TestModelListener;
+import org.jboss.tools.overlord.cdl.jbossesb.model.actions.PerformAction;
import org.scribble.conversation.model.*;
import org.scribble.model.Activity;
@@ -44,7 +45,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{"serviceCategory"}));
@@ -72,7 +73,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{"serviceName"}));
@@ -107,7 +108,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.Messages"),
"_NOT_FOUND_SERVICE_DESCRIPTOR",
new String[]{"cat1", "name1"}));
@@ -150,7 +151,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.Messages"),
"_NOT_FOUND_SERVICE_DESCRIPTOR",
new String[]{"cat2", "name2"}));
@@ -198,7 +199,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_NOT_FOUND_PERFORM_CREATE_SESSION",
new String[]{}));
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/ReceiveMessageActionTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/ReceiveMessageActionTest.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/ReceiveMessageActionTest.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,10 +15,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.actions;
+package org.jboss.tools.overlord.cdl.jbossesb.model.actions;
import org.scribble.model.*;
-import org.jboss.tools.overlord.jbossesb.model.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.actions.ReceiveMessageAction;
import junit.framework.TestCase;
@@ -41,7 +42,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{"messageType"}));
@@ -69,7 +70,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{"identities"}));
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/RetrieveSessionActionTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/RetrieveSessionActionTest.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/RetrieveSessionActionTest.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,10 +15,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.actions;
+package org.jboss.tools.overlord.cdl.jbossesb.model.actions;
-import org.jboss.tools.overlord.jbossesb.model.TestESBService;
-import org.jboss.tools.overlord.jbossesb.model.TestModelListener;
+import org.jboss.tools.overlord.cdl.jbossesb.model.TestESBService;
+import org.jboss.tools.overlord.cdl.jbossesb.model.TestModelListener;
+import org.jboss.tools.overlord.cdl.jbossesb.model.actions.RetrieveSessionAction;
+import org.jboss.tools.overlord.cdl.jbossesb.model.actions.UnsupportedAction;
import junit.framework.TestCase;
@@ -67,7 +69,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_MUST_BE_FIRST_ACTION",
new String[]{"RetrieveSession"}));
@@ -93,7 +95,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{"identities"}));
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/ScheduleStateActionTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/ScheduleStateActionTest.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/ScheduleStateActionTest.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,10 +15,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.actions;
+package org.jboss.tools.overlord.cdl.jbossesb.model.actions;
import org.scribble.model.Activity;
-import org.jboss.tools.overlord.jbossesb.model.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.actions.ScheduleStateAction;
import junit.framework.TestCase;
@@ -41,7 +42,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{"serviceCategory"}));
@@ -69,7 +70,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{"serviceName"}));
@@ -104,7 +105,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.Messages"),
"_NOT_FOUND_SERVICE_DESCRIPTOR",
new String[]{"cat1", "name1"}));
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/SendMessageActionTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SendMessageActionTest.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/SendMessageActionTest.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,12 +15,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.actions;
+package org.jboss.tools.overlord.cdl.jbossesb.model.actions;
-import org.jboss.tools.overlord.jbossesb.model.DefaultConversionContext;
-import org.jboss.tools.overlord.jbossesb.model.TestESBLanguageModel;
-import org.jboss.tools.overlord.jbossesb.model.TestESBService;
-import org.jboss.tools.overlord.jbossesb.model.TestModelListener;
+import org.jboss.tools.overlord.cdl.jbossesb.model.DefaultConversionContext;
+import org.jboss.tools.overlord.cdl.jbossesb.model.TestESBLanguageModel;
+import org.jboss.tools.overlord.cdl.jbossesb.model.TestESBService;
+import org.jboss.tools.overlord.cdl.jbossesb.model.TestModelListener;
+import org.jboss.tools.overlord.cdl.jbossesb.model.actions.SendMessageAction;
import org.scribble.model.Activity;
import org.scribble.model.Interaction;
import org.scribble.model.TypeReference;
@@ -48,7 +49,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{"messageType"}));
@@ -77,7 +78,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{"identities"}));
@@ -106,7 +107,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_REQ_RESP_EPR",
new String[]{}));
@@ -145,7 +146,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.Messages"),
"_NOT_FOUND_SERVICE_DESCRIPTOR",
new String[]{"cat2", "name2"}));
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/SetMessageActionTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SetMessageActionTest.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/SetMessageActionTest.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,10 +15,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.actions;
+package org.jboss.tools.overlord.cdl.jbossesb.model.actions;
-import org.jboss.tools.overlord.jbossesb.model.TestESBService;
-import org.jboss.tools.overlord.jbossesb.model.TestModelListener;
+import org.jboss.tools.overlord.cdl.jbossesb.model.TestESBService;
+import org.jboss.tools.overlord.cdl.jbossesb.model.TestModelListener;
+import org.jboss.tools.overlord.cdl.jbossesb.model.actions.SetMessageAction;
import junit.framework.TestCase;
@@ -40,7 +41,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{SetMessageAction.STATE_EXPRESSION}));
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/SetStateActionTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SetStateActionTest.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/SetStateActionTest.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,10 +15,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.actions;
+package org.jboss.tools.overlord.cdl.jbossesb.model.actions;
-import org.jboss.tools.overlord.jbossesb.model.TestESBService;
-import org.jboss.tools.overlord.jbossesb.model.TestModelListener;
+import org.jboss.tools.overlord.cdl.jbossesb.model.TestESBService;
+import org.jboss.tools.overlord.cdl.jbossesb.model.TestModelListener;
+import org.jboss.tools.overlord.cdl.jbossesb.model.actions.SetStateAction;
import junit.framework.TestCase;
@@ -41,7 +42,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{SetStateAction.VARIABLE}));
@@ -75,7 +76,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_NOT_FOUND_VARIABLE",
new String[]{varName, cls.getName()}));
@@ -165,7 +166,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_NOT_WRITABLE_PROPERTY",
new String[]{"readableProperty", TestClass2.class.getName()}));
@@ -199,7 +200,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_NOT_READABLE_PROPERTY",
new String[]{"testClass2", TestClass3.class.getName()}));
@@ -232,7 +233,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_MUST_SPECIFY_STATE_OR_MESSAGE_EXPRESSION",
new String[]{}));
@@ -267,7 +268,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_MUST_SPECIFY_STATE_OR_MESSAGE_EXPRESSION",
new String[]{}));
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/SwitchActionTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SwitchActionTest.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/SwitchActionTest.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,11 +15,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.actions;
+package org.jboss.tools.overlord.cdl.jbossesb.model.actions;
-import org.jboss.tools.overlord.jbossesb.model.TestESBLanguageModel;
-import org.jboss.tools.overlord.jbossesb.model.TestESBService;
-import org.jboss.tools.overlord.jbossesb.model.TestModelListener;
+import org.jboss.tools.overlord.cdl.jbossesb.model.TestESBLanguageModel;
+import org.jboss.tools.overlord.cdl.jbossesb.model.TestESBService;
+import org.jboss.tools.overlord.cdl.jbossesb.model.TestModelListener;
+import org.jboss.tools.overlord.cdl.jbossesb.model.actions.SwitchAction;
import org.scribble.conversation.model.If;
import org.scribble.model.Activity;
@@ -42,7 +43,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{"paths"}));
@@ -78,17 +79,17 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.Messages"),
"_NOT_FOUND_SERVICE_DESCRIPTOR",
new String[]{"cat1","name1"}));
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.Messages"),
"_NOT_FOUND_SERVICE_DESCRIPTOR",
new String[]{"cat2","name2"}));
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.Messages"),
"_NOT_FOUND_SERVICE_DESCRIPTOR",
new String[]{"cat3","name3"}));
@@ -131,7 +132,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_SWITCH_ONE_OR_MORE_PATHS",
new String[]{}));
@@ -182,7 +183,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_PATH_SERVICE_DETAILS_MISSING",
new String[]{}));
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/TestActivity.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/TestActivity.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/TestActivity.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,7 +15,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.actions;
+package org.jboss.tools.overlord.cdl.jbossesb.model.actions;
public class TestActivity extends org.scribble.model.Activity {
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/WhenActionTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/WhenActionTest.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/WhenActionTest.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,11 +15,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.actions;
+package org.jboss.tools.overlord.cdl.jbossesb.model.actions;
-import org.jboss.tools.overlord.jbossesb.model.TestESBLanguageModel;
-import org.jboss.tools.overlord.jbossesb.model.TestESBService;
-import org.jboss.tools.overlord.jbossesb.model.TestModelListener;
+import org.jboss.tools.overlord.cdl.jbossesb.model.TestESBLanguageModel;
+import org.jboss.tools.overlord.cdl.jbossesb.model.TestESBService;
+import org.jboss.tools.overlord.cdl.jbossesb.model.TestModelListener;
+import org.jboss.tools.overlord.cdl.jbossesb.model.actions.WhenAction;
import org.scribble.conversation.model.*;
import org.scribble.model.*;
@@ -42,7 +43,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{"paths"}));
@@ -78,17 +79,17 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.Messages"),
"_NOT_FOUND_SERVICE_DESCRIPTOR",
new String[]{"cat1","name1"}));
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.Messages"),
"_NOT_FOUND_SERVICE_DESCRIPTOR",
new String[]{"cat2","name2"}));
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.Messages"),
"_NOT_FOUND_SERVICE_DESCRIPTOR",
new String[]{"cat3","name3"}));
@@ -131,7 +132,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_WHEN_ONE_OR_MORE_PATHS",
new String[]{}));
@@ -182,7 +183,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_PATH_SERVICE_DETAILS_MISSING",
new String[]{}));
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/WhileActionTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/WhileActionTest.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/WhileActionTest.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,11 +15,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.actions;
+package org.jboss.tools.overlord.cdl.jbossesb.model.actions;
import org.scribble.conversation.model.*;
import org.scribble.model.*;
-import org.jboss.tools.overlord.jbossesb.model.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.actions.WhileAction;
import junit.framework.TestCase;
@@ -40,7 +41,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{"paths"}));
@@ -75,12 +76,12 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.Messages"),
"_NOT_FOUND_SERVICE_DESCRIPTOR",
new String[]{"cat1","name1"}));
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.Messages"),
"_NOT_FOUND_SERVICE_DESCRIPTOR",
new String[]{"cat2","name2"}));
@@ -124,7 +125,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_MUST_DEFINE_SINGLE_WHILE_EXIT",
new String[]{}));
@@ -168,7 +169,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_MUST_DEFINE_SINGLE_WHILE_PATH",
new String[]{}));
@@ -218,7 +219,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_PATH_SERVICE_DETAILS_MISSING",
new String[]{}));
@@ -268,7 +269,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_PATH_SERVICE_DETAILS_MISSING",
new String[]{}));
@@ -318,7 +319,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_WHILE_PATH_AFTER_EXIT",
new String[]{}));
@@ -363,7 +364,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_BOOLEAN",
new String[]{WhileAction.IMMEDIATE}));
@@ -408,7 +409,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "org.jboss.tools.overlord.cdl.jbossesb.model.actions.Messages"),
"_BOOLEAN",
new String[]{WhileAction.IMMEDIATE}));
Copied: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/change (from rev 260, cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/change)
Property changes on: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/change
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/change/ConversationInteractionModelChangeRuleTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/change/ConversationInteractionModelChangeRuleTest.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/change/ConversationInteractionModelChangeRuleTest.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,13 +15,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.change;
+package org.jboss.tools.overlord.cdl.jbossesb.model.change;
import junit.framework.TestCase;
-import org.jboss.tools.overlord.jbossesb.model.*;
-import org.jboss.tools.overlord.jbossesb.model.actions.*;
-import org.jboss.tools.overlord.jbossesb.model.util.InteractionUtil;
+import org.jboss.tools.overlord.cdl.jbossesb.model.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.actions.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.change.ConversationInteractionModelChangeRule;
+import org.jboss.tools.overlord.cdl.jbossesb.model.util.InteractionUtil;
import org.scribble.model.*;
import org.scribble.model.change.*;
import org.scribble.conversation.model.*;
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/change/IfModelChangeRuleTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/change/IfModelChangeRuleTest.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/change/IfModelChangeRuleTest.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,12 +15,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.change;
+package org.jboss.tools.overlord.cdl.jbossesb.model.change;
import junit.framework.TestCase;
-import org.jboss.tools.overlord.jbossesb.model.*;
-import org.jboss.tools.overlord.jbossesb.model.actions.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.actions.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.change.IfModelChangeRule;
import org.scribble.model.*;
import org.scribble.model.change.*;
import org.scribble.conversation.model.*;
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/change/ParallelModelChangeRuleTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/change/ParallelModelChangeRuleTest.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/change/ParallelModelChangeRuleTest.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,12 +15,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.change;
+package org.jboss.tools.overlord.cdl.jbossesb.model.change;
import junit.framework.TestCase;
-import org.jboss.tools.overlord.jbossesb.model.*;
-import org.jboss.tools.overlord.jbossesb.model.actions.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.actions.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.change.ParallelModelChangeRule;
import org.scribble.model.*;
import org.scribble.model.analysis.*;
import org.scribble.model.change.*;
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/change/RunModelChangeRuleTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/change/RunModelChangeRuleTest.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/change/RunModelChangeRuleTest.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,14 +15,15 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.change;
+package org.jboss.tools.overlord.cdl.jbossesb.model.change;
import junit.framework.TestCase;
-import org.jboss.tools.overlord.jbossesb.model.*;
-import org.jboss.tools.overlord.jbossesb.model.actions.*;
-import org.jboss.tools.overlord.jbossesb.model.util.ConversationUtil;
-import org.jboss.tools.overlord.jbossesb.model.util.InteractionUtil;
+import org.jboss.tools.overlord.cdl.jbossesb.model.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.actions.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.change.RunModelChangeRule;
+import org.jboss.tools.overlord.cdl.jbossesb.model.util.ConversationUtil;
+import org.jboss.tools.overlord.cdl.jbossesb.model.util.InteractionUtil;
import org.scribble.model.*;
import org.scribble.model.change.*;
import org.scribble.conversation.model.*;
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/change/WhenModelChangeRuleTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/change/WhenModelChangeRuleTest.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/change/WhenModelChangeRuleTest.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,12 +15,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.change;
+package org.jboss.tools.overlord.cdl.jbossesb.model.change;
import junit.framework.TestCase;
-import org.jboss.tools.overlord.jbossesb.model.*;
-import org.jboss.tools.overlord.jbossesb.model.actions.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.actions.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.change.WhenModelChangeRule;
import org.scribble.model.*;
import org.scribble.model.change.*;
import org.scribble.conversation.model.*;
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/change/WhileModelChangeRuleTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/change/WhileModelChangeRuleTest.java 2008-08-21 09:27:12 UTC (rev 260)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/change/WhileModelChangeRuleTest.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -15,12 +15,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.tools.overlord.jbossesb.model.change;
+package org.jboss.tools.overlord.cdl.jbossesb.model.change;
import junit.framework.TestCase;
-import org.jboss.tools.overlord.jbossesb.model.*;
-import org.jboss.tools.overlord.jbossesb.model.actions.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.actions.*;
+import org.jboss.tools.overlord.cdl.jbossesb.model.change.WhileModelChangeRule;
import org.scribble.model.*;
import org.scribble.model.analysis.TestLookaheadAnalyser;
import org.scribble.model.change.*;
Copied: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/util (from rev 263, cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/util)
Property changes on: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/util
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/util/ESBModelUtilTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/util/ESBModelUtilTest.java 2008-08-21 20:15:54 UTC (rev 263)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/util/ESBModelUtilTest.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -17,8 +17,10 @@
* Change History:
* 21 Aug 2008 : Initial version created by gary
*/
-package org.jboss.tools.overlord.jbossesb.model.util;
+package org.jboss.tools.overlord.cdl.jbossesb.model.util;
+import org.jboss.tools.overlord.cdl.jbossesb.model.util.ESBModelUtil;
+
import junit.framework.TestCase;
public class ESBModelUtilTest extends TestCase {
Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/DefaultConversionContextTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/DefaultConversionContextTest.java 2008-08-26 14:01:00 UTC (rev 274)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/DefaultConversionContextTest.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -1,113 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.tools.overlord.jbossesb.model;
-
-import junit.framework.TestCase;
-
-public class DefaultConversionContextTest extends TestCase {
-
- public void testIsJoin() {
- DefaultESBService service=new DefaultESBService(null, null);
-
- DefaultConversionContext context=new DefaultConversionContext(null);
- context.markJoin(service);
-
- if (context.isJoin(service) == false) {
- fail("Service should be join");
- }
- }
-
- public void testIsJoinFalse() {
- DefaultESBService service=new DefaultESBService(null, null);
-
- DefaultConversionContext context=new DefaultConversionContext(null);
-
- if (context.isJoin(service)) {
- fail("Service should not be join");
- }
- }
-
- public void testJoinProcessing() {
- DefaultESBService service=new DefaultESBService(null, null);
-
- DefaultConversionContext context=new DefaultConversionContext(null);
- context.markJoin(service);
-
- if (context.isJoin(service) == false) {
- fail("Service should be join");
- }
-
- context.processing(service);
-
- if (context.isJoin(service)) {
- fail("Service should no longer be marked as join");
- }
- }
-
- public void testIsOnStack() {
- DefaultESBService service=new DefaultESBService(null, null);
-
- DefaultConversionContext context=new DefaultConversionContext(null);
- context.push(service);
-
- if (context.isOnStack(service) == false) {
- fail("Service should be on stack");
- }
- }
-
- public void testIsOnStackFalse() {
- DefaultESBService service=new DefaultESBService(null, null);
-
- DefaultConversionContext context=new DefaultConversionContext(null);
-
- if (context.isOnStack(service)) {
- fail("Service should not be on stack");
- }
- }
-
- public void testStackPushPop() {
- DefaultESBService service=new DefaultESBService(null, null);
-
- DefaultConversionContext context=new DefaultConversionContext(null);
- context.push(service);
-
- if (context.isOnStack(service) == false) {
- fail("Service should be on stack");
- }
-
- context.pop(service);
-
- if (context.isOnStack(service)) {
- fail("Service should no longer be on stack after pop");
- }
- }
-
- public void testGetRole() {
- String role="myRole";
-
- DefaultConversionContext context=new DefaultConversionContext(role);
-
- if (context.getRole() == null) {
- fail("Role is null");
- }
-
- if (context.getRole().equals(role) == false) {
- fail("Role should be '"+role+"', but got: "+context.getRole());
- }
- }
-}
Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/DefaultESBLanguageModelTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/DefaultESBLanguageModelTest.java 2008-08-26 14:01:00 UTC (rev 274)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/DefaultESBLanguageModelTest.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -1,268 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.tools.overlord.jbossesb.model;
-
-import junit.framework.TestCase;
-
-import org.scribble.model.*;
-
-public class DefaultESBLanguageModelTest extends TestCase {
-
- public void testBaseConfiguration() {
-
- ModelReference ref=new ModelReference(ESBLanguageModel.JBOSSESB_NOTATION);
-
- DefaultESBLanguageModel model=new DefaultESBLanguageModel(ref);
-
- org.w3c.dom.Element config=model.getESBConfiguration();
-
- if (config.getNodeName().equals(DefaultESBLanguageModel.TOP_LEVEL_ELEMENT) == false) {
- fail("Top level element should be '"+
- DefaultESBLanguageModel.TOP_LEVEL_ELEMENT+"' but found: "+
- config.getNodeName());
- }
-
- boolean f_providers=false;
- boolean f_services=false;
-
- org.w3c.dom.NodeList nl=config.getChildNodes();
-
- for (int i=0; i < nl.getLength(); i++) {
- if (nl.item(i) instanceof org.w3c.dom.Element) {
- org.w3c.dom.Element elem=
- (org.w3c.dom.Element)nl.item(i);
-
- if (elem.getNodeName().equals(DefaultESBLanguageModel.PROVIDERS_ELEMENT)) {
-
- if (f_providers) {
- fail("Duplicate '"+DefaultESBLanguageModel.PROVIDERS_ELEMENT+"' elements");
- } else {
-
- // Check if jms provider defined
- org.w3c.dom.NodeList nl2=
- elem.getChildNodes();
- boolean f_jmsProvider=false;
-
- for (int j=0; j < nl2.getLength(); j++) {
- if (nl2.item(j) instanceof org.w3c.dom.Element) {
-
- if (nl2.item(j).getNodeName().equals(
- DefaultESBLanguageModel.JMS_PROVIDER_ELEMENT)) {
-
- if (f_jmsProvider) {
- fail("JMS Provider already defined");
- }
-
- f_jmsProvider = true;
- } else {
- fail("Unknown provider element: "+
- nl2.item(j).getNodeName());
- }
- }
- }
-
- if (f_jmsProvider == false) {
- fail("JMS provider not defined");
- }
- }
-
- f_providers = true;
- } else if (elem.getNodeName().equals(DefaultESBLanguageModel.SERVICES_ELEMENT)) {
-
- if (f_services) {
- fail("Duplicate '"+DefaultESBLanguageModel.SERVICES_ELEMENT+"' elements");
- }
-
- f_services = true;
- } else {
- fail("Unknown element: "+nl.item(i).getNodeName());
- }
- }
- }
-
- if (f_providers == false) {
- fail("Element '"+DefaultESBLanguageModel.PROVIDERS_ELEMENT+"' not found");
- }
-
- if (f_services == false) {
- fail("Element '"+DefaultESBLanguageModel.SERVICES_ELEMENT+"' not found");
- }
- }
-
- public void testAddService() {
- String busId="TestBusId";
- String category="category.one";
- String name="serviceName";
-
- ModelReference ref=new ModelReference(ESBLanguageModel.JBOSSESB_NOTATION);
-
- DefaultESBLanguageModel model=new DefaultESBLanguageModel(ref);
-
- org.w3c.dom.Element config=model.getESBConfiguration();
-
- TestESBService service=new TestESBService();
- service.setJMSBusIdRef(busId);
- service.setCategory(category);
- service.setName(name);
-
- model.addService(service);
-
- if (service.getJMSBusIdRef() == null) {
- fail("JMS BusIdRef not set");
- }
-
- if (service.getJMSBusIdRef().equals(busId) == false) {
- fail("Bus Id should be '"+busId+"', but got: "+service.getJMSBusIdRef());
- }
-
- // Check that the jms bus id has been created
- org.w3c.dom.NodeList nl=config.getElementsByTagName(
- DefaultESBLanguageModel.JMS_PROVIDER_ELEMENT);
-
- if (nl.getLength() != 1) {
- fail("JMS provider element not found");
- }
-
- org.w3c.dom.Element provider=(org.w3c.dom.Element)nl.item(0);
-
- nl = provider.getElementsByTagName(
- DefaultESBLanguageModel.JMS_BUS_ELEMENT);
-
- if (nl.getLength() != 1) {
- fail("JMS bus element not found");
- }
-
- org.w3c.dom.Element bus=(org.w3c.dom.Element)nl.item(0);
-
- if (bus.getAttribute("busid").equals(busId) == false) {
- fail("Bus had invalid busid '"+bus.getAttribute("busid")+
- "', was expecting: "+busId);
- }
-
- if (bus.getParentNode() != provider) {
- fail("Bus not contained directly within provider");
- }
-
- // Check bus retrieved directly
- org.w3c.dom.Element bus2=model.findJMSBus(busId);
-
- if (bus2 != bus) {
- fail("Bus elements not the same");
- }
- }
-
- public void testRemoveService() {
- String busId="TestBusId";
- String category="category.two";
- String name="serviceName";
-
- ModelReference ref=new ModelReference(ESBLanguageModel.JBOSSESB_NOTATION);
-
- DefaultESBLanguageModel model=new DefaultESBLanguageModel(ref);
-
- org.w3c.dom.Element config=model.getESBConfiguration();
-
- TestESBService service=new TestESBService();
- service.setJMSBusIdRef(busId);
- service.setCategory(category);
- service.setName(name);
-
- model.addService(service);
-
- // Check that the jms bus id has been created
- org.w3c.dom.NodeList nl=config.getElementsByTagName(
- DefaultESBLanguageModel.JMS_PROVIDER_ELEMENT);
-
- if (nl.getLength() != 1) {
- fail("JMS provider element not found");
- }
-
- org.w3c.dom.Element provider=(org.w3c.dom.Element)nl.item(0);
-
- nl = provider.getElementsByTagName(
- DefaultESBLanguageModel.JMS_BUS_ELEMENT);
-
- if (nl.getLength() != 1) {
- fail("JMS bus element not found");
- }
-
- // Remove the service and check that the bus entry
- // is no longer there
- model.removeService(service);
-
- nl = provider.getElementsByTagName(
- DefaultESBLanguageModel.JMS_BUS_ELEMENT);
-
- if (nl.getLength() != 0) {
- fail("JMS bus element should NOT be found");
- }
- }
-
- public void testAddServiceWithNoBusId() {
- String category="category.one";
- String name="serviceName";
-
- ModelReference ref=new ModelReference(ESBLanguageModel.JBOSSESB_NOTATION);
-
- DefaultESBLanguageModel model=new DefaultESBLanguageModel(ref);
-
- TestESBService service=new TestESBService();
- service.setCategory(category);
- service.setName(name);
-
- model.addService(service);
-
- if (service.getJMSBusIdRef() == null) {
- fail("JMS BusIdRef not set");
- }
- }
-
- public void testAddMultipleServiceWithNoBusId() {
- String category="category.one";
- String name1="serviceName1";
- String name2="serviceName2";
-
- ModelReference ref=new ModelReference(ESBLanguageModel.JBOSSESB_NOTATION);
-
- DefaultESBLanguageModel model=new DefaultESBLanguageModel(ref);
-
- TestESBService service1=new TestESBService();
- service1.setCategory(category);
- service1.setName(name1);
-
- model.addService(service1);
-
- if (service1.getJMSBusIdRef() == null) {
- fail("JMS BusIdRef1 not set");
- }
-
- TestESBService service2=new TestESBService();
- service2.setCategory(category);
- service2.setName(name2);
-
- model.addService(service2);
-
- if (service2.getJMSBusIdRef() == null) {
- fail("JMS BusIdRef2 not set");
- }
-
- if (service1.getJMSBusIdRef().equals(service2.getJMSBusIdRef())) {
- fail("Service JMS bus ids should be unique");
- }
- }
-}
Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/DefaultESBServiceTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/DefaultESBServiceTest.java 2008-08-26 14:01:00 UTC (rev 274)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/DefaultESBServiceTest.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -1,363 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.tools.overlord.jbossesb.model;
-
-import junit.framework.TestCase;
-
-import org.jboss.tools.overlord.jbossesb.model.actions.*;
-
-public class DefaultESBServiceTest extends TestCase {
-
- public void testValidateSessionClassRequired() {
- DefaultESBService service=new DefaultESBService(null, null);
-
- TestESBAction act1=new TestESBAction();
- act1.setSessionBased(true);
-
- service.getActions().add(act1);
-
- TestModelListener l=new TestModelListener();
-
- l.addExpectedError(org.scribble.util.MessageUtil.format(
- java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
- "_NOT_SPECIFIED_SESSION_CLASS",
- new String[]{}));
-
- service.validate(l);
-
- if (l.isValid() == false) {
- fail(l.invalidMessage());
- }
- }
-
- public void testValidateSessionClassNotRequired() {
- DefaultESBService service=new DefaultESBService(null, null);
-
- TestModelListener l=new TestModelListener();
-
- service.validate(l);
-
- if (l.isValid() == false) {
- fail(l.invalidMessage());
- }
- }
-
- public void testIsLoop() {
- DefaultESBService service=new DefaultESBService(null, null);
-
- TestESBAction act1=new TestESBAction();
- act1.setSessionBased(true);
- act1.setLoop(true);
-
- service.getActions().add(act1);
-
- if (service.isLoop() == false) {
- fail("Service should be loop");
- }
- }
-
- public void testIsLoopFalse() {
- DefaultESBService service=new DefaultESBService(null, null);
-
- TestESBAction act1=new TestESBAction();
- act1.setSessionBased(true);
-
- service.getActions().add(act1);
-
- if (service.isLoop()) {
- fail("Service is not a loop");
- }
- }
-
- public void testIsRoot() {
- DefaultESBService service=new DefaultESBService(null, null);
-
- TestESBAction act1=new TestESBAction();
- act1.setSessionBased(true);
- act1.setCreateSession(true);
- act1.setPropertyValue(DefaultESBService.ROOT_PROPERTY, "true");
-
- service.getActions().add(act1);
-
- if (service.isRoot() == false) {
- fail("Service should be root");
- }
- }
-
- public void testIsRootFalse() {
- DefaultESBService service=new DefaultESBService(null, null);
-
- TestESBAction act1=new TestESBAction();
-
- service.getActions().add(act1);
-
- if (service.isRoot()) {
- fail("Service should NOT be root");
- }
- }
-
- public void testIsSessionBased() {
- DefaultESBService service=new DefaultESBService(null, null);
-
- TestESBAction act1=new TestESBAction();
- act1.setSessionBased(true);
-
- service.getActions().add(act1);
-
- if (service.isSessionBased() == false) {
- fail("Service should be SessionBased");
- }
- }
-
- public void testIsSessionBasedFalse() {
- DefaultESBService service=new DefaultESBService(null, null);
-
- TestESBAction act1=new TestESBAction();
-
- service.getActions().add(act1);
-
- if (service.isSessionBased()) {
- fail("Service should NOT be SessionBased");
- }
- }
-
- public void testIsCreateSession() {
- DefaultESBService service=new DefaultESBService(null, null);
-
- TestESBAction act1=new TestESBAction();
- act1.setSessionBased(true);
- act1.setCreateSession(true);
-
- service.getActions().add(act1);
-
- if (service.isCreateSession() == false) {
- fail("Service should be 'create session'");
- }
- }
-
- public void testIsCreateSessionFalse() {
- DefaultESBService service=new DefaultESBService(null, null);
-
- TestESBAction act1=new TestESBAction();
-
- service.getActions().add(act1);
-
- if (service.isCreateSession()) {
- fail("Service should NOT be 'create session'");
- }
- }
-
- public void testGetServiceName() {
- String name="serviceName1";
-
- DefaultESBService service=new DefaultESBService(null, null);
-
- TestESBAction act1=new TestESBAction();
- act1.setSessionBased(true);
- act1.setCreateSession(true);
- act1.setPropertyValue(DefaultESBService.SERVICE_DESCRIPTION_NAME_PROPERTY,
- name);
-
- service.getActions().add(act1);
-
- if (service.getServiceDescriptionName().equals(name) == false) {
- fail("Service name '"+service.getServiceDescriptionName()+
- "' invalid, expecting: "+name);
- }
- }
-
- public void testGetConversationType() {
- String name="convType1";
-
- DefaultESBService service=new DefaultESBService(null, null);
-
- TestESBAction act1=new TestESBAction();
- act1.setSessionBased(true);
- act1.setCreateSession(true);
- act1.setPropertyValue(DefaultESBService.CONVERSATION_TYPE_PROPERTY,
- name);
-
- service.getActions().add(act1);
-
- if (service.getConversationType().equals(name) == false) {
- fail("Conversation type '"+service.getConversationType()+
- "' invalid, expecting: "+name);
- }
- }
-
- public void testGetSessionName() {
- String name="session1";
-
- DefaultESBService service=new DefaultESBService(null, null);
-
- TestESBAction act1=new TestESBAction();
- act1.setSessionBased(true);
- act1.setPropertyValue(DefaultESBService.BUSINESS_OBJECT_TYPE_PROPERTY,
- name);
-
- service.getActions().add(act1);
-
- if (service.getSessionName().equals(name) == false) {
- fail("Session name '"+service.getSessionName()+
- "' invalid, expecting: "+name);
- }
- }
-
- public void testBaseConfiguration() {
- String category="category";
- String name="name";
-
- DefaultESBService service=new DefaultESBService(new TestESBLanguageModel(),
- category, name);
-
- org.w3c.dom.Element servElem=service.getService();
-
- if (servElem == null) {
- fail("Service element is null");
- }
-
- if (servElem.getNodeName().equals(DefaultESBService.SERVICE_ELEMENT) == false) {
- fail("Root element is incorrect: "+servElem.getNodeName());
- }
-
- if (servElem.getAttribute(DefaultESBService.CATEGORY_ATTR).equals(category) == false) {
- fail("Category invalid: "+servElem.getAttribute(DefaultESBService.CATEGORY_ATTR));
- }
-
- if (servElem.getAttribute(DefaultESBService.NAME_ATTR).equals(name) == false) {
- fail("Name invalid: "+servElem.getAttribute(DefaultESBService.NAME_ATTR));
- }
- }
-
- public void testSetInitialBusIdRef() {
- String category="category";
- String name="name";
- String busId="myBusId";
-
- DefaultESBService service=new DefaultESBService(new TestESBLanguageModel(),
- category, name);
-
- org.w3c.dom.Element servElem=service.getService();
-
- service.setJMSBusIdRef(busId);
-
- if (service.getJMSBusIdRef() == null) {
- fail("Bus id not set");
- }
-
- if (service.getJMSBusIdRef().equals(busId) == false) {
- fail("Bus Id not '"+busId+"', got: "+service.getJMSBusIdRef());
- }
-
- org.w3c.dom.NodeList nl=servElem.getElementsByTagName(DefaultESBService.JMS_LISTENER_ELEMENT);
-
- if (nl.getLength() != 1) {
- fail("Expecting one JMS listener element, but got: "+
- nl.getLength());
- }
-
- org.w3c.dom.Element jmslistener=(org.w3c.dom.Element)nl.item(0);
-
- if (jmslistener.getParentNode().getNodeName().equals(DefaultESBService.LISTENERS_ELEMENT) == false) {
- fail("JMS listener parent not expected");
- }
-
- if (jmslistener.getParentNode().getParentNode() != servElem) {
- fail("JMS listener grandparent should be service");
- }
-
- if (jmslistener.getAttribute(DefaultESBService.BUSIDREF_ATTR).equals(busId) == false) {
- fail("Bus Id not '"+busId+"', got: "+jmslistener.getAttribute(DefaultESBService.BUSIDREF_ATTR));
- }
-
- if (jmslistener.hasAttribute(DefaultESBService.NAME_ATTR) == false) {
- fail("Name attribute not set on jms listener");
- }
-
- if (jmslistener.hasAttribute(DefaultESBService.MAX_THREADS_ATTR) == false) {
- fail("Max Threads attribute not set on jms listener");
- }
- }
-
- public void testChangeBusIdRef() {
- String initialBusId="busId1";
- String initialName="name1";
- String initialMaxThreads="2";
- String changedBusId="busId2";
-
- org.w3c.dom.Element top=null;
-
- // Create an empty document
- org.w3c.dom.Document doc=null;
- try {
- doc = javax.xml.parsers.DocumentBuilderFactory.
- newInstance().newDocumentBuilder().newDocument();
-
- top = doc.createElement(DefaultESBLanguageModel.TOP_LEVEL_ELEMENT);
-
- } catch(Exception e) {
- e.printStackTrace();
- }
-
- org.w3c.dom.Element services=doc.createElement(DefaultESBLanguageModel.SERVICES_ELEMENT);
- top.appendChild(services);
-
- org.w3c.dom.Element serviceElem=doc.createElement(DefaultESBLanguageModel.SERVICE_ELEMENT);
- services.appendChild(serviceElem);
-
- org.w3c.dom.Element listeners=doc.createElement(DefaultESBService.LISTENERS_ELEMENT);
- serviceElem.appendChild(listeners);
-
- org.w3c.dom.Element jmslistener=doc.createElement(DefaultESBService.JMS_LISTENER_ELEMENT);
- listeners.appendChild(jmslistener);
-
- jmslistener.setAttribute(DefaultESBService.BUSIDREF_ATTR, initialBusId);
- jmslistener.setAttribute(DefaultESBService.NAME_ATTR, initialName);
- jmslistener.setAttribute(DefaultESBService.MAX_THREADS_ATTR, initialMaxThreads);
-
- DefaultESBService service=new DefaultESBService(new TestESBLanguageModel(),
- serviceElem);
-
- if (service.getJMSBusIdRef() == null) {
- fail("JMS bus id not set");
- }
-
- if (service.getJMSBusIdRef().equals(initialBusId) == false) {
- fail("JMS bus id not '"+initialBusId+"', got: "+service.getJMSBusIdRef());
- }
-
- service.setJMSBusIdRef(changedBusId);
-
- if (service.getJMSBusIdRef().equals(changedBusId) == false) {
- fail("Changed JMS bus id not '"+changedBusId+"', got: "+service.getJMSBusIdRef());
- }
-
- if (jmslistener.getAttribute(DefaultESBService.BUSIDREF_ATTR).equals(changedBusId)==false) {
- fail("Changed bus id not reflected in element");
- }
-
- if (jmslistener.getAttribute(DefaultESBService.NAME_ATTR).equals(initialName)==false) {
- fail("Name attribute incorrect");
- }
-
- if (jmslistener.getAttribute(DefaultESBService.MAX_THREADS_ATTR).equals(initialMaxThreads)==false) {
- fail("MaxThreads attribute incorrect");
- }
- }
-}
Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/TestESBAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/TestESBAction.java 2008-08-26 14:01:00 UTC (rev 274)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/TestESBAction.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -1,104 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.tools.overlord.jbossesb.model;
-
-import java.util.List;
-
-import org.scribble.model.Activity;
-import org.scribble.model.ModelListener;
-import org.w3c.dom.Element;
-
-public class TestESBAction implements ESBAction {
-
- public void convert(List<Activity> activities, ConversionContext context) {
- // TODO Auto-generated method stub
-
- }
-
- public Element getAction() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public String getActionClass() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public String getPropertyValue(String property) {
- return(m_property.get(property));
- }
-
- public void setPropertyValue(String property, String value) {
- m_property.put(property, value);
- }
-
- public void initializeLinks() {
- // TODO Auto-generated method stub
-
- }
-
- public boolean isLoop() {
- return(m_loop);
- }
-
- public void setLoop(boolean bool) {
- m_loop = bool;
- }
-
- public boolean isPerform() {
- // TODO Auto-generated method stub
- return false;
- }
-
- public boolean isSessionBased() {
- return(m_sessionBased);
- }
-
- public void setSessionBased(boolean bool) {
- m_sessionBased = bool;
- }
-
- public boolean isCreateSession() {
- return(m_createSession);
- }
-
- public void setCreateSession(boolean bool) {
- m_createSession = bool;
- }
-
- public boolean isGateway() {
- // TODO Auto-generated method stub
- return false;
- }
-
- public boolean hasProperty(String property) {
- // TODO Auto-generated method stub
- return false;
- }
-
- public void validate(ModelListener l) {
- // TODO Auto-generated method stub
-
- }
-
- private boolean m_sessionBased=false;
- private boolean m_loop=false;
- private boolean m_createSession=false;
- private java.util.Map<String,String> m_property=new java.util.Hashtable<String, String>();
-}
Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/TestESBLanguageModel.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/TestESBLanguageModel.java 2008-08-26 14:01:00 UTC (rev 274)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/TestESBLanguageModel.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -1,117 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.tools.overlord.jbossesb.model;
-
-import java.util.Collection;
-
-import org.scribble.model.ModelListener;
-import org.scribble.model.ModelReference;
-import org.w3c.dom.Element;
-
-public class TestESBLanguageModel extends org.scribble.lang.model.LanguageModel
- implements org.jboss.tools.overlord.jbossesb.model.ESBLanguageModel {
-
- public TestESBLanguageModel() {
- org.w3c.dom.Document doc=null;
-
- // Create an empty document
- try {
- doc = javax.xml.parsers.DocumentBuilderFactory.
- newInstance().newDocumentBuilder().newDocument();
-
- m_esbConfig = doc.createElement(DefaultESBLanguageModel.TOP_LEVEL_ELEMENT);
-
- } catch(Exception e) {
- e.printStackTrace();
- }
- }
- public String getOriginalContents() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public ModelReference getModelReference() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public ESBService createService(String category, String name) {
- TestESBService ret=new TestESBService(category, name);
-
- org.w3c.dom.Element service=m_esbConfig.getOwnerDocument().
- createElement(DefaultESBService.SERVICE_ELEMENT);
- m_esbConfig.appendChild(service);
-
- ret.setService(service);
-
- return(ret);
- }
-
- public void addService(ESBService service) {
- m_services.put(service.getCategory()+":"+service.getName(), service);
- }
-
- public void removeService(ESBService service) {
- m_services.remove(service.getCategory()+":"+service.getName());
- }
-
- public ESBService getService(String category, String name) {
- return(m_services.get(category+":"+name));
- }
-
- public Collection<ESBService> getServices() {
- return(m_services.values());
- }
-
- public ESBService getGatewayService() {
- return(m_gatewayService);
- }
-
- public void setGatewayService(ESBService gw) {
- m_gatewayService = gw;
- }
-
- public void validate(ModelListener l) {
- // TODO Auto-generated method stub
-
- }
-
- public String getUniqueServiceName(String category, String name) {
- return("serviceName__"+m_count++);
- }
-
- public Element getESBConfiguration() {
- return(m_esbConfig);
- }
-
- @Override
- public String getNotation() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public String getJMSDefinition(String jmsBusId) {
- // TODO Auto-generated method stub
- return null;
- }
-
- private java.util.Map<String,ESBService> m_services=new java.util.Hashtable<String,ESBService>();
- private ESBService m_gatewayService=null;
- private org.w3c.dom.Element m_esbConfig=null;
- private int m_count=0;
-}
Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/TestESBService.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/TestESBService.java 2008-08-26 14:01:00 UTC (rev 274)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/TestESBService.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -1,215 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.tools.overlord.jbossesb.model;
-
-import java.util.List;
-
-import org.scribble.conversation.model.*;
-import org.scribble.model.*;
-import org.w3c.dom.Element;
-
-public class TestESBService extends ModelObject
- implements org.jboss.tools.overlord.jbossesb.model.ESBService {
-
- public TestESBService() {
- }
-
- public TestESBService(String category, String name) {
- m_category = category;
- m_name = name;
- }
-
- public void convert(List<Activity> activities, ConversionContext context) {
- activities.addAll(m_contents);
- }
-
- public Conversation convert(ConversionContext context) {
- return(null);
- }
-
- public List<Activity> getContents() {
- return(m_contents);
- }
-
- public List<ESBAction> getActions() {
- return(m_actions);
- }
-
- public void setCategory(String cat) {
- m_category = cat;
- }
-
- public String getCategory() {
- return(m_category);
- }
-
- public void setConversationType(String type) {
- m_conversationType = type;
- }
-
- public String getConversationType() {
- return(m_conversationType);
- }
-
- public void setName(String name) {
- m_name = name;
- }
-
- public String getName() {
- return(m_name);
- }
-
- public void setModel(ESBLanguageModel model) {
- m_model = model;
- }
-
- public ESBLanguageModel getModel() {
- return(m_model);
- }
-
- public Element getService() {
- return(m_service);
- }
-
- public void setService(Element service) {
- m_service = service;
- }
-
- public ClassLoader getServiceClassLoader() throws Exception {
- // TODO Auto-generated method stub
- return null;
- }
-
- public String getServiceDescriptionName() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public int getServicePosition() {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public void setSessionClass(Class<?> cls) {
- m_sessionClass = cls;
- }
-
- public Class<?> getSessionClass() {
- return(m_sessionClass);
- }
-
- public String getSessionName() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public void initializeLinks() {
- // TODO Auto-generated method stub
-
- }
-
- public void setLoop(boolean bool) {
- m_loop = bool;
- }
-
- public boolean isLoop() {
- return(m_loop);
- }
-
- public void setRoot(boolean bool) {
- m_root = bool;
- }
-
- public boolean isRoot() {
- return(m_root);
- }
-
- public void setCreateSession(boolean bool) {
- m_createSession = bool;
- }
-
- public boolean isCreateSession() {
- return(m_createSession);
- }
-
- public void setSessionBased(boolean bool) {
- m_sessionBased = bool;
- }
-
- public boolean isSessionBased() {
- return(m_sessionBased);
- }
-
- public ESBAction getFirstSessionBasedAction() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public boolean isGateway() {
- return(m_gateway);
- }
-
- public void setGateway(boolean gw) {
- m_gateway = gw;
- }
-
- public ESBAction getGatewayAction() {
- return(m_gatewayAction);
- }
-
- public void setGatewayAction(ESBAction act) {
- m_gatewayAction = act;
- }
-
- public void validate(ModelListener l) {
- // TODO Auto-generated method stub
-
- }
-
- public String getJMSBusIdRef() {
- return(m_jmsBusIdRef);
- }
-
- public void setJMSBusIdRef(String busId) {
- m_jmsBusIdRef = busId;
- }
-
- public void addAction(ESBAction action, int pos) {
- m_actions.add(action);
- }
-
- public boolean removeAction(ESBAction action) {
- return(m_actions.remove(action));
- }
-
- private String m_category=null;
- private String m_name=null;
- private ESBLanguageModel m_model=null;
- private Element m_service;
- private List<ESBAction> m_actions=new java.util.Vector<ESBAction>();
- private boolean m_root=false;
- private boolean m_gateway=false;
- private ESBAction m_gatewayAction=null;
- private boolean m_loop=false;
- private boolean m_sessionBased=false;
- private boolean m_createSession=false;
- private Class<?> m_sessionClass=null;
- private String m_conversationType=null;
- private List<Activity> m_contents=new java.util.Vector<Activity>();
- private String m_jmsBusIdRef=null;
-}
Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/TestModelListener.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/TestModelListener.java 2008-08-26 14:01:00 UTC (rev 274)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/TestModelListener.java 2008-08-26 15:57:32 UTC (rev 275)
@@ -1,84 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.tools.overlord.jbossesb.model;
-
-import org.scribble.model.ModelObject;
-
-public class TestModelListener implements org.scribble.model.ModelListener {
-
- public void error(ModelObject modelObject, String mesg,
- java.util.Map<String,Object> props) {
- reported(mesg);
- }
-
- public void warning(ModelObject modelObject, String mesg,
- java.util.Map<String,Object> props) {
- reported(mesg);
- }
-
- protected void reported(String mesg) {
- if (mesg != null) {
-
- // Check if in the list of messages to be
- // detected
- if (m_errorsToDetect.contains(mesg)) {
- m_errorsToDetect.remove(mesg);
- } else {
- m_unexpectedErrors.add(mesg);
- }
- }
- }
-
- public void addExpectedError(String mesg) {
- m_errorsToDetect.add(mesg);
- }
-
- public boolean isValid() {
- // If there are no more errors to detect, and no
- // unexpected errors have been reported, then
- // the expression has been validated as expected
- return(m_errorsToDetect.size() == 0 &&
- m_unexpectedErrors.size() == 0);
- }
-
- public String invalidMessage() {
- String ret="\r\n";
-
- if (m_errorsToDetect.size() > 0) {
- ret += "Errors not detected:\r\n";
-
- for (int i=0; i < m_errorsToDetect.size(); i++) {
- ret += m_errorsToDetect.get(i)+"\r\n";
- }
- }
-
- if (m_unexpectedErrors.size() > 0) {
- ret += "Unexpected Errors:\r\n";
-
- for (int i=0; i < m_unexpectedErrors.size(); i++) {
- ret += m_unexpectedErrors.get(i)+"\r\n";
- }
- }
-
- return(ret);
- }
-
- private java.util.List<String> m_errorsToDetect=new java.util.Vector<String>();
- private java.util.List<String> m_unexpectedErrors=new java.util.Vector<String>();
- private java.util.List<String> m_messages=new java.util.Vector<String>();
-}
More information about the overlord-commits
mailing list