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

overlord-commits at lists.jboss.org overlord-commits at lists.jboss.org
Thu Aug 20 05:30:11 EDT 2009


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.
+ */
+ at 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.
- */
- at 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 at 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 at Broker"));
+        suite.addTest(new BPELToConversationTest("ESBBroker at Buyer"));
+        suite.addTest(new BPELToConversationTest("ESBBroker at CreditAgency"));
+        suite.addTest(new BPELToConversationTest("ESBBroker at SupplierQuoteEngine"));
+        suite.addTest(new BPELToConversationTest("ESBBroker at SupplierTxnProcessor"));
+        suite.addTest(new BPELToConversationTest("PurchaseGoods at Buyer"));
+        suite.addTest(new BPELToConversationTest("PurchaseGoods at CreditAgency"));
+        suite.addTest(new BPELToConversationTest("PurchaseGoods at Store"));
+        suite.addTest(new BPELToConversationTest("ReqRespFault at Buyer"));
+        suite.addTest(new BPELToConversationTest("ReqRespFault at Seller"));
+        suite.addTest(new BPELToConversationTest("LoanApprovalService at 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 at 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 at Broker"));
-        suite.addTest(new BPELToConversationTest("ESBBroker at Buyer"));
-        suite.addTest(new BPELToConversationTest("ESBBroker at CreditAgency"));
-        suite.addTest(new BPELToConversationTest("ESBBroker at SupplierQuoteEngine"));
-        suite.addTest(new BPELToConversationTest("ESBBroker at SupplierTxnProcessor"));
-        suite.addTest(new BPELToConversationTest("PurchaseGoods at Buyer"));
-        suite.addTest(new BPELToConversationTest("PurchaseGoods at CreditAgency"));
-        suite.addTest(new BPELToConversationTest("PurchaseGoods at Store"));
-        suite.addTest(new BPELToConversationTest("ReqRespFault at Buyer"));
-        suite.addTest(new BPELToConversationTest("ReqRespFault at Seller"));
-        suite.addTest(new BPELToConversationTest("LoanApprovalService at 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 {



More information about the overlord-commits mailing list