overlord-commits August 2009

overlord-commits@lists.jboss.org

1 participants
83 discussions

Overlord SVN: r779 - in cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel: META-INF and 35 other directories.

by overlord-commits＠lists.jboss.org

Author: objectiser Date: 2009-08-20 05:30:07 -0400 (Thu, 20 Aug 2009) New Revision: 779 Added: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/actions/ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/dialogs/ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/eclipse/ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/export/ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/AbstractBuildSystem.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/AntBuildSystem.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/BuildSystem.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/GeneratorException.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/GeneratorUtil.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/MavenBuildSystem.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/template/ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/BPELLanguageModel.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/BPELNotation.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/DefaultBPELLanguageModel.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/util/ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/parser/ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/util/ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/GeneratorTest.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/testmodels/ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/ParserTest.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/util/ Removed: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/actions/ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/dialogs/ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/eclipse/ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/export/ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/AbstractBuildSystem.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/AntBuildSystem.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/BuildSystem.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/Generator.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/GeneratorException.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/GeneratorUtil.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/MavenBuildSystem.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/template/ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/BPELLanguageModel.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/BPELNotation.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/DefaultBPELLanguageModel.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/util/ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/parser/ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/util/ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/GeneratorTest.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/testmodels/ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/parser/ParserTest.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/parser/results/ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/parser/testmodels/ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/tools/overlord/cdl/bpel/model/component/ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/tools/overlord/cdl/bpel/util/ Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/META-INF/MANIFEST.MF cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/plugin.xml cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/actions/GenerateAction.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/dialogs/GenerateDialog.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/eclipse/Activator.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/export/BPELLanguageModelStreamExportRule.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/AbstractBPELModelChangeRule.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationModelChangeRule.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/IfModelChangeRule.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/InteractionPatterns.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/LanguageToConversationModelChangeRule.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/RunModelChangeRule.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/SpawnModelChangeRule.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/WhenModelChangeRule.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/WhileModelChangeRule.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/AbstractCondition.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/AbstractInteraction.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/BPELActivity.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/BPELElement.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/BPELElementFactory.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/BPELGroupingConstruct.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Catch.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/CatchAll.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/CompensationHandler.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Condition.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/ConversionContext.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/DefaultConversionContext.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Else.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Elseif.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/EventHandlers.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Exit.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/FaultHandlers.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Flow.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/For.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/ForEach.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/If.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Invoke.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Link.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/OnAlarm.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/OnEvent.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/OnMessage.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/PartnerLink.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Pick.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Process.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Receive.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/RepeatUntil.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Reply.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Rethrow.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Scope.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/ScopeActivity.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Sequence.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Source.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Target.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/TerminationHandler.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Throw.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Until.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Variable.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Wait.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/While.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/util/InteractionUtil.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/parser/BPELModelParserRule.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/parser/BPELTokenizer.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/util/XMLUtils.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/AbstractInteractionTest.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/BPELActivityTest.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/BPELElementTest.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/CatchAllTest.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/CatchTest.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/CompensationHandlerTest.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/ConditionTest.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/ElseIfTest.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/ElseTest.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/EventHandlersTest.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/ExitTest.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/FaultHandlersTest.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/FlowTest.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/ForEachTest.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/IfTest.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/InvokeTest.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/OnAlarmTest.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/OnEventTest.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/OnMessageTest.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/PartnerLinkTest.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/PickTest.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/ProcessTest.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/ReceiveTest.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/RepeatUntilTest.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/ReplyTest.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/RethrowTest.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/ScopeTest.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/SequenceTest.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/TerminationHandlerTest.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/TestAbstractInteraction.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/TestBPELActivity.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/TestBPELElement.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/ThrowTest.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/VariableTest.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/WaitTest.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/WhileTest.java cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/util/XMLUtilsTest.java Log: Rename packages from overlord.cdl to savara. Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/META-INF/MANIFEST.MF =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/META-INF/MANIFEST.MF 2009-08-20 08:57:33 UTC (rev 778) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/META-INF/MANIFEST.MF 2009-08-20 09:30:07 UTC (rev 779) @@ -3,7 +3,7 @@ Bundle-Name: Overlord CDL BPEL Plug-in Bundle-SymbolicName: org.jboss.tools.overlord.cdl.bpel;singleton:=true Bundle-Version: 1.0.0.qualifier -Bundle-Activator: org.jboss.tools.overlord.cdl.bpel.eclipse.Activator +Bundle-Activator: org.jboss.savara.tools.bpel.eclipse.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.scribble.conversation.model, @@ -20,14 +20,14 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: www.jboss.org -Scribble-Extensions: org.jboss.tools.overlord.cdl.bpel.parser.BPELTokenizer, - org.jboss.tools.overlord.cdl.bpel.parser.BPELModelParserRule, - org.jboss.tools.overlord.cdl.bpel.model.BPELNotation, - org.jboss.tools.overlord.cdl.bpel.model.change.LanguageToConversationModelChangeRule, - org.jboss.tools.overlord.cdl.bpel.model.change.ConversationModelChangeRule, - org.jboss.tools.overlord.cdl.bpel.model.change.WhileModelChangeRule, - org.jboss.tools.overlord.cdl.bpel.model.change.WhenModelChangeRule, - org.jboss.tools.overlord.cdl.bpel.model.change.IfModelChangeRule, - org.jboss.tools.overlord.cdl.bpel.model.change.RunModelChangeRule, - org.jboss.tools.overlord.cdl.bpel.model.change.SpawnModelChangeRule, - org.jboss.tools.overlord.cdl.bpel.model.change.ConversationInteractionModelChangeRule +Scribble-Extensions: org.jboss.savara.tools.bpel.parser.BPELTokenizer, + org.jboss.savara.tools.bpel.parser.BPELModelParserRule, + org.jboss.savara.tools.bpel.model.BPELNotation, + org.jboss.savara.tools.bpel.model.change.LanguageToConversationModelChangeRule, + org.jboss.savara.tools.bpel.model.change.ConversationModelChangeRule, + org.jboss.savara.tools.bpel.model.change.WhileModelChangeRule, + org.jboss.savara.tools.bpel.model.change.WhenModelChangeRule, + org.jboss.savara.tools.bpel.model.change.IfModelChangeRule, + org.jboss.savara.tools.bpel.model.change.RunModelChangeRule, + org.jboss.savara.tools.bpel.model.change.SpawnModelChangeRule, + org.jboss.savara.tools.bpel.model.change.ConversationInteractionModelChangeRule Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/plugin.xml =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/plugin.xml 2009-08-20 08:57:33 UTC (rev 778) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/plugin.xml 2009-08-20 09:30:07 UTC (rev 779) @@ -21,7 +21,7 @@ </menu> <action label="WS-BPEL" - class="org.jboss.tools.overlord.cdl.bpel.actions.GenerateAction" + class="org.jboss.savara.tools.bpel.actions.GenerateAction" menubarPath="org.jboss.tools.overlord.menu/generate.menu/group2" enablesFor="1" id="org.jboss.tools.overlord.cdl.bpel.actions.GenerateAction"> Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/actions (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/actions) Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/actions/GenerateAction.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/actions/GenerateAction.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/actions/GenerateAction.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,7 +15,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.actions; +package org.jboss.savara.tools.bpel.actions; import org.apache.commons.logging.*; import org.eclipse.core.resources.IFile; @@ -30,7 +30,7 @@ import org.scribble.eclipse.util.*; -import org.jboss.tools.overlord.cdl.bpel.dialogs.*; +import org.jboss.savara.tools.bpel.dialogs.*; /** * This class implements the action to generate the choreography Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/dialogs (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/dialogs) Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/dialogs/GenerateDialog.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/dialogs/GenerateDialog.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/dialogs/GenerateDialog.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,7 +15,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.dialogs; +package org.jboss.savara.tools.bpel.dialogs; import org.apache.commons.logging.*; import org.eclipse.core.resources.IFile; @@ -24,7 +24,7 @@ import org.eclipse.swt.events.*; import org.eclipse.swt.layout.*; import org.eclipse.swt.widgets.*; -import org.jboss.tools.overlord.cdl.bpel.generator.*; +import org.jboss.savara.tools.bpel.generator.*; import org.scribble.conversation.model.ConversationModel; import org.scribble.extensions.RegistryFactory; import org.scribble.model.*; @@ -358,7 +358,7 @@ */ public void error(String mesg, Exception ex) { - org.jboss.tools.overlord.cdl.bpel.eclipse.Activator.logError(mesg, ex); + org.jboss.savara.tools.bpel.eclipse.Activator.logError(mesg, ex); MessageBox mbox=new MessageBox(getShell(), SWT.ICON_ERROR|SWT.OK); Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/eclipse (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/eclipse) Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/eclipse/Activator.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/eclipse/Activator.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/eclipse/Activator.java 2009-08-20 09:30:07 UTC (rev 779) @@ -1,4 +1,4 @@ -package org.jboss.tools.overlord.cdl.bpel.eclipse; +package org.jboss.savara.tools.bpel.eclipse; import org.apache.commons.logging.*; import org.eclipse.core.runtime.IStatus; Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/export (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/export) Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/export/BPELLanguageModelStreamExportRule.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/export/BPELLanguageModelStreamExportRule.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/export/BPELLanguageModelStreamExportRule.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,13 +15,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.export; +package org.jboss.savara.tools.bpel.export; import java.io.IOException; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; -import org.jboss.tools.overlord.cdl.bpel.model.BPELNotation; -import org.jboss.tools.overlord.cdl.bpel.util.XMLUtils; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.BPELNotation; +import org.jboss.savara.tools.bpel.util.XMLUtils; import org.scribble.export.ExportRule; import org.scribble.export.ExporterContext; import org.scribble.export.Formatter; Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/AbstractBuildSystem.java (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/AbstractBuildSystem.java) =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/AbstractBuildSystem.java (rev 0) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/AbstractBuildSystem.java 2009-08-20 09:30:07 UTC (rev 779) @@ -0,0 +1,58 @@ +/* + * 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.savara.tools.bpel.generator; + +/** + * This class represents an abstract build system. + */ +public abstract class AbstractBuildSystem implements BuildSystem { + + private static final String TEMPLATE_SUFFIX = ".template"; + private static final String TEMPLATE_PREFIX = "template/"; + + /** + * This method returns the contents for the build + * configuration file. + * + * @param projectName The project name + * @return The build file contents + */ + public String getBuildFileContents(String projectName) { + String ret=null; + + java.io.InputStream is= + AbstractBuildSystem.class.getResourceAsStream( + TEMPLATE_PREFIX+getName()+TEMPLATE_SUFFIX); + + if (is != null) { + + try { + byte[] b=new byte[is.available()]; + is.read(b); + + ret = new String(b); + + ret = ret.replaceAll("%PROJECT%", projectName); + } catch(Exception e) { + e.printStackTrace(); + } + } + + return(ret); + } +} Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/AntBuildSystem.java (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/AntBuildSystem.java) =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/AntBuildSystem.java (rev 0) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/AntBuildSystem.java 2009-08-20 09:30:07 UTC (rev 779) @@ -0,0 +1,59 @@ +/* + * 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.savara.tools.bpel.generator; + +/** + * This class represents the Ant build system. + */ +public class AntBuildSystem extends AbstractBuildSystem { + + private static final String BUILD_FILE = "build.xml"; + private static final String ANT = "Ant"; + private static final String BPEL_PATH = "bpel"; + + /** + * This method represents the name of the build + * system. + * + * @return The name + */ + public String getName() { + return(ANT); + } + + /** + * This method returns the build configuration file + * path. + * + * @return The build configuration file path + */ + public String getBuildFilePath() { + return(BUILD_FILE); + } + + /** + * This method returns the BPEL file + * path. + * + * @return The BPEL file path + */ + public String getBPELFilePath() { + return(BPEL_PATH); + } + +} Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/BuildSystem.java (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/BuildSystem.java) =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/BuildSystem.java (rev 0) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/BuildSystem.java 2009-08-20 09:30:07 UTC (rev 779) @@ -0,0 +1,58 @@ +/* + * 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.savara.tools.bpel.generator; + +/** + * This interface represents a build system used when + * generating the ESB projects. + */ +public interface BuildSystem { + + /** + * This method represents the name of the build + * system. + * + * @return The name + */ + public String getName(); + + /** + * This method returns the build configuration file + * path. + * + * @return The build configuration file path + */ + public String getBuildFilePath(); + + /** + * This method returns the contents for the build + * configuration file. + * + * @param projectName The project name + * @return The build file contents + */ + public String getBuildFileContents(String projectName); + + /** + * This method returns the BPEL file path. + * + * @return The BPEL file path + */ + public String getBPELFilePath(); + +} Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/Generator.java) =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java (rev 0) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java 2009-08-20 09:30:07 UTC (rev 779) @@ -0,0 +1,213 @@ +/* + * 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.savara.tools.bpel.generator; + +import org.apache.commons.logging.*; +import org.eclipse.core.resources.IFile; +import org.jboss.savara.tools.bpel.generator.BuildSystem; +import org.jboss.savara.tools.bpel.model.*; +import org.jboss.savara.tools.bpel.util.XMLUtils; +import org.scribble.conversation.model.*; +import org.scribble.extensions.RegistryFactory; +import org.scribble.model.*; +import org.scribble.model.admin.DefaultModelListener; +import org.scribble.model.admin.ModelInfo; +import org.scribble.model.admin.ModelRepository; +import org.scribble.model.change.ModelGenerator; +import org.eclipse.core.resources.*; +import org.eclipse.core.runtime.*; + +/** + * This class provides the mechanism for generating JBossESB + * service artefacts. + */ +public class Generator { + + /** + * This is the constructor for the generator. + * + */ + public Generator(IFile file, BuildSystem buildSystem) { + m_file = file; + m_buildSystem = buildSystem; + + initialize(m_file); + } + + /** + * This method initializes the conversation model associated + * with the supplied file resource. + * + * @param res The file + */ + protected void initialize(IFile res) { + + // Initialize the model + ModelReference ref= + org.scribble.eclipse.model.admin.OSGIModelRepository.createReference(res); + + if (ref != null) { + ModelRepository mrep=(ModelRepository) + RegistryFactory.getRegistry().getExtension( + ModelRepository.class, null); + + if (mrep != null) { + java.util.List<ModelInfo> models=mrep.getModels(ref, + new DefaultModelListener()); + + for (int i=0; m_conversationModel == null && + i < models.size(); i++) { + if (models.get(i).getModel() instanceof ConversationModel) { + m_conversationModel = (ConversationModel) + models.get(i).getModel(); + + m_localModelRefs = m_conversationModel.getLocalModels(ref); + } + } + } + } + + if (m_conversationModel == null) { + logger.error("Unable to load model used to generate " + + "the ESB artefacts"); + } + } + + /** + * This method returns the local model references that + * can be generated. + * + * @return The local model references + */ + public java.util.List<ModelReference> getLocalModels() { + return(m_localModelRefs); + } + + /** + * This method generates the project associated with the + * supplied role (and optional sub-definition path) contained + * in the local model reference. + * + * @param localModelRef The local model reference + * @param projectName The project name + * @throws Exception Failed to generate role + */ + public void generateRole(ModelReference localModelRef, String projectName) + throws Exception { + + if (logger.isDebugEnabled()) { + logger.debug("Generate local model '"+localModelRef+"' for: "+ + m_conversationModel); + } + + // Project to role + org.scribble.projector.Projector projector= + (org.scribble.projector.Projector) + RegistryFactory.getRegistry().getExtension( + org.scribble.projector.Projector.class, null); + + if (projector != null) { + Role role=new Role(localModelRef.getLocatedRole()); + + ModelReference srcRef= + new ModelReference(ConversationNotation.NOTATION_CODE); + + Model localModel=projector.project(srcRef, m_conversationModel, + localModelRef.getSubDefinitionPath(), role, + new DefaultModelListener()); + + if (localModel instanceof ConversationModel && + ((ConversationModel)localModel).getConversation() != null) { + ConversationModel lcm=(ConversationModel)localModel; + + ModelReference targetRef= + new ModelReference(BPELNotation.NOTATION_CODE); + + DefaultBPELLanguageModel target= + new DefaultBPELLanguageModel(targetRef); + + ModelGenerator generator=(ModelGenerator) + RegistryFactory.getRegistry().getExtension( + ModelGenerator.class, null); + + if (generator != null) { + generator.generate(targetRef, role, target, + lcm); + + generateRoleProject(projectName, + target.getBPELProcess().getDOMElement(), + lcm, target); + } else { + logger.error("Unable to find model generator"); + } + } + } + } + + protected void generateRoleProject(String projectName, + org.w3c.dom.Element bpel, ConversationModel localcm, + BPELLanguageModel model) throws Exception { + + final IProject proj=createProject(projectName); + + if (proj != null && bpel != null) { + + // Store BPEL configuration + IPath bpelPath=proj.getFullPath().append( + new Path(getBuildSystem().getBPELFilePath())). + append(localcm.getModelName().getName()+"_"+ + localcm.getModelName().getRole().getName()+".bpel"); + + IFile bpelFile=proj.getProject().getWorkspace().getRoot().getFile(bpelPath); + GeneratorUtil.createParentFolder(bpelFile); + bpelFile.create(null, true, + new org.eclipse.core.runtime.NullProgressMonitor()); + + String bpelText=XMLUtils.toText(bpel); + + if (bpelText != null) { + bpelFile.setContents(new java.io.ByteArrayInputStream( + bpelText.getBytes()), true, false, + new org.eclipse.core.runtime.NullProgressMonitor()); + } + } + } + + protected IProject createProject(String projectName) + throws Exception { + + // Create project + IProject project=m_file.getWorkspace().getRoot().getProject(projectName); + project.create(new org.eclipse.core.runtime.NullProgressMonitor()); + + project.open(new org.eclipse.core.runtime.NullProgressMonitor()); + + return(project); + } + + public BuildSystem getBuildSystem() { + return(m_buildSystem); + } + + private static Log logger = LogFactory.getLog(Generator.class); + + private IFile m_file=null; + private java.util.List<ModelReference> m_localModelRefs=null; + private ConversationModel m_conversationModel=null; + private BuildSystem m_buildSystem=null; +} Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/GeneratorException.java (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/GeneratorException.java) =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/GeneratorException.java (rev 0) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/GeneratorException.java 2009-08-20 09:30:07 UTC (rev 779) @@ -0,0 +1,35 @@ +/* + * 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.savara.tools.bpel.generator; + +public class GeneratorException extends Exception { + + private static final long serialVersionUID = -2263049447116467663L; + + /** + * This constructor initializes the generator exception + * with a message and the underlying exception that + * caused the problem. + * + * @param mesg The message + * @param t The cause + */ + public GeneratorException(String mesg, Throwable t) { + super(mesg, t); + } +} Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/GeneratorUtil.java (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/GeneratorUtil.java) =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/GeneratorUtil.java (rev 0) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/GeneratorUtil.java 2009-08-20 09:30:07 UTC (rev 779) @@ -0,0 +1,53 @@ +/* + * 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.savara.tools.bpel.generator; + +import org.eclipse.core.resources.IFolder; +import org.eclipse.core.resources.IResource; + +/** + * This class provides general utility functions for + * use when generating artefacts. + */ +public class GeneratorUtil { + + /** + * This method checks whether the parent folder exists, + * and if not attempts to create it. + * + * @param res The current resource + */ + public static void createParentFolder(IResource res) { + + if (res.getParent() instanceof IFolder) { + IFolder parent=(IFolder)res.getParent(); + + if (parent.exists() == false) { + createParentFolder(parent); + + try { + parent.create(true, true, + new org.eclipse.core.runtime.NullProgressMonitor()); + } catch(Exception e) { + e.printStackTrace(); + } + } + } + } + +} Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/MavenBuildSystem.java (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/MavenBuildSystem.java) =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/MavenBuildSystem.java (rev 0) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/MavenBuildSystem.java 2009-08-20 09:30:07 UTC (rev 779) @@ -0,0 +1,59 @@ +/* + * 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.savara.tools.bpel.generator; + +/** + * This class represents the Ant build system. + */ +public class MavenBuildSystem extends AbstractBuildSystem { + + private static final String BUILD_FILE = "pom.xml"; + private static final String MAVEN = "Maven"; + private static final String BPEL_PATH = "src/main/resources/bpel"; + + /** + * This method represents the name of the build + * system. + * + * @return The name + */ + public String getName() { + return(MAVEN); + } + + /** + * This method returns the build configuration file + * path. + * + * @return The build configuration file path + */ + public String getBuildFilePath() { + return(BUILD_FILE); + } + + /** + * This method returns the BPEL file + * path. + * + * @return The BPEL file path + */ + public String getBPELFilePath() { + return(BPEL_PATH); + } + +} Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/template (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/template) Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/BPELLanguageModel.java (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/BPELLanguageModel.java) =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/BPELLanguageModel.java (rev 0) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/BPELLanguageModel.java 2009-08-20 09:30:07 UTC (rev 779) @@ -0,0 +1,60 @@ +/* + * 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.savara.tools.bpel.model; + +import org.jboss.savara.tools.bpel.model.component.Process; +import org.scribble.model.*; +import org.scribble.model.admin.ModelListener; + +/** + * This class represents a BPEL model. + * + * @author gary + */ +public interface BPELLanguageModel { + + /** + * 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 textual contents of the model. + * + * @return The textual contents + */ + public String getOriginalContents(); + + /** + * This method returns the BPEL Process. + * + * @return The BPEL Process + */ + public Process getBPELProcess(); + +} Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/BPELNotation.java (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/BPELNotation.java) =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/BPELNotation.java (rev 0) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/BPELNotation.java 2009-08-20 09:30:07 UTC (rev 779) @@ -0,0 +1,66 @@ +/* + * 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.savara.tools.bpel.model; + +import org.scribble.extensions.*; +import org.scribble.model.ModelReference; +import org.scribble.model.Notation; + +/** + * The notation class for the BPEL language. + */ +(a)RegistryInfo(extension=org.scribble.model.Notation.class) +public class BPELNotation extends org.scribble.model.AbstractNotation { + + public static final String NOTATION_CODE = "bpel"; + + /** + * This is the default constructor for the BPEL notation. + */ + public BPELNotation() { + super(NOTATION_CODE, "BPEL", false); + } + + /** + * This method returns the initial description associated + * with the supplied reference. + * + * @param ref The reference + * @return The initial description, or null if no description + */ + @Override + public String getInitialDescription(ModelReference ref) { + StringBuffer buf=new StringBuffer(); + + return(buf.toString()); + } + + /** + * This method returns the optional 'super' notation. + * If defined, then this notation is a derived notation + * from the 'super' notation. + * + * @return The optional 'super' notation + */ + @Override + public Notation getSuperNotation() { + return(m_superNotation); + } + + private Notation m_superNotation=new org.scribble.conversation.model.ConversationNotation(); +} Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/DefaultBPELLanguageModel.java (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/DefaultBPELLanguageModel.java) =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/DefaultBPELLanguageModel.java (rev 0) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/DefaultBPELLanguageModel.java 2009-08-20 09:30:07 UTC (rev 779) @@ -0,0 +1,187 @@ +/* + * 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.savara.tools.bpel.model; + +import org.apache.commons.logging.*; +import org.jboss.savara.tools.bpel.model.component.Process; +import org.scribble.conversation.model.Conversation; +import org.scribble.model.*; +import org.scribble.model.admin.ModelIssue; +import org.scribble.model.admin.ModelListener; +import org.scribble.model.resolutions.*; + +/** + * This class represents a BPEL model. + * + * @author gary + */ +public class DefaultBPELLanguageModel extends org.scribble.lang.model.LanguageModel + implements BPELLanguageModel { + + private static final long serialVersionUID = 7625564863751533521L; + + public static final String BPEL_NOTATION = "bpel"; + + /** + * This constructor is initialized with the BPEL description. + * + * @param source The model reference for the BPEL source + * @param elem The BPEL document + * @param contents The textual contents + */ + public DefaultBPELLanguageModel(ModelReference source, org.w3c.dom.Element elem, + String contents) { + m_source = source; + m_bpelProcess = new Process(this, elem); + m_contents = contents; + + Namespace ns=new Namespace(); + ns.setName(source.getNamespace()); + setNamespace(ns); + + // Initialize the existing model + Conversation conv=m_bpelProcess.convert(); + + if (conv != null) { + getConversations().add(conv); + } else { + // Log error? + } + } + + /** + * This constructor initializes a new BPEL process. + * + * @param source The model reference for the BPEL description + */ + public DefaultBPELLanguageModel(ModelReference source) { + m_source = source; + + m_bpelProcess = new Process(this); + } + + /** + * 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) { + + } + + /** + * This textual contents of the model. + * + * @return The textual contents + */ + public String getOriginalContents() { + return(m_contents); + } + + /** + * This method returns the BPEL Process. + * + * @return The BPEL Process + */ + public Process getBPELProcess() { + return(m_bpelProcess); + } + + private static Log logger = LogFactory.getLog(DefaultBPELLanguageModel.class); + + private ModelReference m_source=null; + private Process m_bpelProcess=null; + private String m_contents=null; + + public class InnerModelListener implements ModelListener { + + public InnerModelListener(ModelListener l) { + m_listener = l; + } + + public void error(ModelIssue issue) { + + /* + issue.getProperties().put(ModelListener.RESOLUTIONS, ModelListener.SHOW_REFERENCE_DESCRIPTION_RESOLUTION); + issue.getProperties().put(ModelListener.REFERENCE_MODEL, m_source); + issue.getProperties().put(ModelListener.REFERENCE_MODEL_START_POSITION, + issue.getModelObject().getSource().getStartPosition()); + issue.getProperties().put(ModelListener.REFERENCE_MODEL_END_POSITION, + issue.getModelObject().getSource().getEndPosition()); + if (issue.getModelObject().getSource().getComponentURI() != null) { + issue.getProperties().put(ModelListener.REFERENCE_MODEL_COMPONENT, + issue.getModelObject().getSource().getComponentURI()); + } + */ + ShowReferencedDescription res=new ShowReferencedDescription(); + res.setModel(m_source); + res.setSourceReference(issue.getModelObject().getSource()); + + issue.getResolutions().add(res); + + m_listener.error(issue); + } + + public void warning(ModelIssue issue) { + /* + issue.getProperties().put(ModelListener.RESOLUTIONS, ModelListener.SHOW_REFERENCE_DESCRIPTION_RESOLUTION); + issue.getProperties().put(ModelListener.REFERENCE_MODEL, m_source); + issue.getProperties().put(ModelListener.REFERENCE_MODEL_START_POSITION, + issue.getModelObject().getSource().getStartPosition()); + issue.getProperties().put(ModelListener.REFERENCE_MODEL_END_POSITION, + issue.getModelObject().getSource().getEndPosition()); + if (issue.getModelObject().getSource().getComponentURI() != null) { + issue.getProperties().put(ModelListener.REFERENCE_MODEL_COMPONENT, + issue.getModelObject().getSource().getComponentURI()); + } + */ + + ShowReferencedDescription res=new ShowReferencedDescription(); + res.setModel(m_source); + res.setSourceReference(issue.getModelObject().getSource()); + + issue.getResolutions().add(res); + + m_listener.warning(issue); + } + + private ModelListener m_listener=null; + } +} Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change) Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/AbstractBPELModelChangeRule.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/AbstractBPELModelChangeRule.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/AbstractBPELModelChangeRule.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,12 +15,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.change; +package org.jboss.savara.tools.bpel.model.change; import org.scribble.model.*; import org.scribble.model.change.*; -import org.jboss.tools.overlord.cdl.bpel.model.*; -import org.jboss.tools.overlord.cdl.bpel.model.component.Sequence; +import org.jboss.savara.tools.bpel.model.*; +import org.jboss.savara.tools.bpel.model.component.Sequence; /** * This is the abstract ESB model change rule. Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/ConversationInteractionModelChangeRule.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,11 +15,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.change; +package org.jboss.savara.tools.bpel.model.change; -import org.jboss.tools.overlord.cdl.bpel.model.*; -import org.jboss.tools.overlord.cdl.bpel.model.util.*; -import org.jboss.tools.overlord.cdl.bpel.model.component.*; +import org.jboss.savara.tools.bpel.model.*; +import org.jboss.savara.tools.bpel.model.component.*; +import org.jboss.savara.tools.bpel.model.util.*; import org.scribble.model.*; import org.scribble.model.change.*; import org.scribble.conversation.model.*; @@ -241,11 +241,11 @@ // Create variable if (varName != null) { - org.jboss.tools.overlord.cdl.bpel.model.component.Variable var= + org.jboss.savara.tools.bpel.model.component.Variable var= bpelModel.getBPELProcess().getVariable(varName); if (var == null) { - var = new org.jboss.tools.overlord.cdl.bpel.model.component.Variable(bpelModel); + var = new org.jboss.savara.tools.bpel.model.component.Variable(bpelModel); var.setName(varName); String mesgType=InteractionPatterns.getMessageTypeLocalPart(interaction); Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationModelChangeRule.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/ConversationModelChangeRule.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationModelChangeRule.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,10 +15,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.change; +package org.jboss.savara.tools.bpel.model.change; -import org.jboss.tools.overlord.cdl.bpel.model.*; -import org.jboss.tools.overlord.cdl.bpel.model.component.*; +import org.jboss.savara.tools.bpel.model.*; +import org.jboss.savara.tools.bpel.model.component.*; import org.scribble.model.*; import org.scribble.model.change.*; import org.scribble.conversation.model.*; Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/IfModelChangeRule.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/IfModelChangeRule.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/IfModelChangeRule.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,11 +15,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.change; +package org.jboss.savara.tools.bpel.model.change; -import org.jboss.tools.overlord.cdl.bpel.model.*; -import org.jboss.tools.overlord.cdl.bpel.model.component.*; -import org.jboss.tools.overlord.cdl.bpel.model.util.InteractionUtil; +import org.jboss.savara.tools.bpel.model.*; +import org.jboss.savara.tools.bpel.model.component.*; +import org.jboss.savara.tools.bpel.model.util.InteractionUtil; import org.scribble.model.*; import org.scribble.model.change.*; import org.scribble.extensions.RegistryInfo; @@ -324,11 +324,11 @@ * @param bpelModel The BPEL model */ protected void createVariable(String varName, Interaction interaction, BPELLanguageModel bpelModel) { - org.jboss.tools.overlord.cdl.bpel.model.component.Variable var= + org.jboss.savara.tools.bpel.model.component.Variable var= bpelModel.getBPELProcess().getVariable(varName); if (var == null) { - var = new org.jboss.tools.overlord.cdl.bpel.model.component.Variable(bpelModel); + var = new org.jboss.savara.tools.bpel.model.component.Variable(bpelModel); var.setName(varName); String mesgType=InteractionPatterns.getMessageTypeLocalPart(interaction); Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/InteractionPatterns.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/InteractionPatterns.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/InteractionPatterns.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,9 +15,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.change; +package org.jboss.savara.tools.bpel.model.change; -import org.jboss.tools.overlord.cdl.bpel.model.util.InteractionUtil; +import org.jboss.savara.tools.bpel.model.util.InteractionUtil; import org.scribble.model.*; import org.scribble.conversation.model.*; Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/LanguageToConversationModelChangeRule.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/LanguageToConversationModelChangeRule.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/LanguageToConversationModelChangeRule.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,9 +15,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.change; +package org.jboss.savara.tools.bpel.model.change; -import org.jboss.tools.overlord.cdl.bpel.model.*; +import org.jboss.savara.tools.bpel.model.*; import org.scribble.model.*; import org.scribble.model.change.*; import org.scribble.conversation.model.*; Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/RunModelChangeRule.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/RunModelChangeRule.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/RunModelChangeRule.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,10 +15,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.change; +package org.jboss.savara.tools.bpel.model.change; -import org.jboss.tools.overlord.cdl.bpel.model.*; -import org.jboss.tools.overlord.cdl.bpel.model.component.*; +import org.jboss.savara.tools.bpel.model.*; +import org.jboss.savara.tools.bpel.model.component.*; import org.scribble.model.*; import org.scribble.model.change.*; import org.scribble.conversation.model.*; Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/SpawnModelChangeRule.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/SpawnModelChangeRule.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/SpawnModelChangeRule.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,10 +15,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.change; +package org.jboss.savara.tools.bpel.model.change; -import org.jboss.tools.overlord.cdl.bpel.model.*; -import org.jboss.tools.overlord.cdl.bpel.model.component.*; +import org.jboss.savara.tools.bpel.model.*; +import org.jboss.savara.tools.bpel.model.component.*; import org.scribble.model.*; import org.scribble.model.change.*; import org.scribble.conversation.model.*; Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/WhenModelChangeRule.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/WhenModelChangeRule.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/WhenModelChangeRule.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,10 +15,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.change; +package org.jboss.savara.tools.bpel.model.change; -import org.jboss.tools.overlord.cdl.bpel.model.*; -import org.jboss.tools.overlord.cdl.bpel.model.component.*; +import org.jboss.savara.tools.bpel.model.*; +import org.jboss.savara.tools.bpel.model.component.*; import org.scribble.model.*; import org.scribble.model.change.*; import org.scribble.conversation.model.*; Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/WhileModelChangeRule.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/WhileModelChangeRule.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/WhileModelChangeRule.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,10 +15,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.change; +package org.jboss.savara.tools.bpel.model.change; -import org.jboss.tools.overlord.cdl.bpel.model.*; -import org.jboss.tools.overlord.cdl.bpel.model.component.*; +import org.jboss.savara.tools.bpel.model.*; +import org.jboss.savara.tools.bpel.model.component.*; import org.scribble.model.*; import org.scribble.model.change.*; import org.scribble.extensions.RegistryInfo; Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component) Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/AbstractCondition.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/AbstractCondition.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/AbstractCondition.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,11 +15,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; import java.util.List; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; import org.scribble.model.Activity; /** Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/AbstractInteraction.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/AbstractInteraction.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/AbstractInteraction.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,10 +15,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; import org.scribble.model.admin.ModelListener; -import org.jboss.tools.overlord.cdl.bpel.model.*; +import org.jboss.savara.tools.bpel.model.*; /** * This class represents an abstract interaction activity. Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/BPELActivity.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/BPELActivity.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/BPELActivity.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,9 +15,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; import org.scribble.model.Activity; /** Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/BPELElement.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/BPELElement.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/BPELElement.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,12 +15,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; import org.scribble.model.*; import org.scribble.model.admin.ModelListener; import org.apache.commons.logging.*; -import org.jboss.tools.overlord.cdl.bpel.model.*; +import org.jboss.savara.tools.bpel.model.*; /** * This is the generic BPEL element class. Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/BPELElementFactory.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/BPELElementFactory.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/BPELElementFactory.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,10 +15,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; import org.apache.commons.logging.*; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; public class BPELElementFactory { Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/BPELGroupingConstruct.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/BPELGroupingConstruct.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/BPELGroupingConstruct.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,10 +15,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; import org.apache.commons.logging.*; -import org.jboss.tools.overlord.cdl.bpel.model.*; +import org.jboss.savara.tools.bpel.model.*; /** * This is the generic BPEL activity class. Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Catch.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/Catch.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Catch.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,11 +15,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; import java.util.List; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; import org.scribble.model.Activity; /** Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/CatchAll.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/CatchAll.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/CatchAll.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,11 +15,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; import java.util.List; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; import org.scribble.model.Activity; /** Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/CompensationHandler.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/CompensationHandler.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/CompensationHandler.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,11 +15,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; import java.util.List; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; import org.scribble.model.Activity; /** Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Condition.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/Condition.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Condition.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,9 +15,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; /** * This class represents the BPEL condition element. Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/ConversionContext.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/ConversionContext.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/ConversionContext.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,7 +15,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; public interface ConversionContext { Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/DefaultConversionContext.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/DefaultConversionContext.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/DefaultConversionContext.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,7 +15,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; /** * This class provides a default implementation of the conversation Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Else.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/Else.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Else.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,11 +15,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; import java.util.List; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; import org.scribble.model.Activity; /** Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Elseif.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/Elseif.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Elseif.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,11 +15,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; import java.util.List; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; import org.scribble.model.Activity; /** Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/EventHandlers.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/EventHandlers.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/EventHandlers.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,11 +15,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; import org.scribble.model.*; import org.scribble.model.admin.ModelListener; -import org.jboss.tools.overlord.cdl.bpel.model.*; +import org.jboss.savara.tools.bpel.model.*; /** * This class represents the 'eventHandlers' component within Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Exit.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/Exit.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Exit.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,11 +15,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; import org.scribble.model.*; import org.scribble.model.admin.ModelListener; -import org.jboss.tools.overlord.cdl.bpel.model.*; +import org.jboss.savara.tools.bpel.model.*; /** * This class represents the exit activity. Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/FaultHandlers.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/FaultHandlers.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/FaultHandlers.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,12 +15,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; import java.util.List; import org.apache.commons.logging.*; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; import org.scribble.model.Activity; /** Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Flow.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/Flow.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Flow.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,11 +15,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; import org.scribble.model.*; import org.scribble.model.admin.ModelListener; -import org.jboss.tools.overlord.cdl.bpel.model.*; +import org.jboss.savara.tools.bpel.model.*; /** * This class represents a flow grouping activity. Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/For.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/For.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/For.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,9 +15,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; /** * This class represents the BPEL 'for' element. Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/ForEach.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/ForEach.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/ForEach.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,11 +15,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; import org.scribble.model.*; import org.scribble.model.admin.ModelListener; -import org.jboss.tools.overlord.cdl.bpel.model.*; +import org.jboss.savara.tools.bpel.model.*; /** * This class represents a forEach grouping activity. Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/If.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/If.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/If.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,13 +15,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; import org.scribble.conversation.model.ConditionalBlock; import org.scribble.model.*; import org.scribble.model.admin.ModelListener; import org.apache.commons.logging.*; -import org.jboss.tools.overlord.cdl.bpel.model.*; +import org.jboss.savara.tools.bpel.model.*; /** * This class represents an 'if' grouping construct. Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Invoke.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/Invoke.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Invoke.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,12 +15,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; import org.scribble.conversation.model.ConversationInteraction; import org.scribble.model.*; import org.scribble.model.admin.ModelListener; -import org.jboss.tools.overlord.cdl.bpel.model.*; +import org.jboss.savara.tools.bpel.model.*; /** * This class represents an unsupported (or custom) action within Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Link.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/Link.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Link.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,11 +15,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; import java.util.List; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; import org.scribble.model.Activity; /** Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/OnAlarm.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/OnAlarm.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/OnAlarm.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,11 +15,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; import java.util.List; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; import org.scribble.model.Activity; /** Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/OnEvent.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/OnEvent.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/OnEvent.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,11 +15,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; import java.util.List; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; import org.scribble.model.Activity; /** Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/OnMessage.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/OnMessage.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/OnMessage.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,11 +15,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; import java.util.List; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; import org.scribble.conversation.model.ConversationInteraction; import org.scribble.model.Activity; import org.scribble.model.MessageSignature; Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/PartnerLink.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/PartnerLink.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/PartnerLink.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,11 +15,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; import java.util.List; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; import org.scribble.model.Activity; /** Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Pick.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/Pick.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Pick.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,12 +15,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; import org.scribble.conversation.model.ConditionalBlock; import org.scribble.model.*; import org.scribble.model.admin.ModelListener; -import org.jboss.tools.overlord.cdl.bpel.model.*; +import org.jboss.savara.tools.bpel.model.*; /** * This class represents a pick grouping activity. Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Process.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/Process.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Process.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,7 +15,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; import org.scribble.conversation.model.ConditionalBlock; import org.scribble.conversation.model.Conversation; @@ -25,8 +25,8 @@ import org.scribble.model.admin.ModelListener; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jboss.tools.overlord.cdl.bpel.model.*; -import org.jboss.tools.overlord.cdl.bpel.model.util.InteractionUtil; +import org.jboss.savara.tools.bpel.model.*; +import org.jboss.savara.tools.bpel.model.util.InteractionUtil; /** * This class represents a BPEL process. Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Receive.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/Receive.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Receive.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,12 +15,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; import org.scribble.conversation.model.ConversationInteraction; import org.scribble.model.*; import org.scribble.model.admin.ModelListener; -import org.jboss.tools.overlord.cdl.bpel.model.*; +import org.jboss.savara.tools.bpel.model.*; /** * This class represents an unsupported (or custom) action within Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/RepeatUntil.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/RepeatUntil.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/RepeatUntil.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,11 +15,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; import org.scribble.model.*; import org.scribble.model.admin.ModelListener; -import org.jboss.tools.overlord.cdl.bpel.model.*; +import org.jboss.savara.tools.bpel.model.*; /** * This class represents a RepeatUntil grouping activity. Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Reply.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/Reply.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Reply.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,12 +15,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; import org.scribble.conversation.model.ConversationInteraction; import org.scribble.model.*; import org.scribble.model.admin.ModelListener; -import org.jboss.tools.overlord.cdl.bpel.model.*; +import org.jboss.savara.tools.bpel.model.*; /** * This class represents a BPEL reply activity. Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Rethrow.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/Rethrow.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Rethrow.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,11 +15,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; import org.scribble.model.*; import org.scribble.model.admin.ModelListener; -import org.jboss.tools.overlord.cdl.bpel.model.*; +import org.jboss.savara.tools.bpel.model.*; /** * This class represents the rethrow activity. Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Scope.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/Scope.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Scope.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,7 +15,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; import java.util.List; @@ -23,8 +23,8 @@ import org.scribble.conversation.model.ConversationInteraction; import org.scribble.model.*; import org.scribble.model.admin.ModelListener; -import org.jboss.tools.overlord.cdl.bpel.model.*; -import org.jboss.tools.overlord.cdl.bpel.model.util.InteractionUtil; +import org.jboss.savara.tools.bpel.model.*; +import org.jboss.savara.tools.bpel.model.util.InteractionUtil; /** * This class represents a scope grouping activity. Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/ScopeActivity.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/ScopeActivity.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/ScopeActivity.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,7 +15,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; import org.scribble.model.admin.ModelListener; Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Sequence.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/Sequence.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Sequence.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,11 +15,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; import org.scribble.model.*; import org.scribble.model.admin.ModelListener; -import org.jboss.tools.overlord.cdl.bpel.model.*; +import org.jboss.savara.tools.bpel.model.*; /** * This class represents a sequence grouping activity. Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Source.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/Source.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Source.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,11 +15,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; import java.util.List; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; import org.scribble.model.Activity; /** Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Target.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/Target.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Target.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,11 +15,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; import java.util.List; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; import org.scribble.model.Activity; /** Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/TerminationHandler.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/TerminationHandler.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/TerminationHandler.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,11 +15,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; import java.util.List; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; import org.scribble.model.Activity; /** Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Throw.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/Throw.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Throw.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,11 +15,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; import org.scribble.model.*; import org.scribble.model.admin.ModelListener; -import org.jboss.tools.overlord.cdl.bpel.model.*; +import org.jboss.savara.tools.bpel.model.*; /** * This class represents the throw activity. Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Until.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/Until.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Until.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,9 +15,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; /** * This class represents the BPEL 'until' element. Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Variable.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/Variable.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Variable.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,11 +15,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; import org.scribble.model.*; import org.scribble.model.admin.ModelListener; -import org.jboss.tools.overlord.cdl.bpel.model.*; +import org.jboss.savara.tools.bpel.model.*; /** * This class represents the variable. Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Wait.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/Wait.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Wait.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,11 +15,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; import org.scribble.model.*; import org.scribble.model.admin.ModelListener; -import org.jboss.tools.overlord.cdl.bpel.model.*; +import org.jboss.savara.tools.bpel.model.*; /** * This class represents the wait activity. Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/While.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/While.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/While.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,11 +15,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; import org.scribble.model.*; import org.scribble.model.admin.ModelListener; -import org.jboss.tools.overlord.cdl.bpel.model.*; +import org.jboss.savara.tools.bpel.model.*; /** * This class represents a while grouping activity. Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/util (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/util) Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/util/InteractionUtil.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/util/InteractionUtil.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/util/InteractionUtil.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,11 +15,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.util; +package org.jboss.savara.tools.bpel.model.util; -import org.jboss.tools.overlord.cdl.bpel.model.component.BPELActivity; -import org.jboss.tools.overlord.cdl.bpel.model.component.Invoke; -import org.jboss.tools.overlord.cdl.bpel.model.component.Sequence; +import org.jboss.savara.tools.bpel.model.component.BPELActivity; +import org.jboss.savara.tools.bpel.model.component.Invoke; +import org.jboss.savara.tools.bpel.model.component.Sequence; import org.scribble.model.*; /** Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/parser (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/parser) Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/parser/BPELModelParserRule.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/parser/BPELModelParserRule.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/parser/BPELModelParserRule.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,7 +15,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.parser; +package org.jboss.savara.tools.bpel.parser; import java.util.logging.Level; import java.util.logging.Logger; @@ -29,8 +29,8 @@ import org.scribble.parser.ParserContext; import org.scribble.parser.ParserRule; import org.scribble.parser.Token; -import org.jboss.tools.overlord.cdl.bpel.model.BPELNotation; -import org.jboss.tools.overlord.cdl.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.BPELNotation; +import org.jboss.savara.tools.bpel.model.DefaultBPELLanguageModel; /** * This class provides the model parser for the BPEL notation. Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/parser/BPELTokenizer.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/parser/BPELTokenizer.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/parser/BPELTokenizer.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,9 +15,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.parser; +package org.jboss.savara.tools.bpel.parser; -import org.jboss.tools.overlord.cdl.bpel.model.BPELNotation; +import org.jboss.savara.tools.bpel.model.BPELNotation; import org.scribble.extensions.RegistryInfo; import org.scribble.model.ModelReference; import org.scribble.parser.*; Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/util (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/util) Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/util/XMLUtils.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/util/XMLUtils.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/util/XMLUtils.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,7 +15,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.util; +package org.jboss.savara.tools.bpel.util; import java.io.ByteArrayOutputStream; Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/AbstractBuildSystem.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/AbstractBuildSystem.java 2009-08-20 08:57:33 UTC (rev 778) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/AbstractBuildSystem.java 2009-08-20 09:30:07 UTC (rev 779) @@ -1,58 +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.cdl.bpel.generator; - -/** - * This class represents an abstract build system. - */ -public abstract class AbstractBuildSystem implements BuildSystem { - - private static final String TEMPLATE_SUFFIX = ".template"; - private static final String TEMPLATE_PREFIX = "template/"; - - /** - * This method returns the contents for the build - * configuration file. - * - * @param projectName The project name - * @return The build file contents - */ - public String getBuildFileContents(String projectName) { - String ret=null; - - java.io.InputStream is= - AbstractBuildSystem.class.getResourceAsStream( - TEMPLATE_PREFIX+getName()+TEMPLATE_SUFFIX); - - if (is != null) { - - try { - byte[] b=new byte[is.available()]; - is.read(b); - - ret = new String(b); - - ret = ret.replaceAll("%PROJECT%", projectName); - } catch(Exception e) { - e.printStackTrace(); - } - } - - return(ret); - } -} Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/AntBuildSystem.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/AntBuildSystem.java 2009-08-20 08:57:33 UTC (rev 778) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/AntBuildSystem.java 2009-08-20 09:30:07 UTC (rev 779) @@ -1,59 +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.cdl.bpel.generator; - -/** - * This class represents the Ant build system. - */ -public class AntBuildSystem extends AbstractBuildSystem { - - private static final String BUILD_FILE = "build.xml"; - private static final String ANT = "Ant"; - private static final String BPEL_PATH = "bpel"; - - /** - * This method represents the name of the build - * system. - * - * @return The name - */ - public String getName() { - return(ANT); - } - - /** - * This method returns the build configuration file - * path. - * - * @return The build configuration file path - */ - public String getBuildFilePath() { - return(BUILD_FILE); - } - - /** - * This method returns the BPEL file - * path. - * - * @return The BPEL file path - */ - public String getBPELFilePath() { - return(BPEL_PATH); - } - -} Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/BuildSystem.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/BuildSystem.java 2009-08-20 08:57:33 UTC (rev 778) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/BuildSystem.java 2009-08-20 09:30:07 UTC (rev 779) @@ -1,58 +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.cdl.bpel.generator; - -/** - * This interface represents a build system used when - * generating the ESB projects. - */ -public interface BuildSystem { - - /** - * This method represents the name of the build - * system. - * - * @return The name - */ - public String getName(); - - /** - * This method returns the build configuration file - * path. - * - * @return The build configuration file path - */ - public String getBuildFilePath(); - - /** - * This method returns the contents for the build - * configuration file. - * - * @param projectName The project name - * @return The build file contents - */ - public String getBuildFileContents(String projectName); - - /** - * This method returns the BPEL file path. - * - * @return The BPEL file path - */ - public String getBPELFilePath(); - -} Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/Generator.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/Generator.java 2009-08-20 08:57:33 UTC (rev 778) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/Generator.java 2009-08-20 09:30:07 UTC (rev 779) @@ -1,213 +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.cdl.bpel.generator; - -import org.apache.commons.logging.*; -import org.eclipse.core.resources.IFile; -import org.jboss.tools.overlord.cdl.bpel.generator.BuildSystem; -import org.jboss.tools.overlord.cdl.bpel.model.*; -import org.jboss.tools.overlord.cdl.bpel.util.XMLUtils; -import org.scribble.conversation.model.*; -import org.scribble.extensions.RegistryFactory; -import org.scribble.model.*; -import org.scribble.model.admin.DefaultModelListener; -import org.scribble.model.admin.ModelInfo; -import org.scribble.model.admin.ModelRepository; -import org.scribble.model.change.ModelGenerator; -import org.eclipse.core.resources.*; -import org.eclipse.core.runtime.*; - -/** - * This class provides the mechanism for generating JBossESB - * service artefacts. - */ -public class Generator { - - /** - * This is the constructor for the generator. - * - */ - public Generator(IFile file, BuildSystem buildSystem) { - m_file = file; - m_buildSystem = buildSystem; - - initialize(m_file); - } - - /** - * This method initializes the conversation model associated - * with the supplied file resource. - * - * @param res The file - */ - protected void initialize(IFile res) { - - // Initialize the model - ModelReference ref= - org.scribble.eclipse.model.admin.OSGIModelRepository.createReference(res); - - if (ref != null) { - ModelRepository mrep=(ModelRepository) - RegistryFactory.getRegistry().getExtension( - ModelRepository.class, null); - - if (mrep != null) { - java.util.List<ModelInfo> models=mrep.getModels(ref, - new DefaultModelListener()); - - for (int i=0; m_conversationModel == null && - i < models.size(); i++) { - if (models.get(i).getModel() instanceof ConversationModel) { - m_conversationModel = (ConversationModel) - models.get(i).getModel(); - - m_localModelRefs = m_conversationModel.getLocalModels(ref); - } - } - } - } - - if (m_conversationModel == null) { - logger.error("Unable to load model used to generate " + - "the ESB artefacts"); - } - } - - /** - * This method returns the local model references that - * can be generated. - * - * @return The local model references - */ - public java.util.List<ModelReference> getLocalModels() { - return(m_localModelRefs); - } - - /** - * This method generates the project associated with the - * supplied role (and optional sub-definition path) contained - * in the local model reference. - * - * @param localModelRef The local model reference - * @param projectName The project name - * @throws Exception Failed to generate role - */ - public void generateRole(ModelReference localModelRef, String projectName) - throws Exception { - - if (logger.isDebugEnabled()) { - logger.debug("Generate local model '"+localModelRef+"' for: "+ - m_conversationModel); - } - - // Project to role - org.scribble.projector.Projector projector= - (org.scribble.projector.Projector) - RegistryFactory.getRegistry().getExtension( - org.scribble.projector.Projector.class, null); - - if (projector != null) { - Role role=new Role(localModelRef.getLocatedRole()); - - ModelReference srcRef= - new ModelReference(ConversationNotation.NOTATION_CODE); - - Model localModel=projector.project(srcRef, m_conversationModel, - localModelRef.getSubDefinitionPath(), role, - new DefaultModelListener()); - - if (localModel instanceof ConversationModel && - ((ConversationModel)localModel).getConversation() != null) { - ConversationModel lcm=(ConversationModel)localModel; - - ModelReference targetRef= - new ModelReference(BPELNotation.NOTATION_CODE); - - DefaultBPELLanguageModel target= - new DefaultBPELLanguageModel(targetRef); - - ModelGenerator generator=(ModelGenerator) - RegistryFactory.getRegistry().getExtension( - ModelGenerator.class, null); - - if (generator != null) { - generator.generate(targetRef, role, target, - lcm); - - generateRoleProject(projectName, - target.getBPELProcess().getDOMElement(), - lcm, target); - } else { - logger.error("Unable to find model generator"); - } - } - } - } - - protected void generateRoleProject(String projectName, - org.w3c.dom.Element bpel, ConversationModel localcm, - BPELLanguageModel model) throws Exception { - - final IProject proj=createProject(projectName); - - if (proj != null && bpel != null) { - - // Store BPEL configuration - IPath bpelPath=proj.getFullPath().append( - new Path(getBuildSystem().getBPELFilePath())). - append(localcm.getModelName().getName()+"_"+ - localcm.getModelName().getRole().getName()+".bpel"); - - IFile bpelFile=proj.getProject().getWorkspace().getRoot().getFile(bpelPath); - GeneratorUtil.createParentFolder(bpelFile); - bpelFile.create(null, true, - new org.eclipse.core.runtime.NullProgressMonitor()); - - String bpelText=XMLUtils.toText(bpel); - - if (bpelText != null) { - bpelFile.setContents(new java.io.ByteArrayInputStream( - bpelText.getBytes()), true, false, - new org.eclipse.core.runtime.NullProgressMonitor()); - } - } - } - - protected IProject createProject(String projectName) - throws Exception { - - // Create project - IProject project=m_file.getWorkspace().getRoot().getProject(projectName); - project.create(new org.eclipse.core.runtime.NullProgressMonitor()); - - project.open(new org.eclipse.core.runtime.NullProgressMonitor()); - - return(project); - } - - public BuildSystem getBuildSystem() { - return(m_buildSystem); - } - - private static Log logger = LogFactory.getLog(Generator.class); - - private IFile m_file=null; - private java.util.List<ModelReference> m_localModelRefs=null; - private ConversationModel m_conversationModel=null; - private BuildSystem m_buildSystem=null; -} Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/GeneratorException.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/GeneratorException.java 2009-08-20 08:57:33 UTC (rev 778) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/GeneratorException.java 2009-08-20 09:30:07 UTC (rev 779) @@ -1,35 +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.cdl.bpel.generator; - -public class GeneratorException extends Exception { - - private static final long serialVersionUID = -2263049447116467663L; - - /** - * This constructor initializes the generator exception - * with a message and the underlying exception that - * caused the problem. - * - * @param mesg The message - * @param t The cause - */ - public GeneratorException(String mesg, Throwable t) { - super(mesg, t); - } -} Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/GeneratorUtil.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/GeneratorUtil.java 2009-08-20 08:57:33 UTC (rev 778) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/GeneratorUtil.java 2009-08-20 09:30:07 UTC (rev 779) @@ -1,53 +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.cdl.bpel.generator; - -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.resources.IResource; - -/** - * This class provides general utility functions for - * use when generating artefacts. - */ -public class GeneratorUtil { - - /** - * This method checks whether the parent folder exists, - * and if not attempts to create it. - * - * @param res The current resource - */ - public static void createParentFolder(IResource res) { - - if (res.getParent() instanceof IFolder) { - IFolder parent=(IFolder)res.getParent(); - - if (parent.exists() == false) { - createParentFolder(parent); - - try { - parent.create(true, true, - new org.eclipse.core.runtime.NullProgressMonitor()); - } catch(Exception e) { - e.printStackTrace(); - } - } - } - } - -} Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/MavenBuildSystem.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/MavenBuildSystem.java 2009-08-20 08:57:33 UTC (rev 778) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/MavenBuildSystem.java 2009-08-20 09:30:07 UTC (rev 779) @@ -1,59 +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.cdl.bpel.generator; - -/** - * This class represents the Ant build system. - */ -public class MavenBuildSystem extends AbstractBuildSystem { - - private static final String BUILD_FILE = "pom.xml"; - private static final String MAVEN = "Maven"; - private static final String BPEL_PATH = "src/main/resources/bpel"; - - /** - * This method represents the name of the build - * system. - * - * @return The name - */ - public String getName() { - return(MAVEN); - } - - /** - * This method returns the build configuration file - * path. - * - * @return The build configuration file path - */ - public String getBuildFilePath() { - return(BUILD_FILE); - } - - /** - * This method returns the BPEL file - * path. - * - * @return The BPEL file path - */ - public String getBPELFilePath() { - return(BPEL_PATH); - } - -} Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/BPELLanguageModel.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/BPELLanguageModel.java 2009-08-20 08:57:33 UTC (rev 778) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/BPELLanguageModel.java 2009-08-20 09:30:07 UTC (rev 779) @@ -1,60 +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.cdl.bpel.model; - -import org.jboss.tools.overlord.cdl.bpel.model.component.Process; -import org.scribble.model.*; -import org.scribble.model.admin.ModelListener; - -/** - * This class represents a BPEL model. - * - * @author gary - */ -public interface BPELLanguageModel { - - /** - * 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 textual contents of the model. - * - * @return The textual contents - */ - public String getOriginalContents(); - - /** - * This method returns the BPEL Process. - * - * @return The BPEL Process - */ - public Process getBPELProcess(); - -} Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/BPELNotation.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/BPELNotation.java 2009-08-20 08:57:33 UTC (rev 778) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/BPELNotation.java 2009-08-20 09:30:07 UTC (rev 779) @@ -1,66 +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.cdl.bpel.model; - -import org.scribble.extensions.*; -import org.scribble.model.ModelReference; -import org.scribble.model.Notation; - -/** - * The notation class for the BPEL language. - */ -(a)RegistryInfo(extension=org.scribble.model.Notation.class) -public class BPELNotation extends org.scribble.model.AbstractNotation { - - public static final String NOTATION_CODE = "bpel"; - - /** - * This is the default constructor for the BPEL notation. - */ - public BPELNotation() { - super(NOTATION_CODE, "BPEL", false); - } - - /** - * This method returns the initial description associated - * with the supplied reference. - * - * @param ref The reference - * @return The initial description, or null if no description - */ - @Override - public String getInitialDescription(ModelReference ref) { - StringBuffer buf=new StringBuffer(); - - return(buf.toString()); - } - - /** - * This method returns the optional 'super' notation. - * If defined, then this notation is a derived notation - * from the 'super' notation. - * - * @return The optional 'super' notation - */ - @Override - public Notation getSuperNotation() { - return(m_superNotation); - } - - private Notation m_superNotation=new org.scribble.conversation.model.ConversationNotation(); -} Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/DefaultBPELLanguageModel.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/DefaultBPELLanguageModel.java 2009-08-20 08:57:33 UTC (rev 778) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/DefaultBPELLanguageModel.java 2009-08-20 09:30:07 UTC (rev 779) @@ -1,187 +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.cdl.bpel.model; - -import org.apache.commons.logging.*; -import org.jboss.tools.overlord.cdl.bpel.model.component.Process; -import org.scribble.conversation.model.Conversation; -import org.scribble.model.*; -import org.scribble.model.admin.ModelIssue; -import org.scribble.model.admin.ModelListener; -import org.scribble.model.resolutions.*; - -/** - * This class represents a BPEL model. - * - * @author gary - */ -public class DefaultBPELLanguageModel extends org.scribble.lang.model.LanguageModel - implements BPELLanguageModel { - - private static final long serialVersionUID = 7625564863751533521L; - - public static final String BPEL_NOTATION = "bpel"; - - /** - * This constructor is initialized with the BPEL description. - * - * @param source The model reference for the BPEL source - * @param elem The BPEL document - * @param contents The textual contents - */ - public DefaultBPELLanguageModel(ModelReference source, org.w3c.dom.Element elem, - String contents) { - m_source = source; - m_bpelProcess = new Process(this, elem); - m_contents = contents; - - Namespace ns=new Namespace(); - ns.setName(source.getNamespace()); - setNamespace(ns); - - // Initialize the existing model - Conversation conv=m_bpelProcess.convert(); - - if (conv != null) { - getConversations().add(conv); - } else { - // Log error? - } - } - - /** - * This constructor initializes a new BPEL process. - * - * @param source The model reference for the BPEL description - */ - public DefaultBPELLanguageModel(ModelReference source) { - m_source = source; - - m_bpelProcess = new Process(this); - } - - /** - * 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) { - - } - - /** - * This textual contents of the model. - * - * @return The textual contents - */ - public String getOriginalContents() { - return(m_contents); - } - - /** - * This method returns the BPEL Process. - * - * @return The BPEL Process - */ - public Process getBPELProcess() { - return(m_bpelProcess); - } - - private static Log logger = LogFactory.getLog(DefaultBPELLanguageModel.class); - - private ModelReference m_source=null; - private Process m_bpelProcess=null; - private String m_contents=null; - - public class InnerModelListener implements ModelListener { - - public InnerModelListener(ModelListener l) { - m_listener = l; - } - - public void error(ModelIssue issue) { - - /* - issue.getProperties().put(ModelListener.RESOLUTIONS, ModelListener.SHOW_REFERENCE_DESCRIPTION_RESOLUTION); - issue.getProperties().put(ModelListener.REFERENCE_MODEL, m_source); - issue.getProperties().put(ModelListener.REFERENCE_MODEL_START_POSITION, - issue.getModelObject().getSource().getStartPosition()); - issue.getProperties().put(ModelListener.REFERENCE_MODEL_END_POSITION, - issue.getModelObject().getSource().getEndPosition()); - if (issue.getModelObject().getSource().getComponentURI() != null) { - issue.getProperties().put(ModelListener.REFERENCE_MODEL_COMPONENT, - issue.getModelObject().getSource().getComponentURI()); - } - */ - ShowReferencedDescription res=new ShowReferencedDescription(); - res.setModel(m_source); - res.setSourceReference(issue.getModelObject().getSource()); - - issue.getResolutions().add(res); - - m_listener.error(issue); - } - - public void warning(ModelIssue issue) { - /* - issue.getProperties().put(ModelListener.RESOLUTIONS, ModelListener.SHOW_REFERENCE_DESCRIPTION_RESOLUTION); - issue.getProperties().put(ModelListener.REFERENCE_MODEL, m_source); - issue.getProperties().put(ModelListener.REFERENCE_MODEL_START_POSITION, - issue.getModelObject().getSource().getStartPosition()); - issue.getProperties().put(ModelListener.REFERENCE_MODEL_END_POSITION, - issue.getModelObject().getSource().getEndPosition()); - if (issue.getModelObject().getSource().getComponentURI() != null) { - issue.getProperties().put(ModelListener.REFERENCE_MODEL_COMPONENT, - issue.getModelObject().getSource().getComponentURI()); - } - */ - - ShowReferencedDescription res=new ShowReferencedDescription(); - res.setModel(m_source); - res.setSourceReference(issue.getModelObject().getSource()); - - issue.getResolutions().add(res); - - m_listener.warning(issue); - } - - private ModelListener m_listener=null; - } -} Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/GeneratorTest.java (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/GeneratorTest.java) =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/GeneratorTest.java (rev 0) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/GeneratorTest.java 2009-08-20 09:30:07 UTC (rev 779) @@ -0,0 +1,477 @@ +/* + * 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.savara.tools.bpel.generator; + +import junit.framework.TestCase; +import junit.framework.TestResult; +import junit.framework.TestSuite; + +import org.jboss.savara.tools.bpel.model.BPELNotation; +import org.jboss.savara.tools.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.parser.ParserTest; +import org.jboss.savara.tools.bpel.util.XMLUtils; +import org.scribble.conversation.model.ConversationNotation; +import org.scribble.pi4soa.cdm.model.CDMNotation; +import org.scribble.extensions.RegistryFactory; +import org.scribble.model.Definition; +import org.scribble.model.ModelReference; +import org.scribble.model.SubDefinitionPath; +import org.scribble.model.change.ModelGenerator; + +public class GeneratorTest extends TestCase { + + public static TestSuite suite() { + TestSuite suite = new TestSuite("Conversation->BPEL Generator Tests"); + + suite.addTest(new ConversationToBPELTest("EventHandler@Store")); + suite.addTest(new ChoreographyToBPELTest("ESBBroker", "Broker")); + suite.addTest(new ChoreographyToBPELTest("ESBBroker", "Buyer")); + suite.addTest(new ChoreographyToBPELTest("ESBBroker", "CreditAgency")); + suite.addTest(new ChoreographyToBPELTest("ESBBroker", + new SubDefinitionPath(new String[]{"CompleteTransaction"}), + "SupplierTxnProcessor")); + suite.addTest(new ChoreographyToBPELTest("ESBBroker", + new SubDefinitionPath(new String[]{"RequestForQuote"}), + "SupplierQuoteEngine")); + suite.addTest(new ChoreographyToBPELTest("PurchaseGoods", "Buyer")); + suite.addTest(new ChoreographyToBPELTest("PurchaseGoods", "CreditAgency")); + suite.addTest(new ChoreographyToBPELTest("PurchaseGoods", "Store")); + suite.addTest(new ChoreographyToBPELTest("ReqRespFault", "Buyer")); + suite.addTest(new ChoreographyToBPELTest("ReqRespFault", "Seller")); + + return suite; + } + + /** + * The test case for running the conversation to BPEL test. + */ + protected static class ConversationToBPELTest extends TestCase { + + /** + * This constructor is initialized with the test + * name. + * + * @param name The test name + */ + public ConversationToBPELTest(String name) { + super(name); + m_name = name; + } + + /** + * This method runs the test. + * + * @param result The test result + */ + public void run(TestResult result) { + result.startTest(this); + + String filename="testmodels/"+m_name+".scv"; + + java.io.InputStream is= + GeneratorTest.class.getResourceAsStream(filename); + + if (is == null) { + result.addError(this, + new Throwable("Unable to locate resource: "+filename)); + } else { + org.scribble.parser.Parser p=new org.scribble.parser.DefaultParser(); + org.scribble.model.ModelReference ref= + new org.scribble.model.ModelReference(ConversationNotation.NOTATION_CODE); + org.scribble.model.admin.ModelListener l= + new org.scribble.model.admin.DefaultModelListener(); + + org.scribble.model.Model model=p.parse(ref, is, l); + + if (model == null) { + result.addError(this, new Throwable("Model is null")); + } else { + ModelGenerator generator=(ModelGenerator) + RegistryFactory.getRegistry().getExtension( + ModelGenerator.class, null); + + java.util.List<Definition> defns=model.getDefinitions(); + Definition defn=null; + + if (defns.size() == 1) { + defn = defns.get(0); + } + + if (generator != null && defn != null) { + ModelReference targetRef= + new ModelReference(BPELNotation.NOTATION_CODE); + + targetRef.setAlias(defn.getLocatedName().getName()); + targetRef.setLocatedRole(defn.getLocatedName().getRole().getName()); + + DefaultBPELLanguageModel target= + new DefaultBPELLanguageModel(targetRef); + + generator.generate(targetRef, + defn.getLocatedName().getRole(), + target, model); + + if (target.getBPELProcess().getDOMElement() != null) { + try { + String text=XMLUtils.toText(target.getBPELProcess().getDOMElement()); + checkResults(result, text); + } catch(Exception e) { + result.addError(this, e); + } + } else { + result.addError(this, + new Throwable("No BPEL generated")); + } + + } else { + result.addError(this, + new Throwable("Unable to find Model Generator")); + } + } + } + + result.endTest(this); + } + + /** + * This method checks the generated BPEL against a + * previously stored correct version. + * + * @param result The test result + * @param bpel The BPEL + */ + protected void checkResults(TestResult result, String bpel) { + boolean f_valid=false; + + String filename="results/"+m_name+".bpel"; + + java.io.InputStream is= + GeneratorTest.class.getResourceAsStream(filename); + + if (is != null) { + + try { + byte[] b=new byte[is.available()]; + + is.read(b); + + is.close(); + + String orig=new String(b); + + if (orig.equals(bpel) == false) { + result.addError(this, + new Throwable("Generated BPEL does not match stored version")); + } else { + f_valid = true; + } + } catch(Exception e) { + result.addError(this, e); + } + } else { + result.addError(this, + new Throwable("Resulting BPEL '"+filename+ + "' not found for comparison")); + } + + if (f_valid == false) { + String bpelfile="testmodels/"+m_name+".scv"; + + java.net.URL url=GeneratorTest.class.getResource(bpelfile); + + try { + url = org.eclipse.core.runtime.FileLocator.toFileURL(url); + } catch(Exception e) { + e.printStackTrace(); + } + + if (url != null) { + // URL will point to copy of test models in the classes folder, so need + // to obtain reference back to source version + java.io.File f=null; + + if (url.getFile().indexOf("classes") != -1) { + f = new java.io.File(url.getFile().replaceFirst("classes","src/plugintest")); + } else if (url.getFile().indexOf("bin") != -1) { + f = new java.io.File(url.getFile().replaceFirst("bin","src/plugintest")); + } else { + result.addError(this, new Exception("Could not locate results folder to record expected result")); + } + + if (f != null && f.exists()) { + f = f.getParentFile().getParentFile(); + + java.io.File resultsDir=new java.io.File(f, "results"); + + if (resultsDir.exists() == false) { + resultsDir.mkdirs(); + } + + java.io.File resultFile=new java.io.File(resultsDir, + m_name+".expected"); + + if (resultFile.exists() == false) { + try { + java.io.FileOutputStream fos=new java.io.FileOutputStream(resultFile); + + fos.write(bpel.getBytes()); + + fos.flush(); + fos.close(); + + } catch(Exception e){ + result.addError(this, e); + } + } else { + System.err.println("NOTE: Expected output '"+resultFile+ + "' already exists - not being overwritten"); + } + } else { + result.addError(this, new Throwable("Unable to obtain URL for SCV model source '"+ + m_name+"': "+url)); + } + } + } + } + + private String m_name=null; + } + /** + * The test case for running the choreography to BPEL test. + */ + protected static class ChoreographyToBPELTest extends TestCase { + + /** + * This constructor is initialized with the test + * name. + * + * @param name The test name + * @param role The role + */ + public ChoreographyToBPELTest(String name, + String role) { + super(name+"@"+role); + m_name = name; + m_role = role; + } + + /** + * This constructor is initialized with the test + * name. + * + * @param name The test name + * @param role The role + */ + public ChoreographyToBPELTest(String name, + SubDefinitionPath sdp, String role) { + super(name+sdp.toString()+"@"+role); + m_name = name; + m_subDefinitionPath = sdp; + m_role = role; + } + + /** + * This method runs the test. + * + * @param result The test result + */ + public void run(TestResult result) { + result.startTest(this); + + String filename="testmodels/"+m_name+".cdm"; + + java.io.InputStream is= + GeneratorTest.class.getResourceAsStream(filename); + + if (is == null) { + result.addError(this, + new Throwable("Unable to locate resource: "+filename)); + } else { + org.scribble.parser.Parser p=new org.scribble.parser.DefaultParser(); + org.scribble.model.ModelReference ref= + new org.scribble.model.ModelReference(CDMNotation.NOTATION_CODE); + org.scribble.model.admin.ModelListener l= + new org.scribble.model.admin.DefaultModelListener(); + + org.scribble.model.Model model=p.parse(ref, is, l); + + if (model == null) { + result.addError(this, new Throwable("Model is null")); + } else { + org.scribble.projector.Projector projector= + new org.scribble.projector.DefaultProjector(); + + org.scribble.model.Role role= + new org.scribble.model.Role(m_role); + + org.scribble.model.Model projected= + projector.project(ref, model, + m_subDefinitionPath, role, l); + + ModelGenerator generator=(ModelGenerator) + RegistryFactory.getRegistry().getExtension( + ModelGenerator.class, null); + + java.util.List<Definition> defns=model.getDefinitions(); + Definition defn=null; + + if (defns.size() == 1) { + defn = defns.get(0); + } + + if (generator != null && defn != null) { + ModelReference targetRef= + new ModelReference(BPELNotation.NOTATION_CODE); + targetRef.setAlias(m_name); + targetRef.setLocatedRole(m_role); + + DefaultBPELLanguageModel target= + new DefaultBPELLanguageModel(targetRef); + + generator.generate(targetRef, + defn.getLocatedName().getRole(), + target, projected); + + if (target.getBPELProcess().getDOMElement() != null) { + try { + String text=XMLUtils.toText(target.getBPELProcess().getDOMElement()); + checkResults(result, text); + } catch(Exception e) { + result.addError(this, e); + } + } else { + result.addError(this, + new Throwable("No BPEL generated")); + } + + } else { + result.addError(this, + new Throwable("Unable to find Model Generator")); + } + } + } + + result.endTest(this); + } + + /** + * This method checks the generated BPEL against a + * previously stored correct version. + * + * @param result The test result + * @param bpel The BPEL + */ + protected void checkResults(TestResult result, String bpel) { + boolean f_valid=false; + + String filename="results/"+m_name+"@"+m_role+".bpel"; + + java.io.InputStream is= + GeneratorTest.class.getResourceAsStream(filename); + + if (is != null) { + + try { + byte[] b=new byte[is.available()]; + + is.read(b); + + is.close(); + + String orig=new String(b); + + if (orig.equals(bpel) == false) { + result.addError(this, + new Throwable("Generated Conversation does not match stored version")); + } else { + f_valid = true; + } + } catch(Exception e) { + result.addError(this, e); + } + } else { + result.addError(this, + new Throwable("Resulting BPEL '"+filename+ + "' not found for comparison")); + } + + if (f_valid == false) { + String bpelfile="testmodels/"+m_name+".cdm"; + + java.net.URL url=GeneratorTest.class.getResource(bpelfile); + + try { + url = org.eclipse.core.runtime.FileLocator.toFileURL(url); + } catch(Exception e) { + e.printStackTrace(); + } + + if (url != null) { + // URL will point to copy of test models in the classes folder, so need + // to obtain reference back to source version + java.io.File f=null; + + if (url.getFile().indexOf("classes") != -1) { + f = new java.io.File(url.getFile().replaceFirst("classes","src/plugintest")); + } else if (url.getFile().indexOf("bin") != -1) { + f = new java.io.File(url.getFile().replaceFirst("bin","src/plugintest")); + } else { + result.addError(this, new Exception("Could not locate results folder to record expected result")); + } + + if (f != null && f.exists()) { + f = f.getParentFile().getParentFile(); + + java.io.File resultsDir=new java.io.File(f, "results"); + + if (resultsDir.exists() == false) { + resultsDir.mkdirs(); + } + + java.io.File resultFile=new java.io.File(resultsDir, + m_name+"@"+m_role+".expected"); + + if (resultFile.exists() == false) { + try { + java.io.FileOutputStream fos=new java.io.FileOutputStream(resultFile); + + fos.write(bpel.getBytes()); + + fos.flush(); + fos.close(); + + } catch(Exception e){ + result.addError(this, e); + } + } else { + System.err.println("NOTE: Expected output '"+resultFile+ + "' already exists - not being overwritten"); + } + } else { + result.addError(this, new Throwable("Unable to obtain URL for CDM model source '"+ + m_name+"': "+url)); + } + } + } + } + + private String m_name=null; + private SubDefinitionPath m_subDefinitionPath=null; + private String m_role=null; + } +} Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results) Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/testmodels (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/testmodels) Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/ParserTest.java (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/parser/ParserTest.java) =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/ParserTest.java (rev 0) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/ParserTest.java 2009-08-20 09:30:07 UTC (rev 779) @@ -0,0 +1,247 @@ +/* + * 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.savara.tools.bpel.parser; + +import junit.framework.TestCase; +import junit.framework.TestResult; +import junit.framework.TestSuite; + +import org.jboss.savara.tools.bpel.model.BPELNotation; +import org.scribble.conversation.model.ConversationModel; +import org.scribble.lang.model.*; +import org.scribble.conversation.model.ConversationNotation; +import org.scribble.extensions.RegistryFactory; +import org.scribble.model.ModelReference; + +public class ParserTest extends TestCase { + + public static TestSuite suite() { + TestSuite suite = new TestSuite("BPEL->Conversation Parser Tests"); + + suite.addTest(new BPELToConversationTest("ESBBroker@Broker")); + suite.addTest(new BPELToConversationTest("ESBBroker@Buyer")); + suite.addTest(new BPELToConversationTest("ESBBroker@CreditAgency")); + suite.addTest(new BPELToConversationTest("ESBBroker@SupplierQuoteEngine")); + suite.addTest(new BPELToConversationTest("ESBBroker@SupplierTxnProcessor")); + suite.addTest(new BPELToConversationTest("PurchaseGoods@Buyer")); + suite.addTest(new BPELToConversationTest("PurchaseGoods@CreditAgency")); + suite.addTest(new BPELToConversationTest("PurchaseGoods@Store")); + suite.addTest(new BPELToConversationTest("ReqRespFault@Buyer")); + suite.addTest(new BPELToConversationTest("ReqRespFault@Seller")); + suite.addTest(new BPELToConversationTest("LoanApprovalService@Service")); + + return suite; + } + + /** + * The test case for running the BPEL to Conversation test. + */ + protected static class BPELToConversationTest extends TestCase { + + /** + * This constructor is initialized with the test + * name. + * + * @param name The test name + */ + public BPELToConversationTest(String name) { + super(name); + m_name = name; + } + + /** + * This method runs the test. + * + * @param result The test result + */ + public void run(TestResult result) { + result.startTest(this); + + String filename="testmodels/"+m_name+".bpel"; + + java.io.InputStream is= + ParserTest.class.getResourceAsStream(filename); + + if (is == null) { + result.addError(this, + new Throwable("Unable to locate resource: "+filename)); + } else { + org.scribble.parser.Parser p=new org.scribble.parser.DefaultParser(); + org.scribble.model.ModelReference ref= + new org.scribble.model.ModelReference(BPELNotation.NOTATION_CODE); + org.scribble.model.admin.DefaultModelListener l= + new org.scribble.model.admin.DefaultModelListener(); + + org.scribble.model.Model model=p.parse(ref, is, l); + + if (model == null) { + result.addError(this, new Throwable("Model is null")); + + } else if ((model instanceof LanguageModel) == false) { + result.addError(this, new Throwable("Model is null")); + + } else if (l.getErrors().size() != 0) { + result.addError(this, new Throwable("Failed to parse CDM Model")); + + for (int i=0; i < l.getErrors().size(); i++) { + System.err.println("ModelIssue: "+ + l.getErrors().get(i).getMessage()); + } + } else { + LanguageModel lm=(LanguageModel)model; + ConversationModel cm=new ConversationModel(); + + cm.setNamespace(lm.getNamespace()); + + if (lm.getConversations().size() == 1) { + cm.setConversation(lm.getConversations().get(0)); + } + + try { + org.scribble.export.Exporter exporter= + (org.scribble.export.Exporter) + RegistryFactory.getRegistry().getExtension( + org.scribble.export.Exporter.class, null); + + 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(new ModelReference(ConversationNotation.NOTATION_CODE), + cm, formatter); + + String str=new String(os.toByteArray()); + + checkResults(result, str); + + } catch(Exception e) { + e.printStackTrace(); + } + } + } + + result.endTest(this); + } + + /** + * This method checks the generated jboss-esb.xml against a + * previously stored correct version. + * + * @param result The test result + * @param conv The conversation + */ + protected void checkResults(TestResult result, String conv) { + boolean f_valid=false; + + String filename="results/"+m_name+".scv"; + + java.io.InputStream is= + ParserTest.class.getResourceAsStream(filename); + + if (is != null) { + + try { + byte[] b=new byte[is.available()]; + + is.read(b); + + is.close(); + + String orig=new String(b); + + if (orig.equals(conv) == false) { + result.addError(this, + new Throwable("Generated Conversation does not match stored version")); + } else { + f_valid = true; + } + } catch(Exception e) { + result.addError(this, e); + } + } else { + result.addError(this, + new Throwable("Resulting Conversation '"+filename+ + "' not found for comparison")); + } + + if (f_valid == false) { + String bpelfile="testmodels/"+m_name+".bpel"; + + java.net.URL url=ParserTest.class.getResource(bpelfile); + + try { + url = org.eclipse.core.runtime.FileLocator.toFileURL(url); + } catch(Exception e) { + e.printStackTrace(); + } + + if (url != null) { + // URL will point to copy of test models in the classes folder, so need + // to obtain reference back to source version + java.io.File f=null; + + if (url.getFile().indexOf("classes") != -1) { + f = new java.io.File(url.getFile().replaceFirst("classes","src/plugintest")); + } else if (url.getFile().indexOf("bin") != -1) { + f = new java.io.File(url.getFile().replaceFirst("bin","src/plugintest")); + } else { + result.addError(this, new Exception("Could not locate results folder to record expected result")); + } + + if (f != null && f.exists()) { + f = f.getParentFile().getParentFile(); + + java.io.File resultsDir=new java.io.File(f, "results"); + + if (resultsDir.exists() == false) { + resultsDir.mkdirs(); + } + + java.io.File resultFile=new java.io.File(resultsDir, m_name+".expected"); + + if (resultFile.exists() == false) { + try { + java.io.FileOutputStream fos=new java.io.FileOutputStream(resultFile); + + fos.write(conv.getBytes()); + + fos.flush(); + fos.close(); + + } catch(Exception e){ + result.addError(this, e); + } + } else { + System.err.println("NOTE: Expected output '"+resultFile+ + "' already exists - not being overwritten"); + } + } else { + result.addError(this, new Throwable("Unable to obtain URL for BPEL model source '"+ + m_name+"': "+url)); + } + } + } + } + + private String m_name=null; + } +} Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/parser/results) Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/parser/testmodels) Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/GeneratorTest.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/GeneratorTest.java 2009-08-20 08:57:33 UTC (rev 778) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/GeneratorTest.java 2009-08-20 09:30:07 UTC (rev 779) @@ -1,477 +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.cdl.bpel.generator; - -import junit.framework.TestCase; -import junit.framework.TestResult; -import junit.framework.TestSuite; - -import org.jboss.tools.overlord.cdl.bpel.model.BPELNotation; -import org.jboss.tools.overlord.cdl.bpel.model.DefaultBPELLanguageModel; -import org.jboss.tools.overlord.cdl.bpel.parser.ParserTest; -import org.jboss.tools.overlord.cdl.bpel.util.XMLUtils; -import org.scribble.conversation.model.ConversationNotation; -import org.scribble.pi4soa.cdm.model.CDMNotation; -import org.scribble.extensions.RegistryFactory; -import org.scribble.model.Definition; -import org.scribble.model.ModelReference; -import org.scribble.model.SubDefinitionPath; -import org.scribble.model.change.ModelGenerator; - -public class GeneratorTest extends TestCase { - - public static TestSuite suite() { - TestSuite suite = new TestSuite("Conversation->BPEL Generator Tests"); - - suite.addTest(new ConversationToBPELTest("EventHandler@Store")); - suite.addTest(new ChoreographyToBPELTest("ESBBroker", "Broker")); - suite.addTest(new ChoreographyToBPELTest("ESBBroker", "Buyer")); - suite.addTest(new ChoreographyToBPELTest("ESBBroker", "CreditAgency")); - suite.addTest(new ChoreographyToBPELTest("ESBBroker", - new SubDefinitionPath(new String[]{"CompleteTransaction"}), - "SupplierTxnProcessor")); - suite.addTest(new ChoreographyToBPELTest("ESBBroker", - new SubDefinitionPath(new String[]{"RequestForQuote"}), - "SupplierQuoteEngine")); - suite.addTest(new ChoreographyToBPELTest("PurchaseGoods", "Buyer")); - suite.addTest(new ChoreographyToBPELTest("PurchaseGoods", "CreditAgency")); - suite.addTest(new ChoreographyToBPELTest("PurchaseGoods", "Store")); - suite.addTest(new ChoreographyToBPELTest("ReqRespFault", "Buyer")); - suite.addTest(new ChoreographyToBPELTest("ReqRespFault", "Seller")); - - return suite; - } - - /** - * The test case for running the conversation to BPEL test. - */ - protected static class ConversationToBPELTest extends TestCase { - - /** - * This constructor is initialized with the test - * name. - * - * @param name The test name - */ - public ConversationToBPELTest(String name) { - super(name); - m_name = name; - } - - /** - * This method runs the test. - * - * @param result The test result - */ - public void run(TestResult result) { - result.startTest(this); - - String filename="testmodels/"+m_name+".scv"; - - java.io.InputStream is= - GeneratorTest.class.getResourceAsStream(filename); - - if (is == null) { - result.addError(this, - new Throwable("Unable to locate resource: "+filename)); - } else { - org.scribble.parser.Parser p=new org.scribble.parser.DefaultParser(); - org.scribble.model.ModelReference ref= - new org.scribble.model.ModelReference(ConversationNotation.NOTATION_CODE); - org.scribble.model.admin.ModelListener l= - new org.scribble.model.admin.DefaultModelListener(); - - org.scribble.model.Model model=p.parse(ref, is, l); - - if (model == null) { - result.addError(this, new Throwable("Model is null")); - } else { - ModelGenerator generator=(ModelGenerator) - RegistryFactory.getRegistry().getExtension( - ModelGenerator.class, null); - - java.util.List<Definition> defns=model.getDefinitions(); - Definition defn=null; - - if (defns.size() == 1) { - defn = defns.get(0); - } - - if (generator != null && defn != null) { - ModelReference targetRef= - new ModelReference(BPELNotation.NOTATION_CODE); - - targetRef.setAlias(defn.getLocatedName().getName()); - targetRef.setLocatedRole(defn.getLocatedName().getRole().getName()); - - DefaultBPELLanguageModel target= - new DefaultBPELLanguageModel(targetRef); - - generator.generate(targetRef, - defn.getLocatedName().getRole(), - target, model); - - if (target.getBPELProcess().getDOMElement() != null) { - try { - String text=XMLUtils.toText(target.getBPELProcess().getDOMElement()); - checkResults(result, text); - } catch(Exception e) { - result.addError(this, e); - } - } else { - result.addError(this, - new Throwable("No BPEL generated")); - } - - } else { - result.addError(this, - new Throwable("Unable to find Model Generator")); - } - } - } - - result.endTest(this); - } - - /** - * This method checks the generated BPEL against a - * previously stored correct version. - * - * @param result The test result - * @param bpel The BPEL - */ - protected void checkResults(TestResult result, String bpel) { - boolean f_valid=false; - - String filename="results/"+m_name+".bpel"; - - java.io.InputStream is= - GeneratorTest.class.getResourceAsStream(filename); - - if (is != null) { - - try { - byte[] b=new byte[is.available()]; - - is.read(b); - - is.close(); - - String orig=new String(b); - - if (orig.equals(bpel) == false) { - result.addError(this, - new Throwable("Generated BPEL does not match stored version")); - } else { - f_valid = true; - } - } catch(Exception e) { - result.addError(this, e); - } - } else { - result.addError(this, - new Throwable("Resulting BPEL '"+filename+ - "' not found for comparison")); - } - - if (f_valid == false) { - String bpelfile="testmodels/"+m_name+".scv"; - - java.net.URL url=GeneratorTest.class.getResource(bpelfile); - - try { - url = org.eclipse.core.runtime.FileLocator.toFileURL(url); - } catch(Exception e) { - e.printStackTrace(); - } - - if (url != null) { - // URL will point to copy of test models in the classes folder, so need - // to obtain reference back to source version - java.io.File f=null; - - if (url.getFile().indexOf("classes") != -1) { - f = new java.io.File(url.getFile().replaceFirst("classes","src/plugintest")); - } else if (url.getFile().indexOf("bin") != -1) { - f = new java.io.File(url.getFile().replaceFirst("bin","src/plugintest")); - } else { - result.addError(this, new Exception("Could not locate results folder to record expected result")); - } - - if (f != null && f.exists()) { - f = f.getParentFile().getParentFile(); - - java.io.File resultsDir=new java.io.File(f, "results"); - - if (resultsDir.exists() == false) { - resultsDir.mkdirs(); - } - - java.io.File resultFile=new java.io.File(resultsDir, - m_name+".expected"); - - if (resultFile.exists() == false) { - try { - java.io.FileOutputStream fos=new java.io.FileOutputStream(resultFile); - - fos.write(bpel.getBytes()); - - fos.flush(); - fos.close(); - - } catch(Exception e){ - result.addError(this, e); - } - } else { - System.err.println("NOTE: Expected output '"+resultFile+ - "' already exists - not being overwritten"); - } - } else { - result.addError(this, new Throwable("Unable to obtain URL for SCV model source '"+ - m_name+"': "+url)); - } - } - } - } - - private String m_name=null; - } - /** - * The test case for running the choreography to BPEL test. - */ - protected static class ChoreographyToBPELTest extends TestCase { - - /** - * This constructor is initialized with the test - * name. - * - * @param name The test name - * @param role The role - */ - public ChoreographyToBPELTest(String name, - String role) { - super(name+"@"+role); - m_name = name; - m_role = role; - } - - /** - * This constructor is initialized with the test - * name. - * - * @param name The test name - * @param role The role - */ - public ChoreographyToBPELTest(String name, - SubDefinitionPath sdp, String role) { - super(name+sdp.toString()+"@"+role); - m_name = name; - m_subDefinitionPath = sdp; - m_role = role; - } - - /** - * This method runs the test. - * - * @param result The test result - */ - public void run(TestResult result) { - result.startTest(this); - - String filename="testmodels/"+m_name+".cdm"; - - java.io.InputStream is= - GeneratorTest.class.getResourceAsStream(filename); - - if (is == null) { - result.addError(this, - new Throwable("Unable to locate resource: "+filename)); - } else { - org.scribble.parser.Parser p=new org.scribble.parser.DefaultParser(); - org.scribble.model.ModelReference ref= - new org.scribble.model.ModelReference(CDMNotation.NOTATION_CODE); - org.scribble.model.admin.ModelListener l= - new org.scribble.model.admin.DefaultModelListener(); - - org.scribble.model.Model model=p.parse(ref, is, l); - - if (model == null) { - result.addError(this, new Throwable("Model is null")); - } else { - org.scribble.projector.Projector projector= - new org.scribble.projector.DefaultProjector(); - - org.scribble.model.Role role= - new org.scribble.model.Role(m_role); - - org.scribble.model.Model projected= - projector.project(ref, model, - m_subDefinitionPath, role, l); - - ModelGenerator generator=(ModelGenerator) - RegistryFactory.getRegistry().getExtension( - ModelGenerator.class, null); - - java.util.List<Definition> defns=model.getDefinitions(); - Definition defn=null; - - if (defns.size() == 1) { - defn = defns.get(0); - } - - if (generator != null && defn != null) { - ModelReference targetRef= - new ModelReference(BPELNotation.NOTATION_CODE); - targetRef.setAlias(m_name); - targetRef.setLocatedRole(m_role); - - DefaultBPELLanguageModel target= - new DefaultBPELLanguageModel(targetRef); - - generator.generate(targetRef, - defn.getLocatedName().getRole(), - target, projected); - - if (target.getBPELProcess().getDOMElement() != null) { - try { - String text=XMLUtils.toText(target.getBPELProcess().getDOMElement()); - checkResults(result, text); - } catch(Exception e) { - result.addError(this, e); - } - } else { - result.addError(this, - new Throwable("No BPEL generated")); - } - - } else { - result.addError(this, - new Throwable("Unable to find Model Generator")); - } - } - } - - result.endTest(this); - } - - /** - * This method checks the generated BPEL against a - * previously stored correct version. - * - * @param result The test result - * @param bpel The BPEL - */ - protected void checkResults(TestResult result, String bpel) { - boolean f_valid=false; - - String filename="results/"+m_name+"@"+m_role+".bpel"; - - java.io.InputStream is= - GeneratorTest.class.getResourceAsStream(filename); - - if (is != null) { - - try { - byte[] b=new byte[is.available()]; - - is.read(b); - - is.close(); - - String orig=new String(b); - - if (orig.equals(bpel) == false) { - result.addError(this, - new Throwable("Generated Conversation does not match stored version")); - } else { - f_valid = true; - } - } catch(Exception e) { - result.addError(this, e); - } - } else { - result.addError(this, - new Throwable("Resulting BPEL '"+filename+ - "' not found for comparison")); - } - - if (f_valid == false) { - String bpelfile="testmodels/"+m_name+".cdm"; - - java.net.URL url=GeneratorTest.class.getResource(bpelfile); - - try { - url = org.eclipse.core.runtime.FileLocator.toFileURL(url); - } catch(Exception e) { - e.printStackTrace(); - } - - if (url != null) { - // URL will point to copy of test models in the classes folder, so need - // to obtain reference back to source version - java.io.File f=null; - - if (url.getFile().indexOf("classes") != -1) { - f = new java.io.File(url.getFile().replaceFirst("classes","src/plugintest")); - } else if (url.getFile().indexOf("bin") != -1) { - f = new java.io.File(url.getFile().replaceFirst("bin","src/plugintest")); - } else { - result.addError(this, new Exception("Could not locate results folder to record expected result")); - } - - if (f != null && f.exists()) { - f = f.getParentFile().getParentFile(); - - java.io.File resultsDir=new java.io.File(f, "results"); - - if (resultsDir.exists() == false) { - resultsDir.mkdirs(); - } - - java.io.File resultFile=new java.io.File(resultsDir, - m_name+"@"+m_role+".expected"); - - if (resultFile.exists() == false) { - try { - java.io.FileOutputStream fos=new java.io.FileOutputStream(resultFile); - - fos.write(bpel.getBytes()); - - fos.flush(); - fos.close(); - - } catch(Exception e){ - result.addError(this, e); - } - } else { - System.err.println("NOTE: Expected output '"+resultFile+ - "' already exists - not being overwritten"); - } - } else { - result.addError(this, new Throwable("Unable to obtain URL for CDM model source '"+ - m_name+"': "+url)); - } - } - } - } - - private String m_name=null; - private SubDefinitionPath m_subDefinitionPath=null; - private String m_role=null; - } -} Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/parser/ParserTest.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/parser/ParserTest.java 2009-08-20 08:57:33 UTC (rev 778) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/parser/ParserTest.java 2009-08-20 09:30:07 UTC (rev 779) @@ -1,247 +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.cdl.bpel.parser; - -import junit.framework.TestCase; -import junit.framework.TestResult; -import junit.framework.TestSuite; - -import org.jboss.tools.overlord.cdl.bpel.model.BPELNotation; -import org.scribble.conversation.model.ConversationModel; -import org.scribble.lang.model.*; -import org.scribble.conversation.model.ConversationNotation; -import org.scribble.extensions.RegistryFactory; -import org.scribble.model.ModelReference; - -public class ParserTest extends TestCase { - - public static TestSuite suite() { - TestSuite suite = new TestSuite("BPEL->Conversation Parser Tests"); - - suite.addTest(new BPELToConversationTest("ESBBroker@Broker")); - suite.addTest(new BPELToConversationTest("ESBBroker@Buyer")); - suite.addTest(new BPELToConversationTest("ESBBroker@CreditAgency")); - suite.addTest(new BPELToConversationTest("ESBBroker@SupplierQuoteEngine")); - suite.addTest(new BPELToConversationTest("ESBBroker@SupplierTxnProcessor")); - suite.addTest(new BPELToConversationTest("PurchaseGoods@Buyer")); - suite.addTest(new BPELToConversationTest("PurchaseGoods@CreditAgency")); - suite.addTest(new BPELToConversationTest("PurchaseGoods@Store")); - suite.addTest(new BPELToConversationTest("ReqRespFault@Buyer")); - suite.addTest(new BPELToConversationTest("ReqRespFault@Seller")); - suite.addTest(new BPELToConversationTest("LoanApprovalService@Service")); - - return suite; - } - - /** - * The test case for running the BPEL to Conversation test. - */ - protected static class BPELToConversationTest extends TestCase { - - /** - * This constructor is initialized with the test - * name. - * - * @param name The test name - */ - public BPELToConversationTest(String name) { - super(name); - m_name = name; - } - - /** - * This method runs the test. - * - * @param result The test result - */ - public void run(TestResult result) { - result.startTest(this); - - String filename="testmodels/"+m_name+".bpel"; - - java.io.InputStream is= - ParserTest.class.getResourceAsStream(filename); - - if (is == null) { - result.addError(this, - new Throwable("Unable to locate resource: "+filename)); - } else { - org.scribble.parser.Parser p=new org.scribble.parser.DefaultParser(); - org.scribble.model.ModelReference ref= - new org.scribble.model.ModelReference(BPELNotation.NOTATION_CODE); - org.scribble.model.admin.DefaultModelListener l= - new org.scribble.model.admin.DefaultModelListener(); - - org.scribble.model.Model model=p.parse(ref, is, l); - - if (model == null) { - result.addError(this, new Throwable("Model is null")); - - } else if ((model instanceof LanguageModel) == false) { - result.addError(this, new Throwable("Model is null")); - - } else if (l.getErrors().size() != 0) { - result.addError(this, new Throwable("Failed to parse CDM Model")); - - for (int i=0; i < l.getErrors().size(); i++) { - System.err.println("ModelIssue: "+ - l.getErrors().get(i).getMessage()); - } - } else { - LanguageModel lm=(LanguageModel)model; - ConversationModel cm=new ConversationModel(); - - cm.setNamespace(lm.getNamespace()); - - if (lm.getConversations().size() == 1) { - cm.setConversation(lm.getConversations().get(0)); - } - - try { - org.scribble.export.Exporter exporter= - (org.scribble.export.Exporter) - RegistryFactory.getRegistry().getExtension( - org.scribble.export.Exporter.class, null); - - 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(new ModelReference(ConversationNotation.NOTATION_CODE), - cm, formatter); - - String str=new String(os.toByteArray()); - - checkResults(result, str); - - } catch(Exception e) { - e.printStackTrace(); - } - } - } - - result.endTest(this); - } - - /** - * This method checks the generated jboss-esb.xml against a - * previously stored correct version. - * - * @param result The test result - * @param conv The conversation - */ - protected void checkResults(TestResult result, String conv) { - boolean f_valid=false; - - String filename="results/"+m_name+".scv"; - - java.io.InputStream is= - ParserTest.class.getResourceAsStream(filename); - - if (is != null) { - - try { - byte[] b=new byte[is.available()]; - - is.read(b); - - is.close(); - - String orig=new String(b); - - if (orig.equals(conv) == false) { - result.addError(this, - new Throwable("Generated Conversation does not match stored version")); - } else { - f_valid = true; - } - } catch(Exception e) { - result.addError(this, e); - } - } else { - result.addError(this, - new Throwable("Resulting Conversation '"+filename+ - "' not found for comparison")); - } - - if (f_valid == false) { - String bpelfile="testmodels/"+m_name+".bpel"; - - java.net.URL url=ParserTest.class.getResource(bpelfile); - - try { - url = org.eclipse.core.runtime.FileLocator.toFileURL(url); - } catch(Exception e) { - e.printStackTrace(); - } - - if (url != null) { - // URL will point to copy of test models in the classes folder, so need - // to obtain reference back to source version - java.io.File f=null; - - if (url.getFile().indexOf("classes") != -1) { - f = new java.io.File(url.getFile().replaceFirst("classes","src/plugintest")); - } else if (url.getFile().indexOf("bin") != -1) { - f = new java.io.File(url.getFile().replaceFirst("bin","src/plugintest")); - } else { - result.addError(this, new Exception("Could not locate results folder to record expected result")); - } - - if (f != null && f.exists()) { - f = f.getParentFile().getParentFile(); - - java.io.File resultsDir=new java.io.File(f, "results"); - - if (resultsDir.exists() == false) { - resultsDir.mkdirs(); - } - - java.io.File resultFile=new java.io.File(resultsDir, m_name+".expected"); - - if (resultFile.exists() == false) { - try { - java.io.FileOutputStream fos=new java.io.FileOutputStream(resultFile); - - fos.write(conv.getBytes()); - - fos.flush(); - fos.close(); - - } catch(Exception e){ - result.addError(this, e); - } - } else { - System.err.println("NOTE: Expected output '"+resultFile+ - "' already exists - not being overwritten"); - } - } else { - result.addError(this, new Throwable("Unable to obtain URL for BPEL model source '"+ - m_name+"': "+url)); - } - } - } - } - - private String m_name=null; - } -} Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/tools/overlord/cdl/bpel/model/component) Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/AbstractInteractionTest.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/tools/overlord/cdl/bpel/model/component/AbstractInteractionTest.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/AbstractInteractionTest.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,10 +15,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; -import org.jboss.tools.overlord.cdl.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.DefaultBPELLanguageModel; import junit.framework.TestCase; Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/BPELActivityTest.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/tools/overlord/cdl/bpel/model/component/BPELActivityTest.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/BPELActivityTest.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,10 +15,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; -import org.jboss.tools.overlord.cdl.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.DefaultBPELLanguageModel; import junit.framework.TestCase; Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/BPELElementTest.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/tools/overlord/cdl/bpel/model/component/BPELElementTest.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/BPELElementTest.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,11 +15,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; -import org.jboss.tools.overlord.cdl.bpel.model.DefaultBPELLanguageModel; -import org.jboss.tools.overlord.cdl.bpel.model.component.Condition; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.component.BPELElement; +import org.jboss.savara.tools.bpel.model.component.Condition; +import org.jboss.savara.tools.bpel.model.component.Else; +import org.jboss.savara.tools.bpel.model.component.If; +import org.jboss.savara.tools.bpel.model.component.Sequence; import junit.framework.TestCase; Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/CatchAllTest.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/tools/overlord/cdl/bpel/model/component/CatchAllTest.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/CatchAllTest.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,12 +15,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; -import org.jboss.tools.overlord.cdl.bpel.model.DefaultBPELLanguageModel; -import org.jboss.tools.overlord.cdl.bpel.model.component.Else; -import org.jboss.tools.overlord.cdl.bpel.model.component.Sequence; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.component.CatchAll; +import org.jboss.savara.tools.bpel.model.component.Else; +import org.jboss.savara.tools.bpel.model.component.Sequence; import junit.framework.TestCase; Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/CatchTest.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/tools/overlord/cdl/bpel/model/component/CatchTest.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/CatchTest.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,11 +15,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; -import org.jboss.tools.overlord.cdl.bpel.model.DefaultBPELLanguageModel; -import org.jboss.tools.overlord.cdl.bpel.model.component.Sequence; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.component.Catch; +import org.jboss.savara.tools.bpel.model.component.Sequence; import junit.framework.TestCase; Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/CompensationHandlerTest.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/tools/overlord/cdl/bpel/model/component/CompensationHandlerTest.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/CompensationHandlerTest.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,11 +15,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; -import org.jboss.tools.overlord.cdl.bpel.model.DefaultBPELLanguageModel; -import org.jboss.tools.overlord.cdl.bpel.model.component.Sequence; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.component.CompensationHandler; +import org.jboss.savara.tools.bpel.model.component.Sequence; import junit.framework.TestCase; Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/ConditionTest.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/tools/overlord/cdl/bpel/model/component/ConditionTest.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/ConditionTest.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,11 +15,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; -import org.jboss.tools.overlord.cdl.bpel.model.DefaultBPELLanguageModel; -import org.jboss.tools.overlord.cdl.bpel.model.component.Condition; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.component.Condition; import junit.framework.TestCase; Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/ElseIfTest.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/tools/overlord/cdl/bpel/model/component/ElseIfTest.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/ElseIfTest.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,12 +15,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; -import org.jboss.tools.overlord.cdl.bpel.model.DefaultBPELLanguageModel; -import org.jboss.tools.overlord.cdl.bpel.model.component.Elseif; -import org.jboss.tools.overlord.cdl.bpel.model.component.Sequence; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.component.Elseif; +import org.jboss.savara.tools.bpel.model.component.Sequence; import junit.framework.TestCase; Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/ElseTest.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/tools/overlord/cdl/bpel/model/component/ElseTest.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/ElseTest.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,12 +15,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; -import org.jboss.tools.overlord.cdl.bpel.model.DefaultBPELLanguageModel; -import org.jboss.tools.overlord.cdl.bpel.model.component.Else; -import org.jboss.tools.overlord.cdl.bpel.model.component.Sequence; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.component.Else; +import org.jboss.savara.tools.bpel.model.component.Sequence; import junit.framework.TestCase; Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/EventHandlersTest.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/tools/overlord/cdl/bpel/model/component/EventHandlersTest.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/EventHandlersTest.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,10 +15,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; -import org.jboss.tools.overlord.cdl.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.component.EventHandlers; +import org.jboss.savara.tools.bpel.model.component.OnAlarm; +import org.jboss.savara.tools.bpel.model.component.OnEvent; import junit.framework.TestCase; Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/ExitTest.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/tools/overlord/cdl/bpel/model/component/ExitTest.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/ExitTest.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,9 +15,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; -import org.jboss.tools.overlord.cdl.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.component.Exit; import junit.framework.TestCase; Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/FaultHandlersTest.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/tools/overlord/cdl/bpel/model/component/FaultHandlersTest.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/FaultHandlersTest.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,10 +15,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; -import org.jboss.tools.overlord.cdl.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.component.Catch; +import org.jboss.savara.tools.bpel.model.component.FaultHandlers; +import org.jboss.savara.tools.bpel.model.component.Sequence; import junit.framework.TestCase; Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/FlowTest.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/tools/overlord/cdl/bpel/model/component/FlowTest.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/FlowTest.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,10 +15,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; -import org.jboss.tools.overlord.cdl.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.component.Flow; +import org.jboss.savara.tools.bpel.model.component.Link; +import org.jboss.savara.tools.bpel.model.component.While; import junit.framework.TestCase; Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/ForEachTest.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/tools/overlord/cdl/bpel/model/component/ForEachTest.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/ForEachTest.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,10 +15,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; -import org.jboss.tools.overlord.cdl.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.component.ForEach; +import org.jboss.savara.tools.bpel.model.component.Scope; import junit.framework.TestCase; Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/IfTest.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/tools/overlord/cdl/bpel/model/component/IfTest.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/IfTest.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,10 +15,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; -import org.jboss.tools.overlord.cdl.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.component.Condition; +import org.jboss.savara.tools.bpel.model.component.Else; +import org.jboss.savara.tools.bpel.model.component.Elseif; +import org.jboss.savara.tools.bpel.model.component.If; +import org.jboss.savara.tools.bpel.model.component.Sequence; import junit.framework.TestCase; Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/InvokeTest.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/tools/overlord/cdl/bpel/model/component/InvokeTest.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/InvokeTest.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,10 +15,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; -import org.jboss.tools.overlord.cdl.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.component.Invoke; import junit.framework.TestCase; Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/OnAlarmTest.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/tools/overlord/cdl/bpel/model/component/OnAlarmTest.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/OnAlarmTest.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,11 +15,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; -import org.jboss.tools.overlord.cdl.bpel.model.DefaultBPELLanguageModel; -import org.jboss.tools.overlord.cdl.bpel.model.component.Sequence; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.component.For; +import org.jboss.savara.tools.bpel.model.component.OnAlarm; +import org.jboss.savara.tools.bpel.model.component.Sequence; +import org.jboss.savara.tools.bpel.model.component.Until; import junit.framework.TestCase; Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/OnEventTest.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/tools/overlord/cdl/bpel/model/component/OnEventTest.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/OnEventTest.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,10 +15,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; -import org.jboss.tools.overlord.cdl.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.component.OnEvent; import junit.framework.TestCase; Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/OnMessageTest.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/tools/overlord/cdl/bpel/model/component/OnMessageTest.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/OnMessageTest.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,11 +15,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; -import org.jboss.tools.overlord.cdl.bpel.model.DefaultBPELLanguageModel; -import org.jboss.tools.overlord.cdl.bpel.model.component.Sequence; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.component.OnMessage; +import org.jboss.savara.tools.bpel.model.component.Sequence; import junit.framework.TestCase; Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/PartnerLinkTest.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/tools/overlord/cdl/bpel/model/component/PartnerLinkTest.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/PartnerLinkTest.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,10 +15,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; -import org.jboss.tools.overlord.cdl.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.component.PartnerLink; import junit.framework.TestCase; Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/PickTest.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/tools/overlord/cdl/bpel/model/component/PickTest.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/PickTest.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,10 +15,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; -import org.jboss.tools.overlord.cdl.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.component.OnAlarm; +import org.jboss.savara.tools.bpel.model.component.OnMessage; +import org.jboss.savara.tools.bpel.model.component.Pick; import junit.framework.TestCase; Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/ProcessTest.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/tools/overlord/cdl/bpel/model/component/ProcessTest.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/ProcessTest.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,10 +15,16 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; -import org.jboss.tools.overlord.cdl.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.component.EventHandlers; +import org.jboss.savara.tools.bpel.model.component.FaultHandlers; +import org.jboss.savara.tools.bpel.model.component.PartnerLink; +import org.jboss.savara.tools.bpel.model.component.Process; +import org.jboss.savara.tools.bpel.model.component.Sequence; +import org.jboss.savara.tools.bpel.model.component.Variable; import junit.framework.TestCase; Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/ReceiveTest.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/tools/overlord/cdl/bpel/model/component/ReceiveTest.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/ReceiveTest.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,10 +15,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; -import org.jboss.tools.overlord.cdl.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.component.Receive; import junit.framework.TestCase; Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/RepeatUntilTest.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/tools/overlord/cdl/bpel/model/component/RepeatUntilTest.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/RepeatUntilTest.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,10 +15,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; -import org.jboss.tools.overlord.cdl.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.component.Condition; +import org.jboss.savara.tools.bpel.model.component.If; +import org.jboss.savara.tools.bpel.model.component.RepeatUntil; +import org.jboss.savara.tools.bpel.model.component.Sequence; import junit.framework.TestCase; Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/ReplyTest.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/tools/overlord/cdl/bpel/model/component/ReplyTest.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/ReplyTest.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,10 +15,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; -import org.jboss.tools.overlord.cdl.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.component.Reply; import junit.framework.TestCase; Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/RethrowTest.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/tools/overlord/cdl/bpel/model/component/RethrowTest.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/RethrowTest.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,9 +15,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; -import org.jboss.tools.overlord.cdl.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.component.Rethrow; import junit.framework.TestCase; Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/ScopeTest.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/tools/overlord/cdl/bpel/model/component/ScopeTest.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/ScopeTest.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,10 +15,18 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; -import org.jboss.tools.overlord.cdl.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.component.CompensationHandler; +import org.jboss.savara.tools.bpel.model.component.EventHandlers; +import org.jboss.savara.tools.bpel.model.component.FaultHandlers; +import org.jboss.savara.tools.bpel.model.component.PartnerLink; +import org.jboss.savara.tools.bpel.model.component.Scope; +import org.jboss.savara.tools.bpel.model.component.Sequence; +import org.jboss.savara.tools.bpel.model.component.TerminationHandler; +import org.jboss.savara.tools.bpel.model.component.Variable; import junit.framework.TestCase; Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/SequenceTest.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/tools/overlord/cdl/bpel/model/component/SequenceTest.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/SequenceTest.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,10 +15,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; -import org.jboss.tools.overlord.cdl.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.component.Sequence; +import org.jboss.savara.tools.bpel.model.component.While; import junit.framework.TestCase; Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/TerminationHandlerTest.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/tools/overlord/cdl/bpel/model/component/TerminationHandlerTest.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/TerminationHandlerTest.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,11 +15,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; -import org.jboss.tools.overlord.cdl.bpel.model.DefaultBPELLanguageModel; -import org.jboss.tools.overlord.cdl.bpel.model.component.Sequence; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.component.Sequence; +import org.jboss.savara.tools.bpel.model.component.TerminationHandler; import junit.framework.TestCase; Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/TestAbstractInteraction.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/tools/overlord/cdl/bpel/model/component/TestAbstractInteraction.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/TestAbstractInteraction.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,11 +15,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; import java.util.List; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.component.AbstractInteraction; +import org.jboss.savara.tools.bpel.model.component.ConversionContext; import org.scribble.model.Activity; import org.w3c.dom.Element; Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/TestBPELActivity.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/tools/overlord/cdl/bpel/model/component/TestBPELActivity.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/TestBPELActivity.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,11 +15,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; import java.util.List; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.component.BPELActivity; +import org.jboss.savara.tools.bpel.model.component.ConversionContext; import org.scribble.model.Activity; import org.w3c.dom.Element; Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/TestBPELElement.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/tools/overlord/cdl/bpel/model/component/TestBPELElement.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/TestBPELElement.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,11 +15,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; import java.util.List; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.component.BPELElement; +import org.jboss.savara.tools.bpel.model.component.ConversionContext; import org.scribble.model.Activity; import org.w3c.dom.Element; Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/ThrowTest.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/tools/overlord/cdl/bpel/model/component/ThrowTest.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/ThrowTest.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,10 +15,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; -import org.jboss.tools.overlord.cdl.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.component.Throw; import junit.framework.TestCase; Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/VariableTest.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/tools/overlord/cdl/bpel/model/component/VariableTest.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/VariableTest.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,10 +15,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; -import org.jboss.tools.overlord.cdl.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.component.Variable; import junit.framework.TestCase; Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/WaitTest.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/tools/overlord/cdl/bpel/model/component/WaitTest.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/WaitTest.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,10 +15,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; -import org.jboss.tools.overlord.cdl.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.component.Condition; +import org.jboss.savara.tools.bpel.model.component.Wait; import junit.framework.TestCase; Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/WhileTest.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/tools/overlord/cdl/bpel/model/component/WhileTest.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/WhileTest.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,10 +15,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.model.component; +package org.jboss.savara.tools.bpel.model.component; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; -import org.jboss.tools.overlord.cdl.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.BPELLanguageModel; +import org.jboss.savara.tools.bpel.model.DefaultBPELLanguageModel; +import org.jboss.savara.tools.bpel.model.component.Condition; +import org.jboss.savara.tools.bpel.model.component.If; +import org.jboss.savara.tools.bpel.model.component.Sequence; +import org.jboss.savara.tools.bpel.model.component.While; import junit.framework.TestCase; Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/util (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/tools/overlord/cdl/bpel/util) Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/util/XMLUtilsTest.java =================================================================== --- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/tools/overlord/cdl/bpel/util/XMLUtilsTest.java 2009-08-18 11:57:46 UTC (rev 764) +++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/util/XMLUtilsTest.java 2009-08-20 09:30:07 UTC (rev 779) @@ -15,8 +15,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.tools.overlord.cdl.bpel.util; +package org.jboss.savara.tools.bpel.util; +import org.jboss.savara.tools.bpel.util.XMLUtils; + import junit.framework.TestCase; public class XMLUtilsTest extends TestCase {

14 years, 8 months

1
0
0 / 0

Overlord SVN: r778 - in cdl/trunk/validator/jbossesb: src/main/java/org/jboss and 4 other directories.

by overlord-commits＠lists.jboss.org

Author: jeff.yuchang Date: 2009-08-20 04:57:33 -0400 (Thu, 20 Aug 2009) New Revision: 778 Added: cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/ cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/ cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/ cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/AbstractServiceValidator.java cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/DefaultValidatorConfig.java cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/ESBUtil.java cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/Endpoint.java cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/ServiceValidator.java cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/ServiceValidatorFactory.java cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/ServiceValidatorManager.java cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/ValidatorConfig.java cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/ValidatorConfigFactory.java cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/ValidatorConfigLoader.java cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/ValidatorFilter.java cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/ValidatorName.java cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/pi4soa/ cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/pi4soa/Pi4SOAServiceRecorder.java cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/pi4soa/Pi4SOAServiceValidator.java cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/pi4soa/Pi4SOAValidatorConfigLoader.java cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/pi4soa/ValidatorConfigGenerator.java Removed: cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/ Modified: cdl/trunk/validator/jbossesb/pom.xml Log: * Update the package name for validator. Modified: cdl/trunk/validator/jbossesb/pom.xml =================================================================== --- cdl/trunk/validator/jbossesb/pom.xml 2009-08-20 07:20:13 UTC (rev 777) +++ cdl/trunk/validator/jbossesb/pom.xml 2009-08-20 08:57:33 UTC (rev 778) @@ -6,7 +6,7 @@ <artifactId>savara-validator-jbossesb</artifactId> <version>1.0-SNAPSHOT</version> <packaging>jar</packaging> - <name>Savara::Validator::JBossESB</name> + <name>Savara::Validator::JBoss ESB</name> <parent> <groupId>org.jboss</groupId> Added: cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/AbstractServiceValidator.java =================================================================== --- cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/AbstractServiceValidator.java (rev 0) +++ cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/AbstractServiceValidator.java 2009-08-20 08:57:33 UTC (rev 778) @@ -0,0 +1,70 @@ +/* + * 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.savara.validator.jbossesb; + +/** + * Abstract base class representing the ServiceValidator. + */ +public abstract class AbstractServiceValidator implements ServiceValidator { + + private static final String MODELS_PATH = "models/"; + + /** + * This is the constructor for the abstract + * service validator, initialised with the validator + * name. + * + * @param name The validator name + */ + public AbstractServiceValidator(ValidatorName name) { + m_name = name; + } + + /** + * This method returns the validator name. + * + * @return The validator name + */ + public ValidatorName getValidatorName() { + return(m_name); + } + + /** + * This method returns the input stream associated + * with the model. Once the input stream has been + * used, it is the caller's responsibility to close + * the stream. + * + * @return The model's input stream, or null if + * not found + */ + protected java.io.InputStream getModel() { + String filePath=MODELS_PATH+getValidatorName().getModelName(); + + java.io.InputStream ret = AbstractServiceValidator.class. + getClassLoader().getResourceAsStream(filePath); + + return(ret); + } + + public String toString() { + return("ServiceValidator["+getValidatorName()+"]"); + } + + private ValidatorName m_name=null; +} Added: cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/DefaultValidatorConfig.java =================================================================== --- cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/DefaultValidatorConfig.java (rev 0) +++ cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/DefaultValidatorConfig.java 2009-08-20 08:57:33 UTC (rev 778) @@ -0,0 +1,63 @@ +/* + * 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.savara.validator.jbossesb; + +import org.jboss.soa.esb.helpers.*; + +/** + * This class represents a default configuration that will be used for + * validation against a stream of ESB based messages. + */ +public class DefaultValidatorConfig implements ValidatorConfig { + + /** + * This is the constructor for the default validator model. + * + * @param modeType The model type + * @param config The configuration + */ + public DefaultValidatorConfig(String modelType, ConfigTree config) { + m_modelType = modelType; + m_configuration = config; + } + + /** + * This method returns the type of the model associated + * with this validator configuration. This will + * general be based on the file extension of the model + * file. + * + * @return The model type + */ + public String getModelType() { + return(m_modelType); + } + + /** + * This method returns the validator configuration + * associated with the model. + * + * @return The validator model + */ + public ConfigTree getConfiguration() { + return(m_configuration); + } + + private String m_modelType=null; + private ConfigTree m_configuration=null; +} Added: cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/ESBUtil.java =================================================================== --- cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/ESBUtil.java (rev 0) +++ cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/ESBUtil.java 2009-08-20 08:57:33 UTC (rev 778) @@ -0,0 +1,82 @@ +/* + * 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.savara.validator.jbossesb; + +import org.apache.log4j.Logger; + +/** + * This class provides utility functions for processing + * ESB messages. + */ +public class ESBUtil { + + /** + * This method returns the message content associated + * with the supplied JBoss ESB message. + * + * @param message The esb message + * @return The message content + */ + public static java.io.Serializable getMessage( + org.jboss.soa.esb.message.Message message) { + java.io.Serializable ret=null; + + ret = (java.io.Serializable)message.getBody().get(); + + // Check if should return a multipart message + if (ret == null) { + + // Check if single or multipart message + if (message.getBody().getNames() != null && + message.getBody().getNames().length == 1) { + + Object mesg=message.getBody().get(message.getBody().getNames()[0]); + + if (logger.isDebugEnabled()) { + logger.debug("MESSAGE("+ + message.getBody().getNames()[0]+")="+mesg); + } + + if (mesg instanceof java.io.Serializable) { + ret = (java.io.Serializable)mesg; + } + + } else if (message.getBody().getNames() != null && + message.getBody().getNames().length > 1) { + + java.util.Hashtable<String,Object> multipart= + new java.util.Hashtable<String,Object>(); + + for (int i=0; i < message.getBody().getNames().length; i++) { + multipart.put(message.getBody().getNames()[i], + message.getBody().get(message.getBody().getNames()[i])); + } + + ret = multipart; + } + } + + if (ret instanceof byte[]) { + ret = new String((byte[])ret); + } + + return(ret); + } + + private static Logger logger = Logger.getLogger(ESBUtil.class); +} Added: cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/Endpoint.java =================================================================== --- cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/Endpoint.java (rev 0) +++ cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/Endpoint.java 2009-08-20 08:57:33 UTC (rev 778) @@ -0,0 +1,87 @@ +/* + * 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.savara.validator.jbossesb; + +/** + * This class represents an endpoint being monitored by one + * or more service validator. + */ +public class Endpoint { + + /** + * This is the constructor for the endpoint, supplying + * the destination associated with the endpoint. + * + * @param destination The destination + */ + public Endpoint(String destination) { + m_destination = destination; + } + + /** + * This method returns the destination for the endpoint. + * + * @return The destination + */ + public String getDestination() { + return(m_destination); + } + + /** + * This method returns the list of service validators + * associated with this endpoint. + * + * @return The list of service validators for this endpoint + */ + public java.util.List<ServiceValidator> getServiceValidators() { + return(m_validators); + } + + public boolean equals(Object obj) { + boolean ret=false; + + if (obj instanceof Endpoint) { + Endpoint ep=(Endpoint)obj; + + if (ep.getDestination() != null && + ep.getDestination().equals(m_destination)) { + ret = true; + } + } + + return(ret); + } + + public int hashCode() { + int ret=0; + + if (m_destination != null) { + ret = m_destination.hashCode(); + } + + return(ret); + } + + public String toString() { + return("Endpoint["+m_destination+"]"); + } + + private String m_destination=null; + private java.util.List<ServiceValidator> m_validators= + new java.util.Vector<ServiceValidator>(); +} Added: cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/ServiceValidator.java =================================================================== --- cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/ServiceValidator.java (rev 0) +++ cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/ServiceValidator.java 2009-08-20 08:57:33 UTC (rev 778) @@ -0,0 +1,68 @@ +/* + * 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.savara.validator.jbossesb; + +import org.jboss.soa.esb.message.Message; + +/** + * This interface represents a service validator responsible for + * validing a stream of ESB messages against a model. + */ +public interface ServiceValidator { + + /** + * This method returns the validator name. + * + * @return The validator name + */ + public ValidatorName getValidatorName(); + + /** + * This method processes a sent message against a service + * behavioural description. + * + * @param msg The message + * @throws Exception Failed to process sent message + */ + public void messageSent(Message msg) throws Exception; + + /** + * This method processes a received message against a service + * behavioural description. + * + * @param msg The message + * @throws Exception Failed to process received message + */ + public void messageReceived(Message msg) throws Exception; + + /** + * This method is called to update the model associated + * with the service validator. + * + * @throws Exception Failed to update the service validator + */ + public void update() throws Exception; + + /** + * This method closes the service validator. + * + * @throws Exception Failed to close the service validator + */ + public void close() throws Exception; + +} Added: cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/ServiceValidatorFactory.java =================================================================== --- cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/ServiceValidatorFactory.java (rev 0) +++ cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/ServiceValidatorFactory.java 2009-08-20 08:57:33 UTC (rev 778) @@ -0,0 +1,71 @@ +/* + * 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.savara.validator.jbossesb; + +import java.lang.reflect.Constructor; +import org.apache.log4j.Logger; + +/** + * This class provides a factory for Service Validators. + */ +public class ServiceValidatorFactory { + + /** + * This method returns the Service Validator appropriate + * for the supplied validator name. + * + * @param name The validator name + * @return The service validator + * @exception IOException Failed to create the service validator + */ + public static ServiceValidator getServiceValidator(ValidatorName name) + throws Exception { + ServiceValidator ret=null; + + String modelType=name.getModelType(); + + if (modelType != null && + m_validatorClasses.containsKey(modelType)) { + Class<?> cls=m_validatorClasses.get(modelType); + + Constructor<?> con=cls.getConstructor( + new Class[]{ValidatorName.class}); + + ret = (ServiceValidator)con.newInstance(new Object[]{name}); + } + + if (logger.isDebugEnabled()) { + logger.debug("Returning service validator for "+ + name+": "+ret); + } + + return(ret); + } + + private static final Logger logger = Logger.getLogger(ServiceValidatorFactory.class); + + private static java.util.Map<String,Class<?>> m_validatorClasses= + new java.util.HashMap<String,Class<?>>(); + + static { + m_validatorClasses.put(org.jboss.savara.validator.jbossesb.pi4soa.Pi4SOAServiceRecorder.getModelType(), + org.jboss.savara.validator.jbossesb.pi4soa.Pi4SOAServiceRecorder.class); + m_validatorClasses.put(org.jboss.savara.validator.jbossesb.pi4soa.Pi4SOAServiceValidator.getModelType(), + org.jboss.savara.validator.jbossesb.pi4soa.Pi4SOAServiceValidator.class); + } +} Added: cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/ServiceValidatorManager.java =================================================================== --- cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/ServiceValidatorManager.java (rev 0) +++ cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/ServiceValidatorManager.java 2009-08-20 08:57:33 UTC (rev 778) @@ -0,0 +1,966 @@ +/* + * 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.savara.validator.jbossesb; + +import org.apache.log4j.Logger; + +import org.jboss.soa.esb.helpers.ConfigTree; + +/** + * This class is responsible for managing the active + * service validators, the mapping of endpoints to the service + * validators and updating the configuration when changes + * are detected. + */ +public class ServiceValidatorManager { + + /** + * Default constructor for the service validator manager. + */ + private ServiceValidatorManager() { + initialize(); + } + + /** + * This method returns the singleton ValidatorConfigurationManager. + * + * @return The singleton + */ + public synchronized static ServiceValidatorManager instance() { + if (m_instance == null) { + m_instance = new ServiceValidatorManager(); + } + + return(m_instance); + } + + /** + * This method initializes the service validator manager on + * startup. + */ + protected void initialize() { + + java.net.URL url= + ValidatorFilter.class.getClassLoader().getResource(CONFIG_FILE); + + if (url != null) { + m_validatorConfigFile = new java.io.File(url.getFile()); + + java.io.File[] files=m_validatorConfigFile.getParentFile().listFiles(); + + for (int i=0; m_modelsDir == null && i < files.length; i++) { + if (files[i].getName().equals("models") && + files[i].isDirectory()) { + m_modelsDir = files[i]; + } + } + + if (m_modelsDir != null) { + ValidatorConfigChangeMonitor mon= + new ValidatorConfigChangeMonitor(); + + new Thread(mon).start(); + } + } + } + + /** + * This method returns the list of service validators associated + * with the supplied input endpoint. + * + * @param endpoint The input endpoint + * @return The list of service validators, or null if the endpoint + * is unknown + */ + public java.util.List<ServiceValidator> getInputServiceValidators(Endpoint endpoint) { + java.util.List<ServiceValidator> ret= + m_inputValidators.get(endpoint); + + if (ret == null) { + ret = m_replyToManager.getInputServiceValidators(endpoint); + } + + if (logger.isDebugEnabled()) { + logger.debug("Return input validators '"+endpoint+"': "+ret); + } + + return(ret); + } + + /** + * This method determines whether the supplied endpoint will be + * associated with a dynamic reply-to endpoint. + * + * @param endpoint The endpoint + * @return Whether the endpoint has a dynamic reply-to + */ + public boolean isInputDynamicReplyTo(Endpoint endpoint) { + boolean ret=m_inputDynaReplyTos.contains(endpoint); + + if (logger.isDebugEnabled()) { + logger.debug("Is input endpoint '"+endpoint+ + "' a dynamic reply-to: "+ret); + } + + return(ret); + } + + /** + * This method returns the list of service validators associated + * with the supplied output endpoint. + * + * @param endpoint The output endpoint + * @return The list of service validators, or null if the endpoint + * is unknown + */ + public java.util.List<ServiceValidator> getOutputServiceValidators(Endpoint endpoint) { + java.util.List<ServiceValidator> ret= + m_outputValidators.get(endpoint); + + if (ret == null) { + ret = m_replyToManager.getOutputServiceValidators(endpoint); + } + + if (logger.isDebugEnabled()) { + logger.debug("Return output validators '"+endpoint+"': "+ret); + } + + return(ret); + } + + /** + * This method determines whether the supplied endpoint will be + * associated with a dynamic reply-to endpoint. + * + * @param endpoint The endpoint + * @return Whether the endpoint has a dynamic reply-to + */ + public boolean isOutputDynamicReplyTo(Endpoint endpoint) { + boolean ret=m_outputDynaReplyTos.contains(endpoint); + + if (logger.isDebugEnabled()) { + logger.debug("Is output endpoint '"+endpoint+ + "' a dynamic reply-to: "+ret); + } + + return(ret); + } + + /** + * This method registers a list of service validators against + * a dynamic 'reply-to' endpoint. + * + * @param endpoint The endpoint + * @param validators The list of service validators + */ + public void registerInputReplyToValidators(Endpoint endpoint, + java.util.List<ServiceValidator> validators) { + + if (logger.isDebugEnabled()) { + logger.debug("Register input reply-to '"+endpoint+"': "+validators); + } + + m_replyToManager.registerInputDynamicReplyTo(endpoint, validators); + } + + /** + * This method registers a list of service validators against + * a dynamic 'reply-to' endpoint. + * + * @param endpoint The endpoint + * @param validators The list of service validators + */ + public void registerOutputReplyToValidators(Endpoint endpoint, + java.util.List<ServiceValidator> validators) { + if (logger.isDebugEnabled()) { + logger.debug("Register output reply-to '"+endpoint+"': "+validators); + } + + m_replyToManager.registerOutputDynamicReplyTo(endpoint, validators); + } + + /** + * This method returns a ServiceValidator associated with the + * supplied validator name. + * + * @param name The validator name + * @return The service validator + * @throws Exception Failed to create service validator + */ + public ServiceValidator createServiceValidator(ValidatorName name) + throws Exception { + ServiceValidator ret=null; + + synchronized(m_serviceValidators) { + ret = m_serviceValidators.get(name); + + // If does not exist, then create, else update + // the existing service validator + if (ret == null) { + ret = ServiceValidatorFactory.getServiceValidator(name); + + m_serviceValidators.put(name, ret); + } else { + + // Update the description + ret.update(); + } + } + + if (logger.isDebugEnabled()) { + logger.debug("Created Service Validator '"+name+"': "+ret); + } + + return(ret); + } + + /** + * This method removes the service validator associated with + * the supplied validator name. + * + * @param name The validator name + * @throws Exception Failed to remove the service validator + */ + protected void removeServiceValidator(ValidatorName name) + throws Exception { + synchronized(m_serviceValidators) { + ServiceValidator validator=(ServiceValidator) + m_serviceValidators.remove(name); + + // Check if validator should be removed from + // input/output endpoint mappings + java.util.Iterator<Endpoint> iter=m_inputValidators.keySet().iterator(); + + while (iter.hasNext()) { + Endpoint ep=iter.next(); + java.util.List<ServiceValidator> list= + m_inputValidators.get(ep); + + if (list.contains(validator)) { + list.remove(validator); + + if (list.size() == 0) { + logger.error("Input validator list, associated with endpoint '"+ + ep+"' contains no entries after removal of validator '"+ + name+"' - this Endpoint should have previously been removed"); + } + } + } + + iter=m_outputValidators.keySet().iterator(); + + while (iter.hasNext()) { + Endpoint ep=iter.next(); + java.util.List<ServiceValidator> list= + m_outputValidators.get(ep); + + if (list.contains(validator)) { + list.remove(validator); + + if (list.size() == 0) { + logger.error("Output validator list, associated with endpoint '"+ + ep+"' contains no entries after removal of validator '"+ + name+"' - this Endpoint should have previously been removed"); + } + } + } + + if (validator != null) { + validator.close(); + } + } + } + + /** + * This method returns the set of currently configured + * service validator names. + * + * @return The set of validator names + */ + protected java.util.Set<ValidatorName> getServiceValidatorNames() { + java.util.Set<ValidatorName> ret=new java.util.HashSet<ValidatorName>(); + + ret.addAll(m_serviceValidators.keySet()); + + return(ret); + } + + /** + * This method updates the configuration of the service + * validators and endpoint mappings. + */ + protected void updateConfigurations() { + java.util.Set<ValidatorName> existingValidatorNames= + getServiceValidatorNames(); + + java.util.Set<Endpoint> existingInputEndpoints= + new java.util.HashSet<Endpoint>(m_inputValidators.keySet()); + + java.util.Set<Endpoint> existingOutputEndpoints= + new java.util.HashSet<Endpoint>(m_outputValidators.keySet()); + + java.util.Set<Endpoint> existingInputDynaReplyTos= + new java.util.HashSet<Endpoint>(m_inputDynaReplyTos); + + java.util.Set<Endpoint> existingOutputDynaReplyTos= + new java.util.HashSet<Endpoint>(m_outputDynaReplyTos); + + java.io.InputStream is=ValidatorFilter.class.getClassLoader(). + getResourceAsStream(CONFIG_FILE); + + if (logger.isDebugEnabled()) { + logger.debug("ValidationFilter: config="+CONFIG_FILE+" is="+is); + } + + try { + ConfigTree config=ConfigTree.fromInputStream(is); + + if (config.getName().equals(VALIDATOR_NODE)) { + // Old 'active' attribute is now 'mode' + String active=config.getAttribute(ACTIVE_ATTR); + + if (active != null && active.equalsIgnoreCase("true")) { + m_managedMode = true; + } + + String mode=config.getAttribute(MODE_ATTR); + + if (mode != null) { + if (mode.equals("manage")) { + m_managedMode = true; + } else if (mode.equals("monitor")) { + m_managedMode = false; // will override active=true + } else { + logger.error("Unknown mode '"+mode+"' - setting to 'monitor'"); + m_managedMode = false; + } + } + + if (m_managedMode) { + logger.debug("Setting validators in 'manage' mode"); + } else { + logger.debug("Setting validators in 'monitor' mode"); + } + + // Check for dynamic replyTo endpoint timeout + String timeoutValue=config.getAttribute(REPLY_TO_TIMEOUT_ATTR); + + if (timeoutValue != null) { + try { + long tv=Long.parseLong(timeoutValue); + + m_replyToManager.setReplyToTimeout(tv); + } catch(Exception e) { + logger.error("Unable to set 'reply to' timeout", e); + } + } + } + + updateConfiguration(config, existingValidatorNames, + existingInputEndpoints, existingOutputEndpoints, + existingInputDynaReplyTos, existingOutputDynaReplyTos); + + // Work through choreography files in the models directory + java.io.File[] files=m_modelsDir.listFiles(); + + for (int i=0; i < files.length; i++) { + + // Check if a ValidatorModel exists for the + // file + try { + ValidatorConfig vm= + ValidatorConfigFactory.getValidatorConfig(files[i]); + + if (vm != null) { + ConfigTree vConfig=vm.getConfiguration(); + + if (vConfig != null) { + updateConfiguration(vConfig, + existingValidatorNames, + existingInputEndpoints, + existingOutputEndpoints, + existingInputDynaReplyTos, + existingOutputDynaReplyTos); + } else { + logger.error("Failed to obtain configuration for model '"+ + files[i].getName()+"'"); + } + } + } catch(Exception e) { + logger.error("Failed to update configuration for model '"+ + files[i].getName()+"'", e); + } + } + + // Any remaining input keys need to be removed + java.util.Iterator<Endpoint> iter= + existingInputEndpoints.iterator(); + + while (iter.hasNext()) { + Endpoint key=iter.next(); + m_inputValidators.remove(key); + } + + iter = existingInputDynaReplyTos.iterator(); + + while (iter.hasNext()) { + Endpoint key=iter.next(); + m_inputDynaReplyTos.remove(key); + } + + // Any remaining output keys need to be removed + iter = existingOutputEndpoints.iterator(); + + while (iter.hasNext()) { + Endpoint key=iter.next(); + m_outputValidators.remove(key); + } + + iter = existingOutputDynaReplyTos.iterator(); + + while (iter.hasNext()) { + Endpoint key=iter.next(); + m_outputDynaReplyTos.remove(key); + } + + // Any remaining service description names need to + // have their associated monitors removed + java.util.Iterator<ValidatorName> sviter= + existingValidatorNames.iterator(); + + while (sviter.hasNext()) { + ValidatorName svkey=sviter.next(); + + try { + logger.debug("Removing service validator: "+svkey); + removeServiceValidator(svkey); + } catch(Exception e) { + logger.error( + "Failed to remove service validator: "+svkey, e); + } + } + } catch(Exception e) { + logger.error("Failed to update configuration from input stream", e); + } + } + + /** + * This method performs the update of the configuration of + * service monitors, based on the information in the validator + * configuration XML file, and the choreographies defined in the + * models folder. + * + * @param config The configuration + * @param existingValidatorNames The list of validator names + * @param existingInputEndpoints The list of input endpoints + * @param existingOutputEndpoints The list of output endpoints + * @param existingInputDynaReplyTos The set of input dynamic replyTo endpoints + * @param existingOutputDynaReplyTos The set of output dynamic replyTo endpoints + */ + protected void updateConfiguration(ConfigTree config, + java.util.Set<ValidatorName> existingValidatorNames, + java.util.Set<Endpoint> existingInputEndpoints, + java.util.Set<Endpoint> existingOutputEndpoints, + java.util.Set<Endpoint> existingInputDynaReplyTos, + java.util.Set<Endpoint> existingOutputDynaReplyTos) { + logger.debug("Update Service Validator Configuration"); + + if (config != null) { + try { + if (config.getName().equals(VALIDATOR_NODE)) { + String active=config.getAttribute(ACTIVE_ATTR); + + if (active != null && active.equalsIgnoreCase("true")) { + + logger.debug("Setting validator into active mode"); + m_managedMode = true; + } + } + + ConfigTree[] services=config.getChildren(SERVICE_NODE); + + if (logger.isDebugEnabled()) { + if (services != null) { + logger.debug("ValidationFilter: services="+services.length); + } else { + logger.debug("ValidationFilter: services null"); + } + } + + for (int i=0; i < services.length; i++) { + ServiceValidator sm=null; + + // Create service monitor for service + String modelName= + services[i].getAttribute(MODEL_ATTR); + String role= + services[i].getAttribute(ROLE_ATTR); + boolean validate= + services[i].getBooleanAttribute(VALIDATE_ATTR, true); + + // Check for old attribute names, for + // backward compatibility - only support + // for a limited time + if (role == null) { + role = services[i].getAttribute("participantType"); + } + + if (modelName == null) { + modelName = services[i].getAttribute("cdmFilePath"); + + if (modelName != null) { + // Remove path + int pos=modelName.lastIndexOf('/'); + if (pos != -1) { + modelName = modelName.substring(pos+1); + } + } + } + + if (logger.isDebugEnabled()) { + logger.debug("Initialize service validator for: model="+ + modelName+" role="+role+" validate="+validate); + } + + if (role != null) { + + if (modelName != null || + validate == false) { + ValidatorName name=null; + + if (validate) { + name = new ValidatorName(modelName, role); + } else { + name = new ValidatorName(role); + + } + + try { + // Obtain the service container + sm = createServiceValidator(name); + + if (logger.isDebugEnabled()) { + logger.debug("Service validator for '"+modelName+ + "' and role '"+role+"' = "+sm); + } + + // Remove validator name from list + existingValidatorNames.remove(sm.getValidatorName()); + } catch(Exception e) { + logger.error( + "Failed to create service validator '"+ + name+"'", e); + } + } else { + logger.error("Model name must be specified in validation mode"); + } + } else { + logger.error("Role must be specified"); + } + + if (sm != null) { + // Map inputs to service + ConfigTree[] inputs=services[i].getChildren(INPUT_NODE); + + for (int j=0; j < inputs.length; j++) { + String epr=inputs[j].getAttribute(EPR_ATTR); + + if (epr != null) { + Endpoint endpoint=new Endpoint(epr); + + if (logger.isDebugEnabled()) { + logger.debug("Storing input endpoint '"+ + endpoint+"' against validator: "+sm); + } + + // Check if existing list + java.util.List<ServiceValidator> svs= + m_inputValidators.get(endpoint); + + if (svs == null) { + svs = new java.util.Vector<ServiceValidator>(); + m_inputValidators.put(endpoint, svs); + } + + if (svs.contains(sm) == false) { + svs.add(sm); + } + + existingInputEndpoints.remove(endpoint); + + // Check if dynamic replyTo + if (inputs[j].getAttribute(DYNAMIC_REPLY_TO_ATTR, + "false").equalsIgnoreCase("true")) { + + if (logger.isDebugEnabled()) { + logger.debug("Input endpoint '"+ + endpoint+"' has dynamic replyTo destination"); + } + + m_inputDynaReplyTos.add(endpoint); + + existingInputDynaReplyTos.remove(endpoint); + } + } + } + + // Map outputs to service + ConfigTree[] outputs=services[i].getChildren(OUTPUT_NODE); + + for (int j=0; j < outputs.length; j++) { + String epr=outputs[j].getAttribute(EPR_ATTR); + + if (epr != null) { + Endpoint endpoint=new Endpoint(epr); + + if (logger.isDebugEnabled()) { + logger.debug("Storing output endpoint '"+ + endpoint+"' against validator: "+sm); + } + + // Check if existing list + java.util.List<ServiceValidator> svs= + m_outputValidators.get(endpoint); + + if (svs == null) { + svs = new java.util.Vector<ServiceValidator>(); + m_outputValidators.put(endpoint, svs); + } + + if (svs.contains(sm) == false) { + svs.add(sm); + } + + existingOutputEndpoints.remove(endpoint); + + // Check if dynamic replyTo + if (outputs[j].getAttribute(DYNAMIC_REPLY_TO_ATTR, + "false").equalsIgnoreCase("true")) { + + if (logger.isDebugEnabled()) { + logger.debug("Output endpoint '"+ + endpoint+"' has dynamic replyTo destination"); + } + + m_outputDynaReplyTos.add(endpoint); + + existingOutputDynaReplyTos.remove(endpoint); + } + } + } + } + } + } catch(Exception e) { + logger.error("Failed to load validator config", e); + } + } + } + + /** + * This method returns whether the service validator configuration + * is in 'manage' mode. If yes, then invalid messages will + * be blocked from being delivered to their destination. + * + * @return Whether the service validator is in 'manage' mode + */ + public boolean isManagedMode() { + return(m_managedMode); + } + + private static final Logger logger = Logger.getLogger(ServiceValidatorManager.class); + + private static final String EPR_ATTR = "epr"; + private static final String DYNAMIC_REPLY_TO_ATTR = "dynamicReplyTo"; + + private static final String OUTPUT_NODE = "output"; + private static final String INPUT_NODE = "input"; + private static final String SERVICE_NODE = "service"; + private static final String ACTIVE_ATTR = "active"; + private static final String MODE_ATTR = "mode"; + private static final String REPLY_TO_TIMEOUT_ATTR = "replyToTimeout"; + private static final String VALIDATOR_NODE = "validator"; + + private static final String CONFIG_FILE = "validator-config.xml"; + private static final String MODEL_ATTR="model"; + private static final String ROLE_ATTR="role"; + private static final String VALIDATE_ATTR="validate"; + + private static ServiceValidatorManager m_instance=null; + private java.io.File m_validatorConfigFile=null; + private java.io.File m_modelsDir=null; + private java.util.Map<ValidatorName,ServiceValidator> m_serviceValidators= + new java.util.HashMap<ValidatorName,ServiceValidator>(); + private java.util.Map<Endpoint,java.util.List<ServiceValidator>> m_inputValidators=new java.util.Hashtable<Endpoint,java.util.List<ServiceValidator>>(); + private java.util.Map<Endpoint,java.util.List<ServiceValidator>> m_outputValidators=new java.util.Hashtable<Endpoint,java.util.List<ServiceValidator>>(); + private java.util.Set<Endpoint> m_inputDynaReplyTos=new java.util.HashSet<Endpoint>(); + private java.util.Set<Endpoint> m_outputDynaReplyTos=new java.util.HashSet<Endpoint>(); + private boolean m_managedMode=false; + private DynamicReplyToEndpointManager m_replyToManager=new DynamicReplyToEndpointManager(); + + /** + * This class is responsible for monitoring the models folder, + * within the overlord validator ESB bundle, to determine when + * the configuration has changed. + */ + public class ValidatorConfigChangeMonitor implements java.lang.Runnable { + + public ValidatorConfigChangeMonitor() { + // Do initial check for updates, so monitors + // initialized before returning from construct, + // as remainder of checks will be in a separate + // thread - so we need to ensure that the monitors + // are configured before the first message is + // passed through the filter. + checkForUpdates(); + } + + public void run() { + + while (true) { + checkForUpdates(); + + try { + synchronized(ValidatorConfigChangeMonitor.this) { + wait(30000); + } + } catch(Exception e) { + e.printStackTrace(); + } + } + } + + protected void checkForUpdates() { + logger.debug("Checking for config updates"); + + // Get last update time + long lastUpdate=getLastUpdate(); + + if (lastUpdate > m_lastUpdate) { + + updateConfigurations(); + + m_lastUpdate = lastUpdate; + } + } + + protected long getLastUpdate() { + long ret=0; + + if (m_validatorConfigFile != null) { + ret = m_validatorConfigFile.lastModified(); + } + + if (m_modelsDir != null) { + java.io.File[] files=m_modelsDir.listFiles(); + + for (int i=0; i < files.length; i++) { + if (files[i].getName().endsWith(".cdm") && + ret < files[i].lastModified()) { + ret = files[i].lastModified(); + } + } + + if (ret < m_modelsDir.lastModified()) { + ret = m_modelsDir.lastModified(); + } + } + + return(ret); + } + + private long m_lastUpdate=0; + } + + public class DynamicReplyToEndpointManager extends Thread { + + /** + * The default constructor + */ + public DynamicReplyToEndpointManager() { + setDaemon(true); + + start(); + } + + /** + * The run method is responsible for ensuring the dynamic + * 'reply-to' endpoints are cleaned up periodically. + */ + public void run() { + + while(true) { + + try { + synchronized(this) { + wait(m_replyToTimeout); + } + } catch(Exception e) { + logger.error("Failed to wait"); + } + + // Shift main entries to an emptied 'pending delete' + // map + synchronized(m_inputs) { + if (logger.isDebugEnabled()) { + java.util.Iterator<Endpoint> iter= + m_inputsPendingDelete.keySet().iterator(); + while (iter.hasNext()) { + Endpoint endpoint=iter.next(); + java.util.List<ServiceValidator> validators= + m_inputsPendingDelete.get(endpoint); + logger.debug("Deleting input (reply-to) validators '"+ + endpoint+"': "+validators); + } + } + + m_inputsPendingDelete.clear(); + m_inputsPendingDelete.putAll(m_inputs); + m_inputs.clear(); + } + + synchronized(m_outputs) { + if (logger.isDebugEnabled()) { + java.util.Iterator<Endpoint> iter= + m_outputsPendingDelete.keySet().iterator(); + while (iter.hasNext()) { + Endpoint endpoint=iter.next(); + java.util.List<ServiceValidator> validators= + m_outputsPendingDelete.get(endpoint); + logger.debug("Deleting output (reply-to) validators '"+ + endpoint+"': "+validators); + } + } + + m_outputsPendingDelete.clear(); + m_outputsPendingDelete.putAll(m_outputs); + m_outputs.clear(); + } + } + } + + /** + * This method returns the list of service validators + * associated with the dynamic reply-to endpoint. + * + * @param endpoint The input endpoint + * @return The list of service validators, or null if + * not found + */ + public java.util.List<ServiceValidator> getInputServiceValidators(Endpoint endpoint) { + java.util.List<ServiceValidator> ret=null; + + synchronized(m_inputs) { + ret = m_inputs.get(endpoint); + + if (ret == null) { + ret = m_inputsPendingDelete.get(endpoint); + } + } + + if (logger.isDebugEnabled()) { + logger.debug("Return input (reply-to) validators '"+endpoint+"': "+ret); + } + + return(ret); + } + + /** + * This method returns the list of service validators + * associated with the dynamic reply-to endpoint. + * + * @param endpoint The output endpoint + * @return The list of service validators, or null if + * not found + */ + public java.util.List<ServiceValidator> getOutputServiceValidators(Endpoint endpoint) { + java.util.List<ServiceValidator> ret=null; + + synchronized(m_outputs) { + ret = m_outputs.get(endpoint); + + if (ret == null) { + ret = m_outputsPendingDelete.get(endpoint); + } + } + + if (logger.isDebugEnabled()) { + logger.debug("Return output (reply-to) validators '"+endpoint+"': "+ret); + } + + return(ret); + } + + /** + * This method registers a list of service validators against + * a dynamic 'reply-to' endpoint. + * + * @param endpoint The endpoint + * @param validators The list of service validators + */ + public void registerInputDynamicReplyTo(Endpoint endpoint, + java.util.List<ServiceValidator> validators) { + + synchronized(m_inputs) { + m_inputs.put(endpoint, validators); + + // May not be necessary, as entry would not be + // used - but could save memory? + m_inputsPendingDelete.remove(endpoint); + } + } + + /** + * This method registers a list of service validators against + * a dynamic 'reply-to' endpoint. + * + * @param endpoint The endpoint + * @param validators The list of service validators + */ + public void registerOutputDynamicReplyTo(Endpoint endpoint, + java.util.List<ServiceValidator> validators) { + + synchronized(m_outputs) { + m_outputs.put(endpoint, validators); + + // May not be necessary, as entry would not be + // used - but could save memory? + m_outputsPendingDelete.remove(endpoint); + } + } + + /** + * This method sets the timeout period for purging the + * cache of reply-to endpoints. + * + * @param timeoutValue The timeout value + */ + public void setReplyToTimeout(long timeoutValue) { + m_replyToTimeout = timeoutValue; + } + + private java.util.Map<Endpoint,java.util.List<ServiceValidator>> m_inputs= + new java.util.HashMap<Endpoint,java.util.List<ServiceValidator>>(); + private java.util.Map<Endpoint,java.util.List<ServiceValidator>> m_outputs= + new java.util.HashMap<Endpoint,java.util.List<ServiceValidator>>(); + private java.util.Map<Endpoint,java.util.List<ServiceValidator>> m_inputsPendingDelete= + new java.util.HashMap<Endpoint,java.util.List<ServiceValidator>>(); + private java.util.Map<Endpoint,java.util.List<ServiceValidator>> m_outputsPendingDelete= + new java.util.HashMap<Endpoint,java.util.List<ServiceValidator>>(); + private long m_replyToTimeout=10000; + } +} Added: cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/ValidatorConfig.java =================================================================== --- cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/ValidatorConfig.java (rev 0) +++ cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/ValidatorConfig.java 2009-08-20 08:57:33 UTC (rev 778) @@ -0,0 +1,46 @@ +/* + * 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.savara.validator.jbossesb; + +import org.jboss.soa.esb.helpers.*; + +/** + * This interface represents a configuration that will be used for + * validation against a stream of ESB based messages. + */ +public interface ValidatorConfig { + + /** + * This method returns the type of the model associated + * with this validator configuration. This will + * general be based on the file extension of the model + * file. + * + * @return The model type + */ + public String getModelType(); + + /** + * This method returns the validator configuration + * associated with the model. + * + * @return The validator model + */ + public ConfigTree getConfiguration(); + +} Added: cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/ValidatorConfigFactory.java =================================================================== --- cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/ValidatorConfigFactory.java (rev 0) +++ cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/ValidatorConfigFactory.java 2009-08-20 08:57:33 UTC (rev 778) @@ -0,0 +1,97 @@ +/* + * 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.savara.validator.jbossesb; + +import org.apache.log4j.Logger; + +/** + * This class provides a factory for ValidatorConfig objects + * based on supplied model file details. + */ +public class ValidatorConfigFactory { + + /** + * This method retrieves a validator config associated with + * the supplied file. If the model associated with the + * file is not supported, then a null will be returned. + * + * @param file The file containing the model + * @return The validator config, or null if an unsupported type + * @exception IOException Failed to load supported model type + */ + public static ValidatorConfig getValidatorConfig(java.io.File file) + throws java.io.IOException { + ValidatorConfig ret=null; + + String modelType=null; + + if (file != null && (modelType=getModelType(file.getName())) != null) { + ValidatorConfigLoader loader=null; + + for (int i=0; loader == null && + i < m_loaders.size(); i++) { + + if (m_loaders.get(i).isSupported(modelType)) { + loader = m_loaders.get(i); + } + } + + if (loader != null) { + java.io.FileInputStream fis=new java.io.FileInputStream(file); + + ret = loader.loadValidatorConfig(fis, file.getName()); + + fis.close(); + } + } + + if (logger.isDebugEnabled()) { + logger.debug("Returning validator config for "+ + file.getName()+": "+ret); + } + + return(ret); + } + + /** + * This method determines the model type associated with the + * supplied model filename. + * + * @param name The model filename + * @return The model type, or null if not known + */ + protected static String getModelType(String name) { + String ret=null; + int pos=name.lastIndexOf('.'); + + if (pos != -1) { + ret = name.substring(pos+1); + } + + return(ret); + } + + private static final Logger logger = Logger.getLogger(ValidatorConfigFactory.class); + + private static java.util.List<ValidatorConfigLoader> m_loaders= + new java.util.Vector<ValidatorConfigLoader>(); + + static { + m_loaders.add(new org.jboss.savara.validator.jbossesb.pi4soa.Pi4SOAValidatorConfigLoader()); + } +} Added: cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/ValidatorConfigLoader.java =================================================================== --- cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/ValidatorConfigLoader.java (rev 0) +++ cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/ValidatorConfigLoader.java 2009-08-20 08:57:33 UTC (rev 778) @@ -0,0 +1,48 @@ +/* + * 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.savara.validator.jbossesb; + +/** + * This interface is implemented by model specific loaders, to + * load a ValidatorConfig for the particular model type. + */ +public interface ValidatorConfigLoader { + + /** + * This method determines if the validator config loader + * implementation supports the supplied model type. + * + * @param modelType The model type + * @return Whether the loader supports the model type + */ + public boolean isSupported(String modelType); + + /** + * This method loads the validator config, contained within + * the supplied input stream representing a model of the + * supported type. + * + * @param is The input stream + * @param modelPath The path to the model file + * @return The validator config + * @throws java.io.IOException Failed to load validator config + */ + public ValidatorConfig loadValidatorConfig(java.io.InputStream is, + String modelPath) throws java.io.IOException; + +} Added: cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/ValidatorFilter.java =================================================================== --- cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/ValidatorFilter.java (rev 0) +++ cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/ValidatorFilter.java 2009-08-20 08:57:33 UTC (rev 778) @@ -0,0 +1,250 @@ +/* + * 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.savara.validator.jbossesb; + +import org.apache.log4j.Logger; + +import org.jboss.soa.esb.message.*; +import org.jboss.soa.esb.couriers.*; + +/** + * This class represents the filter used to intercept ESB + * messages an apply them to relevant Service Validators. + */ +public class ValidatorFilter extends org.jboss.soa.esb.filter.InputOutputFilter { + + private static final String TOPIC_PREFIX = "topic/"; + private static final String QUEUE_PREFIX = "queue/"; + private static final String JMS_PROTOCOL_PREFIX = "jms:"; + + /** + * The default constructor. + */ + public ValidatorFilter() { + } + + /** + * This method is invoked when a message is sent by an + * ESB service. + * + * @param msg The ESB message + * @param params The parameters + * @throws CourierException Failed to validate message + */ + public Message onOutput(Message msg, java.util.Map params) + throws CourierException { + + Endpoint endpoint=getEndpoint(msg); + + if (endpoint != null) { + java.util.List<ServiceValidator> validators= + ServiceValidatorManager.instance().getOutputServiceValidators(endpoint); + + if (validators != null && validators.size() > 0) { + boolean validated=false; + Exception ex=null; + + for (int i=0; validators != null && + i < validators.size(); i++) { + try { + validators.get(i).messageSent(msg); + validated = true; + } catch(Exception t) { + // Ignore + ex = t; + } + } + + // Only raise exception if none of the service + // validators were able to validate the message + if (validated == false) { + String vnames=""; + + for (int i=0; validators != null && + i < validators.size(); i++) { + if (vnames.length() > 0) { + vnames += ", "; + } + vnames += validators.get(i).getValidatorName(); + } + + logger.error("Failed to handle sent message on endpoint '"+ + endpoint+"' validated against: "+vnames); + + if (ServiceValidatorManager.instance().isManagedMode()) { + throw new CourierException("Failed to handle sent message on endpoint '"+ + endpoint+"' validated against: "+vnames, ex); + } + } else { + + // Check whether a dynamic reply is expected + if (ServiceValidatorManager.instance().isOutputDynamicReplyTo(endpoint)) { + + // Register interest in the 'reply-to' endpoint + Endpoint replyTo=getReplyToEndpoint(msg); + + if (replyTo != null) { + ServiceValidatorManager.instance().registerInputReplyToValidators(replyTo, + validators); + } else { + logger.error("Unable to get 'reply-to' endpoint for message: "+msg); + } + } + } + } + } + + return(msg); + } + + /** + * This method is invoked when a message is received by an + * ESB service. + * + * @param msg The ESB message + * @param params The parameters + * @throws CourierException Failed to validate message + */ + public Message onInput(Message msg, java.util.Map params) + throws CourierException { + + Endpoint endpoint=getEndpoint(msg); + + if (endpoint != null) { + java.util.List<ServiceValidator> validators= + ServiceValidatorManager.instance().getInputServiceValidators(endpoint); + + if (validators != null && validators.size() > 0) { + boolean validated=false; + Exception ex=null; + + for (int i=0; validators != null && + i < validators.size(); i++) { + try { + validators.get(i).messageReceived(msg); + validated = true; + } catch(Exception t) { + // Ignore + ex = t; + } + } + + // Only raise exception if none of the service + // validators were able to validate the message + if (validated == false) { + String vnames=""; + + for (int i=0; validators != null && + i < validators.size(); i++) { + if (vnames.length() > 0) { + vnames += ", "; + } + vnames += validators.get(i).getValidatorName(); + } + + logger.error("Failed to handle received message on endpoint '"+ + endpoint+"' validated against: "+vnames); + + if (ServiceValidatorManager.instance().isManagedMode()) { + throw new CourierException("Failed to handle received message on endpoint '"+ + endpoint+"' validated against: "+vnames, ex); + } + } else { + + // Check whether a dynamic reply is expected + if (ServiceValidatorManager.instance().isInputDynamicReplyTo(endpoint)) { + + // Register interest in the 'reply-to' endpoint + Endpoint replyTo=getReplyToEndpoint(msg); + + if (replyTo != null) { + ServiceValidatorManager.instance().registerOutputReplyToValidators(replyTo, + validators); + } else { + logger.error("Unable to get 'reply-to' endpoint for message: "+msg); + } + } + } + } + } + + return(msg); + } + + /** + * This method returns an endpoint associated with the 'to' + * destination of the supplied message. + * + * @param msg The message + * @return The endpoint, or null if not relevant + */ + protected Endpoint getEndpoint(Message msg) { + Endpoint ret=null; + + if (msg != null && msg.getHeader() != null && + msg.getHeader().getCall() != null && + msg.getHeader().getCall().getTo() != null && + msg.getHeader().getCall().getTo().getAddr() != null) { + + String key=msg.getHeader().getCall().getTo().getAddr().getAddress(); + int ind=-1; + + if (key.startsWith(JMS_PROTOCOL_PREFIX) && + ((ind=key.indexOf(QUEUE_PREFIX)) != -1 || + (ind=key.indexOf(TOPIC_PREFIX)) != -1)) { + ret = new Endpoint(JMS_PROTOCOL_PREFIX+key.substring(ind)); + } + } + + logger.debug("Destination for message '"+msg+"' is: "+ret); + + return(ret); + } + + /** + * This method returns an endpoint associated with the 'to' + * destination of the supplied message. + * + * @param msg The message + * @return The endpoint, or null if not relevant + */ + protected Endpoint getReplyToEndpoint(Message msg) { + Endpoint ret=null; + + if (msg != null && msg.getHeader() != null && + msg.getHeader().getCall() != null && + msg.getHeader().getCall().getReplyTo() != null && + msg.getHeader().getCall().getReplyTo().getAddr() != null) { + + String key=msg.getHeader().getCall().getReplyTo().getAddr().getAddress(); + int ind=-1; + + if (key.startsWith(JMS_PROTOCOL_PREFIX) && + ((ind=key.indexOf(QUEUE_PREFIX)) != -1 || + (ind=key.indexOf(TOPIC_PREFIX)) != -1)) { + ret = new Endpoint(JMS_PROTOCOL_PREFIX+key.substring(ind)); + } + } + + logger.debug("Reply-To Destination for message '"+msg+"' is: "+ret); + + return(ret); + } + + private static final Logger logger = Logger.getLogger(ValidatorFilter.class); +} Added: cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/ValidatorName.java =================================================================== --- cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/ValidatorName.java (rev 0) +++ cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/ValidatorName.java 2009-08-20 08:57:33 UTC (rev 778) @@ -0,0 +1,134 @@ +/* + * 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.savara.validator.jbossesb; + +/** + * This class represents a key for looking up a service validator. + */ +public class ValidatorName { + + /** + * This constructor is initialized with the details used to + * identify the validator. + * + * @param role The role + */ + public ValidatorName(String role) { + m_role = role; + m_validate = false; + } + + /** + * This constructor is initialized with the details used to + * identify the validator. + * + * @param modelName The model name + * @param role The role + * @param validate Whether to validate, or simply record + */ + public ValidatorName(String modelName, String role) { + m_modelName = modelName; + m_role = role; + m_validate = true; + } + + /** + * This method returns the model name associated with the + * service validator. + * + * @return The model name + */ + public String getModelName() { + return(m_modelName); + } + + /** + * This method returns the type associated with the model. + * If no model has been defined for the validator name, + * as in the case of a validator in record mode, then + * this method will return ValidatorName.NO_MODEL_TYPE. + * + * @return The model type + */ + public String getModelType() { + String ret=null; + int pos=0; + + if (m_modelName != null && + (pos=m_modelName.lastIndexOf('.')) != -1) { + ret = m_modelName.substring(pos+1); + } else { + ret = NO_MODEL_TYPE; + } + + return(ret); + } + + /** + * This method returns the role associated with the Service + * Validator. + * + * @return The role + */ + public String getRole() { + return(m_role); + } + + /** + * This method determines whether the associated service + * validator is in validation or record mode. + * + * @return Whether in validation or record mode + */ + public boolean isValidate() { + return(m_validate); + } + + public boolean equals(Object obj) { + boolean ret=false; + + if (obj instanceof ValidatorName) { + ret = (obj.toString().equals(toString()) && + ((ValidatorName)obj).m_validate == m_validate); + } + + return(ret); + } + + public int hashCode() { + return(toString().hashCode()); + } + + public String toString() { + String ret=null; + + if (isValidate()) { + ret = m_modelName+":"+m_role; + } else { + ret = m_role; + } + + return(ret); + } + + public static final String NO_MODEL_TYPE="NoModelType"; + + private String m_modelName=null; + private String m_role=null; + private boolean m_validate=false; +} \ No newline at end of file Added: cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/pi4soa/Pi4SOAServiceRecorder.java =================================================================== --- cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/pi4soa/Pi4SOAServiceRecorder.java (rev 0) +++ cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/pi4soa/Pi4SOAServiceRecorder.java 2009-08-20 08:57:33 UTC (rev 778) @@ -0,0 +1,155 @@ +/* + * 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.savara.validator.jbossesb.pi4soa; + +import org.apache.log4j.Logger; + +import org.jboss.savara.validator.jbossesb.*; +import org.jboss.soa.esb.message.Message; +import org.pi4soa.common.util.MessageUtil; +import org.pi4soa.service.ServiceException; +import org.pi4soa.service.behavior.*; +import org.pi4soa.service.monitor.*; + +/** + * This class implements the pi4soa service validator responsible for + * recording a stream of ESB messages. + */ +public class Pi4SOAServiceRecorder extends AbstractServiceValidator { + + /** + * This is the constructor for the pi4soa service + * recorder implementation. + * + * @param name The validator name + */ + public Pi4SOAServiceRecorder(ValidatorName name) { + super(name); + + initialize(); + } + + /** + * This method initializes the service recorder. + */ + protected void initialize() { + try { + // Use XML configuration, to enable alternative + // runtime configuration to be specified by + // including a pi4soa.xml file in the environment + DefaultMonitorConfiguration conf= + new XMLMonitorConfiguration(); + + conf.setValidateBehaviour(getValidatorName().isValidate()); + + m_monitor = ServiceMonitorFactory.getServiceMonitor(conf); + + ServiceDescription sdesc=BehaviorFactory.eINSTANCE.createServiceDescription(); + sdesc.setName(getValidatorName().getRole()); + + // Register service description + m_monitor.getConfiguration().getServiceRepository(). + addServiceDescription(sdesc); + + logger.debug("Created monitor for service description "+sdesc.getFullyQualifiedName()); + + } catch(Exception e) { + logger.error("Failed to initialize service monitor: "+e); + } + } + + /** + * This method returns the model type associated with this + * service recorder. + * + * @return The model type + */ + public static String getModelType() { + return(ValidatorName.NO_MODEL_TYPE); + } + + /** + * This method is called to update the model associated + * with the service validator. + */ + public void update() { + } + + /** + * This method processes a sent message against a service + * behavioural description. + * + * @param msg The message + * @throws Exception Failed to process sent message + */ + public void messageSent(Message msg) throws Exception { + java.io.Serializable value=ESBUtil.getMessage(msg); + + if (value == null) { + throw new ServiceException("Failed to obtain value from message: "+msg); + } + + String mesgType=MessageUtil.getMessageType(value); + + org.pi4soa.service.Message mesg= + m_monitor.createMessage(mesgType, + null, null, value, null, null); + + synchronized(m_monitor) { + m_monitor.messageSent(mesg); + } + } + + /** + * This method processes a received message against a service + * behavioural description. + * + * @param msg The message + * @throws Exception Failed to process received message + */ + public void messageReceived(Message msg) throws Exception { + java.io.Serializable value=ESBUtil.getMessage(msg); + + if (value == null) { + throw new ServiceException("Failed to obtain value from message: "+msg); + } + + String mesgType=MessageUtil.getMessageType(value); + + org.pi4soa.service.Message mesg= + m_monitor.createMessage(mesgType, + null, null, value, null, null); + + synchronized(m_monitor) { + m_monitor.messageReceived(mesg); + } + } + + /** + * This method closes the service validator. + * + * @throws Exception Failed to close the service validator + */ + public void close() throws Exception { + m_monitor.close(); + } + + private static final Logger logger = Logger.getLogger(Pi4SOAServiceRecorder.class); + + private org.pi4soa.service.monitor.ServiceMonitor m_monitor=null; +} Added: cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/pi4soa/Pi4SOAServiceValidator.java =================================================================== --- cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/pi4soa/Pi4SOAServiceValidator.java (rev 0) +++ cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/pi4soa/Pi4SOAServiceValidator.java 2009-08-20 08:57:33 UTC (rev 778) @@ -0,0 +1,216 @@ +/* + * 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.savara.validator.jbossesb.pi4soa; + +import org.apache.log4j.Logger; + +import org.jboss.savara.validator.jbossesb.*; +import org.jboss.soa.esb.message.Message; +import org.pi4soa.common.util.MessageUtil; +import org.pi4soa.service.ServiceException; +import org.pi4soa.service.behavior.*; +import org.pi4soa.service.monitor.*; + +/** + * This class implements the pi4soa service validator responsible for + * validating a stream of ESB messages against a choreography model. + */ +public class Pi4SOAServiceValidator extends AbstractServiceValidator { + + private static final String CDM_MODEL_TYPE = "cdm"; + + /** + * This is the constructor for the pi4soa service + * validator implementation. + * + * @param name The validator name + * @throws Exception Failed to initialize service validator + */ + public Pi4SOAServiceValidator(ValidatorName name) + throws Exception { + super(name); + + update(); + } + + /** + * This method returns the model type associated with this + * service validator. + * + * @return The model type + */ + public static String getModelType() { + return CDM_MODEL_TYPE; + } + + /** + * This method is called to update the model associated + * with the service validator. + * + * @throws Exception Failed to update the service validator + */ + public void update() throws Exception { + + if (logger.isDebugEnabled()) { + logger.debug("Update: "+getValidatorName()); + } + + java.io.InputStream is=getModel(); + + if (is != null) { + org.pi4soa.service.behavior.ServiceDescription sdesc= + org.pi4soa.service.util.DescriptionRetrievalUtil.instance().getServiceDescription(is, + getValidatorName().getRole()); + + try { + is.close(); + } catch(Exception e) { + logger.error("Failed to close model '"+ + getValidatorName()+"' input stream", e); + } + + if (sdesc != null) { + + if (m_monitor == null) { + + if (logger.isDebugEnabled()) { + logger.debug("Service monitor for '"+ + sdesc.getFullyQualifiedName()+ + "' being created"); + } + + try { + // Use XML configuration, to enable alternative + // runtime configuration to be specified by + // including a pi4soa.xml file in the environment + DefaultMonitorConfiguration conf= + new XMLMonitorConfiguration(); + + conf.setValidateBehaviour(getValidatorName().isValidate()); + + m_monitor = ServiceMonitorFactory.getServiceMonitor(conf); + + // Register service description + m_monitor.getConfiguration().getServiceRepository(). + addServiceDescription(sdesc); + + logger.debug("Created monitor for service description "+sdesc.getFullyQualifiedName()); + + } catch(Exception e) { + logger.error("Failed to initialize service monitor: "+e); + } + } else { + + synchronized(m_monitor) { + // Service monitor already in use for the service + // description, so update description + try { + // Clear previous version of the service description + ServiceDescription[] sdescs= + m_monitor.getConfiguration().getServiceRepository().getServiceDescriptions(); + + for (int i=0; sdescs != null && i < sdescs.length; i++) { + m_monitor.getConfiguration().getServiceRepository(). + removeServiceDescription(sdescs[i]); + } + + logger.debug("Updating service description for "+sdesc.getFullyQualifiedName()); + + m_monitor.getConfiguration().getServiceRepository().addServiceDescription(sdesc); + } catch(Exception e) { + logger.error("Failed to update service description '"+ + sdesc.getFullyQualifiedName()+"'", e); + } + } + } + } else { + logger.error("Unable to obtain service description for validator '"+ + getValidatorName()+"'"); + } + } else { + logger.error("Unable to obtain model for validator '"+ + getValidatorName()+"'"); + + throw new java.io.IOException("Failed to locate model '"+ + getValidatorName().getModelName()+"'"); + } + } + + /** + * This method processes a sent message against a service + * behavioural description. + * + * @param msg The message + * @throws Exception Failed to process sent message + */ + public void messageSent(Message msg) throws Exception { + java.io.Serializable value=ESBUtil.getMessage(msg); + + if (value == null) { + throw new ServiceException("Failed to obtain value from message: "+msg); + } + + String mesgType=MessageUtil.getMessageType(value); + + org.pi4soa.service.Message mesg= + m_monitor.createMessage(mesgType, + null, null, value, null, null); + + synchronized(m_monitor) { + m_monitor.messageSent(mesg); + } + } + + /** + * This method processes a received message against a service + * behavioural description. + * + * @param msg The message + * @throws Exception Failed to process received message + */ + public void messageReceived(Message msg) throws Exception { + java.io.Serializable value=ESBUtil.getMessage(msg); + + if (value == null) { + throw new ServiceException("Failed to obtain value from message: "+msg); + } + + String mesgType=MessageUtil.getMessageType(value); + + org.pi4soa.service.Message mesg= + m_monitor.createMessage(mesgType, + null, null, value, null, null); + + synchronized(m_monitor) { + m_monitor.messageReceived(mesg); + } + } + + /** + * This method closes the service validator. + * + * @throws Exception Failed to close the service validator + */ + public void close() throws Exception { + m_monitor.close(); + } + + private static final Logger logger = Logger.getLogger(Pi4SOAServiceValidator.class); + + private org.pi4soa.service.monitor.ServiceMonitor m_monitor=null; +} Added: cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/pi4soa/Pi4SOAValidatorConfigLoader.java =================================================================== --- cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/pi4soa/Pi4SOAValidatorConfigLoader.java (rev 0) +++ cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/pi4soa/Pi4SOAValidatorConfigLoader.java 2009-08-20 08:57:33 UTC (rev 778) @@ -0,0 +1,69 @@ +/* + * 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.savara.validator.jbossesb.pi4soa; + +import org.jboss.savara.validator.jbossesb.*; +import org.jboss.soa.esb.helpers.ConfigTree; + +/** + * This class provides the pi4soa implementation of the + * validator config loader. + */ +public class Pi4SOAValidatorConfigLoader implements ValidatorConfigLoader { + + public static final String PI4SOA_MODEL_TYPE="cdm"; + + /** + * This method determines if the validator config loader + * implementation supports the supplied model type. + * + * @param modelType The model type + * @return Whether the loader supports the model type + */ + public boolean isSupported(String modelType) { + return(PI4SOA_MODEL_TYPE.equals(modelType)); + } + + /** + * This method loads the validator config, contained within + * the supplied input stream representing a model of the + * supported type. + * + * @param is The input stream + * @param modelPath The path to the model file + * @return The validator config + * @throws java.io.IOException Failed to load validator config + */ + public ValidatorConfig loadValidatorConfig(java.io.InputStream is, + String modelPath) throws java.io.IOException { + ValidatorConfig ret=null; + + org.pi4soa.cdl.Package cdlpack= + org.pi4soa.service.util.DescriptionRetrievalUtil.instance().getCDLPackage(is); + + ValidatorConfigGenerator generator=new ValidatorConfigGenerator(); + + org.w3c.dom.Element validator= + generator.generate(cdlpack, modelPath); + + ret = new DefaultValidatorConfig(PI4SOA_MODEL_TYPE, + ConfigTree.fromElement(validator)); + + return(ret); + } +} Added: cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/pi4soa/ValidatorConfigGenerator.java =================================================================== --- cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/pi4soa/ValidatorConfigGenerator.java (rev 0) +++ cdl/trunk/validator/jbossesb/src/main/java/org/jboss/savara/validator/jbossesb/pi4soa/ValidatorConfigGenerator.java 2009-08-20 08:57:33 UTC (rev 778) @@ -0,0 +1,285 @@ +/* + * 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.savara.validator.jbossesb.pi4soa; + +import java.util.Collections; +import org.apache.log4j.Logger; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; + +import org.pi4soa.cdl.*; +import org.pi4soa.common.annotations.*; + +/** + * This class provides a generator for the JBossESB Validator + * configuration. + */ +public class ValidatorConfigGenerator { + + private static final String ROLE_ATTR = "role"; + private static final String MODEL_ATTR = "model"; + private static final String SERVICE_ELEMENT = "service"; + private static final String VALIDATOR_ELEMENT = "validator"; + + /** + * The default constructor. + */ + public ValidatorConfigGenerator() { + } + + /** + * This method generates the validator configuration associated + * with the supplied choreography. + * + * @param cdlpack The CDL package + * @param model The model (choreography file name) + * @return The validator config + */ + public org.w3c.dom.Element generate(org.pi4soa.cdl.Package cdlpack, + String model) { + org.w3c.dom.Element ret=null; + + try { + ret = createValidatorConfig(); + + // Create the new entries for the supplied choreography + if (cdlpack != null) { + createEntries(ret, model, cdlpack); + } else { + logger.error("Choreography not supplied for '"+model+"'"); + } + + } catch(Exception e) { + e.printStackTrace(); + } + + return(ret); + } + + /** + * This method creates the initial template for the + * validator config. + * + * @return The initial validator config + * @throws Exception Failed to generate validator config + */ + protected org.w3c.dom.Element createValidatorConfig() + throws Exception { + org.w3c.dom.Element ret=null; + + org.w3c.dom.Document doc= + javax.xml.parsers.DocumentBuilderFactory. + newInstance().newDocumentBuilder().newDocument(); + + ret = doc.createElement(VALIDATOR_ELEMENT); + + doc.appendChild(ret); + + return(ret); + } + + /** + * This method creates the entries in the validator config. + * + * @param validator The validator config + * @param model The model + * @param cdlpack The choreography description + */ + protected void createEntries(org.w3c.dom.Element validator, + String model, org.pi4soa.cdl.Package cdlpack) { + + for (int i=0; i < cdlpack.getTypeDefinitions().getParticipantTypes().size(); i++) { + org.pi4soa.cdl.ParticipantType ptype= + cdlpack.getTypeDefinitions().getParticipantTypes().get(i); + + org.w3c.dom.Element service= + validator.getOwnerDocument().createElement(SERVICE_ELEMENT); + + service.setAttribute(MODEL_ATTR, model); + service.setAttribute(ROLE_ATTR, ptype.getName()); + + cdlpack.visit(new InputOutputAnalyser(ptype, service)); + + if (service.getFirstChild() != null) { + validator.appendChild(service); + } + } + } + + private static Logger logger = Logger.getLogger(ValidatorConfigGenerator.class); + + public class InputOutputAnalyser extends DefaultCDLVisitor { + + private static final String DYNAMIC_REPLY_TO_ATTR = "dynamicReplyTo"; + private static final String JBOSSESB_ANNOTATION = "jbossesb"; + private static final String JBOSSESB_ELEMENT = "jbossesb"; + private static final String DESTINATION_ELEMENT = "destination"; + private static final String NAME_ATTR = "name"; + private static final String EPR_ATTR = "epr"; + private static final String INPUT_ELEMENT = "input"; + private static final String OUTPUT_ELEMENT = "output"; + + public InputOutputAnalyser(org.pi4soa.cdl.ParticipantType ptype, + org.w3c.dom.Element service) { + m_participantType = ptype; + m_service = service; + + m_templateProcessor = + org.pi4soa.common.annotations.AnnotationsManagerFactory.getAnnotationsManager().getTemplateProcessor(JBOSSESB_ANNOTATION); + } + + /** + * This method inspects the supplied interaction. + * + */ + public void interaction(Interaction interaction) { + if (m_participantType.getRoleTypes().contains(interaction.getFromRoleType()) || + (interaction.getFromParticipant() != null && + Collections.disjoint(m_participantType.getRoleTypes(), + interaction.getFromParticipant().getRoleTypes()) == false)) { + + for (int i=0; i < interaction.getExchangeDetails().size(); i++) { + processExchangeDetails(interaction.getExchangeDetails().get(i), true); + } + } else if (m_participantType.getRoleTypes().contains(interaction.getToRoleType()) || + (interaction.getToParticipant() != null && + Collections.disjoint(m_participantType.getRoleTypes(), + interaction.getToParticipant().getRoleTypes()) == false)) { + for (int i=0; i < interaction.getExchangeDetails().size(); i++) { + processExchangeDetails(interaction.getExchangeDetails().get(i), false); + } + } + } + + /** + * This method checks the supplied exchange details to determine + * if there is a 'jbossesb' annotation containing information + * about a destination to be validated. + * + * @param details The exchange details + * @param from Whether the 'from' details should be checked, + * otherwise the 'to' details will be checked + */ + protected void processExchangeDetails(ExchangeDetails details, boolean from) { + + for (int i=0; i < details.getSemanticAnnotations().size(); i++) { + SemanticAnnotation sa=details.getSemanticAnnotations().get(i); + org.w3c.dom.Element dest=null; + + if (sa.getAnnotation() != null && sa.getName() != null && + sa.getName().equals(JBOSSESB_ANNOTATION)) { + try { + // Transform the text representation to DOM + DocumentBuilderFactory fact=DocumentBuilderFactory.newInstance(); + fact.setNamespaceAware(true); + + DocumentBuilder builder=fact.newDocumentBuilder(); + org.w3c.dom.Document doc= + builder.parse(new java.io.ByteArrayInputStream( + sa.getAnnotation().getBytes())); + + if (doc.getDocumentElement() != null && + doc.getDocumentElement().getNodeName().equals( + JBOSSESB_ELEMENT)) { + org.w3c.dom.NodeList nl= + doc.getDocumentElement().getElementsByTagName(DESTINATION_ELEMENT); + + if (nl.getLength() == 1) { + dest = (org.w3c.dom.Element)nl.item(0); + } else if (nl.getLength() > 1) { + logger.error("Too many destination elements ("+ + nl.getLength()+") found"); + } else { + logger.error("No destinations found"); + } + } + + } catch(Exception e) { + logger.error("Failed to load jbossesb annotation", e); + } + } + + if (dest != null) { + processDestination(details, dest, from); + } + } + } + + /** + * This method processes the destination information + * associated with the exchange details. + * + * @param details The exchange details + * @param dest The destination DOM element + * @param from Whether the 'from' or 'to' role should + * be considered + */ + protected void processDestination(ExchangeDetails details, + org.w3c.dom.Element dest, boolean from) { + String elemName=null; + + if (dest != null) { + if (from) { + if (details.getAction() == ExchangeActionType.REQUEST) { + elemName = OUTPUT_ELEMENT; + } else { + elemName = INPUT_ELEMENT; + } + } else { + if (details.getAction() == ExchangeActionType.REQUEST) { + elemName = INPUT_ELEMENT; + } else { + elemName = OUTPUT_ELEMENT; + } + } + + org.w3c.dom.Element elem=m_service.getOwnerDocument().createElement(elemName); + + // Parameter has been stored in a structured manner + // to support use of templates and presentations, + // so need to extract the value + java.util.List<TemplateParameter> params= + m_templateProcessor.getTemplateParameters(dest.getAttribute(NAME_ATTR)); + + if (params != null && params.size() > 0) { + elem.setAttribute(EPR_ATTR, params.get(0).getValue()); + } + + if (dest.hasAttribute(DYNAMIC_REPLY_TO_ATTR)) { + params=m_templateProcessor.getTemplateParameters(dest.getAttribute(DYNAMIC_REPLY_TO_ATTR)); + + if (params != null && params.size() > 0) { + + if (params.get(0).getValue().equalsIgnoreCase("true")) { + elem.setAttribute(DYNAMIC_REPLY_TO_ATTR, "true"); + } + } + } + + if (elem.hasAttribute(EPR_ATTR)) { + m_service.appendChild(elem); + } + } + } + + private ParticipantType m_participantType=null; + private org.w3c.dom.Element m_service=null; + private org.pi4soa.common.annotations.TemplateProcessor m_templateProcessor=null; + } +}

14 years, 8 months

1
0
0 / 0

Overlord SVN: r777 - cdl/trunk/runtime/jbossesb/src/test/java/org/jboss.

by overlord-commits＠lists.jboss.org

Author: jeff.yuchang Date: 2009-08-20 03:20:13 -0400 (Thu, 20 Aug 2009) New Revision: 777 Removed: cdl/trunk/runtime/jbossesb/src/test/java/org/jboss/soa/ Log: * remove unused soa package name.

14 years, 8 months

1
0
0 / 0

Overlord SVN: r776 - in cdl/trunk/runtime/jbossesb/src: main/java/org/jboss/savara and 6 other directories.

by overlord-commits＠lists.jboss.org

Author: jeff.yuchang Date: 2009-08-20 03:01:20 -0400 (Thu, 20 Aug 2009) New Revision: 776 Added: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/internal/ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/internal/jbossesb/ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/internal/jbossesb/LogicalCourier.java cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/internal/jbossesb/utils/ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/internal/jbossesb/utils/ClassLoaderUtil.java cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/internal/jbossesb/utils/MessageUtil.java cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/internal/jbossesb/utils/NameSpaceUtil.java cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/internal/jbossesb/utils/StringUtils.java cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/internal/jbossesb/utils/XMLUtils.java Removed: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/jbossesb/ClassLoaderUtil.java cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/jbossesb/LogicalCourier.java cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/jbossesb/MessageUtil.java cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/jbossesb/NameSpaceUtil.java cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/jbossesb/StringUtils.java cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/jbossesb/XMLUtils.java cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/ Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/jbossesb/actions/IfAction.java cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/jbossesb/actions/ReceiveMessageAction.java cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/jbossesb/actions/SendMessageAction.java cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/jbossesb/actions/SwitchAction.java cdl/trunk/runtime/jbossesb/src/test/java/org/jboss/savara/jbossesb/util/XMLUtilsTest.java Log: * Package renaming. move Util classes to its internal package. Added: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/internal/jbossesb/LogicalCourier.java =================================================================== --- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/internal/jbossesb/LogicalCourier.java (rev 0) +++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/internal/jbossesb/LogicalCourier.java 2009-08-20 07:01:20 UTC (rev 776) @@ -0,0 +1,77 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, JBoss Inc., 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. + * + * (C) 2008, + */ +package org.jboss.savara.internal.jbossesb; + +import org.jboss.soa.esb.addressing.MalformedEPRException; +import org.jboss.soa.esb.couriers.CourierException; +import org.jboss.soa.esb.message.Message; +import org.jboss.soa.esb.addressing.eprs.*; +import org.jboss.soa.esb.client.ServiceInvoker; +import org.jboss.soa.esb.listeners.message.MessageDeliverException; + +/** + * This class providers the courier implementation associated + * with a LogicalEPR. + * + * @author <a href="mailto:gary.brown@hattricksoftware.com">Gary Brown</a> + */ +public class LogicalCourier implements org.jboss.soa.esb.couriers.Courier { + + private ServiceInvoker serviceInvoker=null; + + /** + * The constructor, supplied the logical EPR represented + * by the courier. + * + * @param epr The logical EPR + * @throws MessageDeliverException + */ + public LogicalCourier(LogicalEPR epr) + throws MessageDeliverException { + serviceInvoker = epr.getServiceInvoker(); + } + + /** + * This method delivers the supplied message to the EPR + * associated with the logical courier. + * + * @param mesg The message + */ + public boolean deliver(Message mesg) throws CourierException, + MalformedEPRException { + + try { + serviceInvoker.deliverAsync(mesg); + } catch(MessageDeliverException e) { + throw new CourierException("Failed to deliver message", e); + } + + return(true); + } + + /** + * This method cleans up after the courier implementation + * is no longer required. + */ + public void cleanup() { + serviceInvoker = null; + } + +} Added: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/internal/jbossesb/utils/ClassLoaderUtil.java =================================================================== --- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/internal/jbossesb/utils/ClassLoaderUtil.java (rev 0) +++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/internal/jbossesb/utils/ClassLoaderUtil.java 2009-08-20 07:01:20 UTC (rev 776) @@ -0,0 +1,33 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, JBoss Inc., 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. + * + * (C) 2008, + */ +package org.jboss.savara.internal.jbossesb.utils; + +/** + * + * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a> + * + */ +public class ClassLoaderUtil { + + public static Class<?> loadClass(String className) throws ClassNotFoundException { + return Thread.currentThread().getContextClassLoader().loadClass(className); + } + +} Added: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/internal/jbossesb/utils/MessageUtil.java =================================================================== --- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/internal/jbossesb/utils/MessageUtil.java (rev 0) +++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/internal/jbossesb/utils/MessageUtil.java 2009-08-20 07:01:20 UTC (rev 776) @@ -0,0 +1,96 @@ +/* + * Copyright 2005-6 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: + * Mar 21, 2006 : Initial version created by gary + */ +package org.jboss.savara.internal.jbossesb.utils; + +import java.util.logging.Logger; + +import org.w3c.dom.Node; + + +/** + * This class represents utility functions for processing + * messages. + * + * @author <a href="mailto:gary.brown@hattricksoftware.com">Gary Brown</a> + * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a> + */ +public class MessageUtil { + + private static Logger logger = Logger.getLogger(MessageUtil.class.getName()); + + /** + * This method returns the message type associated with the + * supplied value. + * + * @param value The value + * @return The message type + */ + public static String getMessageType(Object value) { + String ret=null; + + if (value instanceof org.w3c.dom.Node) { + String namespace=((org.w3c.dom.Node)value).getNamespaceURI(); + String localpart=((org.w3c.dom.Node)value).getLocalName(); + + if (value instanceof org.w3c.dom.Element && + ((org.w3c.dom.Element)value).hasAttributeNS( + "http://www.w3.org/2001/XMLSchema-instance", "type")) { + String type=((org.w3c.dom.Element)value).getAttributeNS( + "http://www.w3.org/2001/XMLSchema-instance", "type"); + + String prefix= XMLUtils.getPrefix(type); + + localpart = XMLUtils.getLocalname(type); + + if (prefix == null) { + namespace = null; + } else { + namespace = ((org.w3c.dom.Element)value). + getAttribute("xmlns:"+prefix); + if (!NameSpaceUtil.isNotNull(namespace)) { + namespace = null; + } + } + } + + if (namespace == null) { + ret = localpart; + } else { + ret = NameSpaceUtil.getFullyQualifiedName(namespace, + localpart); + } + } else if (value instanceof String) { + ret = String.class.getName(); + + try { + Node node=XMLUtils.getNode((String)value); + ret = getMessageType(node); + } catch(Exception e) { + logger.warning("Failed to obtain message type from value: "+value); + } + + } else { + ret = value.getClass().getName(); + } + + return(ret); + } + +} Added: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/internal/jbossesb/utils/NameSpaceUtil.java =================================================================== --- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/internal/jbossesb/utils/NameSpaceUtil.java (rev 0) +++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/internal/jbossesb/utils/NameSpaceUtil.java 2009-08-20 07:01:20 UTC (rev 776) @@ -0,0 +1,140 @@ +/* + * Copyright 2005 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: + * Jul 28, 2005 : Initial version created by gary + */ +package org.jboss.savara.internal.jbossesb.utils; + +/** + * This class provides helper functiions for manipulating fully + * qualified names (with local parts and namespaces). + * + * @author <a href="mailto:gary.brown@hattricksoftware.com">Gary Brown</a> + * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a> + */ +public class NameSpaceUtil { + + public static final String NAMESPACE_PREFIX="{"; + public static final String NAMESPACE_SUFFIX="}"; + + /** + * This method checks whether the supplied name is a + * fully qualified name, with the name space contained + * in braces, followed by a localpart. + * + * @param name The name + * @return Whether the name is a fully qualified name + */ + public static boolean isFullyQualifiedName(String name) { + boolean ret=false; + int pos=0; + + if (name != null && name.startsWith("{") && + (pos=name.indexOf('}')) != -1 && + name.length() != pos+1) { + ret = true; + } + + return(ret); + } + + /** + * This method returns the fully qualified name associated + * with the supplied namespace and local part. If the namespace + * is null, or an empty string, then only the local part + * will be returned. + * + * @param namespace The namespace + * @param localpart The local part + * @return The fully qualified name + */ + public static String getFullyQualifiedName(String namespace, + String localpart) { + String ret=null; + + if (namespace != null && namespace.trim().length() > 0) { + ret = NAMESPACE_PREFIX+namespace+NAMESPACE_SUFFIX; + } + + if (localpart != null) { + if (ret == null) { + ret = localpart; + } else { + ret += localpart; + } + } + + return(ret); + } + + /** + * This method returns the namespace component of a fully + * qualified name. If the supplied name does not have the + * namespace prefix, then a null will be returned. If the + * supplied name does not have the suffix, then the contents + * following the prefix, to the end of the name, will be + * returned. + * + * @param qname The fully qualified name + * @return The namespace + */ + public static String getNamespace(String qname) { + String ret=null; + int index=0; + + if (qname != null && + (index=qname.indexOf(NAMESPACE_PREFIX)) != -1) { + int endindex=qname.indexOf(NAMESPACE_SUFFIX); + + if (endindex == -1) { + endindex = qname.length(); + } + + ret = qname.substring(index+1, endindex); + } + + return(ret); + } + + /** + * This method extracts the local part from the supplied + * fully qualified name. If the namespace suffix cannot + * be found, then the fully supplied name will be + * returned. + * + * @param qname The fully qualified name + * @return The local part + */ + public static String getLocalPart(String qname) { + String ret=null; + int index=0; + + if (qname != null && + (index=qname.indexOf(NAMESPACE_SUFFIX)) != -1) { + ret = qname.substring(index+1); + } else { + ret = qname; + } + + return(ret); + } + + public static boolean isNotNull(String value) { + return(value != null && value.trim().length() > 0); + } + +} Added: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/internal/jbossesb/utils/StringUtils.java =================================================================== --- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/internal/jbossesb/utils/StringUtils.java (rev 0) +++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/internal/jbossesb/utils/StringUtils.java 2009-08-20 07:01:20 UTC (rev 776) @@ -0,0 +1,42 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, JBoss Inc., 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. + * + * (C) 2008, + */ +package org.jboss.savara.internal.jbossesb.utils; + +/** + * This utility class for keeping some common used methods to deal with String. + * + * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a> + * + */ +public class StringUtils { + + public static final boolean isNull(String string) { + if (string == null || "".equals(string.trim())) { + return true; + } + return false; + } + + public static final boolean isNotNull(String string) { + return !isNull(string); + } + + +} Added: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/internal/jbossesb/utils/XMLUtils.java =================================================================== --- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/internal/jbossesb/utils/XMLUtils.java (rev 0) +++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/internal/jbossesb/utils/XMLUtils.java 2009-08-20 07:01:20 UTC (rev 776) @@ -0,0 +1,130 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, JBoss Inc., 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. + * + * (C) 2008, + */ +package org.jboss.savara.internal.jbossesb.utils; + +import java.io.ByteArrayInputStream; +import java.io.InputStream; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.xpath.XPath; +import javax.xml.xpath.XPathFactory; + +import org.w3c.dom.Element; +import org.w3c.dom.Node; + +/** + * + * @author <a href="mailto:gary.brown@hattricksoftware.com">Gary Brown</a> + * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a> + */ + +public class XMLUtils { + + /** + * This method converts the supplied text representation + * of an XML document into a DOM Node. + * + * @param text The text + * @return The node + * @throws XMLException Failed to convert the text + */ + public static Node getNode(String text) throws Exception { + Node ret=null; + + try { + // Transform the text representation to DOM + DocumentBuilderFactory fact=DocumentBuilderFactory.newInstance(); + fact.setNamespaceAware(true); + + InputStream xmlstr= new ByteArrayInputStream(text.getBytes()); + + DocumentBuilder builder=fact.newDocumentBuilder(); + org.w3c.dom.Document doc=builder.parse(xmlstr); + + ret = doc.getDocumentElement(); + + } catch(Exception e) { + throw new Exception("Failed to transform text " + + "into DOM representation", e); + } + + return(ret); + } + + /** + * This method returns the prefix part of the supplied + * qualified name. + * + * @param qname The qualified name + * @return The prefix + */ + public static String getPrefix(String qname) { + String ret=null; + int pos=0; + + if (qname != null && ((pos=qname.indexOf(':')) != -1)) { + ret = qname.substring(0, pos); + } + + return(ret); + } + + /** + * This method returns the localname part of the supplied + * qualified name. + * + * @param qname The qualified name + * @return The localname part + */ + public static String getLocalname(String qname) { + String ret=qname; + int pos=0; + + if (qname != null && ((pos=qname.indexOf(':')) != -1)) { + ret = qname.substring(pos+1); + } + + return(ret); + } + + /** + * + * @param object + * @param expression: xpath expression + * @return + * @throws Exception + */ + public static String executeXpath(Object object, String expression) throws Exception { + XPathFactory factory = XPathFactory.newInstance(); + XPath theXpath = factory.newXPath(); + + if (object instanceof String) { + String xmlMessage = (String)object; + Node node = getNode(xmlMessage); + return theXpath.evaluate(expression, node); + } else if (object instanceof Element) { + return theXpath.evaluate(expression, object); + } + + return null; + } + +} \ No newline at end of file Deleted: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/jbossesb/ClassLoaderUtil.java =================================================================== --- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/jbossesb/ClassLoaderUtil.java 2009-08-20 05:58:57 UTC (rev 775) +++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/jbossesb/ClassLoaderUtil.java 2009-08-20 07:01:20 UTC (rev 776) @@ -1,33 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, JBoss Inc., 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. - * - * (C) 2008, - */ -package org.jboss.savara.jbossesb; - -/** - * - * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a> - * - */ -public class ClassLoaderUtil { - - public static Class<?> loadClass(String className) throws ClassNotFoundException { - return Thread.currentThread().getContextClassLoader().loadClass(className); - } - -} Deleted: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/jbossesb/LogicalCourier.java =================================================================== --- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/jbossesb/LogicalCourier.java 2009-08-20 05:58:57 UTC (rev 775) +++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/jbossesb/LogicalCourier.java 2009-08-20 07:01:20 UTC (rev 776) @@ -1,77 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, JBoss Inc., 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. - * - * (C) 2008, - */ -package org.jboss.savara.jbossesb; - -import org.jboss.soa.esb.addressing.MalformedEPRException; -import org.jboss.soa.esb.couriers.CourierException; -import org.jboss.soa.esb.message.Message; -import org.jboss.soa.esb.addressing.eprs.*; -import org.jboss.soa.esb.client.ServiceInvoker; -import org.jboss.soa.esb.listeners.message.MessageDeliverException; - -/** - * This class providers the courier implementation associated - * with a LogicalEPR. - * - * @author <a href="mailto:gary.brown@hattricksoftware.com">Gary Brown</a> - */ -public class LogicalCourier implements org.jboss.soa.esb.couriers.Courier { - - private ServiceInvoker serviceInvoker=null; - - /** - * The constructor, supplied the logical EPR represented - * by the courier. - * - * @param epr The logical EPR - * @throws MessageDeliverException - */ - public LogicalCourier(LogicalEPR epr) - throws MessageDeliverException { - serviceInvoker = epr.getServiceInvoker(); - } - - /** - * This method delivers the supplied message to the EPR - * associated with the logical courier. - * - * @param mesg The message - */ - public boolean deliver(Message mesg) throws CourierException, - MalformedEPRException { - - try { - serviceInvoker.deliverAsync(mesg); - } catch(MessageDeliverException e) { - throw new CourierException("Failed to deliver message", e); - } - - return(true); - } - - /** - * This method cleans up after the courier implementation - * is no longer required. - */ - public void cleanup() { - serviceInvoker = null; - } - -} Deleted: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/jbossesb/MessageUtil.java =================================================================== --- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/jbossesb/MessageUtil.java 2009-08-20 05:58:57 UTC (rev 775) +++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/jbossesb/MessageUtil.java 2009-08-20 07:01:20 UTC (rev 776) @@ -1,96 +0,0 @@ -/* - * Copyright 2005-6 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: - * Mar 21, 2006 : Initial version created by gary - */ -package org.jboss.savara.jbossesb; - -import java.util.logging.Logger; - -import org.w3c.dom.Node; - - -/** - * This class represents utility functions for processing - * messages. - * - * @author <a href="mailto:gary.brown@hattricksoftware.com">Gary Brown</a> - * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a> - */ -public class MessageUtil { - - private static Logger logger = Logger.getLogger(MessageUtil.class.getName()); - - /** - * This method returns the message type associated with the - * supplied value. - * - * @param value The value - * @return The message type - */ - public static String getMessageType(Object value) { - String ret=null; - - if (value instanceof org.w3c.dom.Node) { - String namespace=((org.w3c.dom.Node)value).getNamespaceURI(); - String localpart=((org.w3c.dom.Node)value).getLocalName(); - - if (value instanceof org.w3c.dom.Element && - ((org.w3c.dom.Element)value).hasAttributeNS( - "http://www.w3.org/2001/XMLSchema-instance", "type")) { - String type=((org.w3c.dom.Element)value).getAttributeNS( - "http://www.w3.org/2001/XMLSchema-instance", "type"); - - String prefix= XMLUtils.getPrefix(type); - - localpart = XMLUtils.getLocalname(type); - - if (prefix == null) { - namespace = null; - } else { - namespace = ((org.w3c.dom.Element)value). - getAttribute("xmlns:"+prefix); - if (!NameSpaceUtil.isNotNull(namespace)) { - namespace = null; - } - } - } - - if (namespace == null) { - ret = localpart; - } else { - ret = NameSpaceUtil.getFullyQualifiedName(namespace, - localpart); - } - } else if (value instanceof String) { - ret = String.class.getName(); - - try { - Node node=XMLUtils.getNode((String)value); - ret = getMessageType(node); - } catch(Exception e) { - logger.warning("Failed to obtain message type from value: "+value); - } - - } else { - ret = value.getClass().getName(); - } - - return(ret); - } - -} Deleted: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/jbossesb/NameSpaceUtil.java =================================================================== --- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/jbossesb/NameSpaceUtil.java 2009-08-20 05:58:57 UTC (rev 775) +++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/jbossesb/NameSpaceUtil.java 2009-08-20 07:01:20 UTC (rev 776) @@ -1,140 +0,0 @@ -/* - * Copyright 2005 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: - * Jul 28, 2005 : Initial version created by gary - */ -package org.jboss.savara.jbossesb; - -/** - * This class provides helper functiions for manipulating fully - * qualified names (with local parts and namespaces). - * - * @author <a href="mailto:gary.brown@hattricksoftware.com">Gary Brown</a> - * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a> - */ -public class NameSpaceUtil { - - public static final String NAMESPACE_PREFIX="{"; - public static final String NAMESPACE_SUFFIX="}"; - - /** - * This method checks whether the supplied name is a - * fully qualified name, with the name space contained - * in braces, followed by a localpart. - * - * @param name The name - * @return Whether the name is a fully qualified name - */ - public static boolean isFullyQualifiedName(String name) { - boolean ret=false; - int pos=0; - - if (name != null && name.startsWith("{") && - (pos=name.indexOf('}')) != -1 && - name.length() != pos+1) { - ret = true; - } - - return(ret); - } - - /** - * This method returns the fully qualified name associated - * with the supplied namespace and local part. If the namespace - * is null, or an empty string, then only the local part - * will be returned. - * - * @param namespace The namespace - * @param localpart The local part - * @return The fully qualified name - */ - public static String getFullyQualifiedName(String namespace, - String localpart) { - String ret=null; - - if (namespace != null && namespace.trim().length() > 0) { - ret = NAMESPACE_PREFIX+namespace+NAMESPACE_SUFFIX; - } - - if (localpart != null) { - if (ret == null) { - ret = localpart; - } else { - ret += localpart; - } - } - - return(ret); - } - - /** - * This method returns the namespace component of a fully - * qualified name. If the supplied name does not have the - * namespace prefix, then a null will be returned. If the - * supplied name does not have the suffix, then the contents - * following the prefix, to the end of the name, will be - * returned. - * - * @param qname The fully qualified name - * @return The namespace - */ - public static String getNamespace(String qname) { - String ret=null; - int index=0; - - if (qname != null && - (index=qname.indexOf(NAMESPACE_PREFIX)) != -1) { - int endindex=qname.indexOf(NAMESPACE_SUFFIX); - - if (endindex == -1) { - endindex = qname.length(); - } - - ret = qname.substring(index+1, endindex); - } - - return(ret); - } - - /** - * This method extracts the local part from the supplied - * fully qualified name. If the namespace suffix cannot - * be found, then the fully supplied name will be - * returned. - * - * @param qname The fully qualified name - * @return The local part - */ - public static String getLocalPart(String qname) { - String ret=null; - int index=0; - - if (qname != null && - (index=qname.indexOf(NAMESPACE_SUFFIX)) != -1) { - ret = qname.substring(index+1); - } else { - ret = qname; - } - - return(ret); - } - - public static boolean isNotNull(String value) { - return(value != null && value.trim().length() > 0); - } - -} Deleted: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/jbossesb/StringUtils.java =================================================================== --- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/jbossesb/StringUtils.java 2009-08-20 05:58:57 UTC (rev 775) +++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/jbossesb/StringUtils.java 2009-08-20 07:01:20 UTC (rev 776) @@ -1,42 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, JBoss Inc., 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. - * - * (C) 2008, - */ -package org.jboss.savara.jbossesb; - -/** - * This utility class for keeping some common used methods to deal with String. - * - * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a> - * - */ -public class StringUtils { - - public static final boolean isNull(String string) { - if (string == null || "".equals(string.trim())) { - return true; - } - return false; - } - - public static final boolean isNotNull(String string) { - return !isNull(string); - } - - -} Deleted: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/jbossesb/XMLUtils.java =================================================================== --- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/jbossesb/XMLUtils.java 2009-08-20 05:58:57 UTC (rev 775) +++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/jbossesb/XMLUtils.java 2009-08-20 07:01:20 UTC (rev 776) @@ -1,130 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, JBoss Inc., 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. - * - * (C) 2008, - */ -package org.jboss.savara.jbossesb; - -import java.io.ByteArrayInputStream; -import java.io.InputStream; - -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.xpath.XPath; -import javax.xml.xpath.XPathFactory; - -import org.w3c.dom.Element; -import org.w3c.dom.Node; - -/** - * - * @author <a href="mailto:gary.brown@hattricksoftware.com">Gary Brown</a> - * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a> - */ - -public class XMLUtils { - - /** - * This method converts the supplied text representation - * of an XML document into a DOM Node. - * - * @param text The text - * @return The node - * @throws XMLException Failed to convert the text - */ - public static Node getNode(String text) throws Exception { - Node ret=null; - - try { - // Transform the text representation to DOM - DocumentBuilderFactory fact=DocumentBuilderFactory.newInstance(); - fact.setNamespaceAware(true); - - InputStream xmlstr= new ByteArrayInputStream(text.getBytes()); - - DocumentBuilder builder=fact.newDocumentBuilder(); - org.w3c.dom.Document doc=builder.parse(xmlstr); - - ret = doc.getDocumentElement(); - - } catch(Exception e) { - throw new Exception("Failed to transform text " + - "into DOM representation", e); - } - - return(ret); - } - - /** - * This method returns the prefix part of the supplied - * qualified name. - * - * @param qname The qualified name - * @return The prefix - */ - public static String getPrefix(String qname) { - String ret=null; - int pos=0; - - if (qname != null && ((pos=qname.indexOf(':')) != -1)) { - ret = qname.substring(0, pos); - } - - return(ret); - } - - /** - * This method returns the localname part of the supplied - * qualified name. - * - * @param qname The qualified name - * @return The localname part - */ - public static String getLocalname(String qname) { - String ret=qname; - int pos=0; - - if (qname != null && ((pos=qname.indexOf(':')) != -1)) { - ret = qname.substring(pos+1); - } - - return(ret); - } - - /** - * - * @param object - * @param expression: xpath expression - * @return - * @throws Exception - */ - public static String executeXpath(Object object, String expression) throws Exception { - XPathFactory factory = XPathFactory.newInstance(); - XPath theXpath = factory.newXPath(); - - if (object instanceof String) { - String xmlMessage = (String)object; - Node node = getNode(xmlMessage); - return theXpath.evaluate(expression, node); - } else if (object instanceof Element) { - return theXpath.evaluate(expression, object); - } - - return null; - } - -} \ No newline at end of file Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/jbossesb/actions/IfAction.java =================================================================== --- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/jbossesb/actions/IfAction.java 2009-08-20 05:58:57 UTC (rev 775) +++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/jbossesb/actions/IfAction.java 2009-08-20 07:01:20 UTC (rev 776) @@ -23,9 +23,9 @@ import java.util.List; import org.apache.log4j.Logger; -import org.jboss.savara.jbossesb.ClassLoaderUtil; +import org.jboss.savara.internal.jbossesb.utils.ClassLoaderUtil; +import org.jboss.savara.internal.jbossesb.utils.StringUtils; import org.jboss.savara.jbossesb.Decision; -import org.jboss.savara.jbossesb.StringUtils; import org.jboss.soa.esb.actions.AbstractActionLifecycle; import org.jboss.soa.esb.client.ServiceInvoker; import org.jboss.soa.esb.helpers.ConfigTree; Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/jbossesb/actions/ReceiveMessageAction.java =================================================================== --- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/jbossesb/actions/ReceiveMessageAction.java 2009-08-20 05:58:57 UTC (rev 775) +++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/jbossesb/actions/ReceiveMessageAction.java 2009-08-20 07:01:20 UTC (rev 776) @@ -20,10 +20,10 @@ package org.jboss.savara.jbossesb.actions; import org.apache.log4j.Logger; -import org.jboss.savara.jbossesb.ClassLoaderUtil; +import org.jboss.savara.internal.jbossesb.utils.ClassLoaderUtil; +import org.jboss.savara.internal.jbossesb.utils.MessageUtil; +import org.jboss.savara.internal.jbossesb.utils.StringUtils; import org.jboss.savara.jbossesb.EPRStore; -import org.jboss.savara.jbossesb.MessageUtil; -import org.jboss.savara.jbossesb.StringUtils; import org.jboss.soa.esb.actions.AbstractActionLifecycle; import org.jboss.soa.esb.helpers.ConfigTree; import org.jboss.soa.esb.message.Message; Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/jbossesb/actions/SendMessageAction.java =================================================================== --- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/jbossesb/actions/SendMessageAction.java 2009-08-20 05:58:57 UTC (rev 775) +++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/jbossesb/actions/SendMessageAction.java 2009-08-20 07:01:20 UTC (rev 776) @@ -21,11 +21,11 @@ import org.apache.log4j.Logger; import org.jboss.internal.soa.esb.addressing.helpers.EPRHelper; -import org.jboss.savara.jbossesb.ClassLoaderUtil; +import org.jboss.savara.internal.jbossesb.LogicalCourier; +import org.jboss.savara.internal.jbossesb.utils.ClassLoaderUtil; +import org.jboss.savara.internal.jbossesb.utils.MessageUtil; +import org.jboss.savara.internal.jbossesb.utils.StringUtils; import org.jboss.savara.jbossesb.EPRStore; -import org.jboss.savara.jbossesb.LogicalCourier; -import org.jboss.savara.jbossesb.MessageUtil; -import org.jboss.savara.jbossesb.StringUtils; import org.jboss.soa.esb.actions.AbstractActionLifecycle; import org.jboss.soa.esb.addressing.EPR; import org.jboss.soa.esb.addressing.eprs.LogicalEPR; Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/jbossesb/actions/SwitchAction.java =================================================================== --- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/jbossesb/actions/SwitchAction.java 2009-08-20 05:58:57 UTC (rev 775) +++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/savara/jbossesb/actions/SwitchAction.java 2009-08-20 07:01:20 UTC (rev 776) @@ -22,7 +22,7 @@ import java.util.LinkedList; import java.util.List; -import org.jboss.savara.jbossesb.MessageUtil; +import org.jboss.savara.internal.jbossesb.utils.MessageUtil; import org.jboss.soa.esb.actions.AbstractActionLifecycle; import org.jboss.soa.esb.client.ServiceInvoker; import org.jboss.soa.esb.helpers.ConfigTree; Modified: cdl/trunk/runtime/jbossesb/src/test/java/org/jboss/savara/jbossesb/util/XMLUtilsTest.java =================================================================== --- cdl/trunk/runtime/jbossesb/src/test/java/org/jboss/savara/jbossesb/util/XMLUtilsTest.java 2009-08-20 05:58:57 UTC (rev 775) +++ cdl/trunk/runtime/jbossesb/src/test/java/org/jboss/savara/jbossesb/util/XMLUtilsTest.java 2009-08-20 07:01:20 UTC (rev 776) @@ -20,7 +20,7 @@ package org.jboss.savara.jbossesb.util; import org.w3c.dom.Element; -import org.jboss.savara.jbossesb.XMLUtils; +import org.jboss.savara.internal.jbossesb.utils.XMLUtils; import org.junit.Test; import junit.framework.Assert;

14 years, 8 months

1
0
0 / 0

Overlord SVN: r775 - in cdl/trunk: runtime and 10 other directories.

by overlord-commits＠lists.jboss.org

Author: jeff.yuchang Date: 2009-08-20 01:58:57 -0400 (Thu, 20 Aug 2009) New Revision: 775 Added: cdl/trunk/validator/jbossesb/src/main/configs/ cdl/trunk/validator/jbossesb/src/main/configs/META-INF/ cdl/trunk/validator/jbossesb/src/main/configs/META-INF/deployment.xml cdl/trunk/validator/jbossesb/src/main/configs/META-INF/jboss-esb.xml cdl/trunk/validator/jbossesb/src/main/configs/esb-assembly.xml cdl/trunk/validator/jbossesb/src/main/configs/models/ cdl/trunk/validator/jbossesb/src/main/configs/models/TrailBlazer.cdm cdl/trunk/validator/jbossesb/src/main/configs/validator-config.xml Removed: cdl/trunk/Developer.txt cdl/trunk/install.xml cdl/trunk/runtime/pom.xml cdl/trunk/validator/jbossesb-assembly/ cdl/trunk/validator/pom.xml Modified: cdl/trunk/pom.xml cdl/trunk/runtime/jbossesb/pom.xml cdl/trunk/runtime/jbossesb/src/main/configs/esb-assembly.xml cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/WSBuyerClient.java cdl/trunk/samples/jbossesb/client/src/soap_message_01.xml cdl/trunk/validator/jbossesb/pom.xml Log: * Update the validator module (removing the esb maven plugin) Deleted: cdl/trunk/Developer.txt =================================================================== --- cdl/trunk/Developer.txt 2009-08-19 12:07:42 UTC (rev 774) +++ cdl/trunk/Developer.txt 2009-08-20 05:58:57 UTC (rev 775) @@ -1,16 +0,0 @@ - -Building from source ---------------------------- -0. Checked you have installed the Maven 2.0.9 or above. - Otherwise, you can download it from http://maven.apache.org -1. Download the JBossESB 4.5 from http://www.jboss.org/jbossesb/downloads/ -2. Run the following command to install the required libraries into local maven repository. - ant -f install.xml - - -Setting up in IDE ---------------------------- -1. Setup in Eclipse - run the following command to generate the eclipse specific environment: - mvn eclipse:eclipse - Deleted: cdl/trunk/install.xml =================================================================== --- cdl/trunk/install.xml 2009-08-19 12:07:42 UTC (rev 774) +++ cdl/trunk/install.xml 2009-08-20 05:58:57 UTC (rev 775) @@ -1,40 +0,0 @@ -<project name="Overlord-CDL" basedir="." default="install" > - - <property name="libraries.dir" value="${basedir}/distribution/libraries" /> - <property name="shell" value="/bin/sh" /> - - <target name="init"> - <condition property="shell" value="cmd.exe"> - <os family="Windows"/> - </condition> - - <condition property="shell" value="bin/sh"> - <os family="UNIX"/> - </condition> - </target> - - <target name="install" depends="init"> - <echo message="Install the libraries into the local maven repo" /> - <exec executable="${shell}"> - <arg line="-c 'mvn install:install-file -DgroupId=org.jboss.jbossesb -DartifactId=rosetta -Dversion=4.5 -Dpackaging=jar -Dfile=${libraries.dir}/rosetta-4.5.jar'" /> - </exec> - <exec executable="${shell}"> - <arg line="-c 'mvn install:install-file -DgroupId=org.jboss.jbossesb -DartifactId=config-model -Dversion=1.0.1 -Dpackaging=jar -Dfile=${libraries.dir}/config-model-1.0.1.jar'" /> - </exec> - <exec executable="${shell}"> - <arg line="-c 'mvn install:install-file -DgroupId=org.pi4soa -DartifactId=common -Dversion=2.0 -Dpackaging=jar -Dfile=${libraries.dir}/pi4soa-common-2.0.jar'" /> - </exec> - <exec executable="${shell}"> - <arg line="-c 'mvn install:install-file -DgroupId=org.pi4soa -DartifactId=cdl -Dversion=2.0 -Dpackaging=jar -Dfile=${libraries.dir}/pi4soa-cdl-2.0.jar'" /> - </exec> - <exec executable="${shell}"> - <arg line="-c 'mvn install:install-file -DgroupId=org.pi4soa -DartifactId=service -Dversion=2.0 -Dpackaging=jar -Dfile=${libraries.dir}/pi4soa-service-2.0.jar'" /> - </exec> - <exec executable="${shell}"> - <arg line="-c 'mvn install:install-file -DgroupId=org.eclipse.emf -DartifactId=common -Dversion=2.3.0 -Dpackaging=jar -Dfile=${libraries.dir}/eclipse-emf-common-2.3.0.jar'" /> - </exec> - <exec executable="${shell}"> - <arg line="-c 'mvn install:install-file -DgroupId=org.eclipse.emf -DartifactId=ecore -Dversion=2.3.1 -Dpackaging=jar -Dfile=${libraries.dir}/eclipse-emf-ecore-2.3.1.jar'" /> - </exec> - </target> -</project> Modified: cdl/trunk/pom.xml =================================================================== --- cdl/trunk/pom.xml 2009-08-19 12:07:42 UTC (rev 774) +++ cdl/trunk/pom.xml 2009-08-20 05:58:57 UTC (rev 775) @@ -1,208 +1,236 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss</groupId> - <artifactId>savara</artifactId> - <version>1.0-SNAPSHOT</version> - <packaging>pom</packaging> - <name>Savara</name> - <url>http://www.jboss.org/overlord/savara</url> - <description> - JBoss Savara. - </description> - <scm> - <connection>scm:svn:https://svn.jboss.org/repos/soag/savara/trunk</connection> - </scm> - <developers> - <developer> - <name>Jeff Yu</name> - <id>jeff.yuchang</id> - <email>cyu(a)redhat.com</email> - <organization>Red Hat</organization> - <roles> - <role>Developer</role> - </roles> - <timezone>+8</timezone> - </developer> - <developer> - <name>Gary Brown</name> - <id>objectiser</id> - <email>gbrown(a)redhat.com</email> - <organization>Red Hat</organization> - <roles> - <role>Developer</role> - </roles> - <timezone>+1</timezone> - </developer> - </developers> - <modules> - <module>runtime</module> - <module>validator</module> - <module>samples</module> - </modules> - - <properties> - <savara-version>1.0-SNAPSHOT</savara-version> - <junit.version>4.4</junit.version> - <rosetta.version>4.5</rosetta.version> - <log4j.version>1.2.14</log4j.version> - </properties> - - <profiles> - <profile> - <id>release</id> - <modules> - <module>docs/docbook</module> - <module>distribution</module> - </modules> - </profile> - <profile> -  - <id>docs</id> - <activation> - <property> - <name>generate.docs</name> - </property> - </activation> - <modules> - <module>docs</module> - </modules> - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <aggregate>true</aggregate> - <show>public</show> - <title>JBoss Savara ${project.version}</title> - </configuration> - </plugin> - </plugins> - </reporting> - </profile> - </profiles> - - <build> -  - <pluginManagement> - <plugins> -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>2.2</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.2</version> - <configuration> - <aggregate>true</aggregate> - </configuration> - </plugin> - </plugins> - </pluginManagement> - <plugins> -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.5</source> - <target>1.5</target> - <showDeprecation>false</showDeprecation> - <showWarnings>false</showWarnings> - </configuration> - </plugin> -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-sources</id> - <phase>verify</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <includes> - <include>**/*TestCase.java</include> - <include>**/*Test.java</include> - </includes> - </configuration> - </plugin> - </plugins> - </build> - - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-report-plugin</artifactId> - </plugin> - </plugins> - </reporting> - - <repositories> - <repository> - <id>jboss</id> - <url>http://repository.jboss.com/maven2/</url> - </repository> - - <repository> - <id>jboss-snapshot</id> - <url>http://snapshots.jboss.org/maven2</url> - </repository> - - <repository> - <id>maven.repo</id> - <name>maven repository</name> - <url>http://repo1.maven.org/maven2</url> - </repository> - - <repository> - <id>ibiblio</id> - <name>ibiblio repository</name> - <url>http://mirrors.ibiblio.org/pub/mirrors/maven2</url> - </repository> - - <repository> - <id>codehaus</id> - <name>codehaus repository</name> - <url>http://repo1.maven.org/maven2</url> - </repository> - -  -  - - </repositories> - - <distributionManagement> - <repository> -  - <id>repository.jboss.org</id> - <url>file://${jboss.repository.root}</url> - </repository> - </distributionManagement> - -</project> - +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss</groupId> + <artifactId>savara</artifactId> + <version>1.0-SNAPSHOT</version> + <packaging>pom</packaging> + <name>Savara</name> + <url>http://www.jboss.org/overlord/savara</url> + <description> + JBoss Savara. + </description> + <scm> + <connection>scm:svn:https://svn.jboss.org/repos/soag/savara/trunk</connection> + </scm> + <developers> + <developer> + <name>Jeff Yu</name> + <id>jeff.yuchang</id> + <email>cyu(a)redhat.com</email> + <organization>Red Hat</organization> + <roles> + <role>Developer</role> + </roles> + <timezone>+8</timezone> + </developer> + <developer> + <name>Gary Brown</name> + <id>objectiser</id> + <email>gbrown(a)redhat.com</email> + <organization>Red Hat</organization> + <roles> + <role>Developer</role> + </roles> + <timezone>+1</timezone> + </developer> + </developers> + <modules> + <module>runtime/jbossesb</module> + <module>validator/jbossesb</module> + <module>samples</module> + </modules> + + <profiles> + <profile> + <id>release</id> + <modules> + <module>docs/docbook</module> + <module>distribution</module> + </modules> + </profile> + <profile> +  + <id>docs</id> + <activation> + <property> + <name>generate.docs</name> + </property> + </activation> + <modules> + <module>docs</module> + </modules> + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <aggregate>true</aggregate> + <show>public</show> + <title>JBoss Savara ${project.version}</title> + </configuration> + </plugin> + </plugins> + </reporting> + </profile> + </profiles> + + <build> +  + <pluginManagement> + <plugins> +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.2</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.2</version> + <configuration> + <aggregate>true</aggregate> + </configuration> + </plugin> + </plugins> + </pluginManagement> + <plugins> +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> + <configuration> + <source>1.5</source> + <target>1.5</target> + <showDeprecation>false</showDeprecation> + <showWarnings>false</showWarnings> + </configuration> + </plugin> +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-sources</id> + <phase>verify</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <includes> + <include>**/*TestCase.java</include> + <include>**/*Test.java</include> + </includes> + </configuration> + </plugin> + </plugins> + </build> + + <properties> + <savara-version>1.0-SNAPSHOT</savara-version> + <junit.version>4.4</junit.version> + <rosetta.version>4.5</rosetta.version> + <log4j.version>1.2.14</log4j.version> + <mvel.version>1.3.4-java1.5</mvel.version> + </properties> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.overlord.dependencies.org.jboss.esb</groupId> + <artifactId>jbossesb-rosetta</artifactId> + <version>${rosetta.version}</version> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>${log4j.version}</version> + </dependency> + <dependency> + <groupId>org.mvel</groupId> + <artifactId>mvel</artifactId> + <version>${mvel.version}</version> + </dependency> + </dependencies> + </dependencyManagement> + + + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-report-plugin</artifactId> + </plugin> + </plugins> + </reporting> + + <repositories> + <repository> + <id>jboss</id> + <url>http://repository.jboss.com/maven2/</url> + </repository> + + <repository> + <id>jboss-snapshot</id> + <url>http://snapshots.jboss.org/maven2</url> + </repository> + + <repository> + <id>maven.repo</id> + <name>maven repository</name> + <url>http://repo1.maven.org/maven2</url> + </repository> + + <repository> + <id>ibiblio</id> + <name>ibiblio repository</name> + <url>http://mirrors.ibiblio.org/pub/mirrors/maven2</url> + </repository> + + <repository> + <id>codehaus</id> + <name>codehaus repository</name> + <url>http://repo1.maven.org/maven2</url> + </repository> + +  +  + + </repositories> + + <distributionManagement> + <repository> +  + <id>repository.jboss.org</id> + <url>file://${jboss.repository.root}</url> + </repository> + </distributionManagement> + +</project> + Modified: cdl/trunk/runtime/jbossesb/pom.xml =================================================================== --- cdl/trunk/runtime/jbossesb/pom.xml 2009-08-19 12:07:42 UTC (rev 774) +++ cdl/trunk/runtime/jbossesb/pom.xml 2009-08-20 05:58:57 UTC (rev 775) @@ -2,15 +2,16 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.savara.runtime</groupId> - <artifactId>savara-jbossesb</artifactId> + <groupId>org.jboss.savara</groupId> + <artifactId>savara-runtime-jbossesb</artifactId> <packaging>jar</packaging> <name>Savara::Runtime::JBoss ESB</name> <parent> - <groupId>org.jboss.savara</groupId> - <artifactId>runtime</artifactId> + <groupId>org.jboss</groupId> + <artifactId>savara</artifactId> <version>1.0-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> </parent> <properties> @@ -20,22 +21,18 @@ <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>${log4j.version}</version> </dependency> <dependency> <groupId>org.jboss.overlord.dependencies.org.jboss.esb</groupId> <artifactId>jbossesb-rosetta</artifactId> - <version>${rosetta.version}</version> </dependency> <dependency> <groupId>org.mvel</groupId> <artifactId>mvel</artifactId> - <version>1.3.4-java1.5</version> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>${junit.version}</version> <scope>test</scope> </dependency> </dependencies> @@ -52,7 +49,7 @@ <goal>single</goal> </goals> <configuration> - <finalName>savara-runtime.esb</finalName> + <finalName>savara-runtime-jbossesb.esb</finalName> <appendAssemblyId>true</appendAssemblyId> <descriptors> <descriptor>src/main/configs/esb-assembly.xml</descriptor> Modified: cdl/trunk/runtime/jbossesb/src/main/configs/esb-assembly.xml =================================================================== --- cdl/trunk/runtime/jbossesb/src/main/configs/esb-assembly.xml 2009-08-19 12:07:42 UTC (rev 774) +++ cdl/trunk/runtime/jbossesb/src/main/configs/esb-assembly.xml 2009-08-20 05:58:57 UTC (rev 775) @@ -20,7 +20,7 @@ <dependencySet> <outputDirectory>/</outputDirectory> <includes> - <include>org.jboss.savara.runtime:savara-jbossesb</include> + <include>org.jboss.savara:savara-runtime-jbossesb</include> </includes> </dependencySet> </dependencySets> Deleted: cdl/trunk/runtime/pom.xml =================================================================== --- cdl/trunk/runtime/pom.xml 2009-08-19 12:07:42 UTC (rev 774) +++ cdl/trunk/runtime/pom.xml 2009-08-20 05:58:57 UTC (rev 775) @@ -1,21 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.savara</groupId> - <artifactId>runtime</artifactId> - <packaging>pom</packaging> - <name>Savara::Runtime</name> - - <parent> - <groupId>org.jboss</groupId> - <artifactId>savara</artifactId> - <version>1.0-SNAPSHOT</version> - </parent> - - <modules> - <module>jbossesb</module> - </modules> - -</project> - Modified: cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/WSBuyerClient.java =================================================================== --- cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/WSBuyerClient.java 2009-08-19 12:07:42 UTC (rev 774) +++ cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/WSBuyerClient.java 2009-08-20 05:58:57 UTC (rev 775) @@ -61,7 +61,7 @@ */ public static void main(String[] args) throws Throwable{ WSBuyerClient client = new WSBuyerClient(); - String msg = getMessage("02"); + String msg = getMessage("01"); System.out.println(msg); client.sendMessageToJBRListener("http", 8765, msg); } Modified: cdl/trunk/samples/jbossesb/client/src/soap_message_01.xml =================================================================== --- cdl/trunk/samples/jbossesb/client/src/soap_message_01.xml 2009-08-19 12:07:42 UTC (rev 774) +++ cdl/trunk/samples/jbossesb/client/src/soap_message_01.xml 2009-08-20 05:58:57 UTC (rev 775) @@ -4,7 +4,7 @@ <wsdl:checkCredit> <CreditCheckRequest id="1" xmlns:ns2="http://www.jboss.org/overlord/examples/xsd"> <ns2:account>243</ns2:account> - <ns2:amount>500</ns2:amount> + <ns2:amount>502</ns2:amount> </CreditCheckRequest> </wsdl:checkCredit> </soapenv:Body> Modified: cdl/trunk/validator/jbossesb/pom.xml =================================================================== --- cdl/trunk/validator/jbossesb/pom.xml 2009-08-19 12:07:42 UTC (rev 774) +++ cdl/trunk/validator/jbossesb/pom.xml 2009-08-20 05:58:57 UTC (rev 775) @@ -2,15 +2,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.soa.overlord.cdl.validator</groupId> - <artifactId>cdl-validator-jbossesb</artifactId> + <groupId>org.jboss.savara</groupId> + <artifactId>savara-validator-jbossesb</artifactId> <version>1.0-SNAPSHOT</version> <packaging>jar</packaging> - <name>Overlord::CDL::Validator::JBossESB</name> + <name>Savara::Validator::JBossESB</name> <parent> - <groupId>org.jboss.soa.overlord.cdl</groupId> - <artifactId>validator</artifactId> + <groupId>org.jboss</groupId> + <artifactId>savara</artifactId> <version>1.0-SNAPSHOT</version> </parent> @@ -18,19 +18,16 @@ <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>${log4j.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.overlord.dependencies.org.jboss.esb</groupId> <artifactId>jbossesb-rosetta</artifactId> - <version>${rosetta.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>${junit.version}</version> <scope>test</scope> </dependency> <dependency> @@ -67,7 +64,26 @@ <build> <plugins> - <plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>dist</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <finalName>savara-validator-jbossesb.esb</finalName> + <appendAssemblyId>true</appendAssemblyId> + <descriptors> + <descriptor>src/main/configs/esb-assembly.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-javadoc-plugin</artifactId> <executions> <execution> @@ -103,7 +119,7 @@ <encoding>UTF-8</encoding> <locale>en_US</locale> </configuration> - </plugin> + </plugin> </plugins> </build> Added: cdl/trunk/validator/jbossesb/src/main/configs/META-INF/deployment.xml =================================================================== --- cdl/trunk/validator/jbossesb/src/main/configs/META-INF/deployment.xml (rev 0) +++ cdl/trunk/validator/jbossesb/src/main/configs/META-INF/deployment.xml 2009-08-20 05:58:57 UTC (rev 775) @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jbossesb-deployment> + <depends>jboss.esb:deployment=jbossesb.esb</depends> + <depends>pi4soa:service=pi4soa</depends> +</jbossesb-deployment> Added: cdl/trunk/validator/jbossesb/src/main/configs/META-INF/jboss-esb.xml =================================================================== --- cdl/trunk/validator/jbossesb/src/main/configs/META-INF/jboss-esb.xml (rev 0) +++ cdl/trunk/validator/jbossesb/src/main/configs/META-INF/jboss-esb.xml 2009-08-20 05:58:57 UTC (rev 775) @@ -0,0 +1,6 @@ +<?xml version = "1.0" encoding = "UTF-8"?> +<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml..." parameterReloadSecs="5"> +  +</jbossesb> Added: cdl/trunk/validator/jbossesb/src/main/configs/esb-assembly.xml =================================================================== --- cdl/trunk/validator/jbossesb/src/main/configs/esb-assembly.xml (rev 0) +++ cdl/trunk/validator/jbossesb/src/main/configs/esb-assembly.xml 2009-08-20 05:58:57 UTC (rev 775) @@ -0,0 +1,27 @@ +<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd"> + <id>dist</id> + <formats> + <format>zip</format> + </formats> + <includeBaseDirectory>true</includeBaseDirectory> + <fileSets> + <fileSet> + <directory>src/main/configs</directory> + <outputDirectory>/</outputDirectory> + <excludes> + <exclude>esb-assembly.xml</exclude> + </excludes> + </fileSet> + </fileSets> + + <dependencySets> + <dependencySet> + <outputDirectory>/</outputDirectory> + <includes> + <include>org.jboss.savara:savara-validator-jbossesb</include> + </includes> + </dependencySet> + </dependencySets> + +</assembly> Added: cdl/trunk/validator/jbossesb/src/main/configs/models/TrailBlazer.cdm =================================================================== --- cdl/trunk/validator/jbossesb/src/main/configs/models/TrailBlazer.cdm (rev 0) +++ cdl/trunk/validator/jbossesb/src/main/configs/models/TrailBlazer.cdm 2009-08-20 05:58:57 UTC (rev 775) @@ -0,0 +1,109 @@ +<?xml version="1.0" encoding="UTF-8"?> +<org.pi4soa.cdl:Package xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.pi4soa.cdl="http:///org/pi4soa/cdl.ecore" description="The choreography description for TrailBlazer" name="TrailBlazer" author="gary" version="0.1" targetNamespace="http://www.pi4soa.org/TrailBlazer"> + <typeDefinitions> + <nameSpaces description="Target Namespace for TrailBlazer" prefix="tns" uRI="http://www.pi4soa.org/TrailBlazer"/> + <nameSpaces description="XML Schema Namespace" prefix="xsd" uRI="http://www.w3.org/2001/XMLSchema"/> + <informationTypes description="This is the information type CreditCheckReq" name="CreditCheckReq" elementName="creditCheck"/> + <informationTypes description="This is the information type CreditCheckResp" name="CreditCheckResp" elementName="creditCheckResult"/> + <informationTypes description="This is the information type InsufficientCredit" name="InsufficientCredit" elementName="insufficientCredit"/> + <informationTypes description="This is the information type Quote" name="Quote" elementName="quote"/> + <informationTypes description="This is the information type QuoteRefType" name="QuoteRefType" typeName="xsd:string"/> + <informationTypes description="This is the information type QuoteReq" name="QuoteReq" elementName="quoteRequest"/> + <informationTypes description="This is the information type SSNType" name="SSNType" typeName="xsd:string"/> + <informationTypes description="This is the information type URIType" name="URIType" typeName="xsd:anyURI"/> + <tokens description="This is the token QuoteRef" name="QuoteRef" informationType="//@typeDefinitions/(a)informationTypes.4"/> + <tokens description="This is the token SSN" name="SSN" informationType="//@typeDefinitions/(a)informationTypes.6"/> + <tokens description="This is the token URI" name="URI" informationType="//@typeDefinitions/(a)informationTypes.7"/> + <tokenLocators description="This is the token locator QuoteRef4InsufficientCredit" token="//@typeDefinitions/(a)tokens.0" informationType="//@typeDefinitions/(a)informationTypes.2" query="//ref/text()" name="QuoteRef4InsufficientCredit"/> + <tokenLocators description="This is the token locator QuoteRef4Quote" token="//@typeDefinitions/(a)tokens.0" informationType="//@typeDefinitions/(a)informationTypes.3" query="//ref/text()" name="QuoteRef4Quote"/> + <tokenLocators description="This is the token locator QuoteRef4QuoteReq" token="//@typeDefinitions/(a)tokens.0" informationType="//@typeDefinitions/(a)informationTypes.5" query="//@ref" name="QuoteRef4QuoteReq"/> + <tokenLocators description="This is the token locator SSN4CreditCheckReq" token="//@typeDefinitions/(a)tokens.1" informationType="//@typeDefinitions/(a)informationTypes.0" query="//@ssn" name="SSN4CreditCheckReq"/> + <tokenLocators description="This is the token locator SSN4CreditCheckResp" token="//@typeDefinitions/(a)tokens.1" informationType="//@typeDefinitions/(a)informationTypes.1" query="//@ssn" name="SSN4CreditCheckResp"/> + <tokenLocators description="This is the token locator SSN4InsufficientCredit" token="//@typeDefinitions/(a)tokens.1" informationType="//@typeDefinitions/(a)informationTypes.2" query="//customerUID/text()" name="SSN4InsufficientCredit"/> + <tokenLocators description="This is the token locator SSN4Quote" token="//@typeDefinitions/(a)tokens.1" informationType="//@typeDefinitions/(a)informationTypes.3" query="//customerUID/text()" name="SSN4Quote"/> + <tokenLocators description="This is the token locator SSN4QuoteReq" token="//@typeDefinitions/(a)tokens.1" informationType="//@typeDefinitions/(a)informationTypes.5" query="//@ssn" name="SSN4QuoteReq"/> + <roleTypes description="This is the role type Bank" name="Bank"> + <behaviors description="This is the behavior BankBehavior" name="BankBehavior" interface="bank"/> + </roleTypes> + <roleTypes description="This is the role type CreditAgency" name="CreditAgency"> + <behaviors description="This is the behavior CreditAgencyBehavior" name="CreditAgencyBehavior" interface="creditAgency"/> + </roleTypes> + <roleTypes description="This is the role type LoanBroker" name="LoanBroker"> + <behaviors description="This is the behavior LoanBrokerBehavior" name="LoanBrokerBehavior" interface="loanBroker"/> + </roleTypes> + <roleTypes description="This is the role type Notifier" name="Notifier"> + <behaviors description="This is the behavior NotifierBehavior" name="NotifierBehavior" interface="notifier"/> + </roleTypes> + <relationshipTypes description="Relationship between LoanBroker and Bank" name="LoanBrokerToBankRel" firstRoleType="//@typeDefinitions/(a)roleTypes.2" secondRoleType="//@typeDefinitions/(a)roleTypes.0"/> + <relationshipTypes description="Relationship between LoanBroker and CreditAgency" name="LoanBrokerToCreditAgencyRel" firstRoleType="//@typeDefinitions/(a)roleTypes.2" secondRoleType="//@typeDefinitions/(a)roleTypes.1"/> + <relationshipTypes description="Relationship between LoanBroker and Notifier" name="LoanBrokerToNotifierRel" firstRoleType="//@typeDefinitions/(a)roleTypes.2" secondRoleType="//@typeDefinitions/(a)roleTypes.3"/> + <participantTypes description="This is the participant type BankParticipant" name="BankParticipant" roleTypes="//@typeDefinitions/(a)roleTypes.0"/> + <participantTypes description="This is the participant type CreditAgencyParticipant" name="CreditAgencyParticipant" roleTypes="//@typeDefinitions/(a)roleTypes.1"/> + <participantTypes description="This is the participant type LoanBrokerParticipant" name="LoanBrokerParticipant" roleTypes="//@typeDefinitions/(a)roleTypes.2"/> + <participantTypes description="This is the participant type NotifierParticipant" name="NotifierParticipant" roleTypes="//@typeDefinitions/(a)roleTypes.3"/> + <channelTypes description="This is the channel type BankChannelType" name="BankChannelType" referenceToken="//@typeDefinitions/(a)tokens.2" roleType="//@typeDefinitions/(a)roleTypes.0"> + <identities description="SSN Id and Quote Ref" tokens="//@typeDefinitions/(a)tokens.1 //@typeDefinitions/(a)tokens.0"/> + <identities description="SSN Id" type="Association" tokens="//@typeDefinitions/(a)tokens.1"/> + </channelTypes> + <channelTypes description="This is the channel type CreditAgencyChannelType" name="CreditAgencyChannelType" referenceToken="//@typeDefinitions/(a)tokens.2" roleType="//@typeDefinitions/(a)roleTypes.1"> + <identities description="SSN Id" tokens="//@typeDefinitions/(a)tokens.1"/> + </channelTypes> + <channelTypes description="This is the channel type NotifierChannelType" name="NotifierChannelType" referenceToken="//@typeDefinitions/(a)tokens.2" roleType="//@typeDefinitions/(a)roleTypes.3"> + <identities description="SSN Id" type="Association" tokens="//@typeDefinitions/(a)tokens.1"/> + <identities description="SSN Id and Quote Ref" tokens="//@typeDefinitions/(a)tokens.1 //@typeDefinitions/(a)tokens.0"/> + </channelTypes> + </typeDefinitions> + <choreographies description="Choreography flow for the TrailBlazer process" name="TrailBlazerProcess" root="true"> + <enclosedChoreographies name="RequestQuote"> + <variableDefinitions description="Channel to facilitate interaction to Bank" name="BankChannel" type="//@typeDefinitions/(a)channelTypes.0" roleTypes="//@typeDefinitions/(a)roleTypes.0 //@typeDefinitions/(a)roleTypes.2"/> + <variableDefinitions description="Channel to facilitate interaction to Notifier" name="NotifierChannel" type="//@typeDefinitions/(a)channelTypes.2" roleTypes="//@typeDefinitions/(a)roleTypes.2 //@typeDefinitions/(a)roleTypes.3"/> + <activities xsi:type="org.pi4soa.cdl:Interaction" name="QuoteRequest" operation="requestQuote" channelVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.0"> + <exchangeDetails description="This is the exchange details for the request exchange associated with interaction QuoteRequest" name="QuoteRequestRequestExchange" type="//@typeDefinitions/(a)informationTypes.5"> + <semanticAnnotations annotation="<jbossesb>
	<destination name="{{Destination;The URI for the ESB destination;string;;jms:queue/esb-tb-jmsBankRequestQueue}}"
		dynamicReplyTo="{{Dynamic ReplyTo;Whether the replyTo destination is dynamic;boolean;;false}}" />
</jbossesb>
" name="jbossesb"/> + <semanticAnnotations annotation="<jbossesb>
	<destination name="{{Destination;The URI for the ESB destination;string;;jms:queue/esb-tb-fileBankRequestQueue}}"
		dynamicReplyTo="{{Dynamic ReplyTo;Whether the replyTo destination is dynamic;boolean;;false}}" />
</jbossesb>
" name="jbossesb"/> + </exchangeDetails> + <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction QuoteRequest" name="QuoteRequestRespondExchange" type="//@typeDefinitions/(a)informationTypes.3" action="Respond"> + <semanticAnnotations annotation="<jbossesb>
	<destination name="{{Destination;The URI for the ESB destination;string;;jms:queue/esb-tb-jmsBankResponseQueue}}"
		dynamicReplyTo="{{Dynamic ReplyTo;Whether the replyTo destination is dynamic;boolean;;false}}" />
</jbossesb>
" name="jbossesb"/> + <semanticAnnotations annotation="<jbossesb>
	<destination name="{{Destination;The URI for the ESB destination;string;;jms:queue/esb-tb-fileBankResponseQueue}}"
		dynamicReplyTo="{{Dynamic ReplyTo;Whether the replyTo destination is dynamic;boolean;;false}}" />
</jbossesb>
" name="jbossesb"/> + </exchangeDetails> + </activities> + <activities xsi:type="org.pi4soa.cdl:Interaction" name="NotifyCustomer" operation="notify" channelVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.1" relationship="//@typeDefinitions/(a)relationshipTypes.2"> + <exchangeDetails description="This is the exchange details for the request exchange associated with interaction NotifyCustomer" name="NotifyCustomerRequestExchange" type="//@typeDefinitions/(a)informationTypes.3"> + <semanticAnnotations annotation="<jbossesb>
	<destination name="{{Destination;The URI for the ESB destination;string;;jms:queue/esb-tb-customerNotifier}}"
		dynamicReplyTo="{{Dynamic ReplyTo;Whether the replyTo destination is dynamic;boolean;;false}}" />
</jbossesb>
" name="jbossesb"/> + </exchangeDetails> + </activities> + </enclosedChoreographies> + <variableDefinitions description="Channel to facilitate interaction to CreditAgency" name="CreditAgencyChannel" type="//@typeDefinitions/(a)channelTypes.1" roleTypes="//@typeDefinitions/(a)roleTypes.1 //@typeDefinitions/(a)roleTypes.2"/> + <variableDefinitions description="This is the variable NotifierChannel" name="NotifierChannel" type="//@typeDefinitions/(a)channelTypes.2" roleTypes="//@typeDefinitions/(a)roleTypes.2 //@typeDefinitions/(a)roleTypes.3"/> + <variableDefinitions description="This is the variable creditCheckResult" name="creditCheckResult" type="//@typeDefinitions/(a)informationTypes.1" roleTypes="//@typeDefinitions/(a)roleTypes.2"/> + <activities xsi:type="org.pi4soa.cdl:Interaction" name="CreditCheck" operation="checkCredit" channelVariable="//@choreographies.0/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.1"> + <exchangeDetails description="This is the exchange details for the request exchange associated with interaction CreditCheck" name="CreditCheckRequestExchange" type="//@typeDefinitions/(a)informationTypes.0"> + <semanticAnnotations annotation="<jbossesb>
	<destination name="{{Destination;The URI for the ESB destination;string;;jms:queue/esb-tb-creditAgencyQueue}}"
		dynamicReplyTo="{{Dynamic ReplyTo;Whether the replyTo destination is dynamic;boolean;;false}}" />
</jbossesb>
" name="jbossesb"/> + </exchangeDetails> + </activities> + <activities xsi:type="org.pi4soa.cdl:Interaction" name="CreditCheck" operation="checkCredit" channelVariable="//@choreographies.0/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.1"> + <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction CreditCheck" name="CreditCheckRespondExchange" type="//@typeDefinitions/(a)informationTypes.1" action="Respond" receiveVariable="//@choreographies.0/(a)variableDefinitions.2"> + <semanticAnnotations annotation="<jbossesb>
	<destination name="{{Destination;The URI for the ESB destination;string;;jms:queue/esb-tb-creditAgencyQueue_reply}}"
		dynamicReplyTo="{{Dynamic ReplyTo;Whether the replyTo destination is dynamic;boolean;;false}}" />
</jbossesb>
" name="jbossesb"/> + </exchangeDetails> + </activities> + <activities xsi:type="org.pi4soa.cdl:Choice"> + <activities xsi:type="org.pi4soa.cdl:Conditional" description="Sufficient credit to request quotes" name="ValidCredit" expression="cdl:getVariable('creditCheckResult','','//@score') >= 4"> + <activities xsi:type="org.pi4soa.cdl:Parallel"> + <activities xsi:type="org.pi4soa.cdl:Sequence" description="First quote"> + <activities xsi:type="org.pi4soa.cdl:Perform" choreography="//@choreographies.0/(a)enclosedChoreographies.0"/> + </activities> + <activities xsi:type="org.pi4soa.cdl:Sequence" description="Second quote"> + <activities xsi:type="org.pi4soa.cdl:Perform" choreography="//@choreographies.0/(a)enclosedChoreographies.0"/> + </activities> + </activities> + </activities> + <activities xsi:type="org.pi4soa.cdl:Sequence" description="Insufficient credit"> + <activities xsi:type="org.pi4soa.cdl:Interaction" name="NotifyCustomer" operation="notify" channelVariable="//@choreographies.0/(a)variableDefinitions.1" relationship="//@typeDefinitions/(a)relationshipTypes.2"> + <exchangeDetails description="This is the exchange details for the request exchange associated with interaction NotifyCustomer" name="NotifyCustomerRequestExchange" type="//@typeDefinitions/(a)informationTypes.2"> + <semanticAnnotations annotation="<jbossesb>
	<destination name="{{Destination;The URI for the ESB destination;string;;jms:queue/esb-tb-customerNotifier}}"
		dynamicReplyTo="{{Dynamic ReplyTo;Whether the replyTo destination is dynamic;boolean;;false}}" />
</jbossesb>
" name="jbossesb"/> + </exchangeDetails> + </activities> + </activities> + </activities> + </choreographies> +</org.pi4soa.cdl:Package> Added: cdl/trunk/validator/jbossesb/src/main/configs/validator-config.xml =================================================================== --- cdl/trunk/validator/jbossesb/src/main/configs/validator-config.xml (rev 0) +++ cdl/trunk/validator/jbossesb/src/main/configs/validator-config.xml 2009-08-20 05:58:57 UTC (rev 775) @@ -0,0 +1,2 @@ +<validator mode="monitor" replyToTimeout="10000" > +</validator> Deleted: cdl/trunk/validator/pom.xml =================================================================== --- cdl/trunk/validator/pom.xml 2009-08-19 12:07:42 UTC (rev 774) +++ cdl/trunk/validator/pom.xml 2009-08-20 05:58:57 UTC (rev 775) @@ -1,23 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.soa.overlord.cdl</groupId> - <artifactId>validator</artifactId> - <packaging>pom</packaging> - <version>1.0-SNAPSHOT</version> - <name>Overlord::CDL::Validator</name> - - <parent> - <groupId>org.jboss</groupId> - <artifactId>savara</artifactId> - <version>1.0-SNAPSHOT</version> - </parent> - - <modules> - <module>jbossesb</module> - <module>jbossesb-assembly</module> - </modules> - -</project> -

14 years, 8 months

1
0
0 / 0

Overlord SVN: r774 - in bpm-console/trunk: gui/war/src/main/java/org/jboss/bpm/console/client and 2 other directories.

by overlord-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-08-19 08:07:42 -0400 (Wed, 19 Aug 2009) New Revision: 774 Modified: bpm-console/trunk/BPMC.iws bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java bpm-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css bpm-console/trunk/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java Log: Include header debug information and version info upon login Modified: bpm-console/trunk/BPMC.iws =================================================================== --- bpm-console/trunk/BPMC.iws 2009-08-19 09:58:12 UTC (rev 773) +++ bpm-console/trunk/BPMC.iws 2009-08-19 12:07:42 UTC (rev 774) @@ -18,6 +18,7 @@ <component name="ChangeListManager"> <list default="true" name="Default" comment=""> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java" afterPath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css" afterPath="$PROJECT_DIR$/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/BPMC.iws" afterPath="$PROJECT_DIR$/BPMC.iws" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java" afterPath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java" afterPath="$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java" /> @@ -106,7 +107,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java" line="88" class="Class at Authentication.java:87" package="org.jboss.bpm.console.client"> + <breakpoint url="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java" line="91" class="Class at Authentication.java:87" package="org.jboss.bpm.console.client"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -204,28 +205,28 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="AbstractRESTAction.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java"> + <file leaf-file-name="Header.java" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="79" column="21" selection-start="2890" selection-end="3075" vertical-scroll-proportion="0.28447205"> + <state line="113" column="52" selection-start="4195" selection-end="4195" vertical-scroll-proportion="0.7552795"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="LoginView.java" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java"> + <file leaf-file-name="console.css" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css"> <provider selected="true" editor-type-id="text-editor"> - <state line="130" column="36" selection-start="4166" selection-end="4166" vertical-scroll-proportion="0.66086954"> + <state line="45" column="37" selection-start="706" selection-end="706" vertical-scroll-proportion="0.60487807"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="RenderReportAction.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java"> + <file leaf-file-name="LoginView.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="84" column="21" selection-start="3146" selection-end="3146" vertical-scroll-proportion="0.3242236"> + <state line="120" column="46" selection-start="3683" selection-end="3683" vertical-scroll-proportion="-1.484472"> <folding /> </state> </provider> @@ -234,39 +235,12 @@ <file leaf-file-name="Authentication.java" pinned="false" current="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="193" column="34" selection-start="6095" selection-end="6095" vertical-scroll-proportion="0.26459628"> + <state line="270" column="4" selection-start="7894" selection-end="7894" vertical-scroll-proportion="0.45217392"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="Header.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="99" column="6" selection-start="3361" selection-end="3361" vertical-scroll-proportion="0.5463415"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="ApplicationContext.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/ApplicationContext.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="37" column="11" selection-start="1412" selection-end="1412" vertical-scroll-proportion="0.31219512"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="UserMgmtFacade.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/server/war/src/main/java/org/jboss/bpm/console/server/UserMgmtFacade.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="66" column="69" selection-start="2329" selection-end="2329" vertical-scroll-proportion="0.19875777"> - <folding /> - </state> - </provider> - </entry> - </file> </leaf> </component> <component name="FindManager"> @@ -625,6 +599,10 @@ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/resources" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -648,6 +626,94 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/resources" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/resources/org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/resources/org/jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/resources/org/jboss/bpm" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/resources/org/jboss/bpm/console" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="BPMC.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="gui-war" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/resources" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/resources/org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/resources/org/jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/resources/org/jboss/bpm" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/resources/org/jboss/bpm/console" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/resources/org/jboss/bpm/console/public" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="BPMC.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="gui-war" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> @@ -723,7 +789,53 @@ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="BPMC.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="gui-war" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> </subPane> </component> <component name="ProjectReloadState"> @@ -1057,27 +1169,6 @@ <option name="myLastEditedConfigurable" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/jmaki/xhp/XmlHttpProxy.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="156" column="92" selection-start="6299" selection-end="6299" vertical-scroll-proportion="0.96263736"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/jmaki/xhp/HttpClient.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="240" column="40" selection-start="7166" selection-end="7166" vertical-scroll-proportion="0.16666667"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/webapp/WEB-INF/web.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> - <folding /> - </state> - </provider> - </entry> <entry file="jar://$APPLICATION_HOME_DIR$/lib/resources.jar!/standardSchemas/web-app_2_3.dtd"> <provider selected="true" editor-type-id="text-editor"> <state line="431" column="10" selection-start="14438" selection-end="14438" vertical-scroll-proportion="0.2345679"> @@ -1119,13 +1210,6 @@ <state /> </provider> </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="79" column="21" selection-start="2890" selection-end="3075" vertical-scroll-proportion="0.28447205"> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java"> <provider selected="true" editor-type-id="text-editor"> <state line="84" column="21" selection-start="3146" selection-end="3146" vertical-scroll-proportion="0.3242236"> @@ -1147,27 +1231,57 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="99" column="6" selection-start="3361" selection-end="3361" vertical-scroll-proportion="0.5463415"> + <state line="79" column="21" selection-start="2890" selection-end="3075" vertical-scroll-proportion="0.28447205"> <folding /> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/ServerStatusView.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="34" column="13" selection-start="1464" selection-end="1464" vertical-scroll-proportion="0.15609756"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditor.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="68" column="49" selection-start="2400" selection-end="2415" vertical-scroll-proportion="0.93658537"> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="193" column="34" selection-start="6095" selection-end="6095" vertical-scroll-proportion="0.26459628"> + <state line="270" column="4" selection-start="7894" selection-end="7894" vertical-scroll-proportion="0.45217392"> <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="130" column="36" selection-start="4166" selection-end="4166" vertical-scroll-proportion="0.66086954"> + <state line="120" column="46" selection-start="3683" selection-end="3683" vertical-scroll-proportion="-1.484472"> <folding /> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css"> + <provider selected="true" editor-type-id="text-editor"> + <state line="45" column="37" selection-start="706" selection-end="706" vertical-scroll-proportion="0.60487807"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="113" column="52" selection-start="4195" selection-end="4195" vertical-scroll-proportion="0.7552795"> + <folding /> + </state> + </provider> + </entry> </component> </project> Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java 2009-08-19 09:58:12 UTC (rev 773) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java 2009-08-19 12:07:42 UTC (rev 774) @@ -29,6 +29,7 @@ import org.gwt.mosaic.ui.client.layout.BoxLayout; import org.gwt.mosaic.ui.client.layout.BoxLayoutData; import org.gwt.mosaic.ui.client.layout.LayoutPanel; +import org.gwt.mosaic.ui.client.LayoutPopupPanel; import org.jboss.bpm.console.client.icons.ConsoleIconBundle; import java.util.List; @@ -89,6 +90,33 @@ // account info Image img = icons.userIcon().createImage(); + img.addClickListener( + new ClickListener() + { + + public void onClick(Widget widget) + { + StringBuffer sb = new StringBuffer("<h3>User information</h3>"); + sb.append("- User: ").append(appContext.getAuthentication().getUsername()).append("<br/>"); + sb.append("- Logged in since: ").append(appContext.getAuthentication().getLoggedInSince()).append("<br/>"); + sb.append("- SID: ").append(appContext.getAuthentication().getSid()).append("<br/>"); + sb.append("- Roles: ").append(appContext.getAuthentication().getRolesAssigned()).append("<br/>"); + + + final LayoutPopupPanel popup = new LayoutPopupPanel(true); + popup.setPopupPosition( + widget.getAbsoluteLeft()-120, + widget.getAbsoluteTop()+20 + ); + popup.setAnimationEnabled(true); + popup.setSize("240px", "130px"); + HTML html = new HTML(sb.toString()); + html.setStyleName("bpm-user-info-popup"); + popup.add(html); + popup.show(); + } + } + ); HTML html = new HTML(appContext.getAuthentication().getUsername()); Button btn = new Button("Logout", new ClickListener() Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java 2009-08-19 09:58:12 UTC (rev 773) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java 2009-08-19 12:07:42 UTC (rev 774) @@ -30,6 +30,7 @@ import org.gwt.mosaic.ui.client.WindowPanel; import org.gwt.mosaic.ui.client.InfoPanel; import org.gwt.mosaic.ui.client.MessageBox; +import org.gwt.mosaic.ui.client.LayoutPopupPanel; import org.gwt.mosaic.ui.client.layout.*; import org.jboss.bpm.console.client.util.ConsoleLog; @@ -50,7 +51,7 @@ private Controller controller; public final static String[] KNOWN_ROLES = {"admin", "manager", "user"}; - + public LoginView() { @@ -76,7 +77,7 @@ { // force session invalidation, required to catch browser reload Authentication.logout(config); - + // start new session requestSessionID(); } @@ -198,6 +199,9 @@ layoutPanel.setLayout(new BorderLayout()); layoutPanel.setPadding(5); + + Widget form = createForm(); + final Button submit = new Button("Submit"); submit.addClickListener(new ClickListener() { @@ -208,10 +212,16 @@ } }); - Widget form = createForm(); - + + HTML html = new HTML("Version: " + Version.VERSION); + html.setStyleName("bpm-login-info"); + + LayoutPanel southContainer = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL)); + southContainer.add(submit, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); + southContainer.add(html); + layoutPanel.add(form, new BorderLayoutData(BorderLayout.Region.CENTER)); - layoutPanel.add(submit, new BorderLayoutData(BorderLayout.Region.SOUTH)); + layoutPanel.add(southContainer, new BorderLayoutData(BorderLayout.Region.SOUTH)); } @@ -281,6 +291,11 @@ grid.setWidget(1,0, new Label("Password:")); grid.setWidget(1,1, passwordInput); + /*DisclosurePanel msg = new DisclosurePanel("Contact Address"); + + grid.setWidget(2,0, new Label("")); + grid.setWidget(2,1, msg);*/ + p.add(grid); passwordInput.addKeyboardListener( @@ -304,6 +319,11 @@ } } ); + + + /*HTML htmlMsg = new HTML("Messages"); + p.add(htmlMsg);*/ + return p; } Modified: bpm-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css =================================================================== --- bpm-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css 2009-08-19 09:58:12 UTC (rev 773) +++ bpm-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css 2009-08-19 12:07:42 UTC (rev 774) @@ -37,6 +37,22 @@ color: #C8C8C8; } +.bpm-login-info { + font-family: sans-serif; + color: #000000; + font-size:9px; + width:95%; + margin-top:5px; + text-align:right; +} + +.bpm-user-info-popup { + font-family: sans-serif; + color: #000000; + font-size:9px; + margin:5px; +} + .bpm-property-image { padding-top:10px; } Modified: bpm-console/trunk/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java =================================================================== --- bpm-console/trunk/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java 2009-08-19 09:58:12 UTC (rev 773) +++ bpm-console/trunk/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java 2009-08-19 12:07:42 UTC (rev 774) @@ -34,6 +34,7 @@ import java.util.ArrayList; import java.util.List; +import java.util.Date; public class Authentication { @@ -47,12 +48,14 @@ private ConsoleConfig config; private String rolesUrl; + private Date loggedInSince; public Authentication(ConsoleConfig config, String sessionID, String rolesUrl) { this.config = config; this.sid = sessionID; this.rolesUrl = rolesUrl; + this.loggedInSince = new Date(); } public String getSid() @@ -117,6 +120,11 @@ } } + public Date getLoggedInSince() + { + return loggedInSince; + } + /** * Login using specific credentials. * This delegates to {@link com.google.gwt.http.client.RequestBuilder#setUser(String)} @@ -260,6 +268,7 @@ username = null; password = null; rolesAssigned = new ArrayList<String>(); + loggedInSince = null; } public void handleSessionTimeout()

14 years, 8 months

1
0
0 / 0

Overlord SVN: r773 - in bpm-console/trunk: gui/war/src/main/java/org/jboss/bpm/console/client and 1 other directories.

by overlord-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-08-19 05:58:12 -0400 (Wed, 19 Aug 2009) New Revision: 773 Modified: bpm-console/trunk/BPMC.iws bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java bpm-console/trunk/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java Log: Force logout in login screen to catch browser reloads Modified: bpm-console/trunk/BPMC.iws =================================================================== --- bpm-console/trunk/BPMC.iws 2009-08-19 09:35:31 UTC (rev 772) +++ bpm-console/trunk/BPMC.iws 2009-08-19 09:58:12 UTC (rev 773) @@ -17,10 +17,10 @@ </component> <component name="ChangeListManager"> <list default="true" name="Default" comment=""> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java" afterPath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/BPMC.iws" afterPath="$PROJECT_DIR$/BPMC.iws" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java" afterPath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java" afterPath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java" afterPath="$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java" afterPath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java" /> </list> <list name="Failed commit: Default" comment="remove dependency on DTOParser" /> </component> @@ -213,10 +213,10 @@ </provider> </entry> </file> - <file leaf-file-name="LoginView.java" pinned="false" current="false" current-in-tab="false"> + <file leaf-file-name="LoginView.java" pinned="false" current="true" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="232" column="20" selection-start="6479" selection-end="6479" vertical-scroll-proportion="0.18509316"> + <state line="130" column="36" selection-start="4166" selection-end="4166" vertical-scroll-proportion="0.66086954"> <folding /> </state> </provider> @@ -231,15 +231,42 @@ </provider> </entry> </file> - <file leaf-file-name="Authentication.java" pinned="false" current="true" current-in-tab="true"> + <file leaf-file-name="Authentication.java" pinned="false" current="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="204" column="20" selection-start="6327" selection-end="6327" vertical-scroll-proportion="0.2447205"> + <state line="193" column="34" selection-start="6095" selection-end="6095" vertical-scroll-proportion="0.26459628"> <folding /> </state> </provider> </entry> </file> + <file leaf-file-name="Header.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="99" column="6" selection-start="3361" selection-end="3361" vertical-scroll-proportion="0.5463415"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="ApplicationContext.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/ApplicationContext.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="37" column="11" selection-start="1412" selection-end="1412" vertical-scroll-proportion="0.31219512"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="UserMgmtFacade.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/server/war/src/main/java/org/jboss/bpm/console/server/UserMgmtFacade.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="66" column="69" selection-start="2329" selection-end="2329" vertical-scroll-proportion="0.19875777"> + <folding /> + </state> + </provider> + </entry> + </file> </leaf> </component> <component name="FindManager"> @@ -927,7 +954,7 @@ <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="7" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25099602" order="0" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.40229884" order="1" /> - <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24769102" order="1" /> + <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24701196" order="1" /> <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32992035" order="8" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="6" /> <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> @@ -1030,27 +1057,6 @@ <option name="myLastEditedConfigurable" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="75" column="66" selection-start="2468" selection-end="2468" vertical-scroll-proportion="1.512088"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/server/war/src/main/java/org/jboss/bpm/console/server/UserMgmtFacade.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="75" column="0" selection-start="2466" selection-end="2466" vertical-scroll-proportion="0.33186814"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/jmaki/xhp/XmlHttpProxyServlet.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="141" column="0" selection-start="5605" selection-end="5605" vertical-scroll-proportion="0.7032967"> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/jmaki/xhp/XmlHttpProxy.java"> <provider selected="true" editor-type-id="text-editor"> <state line="156" column="92" selection-start="6299" selection-end="6299" vertical-scroll-proportion="0.96263736"> @@ -1120,27 +1126,48 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="232" column="20" selection-start="6479" selection-end="6479" vertical-scroll-proportion="0.18509316"> + <state line="84" column="21" selection-start="3146" selection-end="3146" vertical-scroll-proportion="0.3242236"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java"> + <entry file="file://$PROJECT_DIR$/server/war/src/main/java/org/jboss/bpm/console/server/UserMgmtFacade.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="84" column="21" selection-start="3146" selection-end="3146" vertical-scroll-proportion="0.3242236"> + <state line="66" column="69" selection-start="2329" selection-end="2329" vertical-scroll-proportion="0.19875777"> <folding /> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/ApplicationContext.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="37" column="11" selection-start="1412" selection-end="1412" vertical-scroll-proportion="0.31219512"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="99" column="6" selection-start="3361" selection-end="3361" vertical-scroll-proportion="0.5463415"> + <folding /> + </state> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="204" column="20" selection-start="6327" selection-end="6327" vertical-scroll-proportion="0.2447205"> + <state line="193" column="34" selection-start="6095" selection-end="6095" vertical-scroll-proportion="0.26459628"> <folding /> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="130" column="36" selection-start="4166" selection-end="4166" vertical-scroll-proportion="0.66086954"> + <folding /> + </state> + </provider> + </entry> </component> </project> Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java 2009-08-19 09:35:31 UTC (rev 772) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java 2009-08-19 09:58:12 UTC (rev 773) @@ -96,7 +96,7 @@ public void onClick(Widget widget) { - appContext.getAuthentication().logout(); + appContext.getAuthentication().logoutAndReload(); } } ); Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java 2009-08-19 09:35:31 UTC (rev 772) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java 2009-08-19 09:58:12 UTC (rev 773) @@ -74,6 +74,10 @@ public void display() { + // force session invalidation, required to catch browser reload + Authentication.logout(config); + + // start new session requestSessionID(); } @@ -123,6 +127,8 @@ // move the loading div to foreground DOM.getElementById("splash").getStyle().setProperty("z-index", "1000"); DOM.getElementById("ui_loading").getStyle().setProperty("visibility", "visible"); + + // launch workspace new MainLayout(controller, auth, config); } }); @@ -133,7 +139,7 @@ public void onLoginFailed(Request request, Throwable t) { // auth failed - MessageBox.error("Login failed", t.getMessage()); + MessageBox.error("Login failed", t.getMessage()); ConsoleLog.error("Login failed", t); } } Modified: bpm-console/trunk/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java =================================================================== --- bpm-console/trunk/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java 2009-08-19 09:35:31 UTC (rev 772) +++ bpm-console/trunk/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java 2009-08-19 09:58:12 UTC (rev 773) @@ -191,10 +191,43 @@ $wnd.location.reload(); }-*/; - public void logout() + public static void logout(final ConsoleConfig conf) { RequestBuilder rb = new RequestBuilder( RequestBuilder.POST, + conf.getConsoleServerUrl()+"/rs/identity/sid/invalidate" + ); + + try + { + rb.sendRequest(null, new RequestCallback() + { + public void onResponseReceived(Request request, Response response) + { + ConsoleLog.debug("logout() HTTP "+response.getStatusCode()); + + if(response.getStatusCode()!=200) + { + ConsoleLog.error(response.getText()); + } + } + + public void onError(Request request, Throwable t) + { + ConsoleLog.error("Failed to invalidate session", t); + } + }); + } + catch (RequestException e) + { + ConsoleLog.error("Request error", e); + } + } + + public void logoutAndReload() + { + RequestBuilder rb = new RequestBuilder( + RequestBuilder.POST, config.getConsoleServerUrl()+"/rs/identity/sid/invalidate" ); @@ -204,7 +237,7 @@ { public void onResponseReceived(Request request, Response response) { - ConsoleLog.debug("logout() HTTP "+response.getStatusCode()); + ConsoleLog.debug("logoutAndReload() HTTP "+response.getStatusCode()); resetState(); reload(); } @@ -237,7 +270,7 @@ public void onResult(boolean b) { // regardless of the choice, force login - logout(); + logoutAndReload(); } } );

14 years, 8 months

1
0
0 / 0

Overlord SVN: r772 - in bpm-console/trunk: gui/war/src/main/java/org/jboss/bpm/console/client/common and 2 other directories.

by overlord-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-08-19 05:35:31 -0400 (Wed, 19 Aug 2009) New Revision: 772 Modified: bpm-console/trunk/BPMC.iws bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java bpm-console/trunk/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java Log: Catch 401 in all cases a RequestBuider is used. Move session expriration handling to Authentication.class Modified: bpm-console/trunk/BPMC.iws =================================================================== --- bpm-console/trunk/BPMC.iws 2009-08-19 05:39:44 UTC (rev 771) +++ bpm-console/trunk/BPMC.iws 2009-08-19 09:35:31 UTC (rev 772) @@ -18,7 +18,8 @@ <component name="ChangeListManager"> <list default="true" name="Default" comment=""> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/BPMC.iws" afterPath="$PROJECT_DIR$/BPMC.iws" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/server/war/src/main/webapp/login.html" afterPath="$PROJECT_DIR$/server/war/src/main/webapp/login.html" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java" afterPath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java" afterPath="$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java" afterPath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java" /> </list> <list name="Failed commit: Default" comment="remove dependency on DTOParser" /> @@ -105,7 +106,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java" line="87" class="Class at Authentication.java:87" package="org.jboss.bpm.console.client"> + <breakpoint url="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java" line="88" class="Class at Authentication.java:87" package="org.jboss.bpm.console.client"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -203,66 +204,42 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="LoginView.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java"> + <file leaf-file-name="AbstractRESTAction.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="135" column="67" selection-start="4310" selection-end="4359" vertical-scroll-proportion="0.60493827"> + <state line="79" column="21" selection-start="2890" selection-end="3075" vertical-scroll-proportion="0.28447205"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="FormProcessingFacade.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/server/war/src/main/java/org/jboss/bpm/console/server/FormProcessingFacade.java"> + <file leaf-file-name="LoginView.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="183" column="24" selection-start="5552" selection-end="5552" vertical-scroll-proportion="0.4234568"> + <state line="232" column="20" selection-start="6479" selection-end="6479" vertical-scroll-proportion="0.18509316"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="Authentication.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java"> + <file leaf-file-name="RenderReportAction.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="86" column="65" selection-start="2693" selection-end="3015" vertical-scroll-proportion="0.2765432"> + <state line="84" column="21" selection-start="3146" selection-end="3146" vertical-scroll-proportion="0.3242236"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="AbstractRESTAction.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java"> + <file leaf-file-name="Authentication.java" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="87" column="76" selection-start="3429" selection-end="3429" vertical-scroll-proportion="0.67160493"> + <state line="204" column="20" selection-start="6327" selection-end="6327" vertical-scroll-proportion="0.2447205"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="login_failed.html" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/server/war/src/main/webapp/login_failed.html"> - <provider selected="true" editor-type-id="text-editor"> - <state line="2" column="51" selection-start="18" selection-end="64" vertical-scroll-proportion="0.041078307"> - <folding /> - </state> - </provider> - <provider editor-type-id="HtmlPreview"> - <state /> - </provider> - </entry> - </file> - <file leaf-file-name="login.html" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/server/war/src/main/webapp/login.html"> - <provider selected="true" editor-type-id="text-editor"> - <state line="2" column="48" selection-start="62" selection-end="62" vertical-scroll-proportion="0.041078307"> - <folding /> - </state> - </provider> - <provider editor-type-id="HtmlPreview"> - <state /> - </provider> - </entry> - </file> </leaf> </component> <component name="FindManager"> @@ -719,14 +696,6 @@ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/jmaki" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/jmaki/xhp" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> </subPane> </component> @@ -949,15 +918,15 @@ </todo-panel> </component> <component name="ToolWindowManager"> - <frame x="325" y="35" width="1240" height="972" extended-state="0" /> + <frame x="363" y="39" width="1304" height="967" extended-state="0" /> <editor active="true" /> <layout> <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="7" /> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26448363" order="0" /> - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.40342858" order="1" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25099602" order="0" /> + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.40229884" order="1" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24769102" order="1" /> <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32992035" order="8" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="6" /> @@ -1061,13 +1030,6 @@ <option name="myLastEditedConfigurable" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="98" column="42" selection-start="3339" selection-end="3339" vertical-scroll-proportion="1.2731183"> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java"> <provider selected="true" editor-type-id="text-editor"> <state line="75" column="66" selection-start="2468" selection-end="2468" vertical-scroll-proportion="1.512088"> @@ -1126,51 +1088,58 @@ </entry> <entry file="file://$PROJECT_DIR$/server/war/src/main/java/org/jboss/bpm/console/server/FormProcessingFacade.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="183" column="24" selection-start="5552" selection-end="5552" vertical-scroll-proportion="0.4234568"> + <state line="183" column="24" selection-start="5552" selection-end="5552" vertical-scroll-proportion="0.42608696"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java"> + <entry file="file://$PROJECT_DIR$/server/war/src/main/webapp/login_failed.html"> <provider selected="true" editor-type-id="text-editor"> - <state line="86" column="65" selection-start="2693" selection-end="3015" vertical-scroll-proportion="0.2765432"> + <state line="2" column="51" selection-start="18" selection-end="64" vertical-scroll-proportion="0.04134367"> <folding /> </state> </provider> + <provider editor-type-id="HtmlPreview"> + <state /> + </provider> </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java"> + <entry file="file://$PROJECT_DIR$/server/war/src/main/webapp/login.html"> <provider selected="true" editor-type-id="text-editor"> - <state line="135" column="67" selection-start="4310" selection-end="4359" vertical-scroll-proportion="0.60493827"> + <state line="30" column="0" selection-start="614" selection-end="614" vertical-scroll-proportion="0.62015504"> <folding /> </state> </provider> + <provider editor-type-id="HtmlPreview"> + <state /> + </provider> </entry> <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="87" column="76" selection-start="3429" selection-end="3429" vertical-scroll-proportion="0.67160493"> + <state line="79" column="21" selection-start="2890" selection-end="3075" vertical-scroll-proportion="0.28447205"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/server/war/src/main/webapp/login_failed.html"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="2" column="51" selection-start="18" selection-end="64" vertical-scroll-proportion="0.041078307"> + <state line="232" column="20" selection-start="6479" selection-end="6479" vertical-scroll-proportion="0.18509316"> <folding /> </state> </provider> - <provider editor-type-id="HtmlPreview"> - <state /> + </entry> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="84" column="21" selection-start="3146" selection-end="3146" vertical-scroll-proportion="0.3242236"> + <folding /> + </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/server/war/src/main/webapp/login.html"> + <entry file="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="2" column="48" selection-start="62" selection-end="62" vertical-scroll-proportion="0.041078307"> + <state line="204" column="20" selection-start="6327" selection-end="6327" vertical-scroll-proportion="0.2447205"> <folding /> </state> </provider> - <provider editor-type-id="HtmlPreview"> - <state /> - </provider> </entry> </component> </project> Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java 2009-08-19 05:39:44 UTC (rev 771) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java 2009-08-19 09:35:31 UTC (rev 772) @@ -75,16 +75,7 @@ { if(response.getText().indexOf("HTTP 401")!=-1) // HACK { - MessageBox.confirm("Session expired", "Please login again", - new MessageBox.ConfirmationCallback() - { - public void onResult(boolean b) - { - // regardless of the choice, force login - appContext.getAuthentication().logout(); - } - } - ); + appContext.getAuthentication().handleSessionTimeout(); } else if (200 == response.getStatusCode()) { Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java 2009-08-19 05:39:44 UTC (rev 771) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java 2009-08-19 09:35:31 UTC (rev 772) @@ -78,8 +78,12 @@ public void onResponseReceived(Request request, Response response) { try { - if (200 == response.getStatusCode()) + if(response.getText().indexOf("HTTP 401")!=-1) // HACK { + appContext.getAuthentication().handleSessionTimeout(); + } + else if (200 == response.getStatusCode()) + { // update view view.update(event.getDispatchUrl()); Modified: bpm-console/trunk/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java =================================================================== --- bpm-console/trunk/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java 2009-08-19 05:39:44 UTC (rev 771) +++ bpm-console/trunk/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java 2009-08-19 09:35:31 UTC (rev 772) @@ -30,6 +30,7 @@ import com.google.gwt.user.client.DeferredCommand; import org.jboss.bpm.console.client.util.ConsoleLog; import org.jboss.bpm.console.client.util.JSONWalk; +import org.gwt.mosaic.ui.client.MessageBox; import java.util.ArrayList; import java.util.List; @@ -228,7 +229,21 @@ rolesAssigned = new ArrayList<String>(); } + public void handleSessionTimeout() + { + MessageBox.confirm("Session expired", "Please login again", + new MessageBox.ConfirmationCallback() + { + public void onResult(boolean b) + { + // regardless of the choice, force login + logout(); + } + } + ); + } + public interface AuthCallback { void onLoginSuccess(Request request, Response response);

14 years, 8 months

1
0
0 / 0

Overlord SVN: r771 - in cdl/trunk/distribution: src and 4 other directories.

by overlord-commits＠lists.jboss.org

Author: jeff.yuchang Date: 2009-08-19 01:39:44 -0400 (Wed, 19 Aug 2009) New Revision: 771 Added: cdl/trunk/distribution/src/files/ cdl/trunk/distribution/src/files/eclipse/ cdl/trunk/distribution/src/files/libraries/ cdl/trunk/distribution/src/files/validator/ Removed: cdl/trunk/distribution/eclipse/ cdl/trunk/distribution/libraries/ cdl/trunk/distribution/validator/ Log: * restructure the distribution. Copied: cdl/trunk/distribution/src/files/eclipse (from rev 749, cdl/trunk/distribution/eclipse) Property changes on: cdl/trunk/distribution/src/files/eclipse ___________________________________________________________________ Name: svn:mergeinfo + Copied: cdl/trunk/distribution/src/files/libraries (from rev 770, cdl/trunk/distribution/libraries) Property changes on: cdl/trunk/distribution/src/files/libraries ___________________________________________________________________ Name: svn:mergeinfo + Copied: cdl/trunk/distribution/src/files/validator (from rev 770, cdl/trunk/distribution/validator) Property changes on: cdl/trunk/distribution/src/files/validator ___________________________________________________________________ Name: svn:mergeinfo +

14 years, 8 months

1
0
0 / 0

Overlord SVN: r770 - in bpm-console/trunk: gui/war/src/main/java/org/jboss/bpm/console/client/common and 1 other directories.

by overlord-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-08-18 12:53:17 -0400 (Tue, 18 Aug 2009) New Revision: 770 Modified: bpm-console/trunk/BPMC.iws bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java bpm-console/trunk/server/war/src/main/webapp/login.html Log: Handle session expiration Modified: bpm-console/trunk/BPMC.iws =================================================================== --- bpm-console/trunk/BPMC.iws 2009-08-18 16:38:13 UTC (rev 769) +++ bpm-console/trunk/BPMC.iws 2009-08-18 16:53:17 UTC (rev 770) @@ -17,11 +17,9 @@ </component> <component name="ChangeListManager"> <list default="true" name="Default" comment=""> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java" afterPath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/BPMC.iws" afterPath="$PROJECT_DIR$/BPMC.iws" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/war/src/main/java/jmaki/xhp/HttpClient.java" afterPath="$PROJECT_DIR$/gui/war/src/main/java/jmaki/xhp/HttpClient.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java" afterPath="$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/server/war/src/main/webapp/login_failed.html" afterPath="$PROJECT_DIR$/server/war/src/main/webapp/login_failed.html" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/server/war/src/main/webapp/login.html" afterPath="$PROJECT_DIR$/server/war/src/main/webapp/login.html" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java" afterPath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java" /> </list> <list name="Failed commit: Default" comment="remove dependency on DTOParser" /> </component> @@ -107,7 +105,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java" line="87" class="Class at Authentication.java:80" package="org.jboss.bpm.console.client"> + <breakpoint url="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java" line="87" class="Class at Authentication.java:87" package="org.jboss.bpm.console.client"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -120,6 +118,19 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> + <breakpoint url="file://$PROJECT_DIR$/server/war/src/main/java/org/jboss/bpm/console/server/FormProcessingFacade.java" line="145" class="org.jboss.bpm.console.server.FormProcessingFacade" package="org.jboss.bpm.console.server"> + <option name="ENABLED" value="true" /> + <option name="SUSPEND_POLICY" value="SuspendAll" /> + <option name="LOG_ENABLED" value="false" /> + <option name="LOG_EXPRESSION_ENABLED" value="false" /> + <option name="COUNT_FILTER_ENABLED" value="false" /> + <option name="COUNT_FILTER" value="0" /> + <option name="CONDITION_ENABLED" value="false" /> + <option name="CLASS_FILTERS_ENABLED" value="false" /> + <option name="INSTANCE_FILTERS_ENABLED" value="false" /> + <option name="CONDITION" value="" /> + <option name="LOG_MESSAGE" value="" /> + </breakpoint> </line_breakpoints> <breakpoint_any> <breakpoint> @@ -192,15 +203,66 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="LoginView.java" pinned="false" current="true" current-in-tab="true"> + <file leaf-file-name="LoginView.java" pinned="false" current="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="191" column="26" selection-start="5534" selection-end="5534" vertical-scroll-proportion="0.20246914"> + <state line="135" column="67" selection-start="4310" selection-end="4359" vertical-scroll-proportion="0.60493827"> <folding /> </state> </provider> </entry> </file> + <file leaf-file-name="FormProcessingFacade.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/server/war/src/main/java/org/jboss/bpm/console/server/FormProcessingFacade.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="183" column="24" selection-start="5552" selection-end="5552" vertical-scroll-proportion="0.4234568"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="Authentication.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="86" column="65" selection-start="2693" selection-end="3015" vertical-scroll-proportion="0.2765432"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="AbstractRESTAction.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="87" column="76" selection-start="3429" selection-end="3429" vertical-scroll-proportion="0.67160493"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="login_failed.html" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/server/war/src/main/webapp/login_failed.html"> + <provider selected="true" editor-type-id="text-editor"> + <state line="2" column="51" selection-start="18" selection-end="64" vertical-scroll-proportion="0.041078307"> + <folding /> + </state> + </provider> + <provider editor-type-id="HtmlPreview"> + <state /> + </provider> + </entry> + </file> + <file leaf-file-name="login.html" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/server/war/src/main/webapp/login.html"> + <provider selected="true" editor-type-id="text-editor"> + <state line="2" column="48" selection-start="62" selection-end="62" vertical-scroll-proportion="0.041078307"> + <folding /> + </state> + </provider> + <provider editor-type-id="HtmlPreview"> + <state /> + </provider> + </entry> + </file> </leaf> </component> <component name="FindManager"> @@ -723,7 +785,7 @@ </key> </component> <component name="RestoreUpdateTree" /> - <component name="RunManager" selected="Remote.GWT"> + <component name="RunManager" selected="Remote.server"> <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false"> <option name="MAIN_CLASS_NAME" /> <option name="VM_PARAMETERS" /> @@ -999,20 +1061,6 @@ <option name="myLastEditedConfigurable" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/ConsoleConfig.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="104" column="22" selection-start="3184" selection-end="3184" vertical-scroll-proportion="0.01939394"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="274" column="30" selection-start="8948" selection-end="8948" vertical-scroll-proportion="0.61777776"> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java"> <provider selected="true" editor-type-id="text-editor"> <state line="98" column="42" selection-start="3339" selection-end="3339" vertical-scroll-proportion="1.2731183"> @@ -1020,16 +1068,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/server/war/src/main/webapp/login.html"> - <provider selected="true" editor-type-id="text-editor"> - <state line="26" column="64" selection-start="0" selection-end="557" vertical-scroll-proportion="0.5445026"> - <folding /> - </state> - </provider> - <provider editor-type-id="HtmlPreview"> - <state /> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java"> <provider selected="true" editor-type-id="text-editor"> <state line="75" column="66" selection-start="2468" selection-end="2468" vertical-scroll-proportion="1.512088"> @@ -1086,30 +1124,54 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/server/war/src/main/webapp/login_failed.html"> + <entry file="file://$PROJECT_DIR$/server/war/src/main/java/org/jboss/bpm/console/server/FormProcessingFacade.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="12" column="32" selection-start="230" selection-end="230" vertical-scroll-proportion="0.24646984"> + <state line="183" column="24" selection-start="5552" selection-end="5552" vertical-scroll-proportion="0.4234568"> <folding /> </state> </provider> - <provider editor-type-id="HtmlPreview"> - <state /> - </provider> </entry> <entry file="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="127" column="52" selection-start="4279" selection-end="4279" vertical-scroll-proportion="1.0617284"> + <state line="86" column="65" selection-start="2693" selection-end="3015" vertical-scroll-proportion="0.2765432"> <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="191" column="26" selection-start="5534" selection-end="5534" vertical-scroll-proportion="0.20246914"> + <state line="135" column="67" selection-start="4310" selection-end="4359" vertical-scroll-proportion="0.60493827"> <folding /> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="87" column="76" selection-start="3429" selection-end="3429" vertical-scroll-proportion="0.67160493"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/server/war/src/main/webapp/login_failed.html"> + <provider selected="true" editor-type-id="text-editor"> + <state line="2" column="51" selection-start="18" selection-end="64" vertical-scroll-proportion="0.041078307"> + <folding /> + </state> + </provider> + <provider editor-type-id="HtmlPreview"> + <state /> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/server/war/src/main/webapp/login.html"> + <provider selected="true" editor-type-id="text-editor"> + <state line="2" column="48" selection-start="62" selection-end="62" vertical-scroll-proportion="0.041078307"> + <folding /> + </state> + </provider> + <provider editor-type-id="HtmlPreview"> + <state /> + </provider> + </entry> </component> </project> Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java 2009-08-18 16:38:13 UTC (rev 769) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java 2009-08-18 16:53:17 UTC (rev 770) @@ -29,6 +29,7 @@ import org.jboss.bpm.console.client.LoadingStatusAction; import org.jboss.bpm.console.client.Registry; import org.jboss.bpm.console.client.util.ConsoleLog; +import org.gwt.mosaic.ui.client.MessageBox; import java.io.IOException; @@ -72,8 +73,21 @@ public void onResponseReceived(Request request, Response response) { try { - if (200 == response.getStatusCode()) + if(response.getText().indexOf("HTTP 401")!=-1) // HACK { + MessageBox.confirm("Session expired", "Please login again", + new MessageBox.ConfirmationCallback() + { + public void onResult(boolean b) + { + // regardless of the choice, force login + appContext.getAuthentication().logout(); + } + } + ); + } + else if (200 == response.getStatusCode()) + { handleSuccessfulResponse(controller, object, response); } else @@ -110,7 +124,7 @@ } }; t.schedule(20000); - + } catch (RequestException e) { @@ -121,14 +135,14 @@ } protected void handleError(String url, Throwable t) - { + { final String out = "<ul>"+ - "<li>URL: '" + url + "'\n"+ - "<li>Action: '" + getId() + "'\n" + - "<li>Exception: '" + t.getClass() +"'"+ - "</ul>\n\n"+ - t.getMessage(); + "<li>URL: '" + url + "'\n"+ + "<li>Action: '" + getId() + "'\n" + + "<li>Exception: '" + t.getClass() +"'"+ + "</ul>\n\n"+ + t.getMessage(); ConsoleLog.error(out, t); appContext.displayMessage(out, true); Modified: bpm-console/trunk/server/war/src/main/webapp/login.html =================================================================== --- bpm-console/trunk/server/war/src/main/webapp/login.html 2009-08-18 16:38:13 UTC (rev 769) +++ bpm-console/trunk/server/war/src/main/webapp/login.html 2009-08-18 16:53:17 UTC (rev 770) @@ -1,4 +1,7 @@ <html> +<head> + <title>HTTP 401</title>  +</head> <body> <form method="POST" action="j_security_check">

14 years, 8 months

1
0
0 / 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

overlord-commits August 2009