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

overlord-commits at lists.jboss.org overlord-commits at lists.jboss.org
Thu Aug 20 09:22:29 EDT 2009


Author: objectiser
Date: 2009-08-20 09:22:27 -0400 (Thu, 20 Aug 2009)
New Revision: 784

Added:
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/actions/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/dialogs/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/eclipse/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/editor/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/export/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/AntBuildSystem.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/BuildConfigurationGenerator.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/BuildSystem.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/BusinessObjectTypeGenerator.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/ConversationBasedGenerator.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/DeploymentFileGenerator.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/Generator.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/GeneratorContext.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/GeneratorException.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/GeneratorUtil.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/JBMMessagingSystem.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/JBossMQMessagingSystem.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/MavenBuildSystem.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/Messages.properties
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/MessagingConfigurationGenerator.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/MessagingSystem.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/ModelBasedGenerator.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/TypeMapper.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/template/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/ConversionContext.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/DefaultConversionContext.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/DefaultESBLanguageModel.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/DefaultESBService.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/ESBAction.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/ESBActionFactory.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/ESBLanguageModel.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/ESBLink.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/ESBService.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/JBossESBNotation.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/Messages.properties
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateful/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateless/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateless/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateless/actions/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/util/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/parser/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/validation/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/plugintest/org/jboss/savara/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/plugintest/org/jboss/savara/tools/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/plugintest/org/jboss/savara/tools/jbossesb/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/plugintest/org/jboss/savara/tools/jbossesb/generator/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/plugintest/org/jboss/savara/tools/jbossesb/generator/GeneratorTest.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/plugintest/org/jboss/savara/tools/jbossesb/generator/TypeMapperTest.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/plugintest/org/jboss/savara/tools/jbossesb/generator/results/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/plugintest/org/jboss/savara/tools/jbossesb/generator/testmodels/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/DefaultConversionContextTest.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/DefaultESBLanguageModelTest.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/DefaultESBServiceTest.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/TestESBAction.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/TestESBLanguageModel.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/TestESBService.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/TestModelListener.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/actions/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/change/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/change/stateful/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/util/
Removed:
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/actions/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/dialogs/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/eclipse/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/editor/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/export/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/AntBuildSystem.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/BuildConfigurationGenerator.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/BuildSystem.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/BusinessObjectTypeGenerator.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/ConversationBasedGenerator.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/DeploymentFileGenerator.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Generator.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/GeneratorContext.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/GeneratorException.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/GeneratorUtil.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/JBMMessagingSystem.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/JBossMQMessagingSystem.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/MavenBuildSystem.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Messages.properties
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/MessagingConfigurationGenerator.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/MessagingSystem.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/ModelBasedGenerator.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/TypeMapper.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/template/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ConversionContext.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultConversionContext.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBLanguageModel.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBService.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBAction.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBActionFactory.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBLanguageModel.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBLink.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBService.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/JBossESBNotation.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/Messages.properties
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateless/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/stateful/actions/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/stateless/actions/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/util/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/parser/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/validation/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/plugintest/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/GeneratorTest.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/plugintest/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/TypeMapperTest.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/plugintest/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/results/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/plugintest/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/testmodels/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultConversionContextTest.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBLanguageModelTest.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBServiceTest.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/TestESBAction.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/TestESBLanguageModel.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/TestESBService.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/TestModelListener.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/stateful/actions/
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/util/
Modified:
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/META-INF/MANIFEST.MF
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/plugin.xml
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/actions/GenerateAction.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/dialogs/GenerateDialog.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/eclipse/Activator.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/editor/JBossESBConfigEditorManager.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/export/ESBLanguageModelStreamExportRule.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/AbstractESBAction.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateful/AbstractStatefulESBModelChangeRule.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateful/ConversationInteractionModelChangeRule.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateful/ConversationModelChangeRule.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateful/IfModelChangeRule.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateful/LanguageToConversationModelChangeRule.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateful/MessageSignatureModelChangeRule.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateful/ParallelModelChangeRule.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateful/RunModelChangeRule.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateful/SpawnModelChangeRule.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateful/TypeReferenceModelChangeRule.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateful/WhenModelChangeRule.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateful/WhileModelChangeRule.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateless/AbstractStatelessESBModelChangeRule.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateless/ConversationInteractionModelChangeRule.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateless/ConversationModelChangeRule.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateless/IfModelChangeRule.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateless/LanguageToConversationModelChangeRule.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateless/TypeReferenceModelChangeRule.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/AbstractInteractionMessageAction.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/AbstractStatefulESBAction.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/CreateSessionAction.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/IfAction.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/MessageRouterAction.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/ParallelAction.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/PerformAction.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/ReceiveMessageAction.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/RetrieveSessionAction.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/ScheduleStateAction.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/SendMessageAction.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/SetMessageAction.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/SetStateAction.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/SwitchAction.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/UnsupportedAction.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/WhenAction.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/WhileAction.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateless/actions/AbstractInteractionMessageAction.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateless/actions/AbstractStatelessESBAction.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateless/actions/IfAction.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateless/actions/ReceiveMessageAction.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateless/actions/SendMessageAction.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateless/actions/SwitchAction.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/util/ClasspathUtil.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/util/ConversationUtil.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/util/ESBModelUtil.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/util/IdentityUtil.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/util/InteractionUtil.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/util/ProblemDefinitions.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/util/PropertyUtil.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/parser/JBossESBModelParserRule.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/parser/JBossESBTokenizer.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/validation/ESBLanguageModelValidationRule.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/actions/ESBActionTestUtil.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/actions/TestActivity.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/change/stateful/ConversationInteractionModelChangeRuleTest.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/change/stateful/IfModelChangeRuleTest.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/change/stateful/ParallelModelChangeRuleTest.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/change/stateful/RunModelChangeRuleTest.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/change/stateful/SpawnModelChangeRuleTest.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/change/stateful/WhenModelChangeRuleTest.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/change/stateful/WhileModelChangeRuleTest.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions/CreateSessionActionTest.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions/IfActionTest.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions/MessageRouterActionTest.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions/ParallelActionTest.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions/PerformActionTest.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions/ReceiveMessageActionTest.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions/RetrieveSessionActionTest.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions/ScheduleStateActionTest.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions/SendMessageActionTest.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions/SetMessageActionTest.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions/SetStateActionTest.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions/SwitchActionTest.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions/WhenActionTest.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions/WhileActionTest.java
   cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/util/ESBModelUtilTest.java
Log:
Rename packages from overlord.cdl to savara.

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/META-INF/MANIFEST.MF
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/META-INF/MANIFEST.MF	2009-08-20 10:12:35 UTC (rev 783)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/META-INF/MANIFEST.MF	2009-08-20 13:22:27 UTC (rev 784)
@@ -4,7 +4,7 @@
 Bundle-SymbolicName: org.jboss.tools.overlord.cdl.runtime.jbossesb;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: .
-Bundle-Activator: org.jboss.tools.overlord.cdl.runtime.jbossesb.eclipse.Activator
+Bundle-Activator: org.jboss.savara.tools.jbossesb.eclipse.Activator
 Bundle-Vendor: www.jboss.org
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
@@ -21,26 +21,26 @@
  org.eclipse.ui.editors,
  org.scribble.conversation.parser,
  org.junit
-Scribble-Extensions: org.jboss.tools.overlord.cdl.runtime.jbossesb.parser.JBossESBTokenizer,
-  org.jboss.tools.overlord.cdl.runtime.jbossesb.parser.JBossESBModelParserRule,
-  org.jboss.tools.overlord.cdl.runtime.jbossesb.model.JBossESBNotation,
-  org.jboss.tools.overlord.cdl.runtime.jbossesb.editor.JBossESBConfigEditorManager,
-  org.jboss.tools.overlord.cdl.runtime.jbossesb.validation.ESBLanguageModelValidationRule,
-  org.jboss.tools.overlord.cdl.runtime.jbossesb.export.ESBLanguageModelStreamExportRule,
-  org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateless.LanguageToConversationModelChangeRule,
-  org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateless.ConversationModelChangeRule,
-  org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateless.ConversationInteractionModelChangeRule,
-  org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateless.IfModelChangeRule,
-  org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateless.TypeReferenceModelChangeRule,
-  org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateful.LanguageToConversationModelChangeRule,
-  org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateful.ConversationModelChangeRule,
-  org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateful.ConversationInteractionModelChangeRule,
-  org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateful.MessageSignatureModelChangeRule,
-  org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateful.TypeReferenceModelChangeRule,
-  org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateful.IfModelChangeRule,
-  org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateful.ParallelModelChangeRule,
-  org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateful.RunModelChangeRule,
-  org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateful.SpawnModelChangeRule,
-  org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateful.WhenModelChangeRule,
-  org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateful.WhileModelChangeRule
+Scribble-Extensions: org.jboss.savara.tools.jbossesb.parser.JBossESBTokenizer,
+  org.jboss.savara.tools.jbossesb.parser.JBossESBModelParserRule,
+  org.jboss.savara.tools.jbossesb.model.JBossESBNotation,
+  org.jboss.savara.tools.jbossesb.editor.JBossESBConfigEditorManager,
+  org.jboss.savara.tools.jbossesb.validation.ESBLanguageModelValidationRule,
+  org.jboss.savara.tools.jbossesb.export.ESBLanguageModelStreamExportRule,
+  org.jboss.savara.tools.jbossesb.model.change.stateless.LanguageToConversationModelChangeRule,
+  org.jboss.savara.tools.jbossesb.model.change.stateless.ConversationModelChangeRule,
+  org.jboss.savara.tools.jbossesb.model.change.stateless.ConversationInteractionModelChangeRule,
+  org.jboss.savara.tools.jbossesb.model.change.stateless.IfModelChangeRule,
+  org.jboss.savara.tools.jbossesb.model.change.stateless.TypeReferenceModelChangeRule,
+  org.jboss.savara.tools.jbossesb.model.change.stateful.LanguageToConversationModelChangeRule,
+  org.jboss.savara.tools.jbossesb.model.change.stateful.ConversationModelChangeRule,
+  org.jboss.savara.tools.jbossesb.model.change.stateful.ConversationInteractionModelChangeRule,
+  org.jboss.savara.tools.jbossesb.model.change.stateful.MessageSignatureModelChangeRule,
+  org.jboss.savara.tools.jbossesb.model.change.stateful.TypeReferenceModelChangeRule,
+  org.jboss.savara.tools.jbossesb.model.change.stateful.IfModelChangeRule,
+  org.jboss.savara.tools.jbossesb.model.change.stateful.ParallelModelChangeRule,
+  org.jboss.savara.tools.jbossesb.model.change.stateful.RunModelChangeRule,
+  org.jboss.savara.tools.jbossesb.model.change.stateful.SpawnModelChangeRule,
+  org.jboss.savara.tools.jbossesb.model.change.stateful.WhenModelChangeRule,
+  org.jboss.savara.tools.jbossesb.model.change.stateful.WhileModelChangeRule
 Bundle-ActivationPolicy: lazy

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/plugin.xml
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/plugin.xml	2009-08-20 10:12:35 UTC (rev 783)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/plugin.xml	2009-08-20 13:22:27 UTC (rev 784)
@@ -21,7 +21,7 @@
       </menu>
       <action
            label="JBossESB Services"
-           class="org.jboss.tools.overlord.cdl.runtime.jbossesb.actions.GenerateAction"
+           class="org.jboss.savara.tools.jbossesb.actions.GenerateAction"
            menubarPath="org.jboss.tools.overlord.menu/generate.menu/group2"
            enablesFor="1"
            id="org.jboss.tools.overlord.cdl.runtime.jbossesb.actions.GenerateAction">

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/actions (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/actions)

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/actions/GenerateAction.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/actions/GenerateAction.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/actions/GenerateAction.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,7 +15,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.actions;
+package org.jboss.savara.tools.jbossesb.actions;
 
 import java.util.logging.Logger;
 
@@ -31,7 +31,7 @@
 
 import org.scribble.eclipse.util.*;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.dialogs.*;
+import org.jboss.savara.tools.jbossesb.dialogs.*;
 
 /**
  * This class implements the action to generate the choreography

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/dialogs (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/dialogs)

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/dialogs/GenerateDialog.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/dialogs/GenerateDialog.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/dialogs/GenerateDialog.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,7 +15,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.dialogs;
+package org.jboss.savara.tools.jbossesb.dialogs;
 
 import java.util.logging.Logger;
 
@@ -25,7 +25,7 @@
 import org.eclipse.swt.events.*;
 import org.eclipse.swt.layout.*;
 import org.eclipse.swt.widgets.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.generator.*;
+import org.jboss.savara.tools.jbossesb.generator.*;
 import org.scribble.conversation.model.ConversationModel;
 import org.scribble.extensions.RegistryFactory;
 import org.scribble.model.*;
@@ -411,7 +411,7 @@
 	 */
 	public void error(String mesg, Exception ex) {
 		
-		org.jboss.tools.overlord.cdl.runtime.jbossesb.eclipse.Activator.logError(mesg, ex);
+		org.jboss.savara.tools.jbossesb.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.jbossesb/src/java/org/jboss/savara/tools/jbossesb/eclipse (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/eclipse)

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/eclipse/Activator.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/eclipse/Activator.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/eclipse/Activator.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,7 +15,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.eclipse;
+package org.jboss.savara.tools.jbossesb.eclipse;
 
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/editor (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/editor)

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/editor/JBossESBConfigEditorManager.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/editor/JBossESBConfigEditorManager.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/editor/JBossESBConfigEditorManager.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -17,14 +17,14 @@
  * Change History:
  * 19 Jun 2008 : Initial version created by gary
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.editor;
+package org.jboss.savara.tools.jbossesb.editor;
 
 import org.scribble.extensions.RegistryInfo;
 import org.scribble.model.ModelReference;
 import org.scribble.model.SourceRef;
 import org.scribble.editor.AbstractEditorManager;
 import org.scribble.editor.EditorManager;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.*;
 
 /**
  * This is the JBossESB config implementation of the EditorManager

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/export (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/export)

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/export/ESBLanguageModelStreamExportRule.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/export/ESBLanguageModelStreamExportRule.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/export/ESBLanguageModelStreamExportRule.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,14 +15,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.export;
+package org.jboss.savara.tools.jbossesb.export;
 
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.*;
 import org.scribble.export.*;
 import org.scribble.export.stream.*;
 import org.scribble.extensions.RegistryInfo;

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/AntBuildSystem.java (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/AntBuildSystem.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/AntBuildSystem.java	                        (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/AntBuildSystem.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -0,0 +1,98 @@
+/*
+ * 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.jbossesb.generator;
+
+/**
+ * This class represents the Ant build system.
+ */
+public class AntBuildSystem extends BuildSystem {
+
+	private static final String BUILD_FILE = "build.xml";
+	private static final String ANT = "Ant";
+	private static final String ESB_CONFIG_PATH = "src/conf/jboss-esb.xml";
+	private static final String DEPLOYMENT_PATH = "src/conf/deployment.xml";
+	private static final String MESSAGING_CONFIG_PATH = "src/conf";
+	private static final String JAVA_SOURCE_PATH = "src/java";
+	private static final String LIBRARY_PATH = "src/lib";
+
+	/**
+	 * This is the default constructor for the Ant build system.
+	 */
+	public AntBuildSystem() {
+		super(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 ESB configuration file
+	 * path.
+	 * 
+	 * @return The ESB configuration file path
+	 */
+	public String getESBConfigFilePath() {
+		return(ESB_CONFIG_PATH);
+	}
+	
+	/**
+	 * This method returns the deployment file
+	 * path.
+	 * 
+	 * @return The deployment file path
+	 */
+	public String getDeploymentFilePath() {
+		return(DEPLOYMENT_PATH);
+	}
+	
+	/**
+	 * This method returns the messaging configuration
+	 * path.
+	 * 
+	 * @return The messaging configuration path
+	 */
+	public String getMessagingConfigPath() {
+		return(MESSAGING_CONFIG_PATH);
+	}
+	
+	/**
+	 * This method returns the Java source path.
+	 * 
+	 * @return The Java source path
+	 */
+	public String getJavaSourcePath() {
+		return(JAVA_SOURCE_PATH);
+	}
+	
+	/**
+	 * This method returns the library path.
+	 * 
+	 * @return The library path
+	 */
+	public String getLibraryPath() {
+		return(LIBRARY_PATH);
+	}
+		
+}

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/BuildConfigurationGenerator.java (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/BuildConfigurationGenerator.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/BuildConfigurationGenerator.java	                        (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/BuildConfigurationGenerator.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -0,0 +1,67 @@
+/*
+ * 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.jbossesb.generator;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jdt.core.IJavaProject;
+import org.jboss.savara.tools.jbossesb.model.ESBLanguageModel;
+
+/**
+ * This class implements the model based generator to generate
+ * the build configuration.
+ */
+public class BuildConfigurationGenerator implements ModelBasedGenerator {
+
+	/**
+	 * This method generates the relevant artefacts based on
+	 * the supplied model, within the specified Java project.
+	 * 
+	 * @param jproj The Java project
+	 * @param model The model
+	 * @param context The generator context
+	 * @throws GeneratorException Failed to generate
+	 */
+	public void generate(IJavaProject jproj,
+			ESBLanguageModel model, GeneratorContext context)
+					throws GeneratorException {
+	
+		IPath buildConfigPath=jproj.getPath().append(
+				new Path(context.getBuildSystem().getBuildFilePath()));
+		
+		IFile buildConfigFile=jproj.getProject().getWorkspace().getRoot().getFile(buildConfigPath);
+		
+		GeneratorUtil.createParentFolder(buildConfigFile);
+		
+		try {
+			buildConfigFile.create(null, true,
+					new org.eclipse.core.runtime.NullProgressMonitor());
+			
+			String config=context.getBuildSystem().getBuildFileContents(jproj.getProject().getName());
+			
+			if (config != null) {
+				buildConfigFile.setContents(new java.io.ByteArrayInputStream(
+						config.getBytes()), true, false,
+						new org.eclipse.core.runtime.NullProgressMonitor());
+			}
+		} catch(Exception e) {
+			throw new GeneratorException("Failed to create build config", e);
+		}
+	}
+}

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/BuildSystem.java (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/BuildSystem.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/BuildSystem.java	                        (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/BuildSystem.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -0,0 +1,124 @@
+/*
+ * 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.jbossesb.generator;
+
+/**
+ * This class represents an abstract build system.
+ */
+public abstract class BuildSystem {
+
+	private static final String TEMPLATE_SUFFIX = ".template";
+	private static final String TEMPLATE_PREFIX = "template/";
+
+	/**
+	 * This is the constructor for the build system.
+	 * 
+	 * @param name The name of the build system
+	 */
+	public BuildSystem(String name) {
+		m_name = name;
+	}
+	/**
+	 * This method represents the name of the build
+	 * system.
+	 * 
+	 * @return The name
+	 */
+	public String getName() {
+		return(m_name);
+	}
+	
+	/**
+	 * This method returns the build configuration file
+	 * path.
+	 * 
+	 * @return The build configuration file path
+	 */
+	public abstract String getBuildFilePath();
+	
+	/**
+	 * This method returns the ESB configuration file
+	 * path.
+	 * 
+	 * @return The ESB configuration file path
+	 */
+	public abstract String getESBConfigFilePath();
+	
+	/**
+	 * This method returns the deployment file
+	 * path.
+	 * 
+	 * @return The deployment file path
+	 */
+	public abstract String getDeploymentFilePath();
+	
+	/**
+	 * This method returns the messaging configuration
+	 * path.
+	 * 
+	 * @return The messaging configuration path
+	 */
+	public abstract String getMessagingConfigPath();
+	
+	/**
+	 * This method returns the Java source path.
+	 * 
+	 * @return The Java source path
+	 */
+	public abstract String getJavaSourcePath();
+	
+	/**
+	 * This method returns the library path.
+	 * 
+	 * @return The library path, or null if not required
+	 */
+	public abstract String getLibraryPath();
+
+	/**
+	 * 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=
+				BuildSystem.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);
+	}	
+	
+	private String m_name=null;
+}

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/BusinessObjectTypeGenerator.java (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/BusinessObjectTypeGenerator.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/BusinessObjectTypeGenerator.java	                        (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/BusinessObjectTypeGenerator.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -0,0 +1,429 @@
+/*
+ * 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.jbossesb.generator;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.dom.AST;
+import org.eclipse.jdt.core.dom.ASTParser;
+import org.eclipse.jdt.core.dom.Assignment;
+import org.eclipse.jdt.core.dom.CompilationUnit;
+import org.eclipse.jdt.core.dom.ExpressionStatement;
+import org.eclipse.jdt.core.dom.FieldDeclaration;
+import org.eclipse.jdt.core.dom.Javadoc;
+import org.eclipse.jdt.core.dom.MethodDeclaration;
+import org.eclipse.jdt.core.dom.Modifier;
+import org.eclipse.jdt.core.dom.PackageDeclaration;
+import org.eclipse.jdt.core.dom.PrimitiveType;
+import org.eclipse.jdt.core.dom.ReturnStatement;
+import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
+import org.eclipse.jdt.core.dom.TagElement;
+import org.eclipse.jdt.core.dom.TextElement;
+import org.eclipse.jdt.core.dom.Type;
+import org.eclipse.jdt.core.dom.TypeDeclaration;
+import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
+import org.eclipse.jdt.core.dom.Modifier.ModifierKeyword;
+import org.jboss.savara.tools.jbossesb.model.util.ConversationUtil;
+import org.jboss.savara.tools.jbossesb.model.util.InteractionUtil;
+import org.scribble.conversation.model.Conversation;
+import org.scribble.conversation.model.Variable;
+import org.scribble.conversation.model.VariableList;
+import org.scribble.model.Interaction;
+import org.scribble.model.ModelObject;
+import org.scribble.model.Role;
+import org.scribble.model.Visitor;
+
+/**
+ * This class implements the conversation based generator
+ * for generating the business object type associated with
+ * a conversation.
+ */
+public class BusinessObjectTypeGenerator implements ConversationBasedGenerator {
+
+	private static final String GENERATOR_MESSAGES = "org.jboss.tools.overlord.cdl.runtime.jbossesb.generator.Messages";
+
+	/**
+	 * This method generates the relevant artefacts based on
+	 * the supplied conversation, within the specified Java project.
+	 * 
+	 * @param jproj The Java project
+	 * @param conversation The conversation
+	 * @param context The generator context
+	 * @throws GeneratorException Failed to generate
+	 */
+	public void generate(IJavaProject jproj,
+			Conversation conversation, GeneratorContext context)
+						throws GeneratorException {
+		IPath sourceLocation=jproj.getPath().append(
+				new Path(context.getBuildSystem().getJavaSourcePath()));
+		
+		String javaClass=ConversationUtil.getBusinessObjectType(conversation);
+		
+		String javaPath=javaClass.replace('.', '/')+".java";
+		
+		IPath javaFile=sourceLocation.append(new Path(javaPath));
+				
+		IFile file=jproj.getProject().getWorkspace().getRoot().getFile(javaFile);
+
+		GeneratorUtil.createParentFolder(file);
+		
+		try {
+			file.create(null, true, new org.eclipse.core.runtime.NullProgressMonitor());
+		} catch(Exception e) {
+			throw new GeneratorException("Failed to create the file", e);
+		}
+		
+		ASTParser parser = ASTParser.newParser(AST.JLS3);
+		parser.setResolveBindings(true);
+		parser.setSource(new char[0]);
+		
+		CompilationUnit root=(CompilationUnit)parser.createAST(null);
+		
+		AST ast=root.getAST();
+		
+		org.eclipse.jface.text.IDocument doc=
+					new org.eclipse.jface.text.Document();
+
+		root.recordModifications();
+		
+		PackageDeclaration pd=ast.newPackageDeclaration();
+		pd.setName(ast.newName(ConversationUtil.getBusinessObjectTypePackageName(conversation)));
+		root.setPackage(pd);
+		
+		TypeDeclaration type=ast.newTypeDeclaration();
+		
+		type.setName(ast.newSimpleName(ConversationUtil.getBusinessObjectTypeClassName(conversation)));
+
+		Modifier pubmod=ast.newModifier(ModifierKeyword.PUBLIC_KEYWORD);
+		type.modifiers().add(pubmod);
+		
+		root.types().add(type);
+		
+		// Process conversation to obtain necessary methods and
+		// properties
+		generateBusinessObjectTypeMethods(type, conversation);
+		
+		org.eclipse.text.edits.TextEdit edits=root.rewrite(doc, null);
+		
+		try {
+			edits.apply(doc);
+		} catch(Exception e) {
+			e.printStackTrace();
+		}
+		
+		java.io.ByteArrayInputStream is=
+			new java.io.ByteArrayInputStream(doc.get().getBytes());
+		
+		try {
+			file.setContents(is, false, true, null);
+			
+			is.close();
+		} catch(Exception e) {
+			throw new GeneratorException("Failed to set file contents and close", e);
+		}
+	}
+	
+	protected void generateBusinessObjectTypeMethods(TypeDeclaration type,
+					final Conversation conversation) throws GeneratorException {
+		final java.util.List<Role> roles=new java.util.Vector<Role>();
+		final java.util.List<Variable> variables=new java.util.Vector<Variable>();
+		
+		conversation.visit(new Visitor() {
+			public boolean visit(ModelObject obj) {
+				boolean ret=true;
+				
+				if (obj instanceof Conversation &&
+						obj != conversation) {
+					ret = false;
+				} else if (obj instanceof Interaction) {
+					Interaction interaction=(Interaction)obj;
+					
+					// If send and a response, then create
+					// 'to' role service category/name
+					// methods
+					if (InteractionUtil.isSend(interaction) &&
+							interaction.getReplyToLabel() == null &&
+							interaction.getToRole() != null &&
+							roles.contains(interaction.getToRole()) == false) {
+						roles.add(interaction.getToRole());
+					}
+				} else if (obj instanceof VariableList) {
+					VariableList vars=(VariableList)obj;
+					
+					variables.addAll(vars.getVariables());
+				}
+				
+				return(ret);
+			}
+		});
+
+		generateServiceCategoryAndNameMethods(type, roles);
+		
+		generateAccessorAndModifierMethods(type, variables);
+		generateMemberVariables(type, variables);
+	}
+	
+	/**
+	 * This method generates the methods for returning the
+	 * service category and name associated with a service
+	 * being invoked.
+	 * 
+	 * @param type The type declaration
+	 * @param roles The list of roles representing the invoked
+	 * 						services
+	 */
+	protected void generateServiceCategoryAndNameMethods(TypeDeclaration type,
+							java.util.List<Role> roles) {
+		AST ast=type.getAST();
+
+		for (int i=0; i < roles.size(); i++) {
+			String methodName=
+				InteractionUtil.getRoleServiceCategoryAccessorMethod(roles.get(i).getName());
+			
+			MethodDeclaration method=ast.newMethodDeclaration();
+			method.setName(ast.newSimpleName(methodName));
+			method.setReturnType2(ast.newSimpleType(
+					ast.newName("String")));
+	
+			method.modifiers().add(ast.newModifier(Modifier.ModifierKeyword.PUBLIC_KEYWORD));
+	
+			org.eclipse.jdt.core.dom.Block block=ast.newBlock();
+						
+			ReturnStatement retStatement=ast.newReturnStatement();
+			
+			retStatement.setExpression(ast.newNullLiteral());
+			
+			block.statements().add(retStatement);
+			
+			method.setBody(block);				
+			
+			type.bodyDeclarations().add(method);
+			
+			methodName=
+				InteractionUtil.getRoleServiceNameAccessorMethod(roles.get(i).getName());
+			
+			method=ast.newMethodDeclaration();
+			method.setName(ast.newSimpleName(methodName));
+			method.setReturnType2(ast.newSimpleType(
+					ast.newName("String")));
+	
+			method.modifiers().add(ast.newModifier(Modifier.ModifierKeyword.PUBLIC_KEYWORD));
+	
+			block=ast.newBlock();
+			
+			retStatement=ast.newReturnStatement();
+			
+			retStatement.setExpression(ast.newNullLiteral());
+			
+			block.statements().add(retStatement);
+			
+			method.setBody(block);				
+			
+			type.bodyDeclarations().add(method);
+		}
+	}
+	
+	/**
+	 * This method generates the accessor and modifier methods
+	 * associated with the business state variables used by
+	 * the conversation based actions.
+	 * 
+	 * @param type The type declaration
+	 * @param variables The list of variables
+	 */
+	protected void generateAccessorAndModifierMethods(TypeDeclaration type,
+			java.util.List<Variable> variables) {
+		AST ast=type.getAST();
+	
+		for (int i=0; i < variables.size(); i++) {			
+			String methodName=
+				ConversationUtil.getVariableAccessorMethod(variables.get(i).getName());
+			String memberVariableName=
+				ConversationUtil.getMemberVariableName(variables.get(i).getName());
+			
+			MethodDeclaration method=ast.newMethodDeclaration();
+			method.setName(ast.newSimpleName(methodName));
+			
+			String typeName=TypeMapper.getJavaType(
+					variables.get(i).getType().getNamespace(),
+					variables.get(i).getType().getLocalpart());
+			
+			Type returnType=null;
+			
+			// Check if qualified or base type
+			if (typeName.indexOf('.') == -1) {
+				returnType = ast.newPrimitiveType(PrimitiveType.toCode(typeName));
+			} else {
+				returnType = getType(ast, typeName);			
+			}
+	
+			method.setReturnType2(returnType);
+			
+			method.modifiers().add(ast.newModifier(Modifier.ModifierKeyword.PUBLIC_KEYWORD));
+	
+			org.eclipse.jdt.core.dom.Block block=ast.newBlock();
+			
+			ReturnStatement retStatement=ast.newReturnStatement();
+			
+			retStatement.setExpression(ast.newSimpleName(memberVariableName));
+			
+			block.statements().add(retStatement);
+			
+			method.setBody(block);				
+			
+			Javadoc jdoc=ast.newJavadoc();
+			TagElement tag=ast.newTagElement();
+			
+			TextElement text=ast.newTextElement();
+			
+			text.setText(org.scribble.util.MessageUtil.format(
+					java.util.PropertyResourceBundle.getBundle(
+							GENERATOR_MESSAGES),
+								"_ACCESSOR_DESCRIPTION",
+							new String[]{variables.get(i).getName()}));
+			
+			tag.fragments().add(text);
+			
+			jdoc.tags().add(tag);
+			
+			method.setJavadoc(jdoc);
+
+			type.bodyDeclarations().add(method);
+			
+			// Generate setter method
+			methodName=
+				ConversationUtil.getVariableModifierMethod(variables.get(i).getName());
+			
+			method=ast.newMethodDeclaration();
+			method.setName(ast.newSimpleName(methodName));
+			method.setReturnType2(ast.newPrimitiveType(PrimitiveType.VOID));
+			
+			SingleVariableDeclaration svd=ast.newSingleVariableDeclaration();
+			svd.setName(ast.newSimpleName("value"));
+
+			Type paramType=null;
+			
+			// Check if qualified or base type
+			if (typeName.indexOf('.') == -1) {
+				paramType = ast.newPrimitiveType(PrimitiveType.toCode(typeName));
+			} else {
+				paramType = getType(ast, typeName);			
+			}
+			
+			svd.setType(paramType);
+			
+			method.parameters().add(svd);
+	
+			method.modifiers().add(ast.newModifier(Modifier.ModifierKeyword.PUBLIC_KEYWORD));
+	
+			block=ast.newBlock();
+			
+			method.setBody(block);
+			
+			// Assign value to member variable
+			Assignment assign=ast.newAssignment();
+			assign.setLeftHandSide(ast.newSimpleName(memberVariableName));
+			assign.setRightHandSide(ast.newSimpleName("value"));
+			
+			ExpressionStatement statement=ast.newExpressionStatement(assign);
+			
+			block.statements().add(statement);
+			
+			jdoc = ast.newJavadoc();
+			tag = ast.newTagElement();
+			
+			text = ast.newTextElement();
+			
+			text.setText(org.scribble.util.MessageUtil.format(
+					java.util.PropertyResourceBundle.getBundle(
+							GENERATOR_MESSAGES),
+								"_MODIFIER_DESCRIPTION",
+							new String[]{variables.get(i).getName()}));
+			
+			tag.fragments().add(text);
+			
+			jdoc.tags().add(tag);
+			
+			method.setJavadoc(jdoc);
+			
+			type.bodyDeclarations().add(method);
+		}
+	}
+	
+	/**
+	 * This method generates the member variables
+	 * associated with the business state variables used by
+	 * the conversation based actions.
+	 * 
+	 * @param type The type declaration
+	 * @param variables The list of variables
+	 */
+	protected void generateMemberVariables(TypeDeclaration type,
+			java.util.List<Variable> variables) {
+		AST ast=type.getAST();
+
+		for (int i=0; i < variables.size(); i++) {			
+			String memberVariableName=
+				ConversationUtil.getMemberVariableName(variables.get(i).getName());
+			
+			VariableDeclarationFragment fragment=
+				ast.newVariableDeclarationFragment();
+			fragment.setName(ast.newSimpleName(memberVariableName));
+
+			FieldDeclaration memberVariable=ast.newFieldDeclaration(fragment);
+
+			Type paramType=null;
+			String typeName=TypeMapper.getJavaType(
+					variables.get(i).getType().getNamespace(),
+					variables.get(i).getType().getLocalpart());
+			
+			// Check if qualified or base type
+			if (typeName.indexOf('.') == -1) {
+				paramType = ast.newPrimitiveType(PrimitiveType.toCode(typeName));
+			} else {
+				paramType = getType(ast, typeName);			
+			}
+			
+			memberVariable.setType(paramType);
+			
+			memberVariable.modifiers().add(ast.newModifier(Modifier.ModifierKeyword.PRIVATE_KEYWORD));
+			
+			type.bodyDeclarations().add(memberVariable);
+		}
+	}
+	
+	protected Type getType(AST ast, String typeName) {
+		Type ret=null;
+		
+		java.util.StringTokenizer st=new java.util.StringTokenizer(typeName, ".");
+		while (st.hasMoreTokens()) {
+			String token=st.nextToken();
+			
+			if (ret == null) {
+				ret = ast.newSimpleType(ast.newSimpleName(token));
+			} else {
+				ret = ast.newQualifiedType(ret, ast.newSimpleName(token));
+			}
+		}
+		
+		return(ret);
+	}
+		
+}

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/ConversationBasedGenerator.java (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/ConversationBasedGenerator.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/ConversationBasedGenerator.java	                        (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/ConversationBasedGenerator.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -0,0 +1,42 @@
+/*
+ * 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.jbossesb.generator;
+
+import org.eclipse.jdt.core.IJavaProject;
+import org.scribble.conversation.model.Conversation;
+
+/**
+ * This interface represents a module that generates artefacts
+ * based on a specific conversation.
+ */
+public interface ConversationBasedGenerator {
+
+	/**
+	 * This method generates the relevant artefacts based on
+	 * the supplied conversation, within the specified Java project.
+	 * 
+	 * @param jproj The Java project
+	 * @param conversation The conversation
+	 * @param context The generator context
+	 * @throws GeneratorException Failed to generate
+	 */
+	public void generate(IJavaProject jproj,
+			Conversation conversation, GeneratorContext context)
+					throws GeneratorException;
+	
+}

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/DeploymentFileGenerator.java (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/DeploymentFileGenerator.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/DeploymentFileGenerator.java	                        (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/DeploymentFileGenerator.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -0,0 +1,88 @@
+/*
+ * 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.jbossesb.generator;
+
+import java.util.logging.Logger;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jdt.core.IJavaProject;
+import org.jboss.savara.tools.jbossesb.model.ESBLanguageModel;
+import org.jboss.savara.tools.jbossesb.model.ESBService;
+
+/**
+ * This class implements the model based generator to generate
+ * the deployment file.
+ */
+public class DeploymentFileGenerator implements ModelBasedGenerator {
+
+	/**
+	 * This method generates the relevant artefacts based on
+	 * the supplied model, within the specified Java project.
+	 * 
+	 * @param jproj The Java project
+	 * @param model The model
+	 * @param context The generator context
+	 * @throws GeneratorException Failed to generate
+	 */
+	public void generate(IJavaProject jproj,
+			ESBLanguageModel model, GeneratorContext context)
+					throws GeneratorException {
+		
+		try {
+			IPath deploymentPath=jproj.getPath().append(
+					new Path(context.getBuildSystem().getDeploymentFilePath()));
+			
+			IFile deploymentFile=jproj.getProject().getWorkspace().getRoot().getFile(deploymentPath);
+			GeneratorUtil.createParentFolder(deploymentFile);
+			deploymentFile.create(null, true,
+					new org.eclipse.core.runtime.NullProgressMonitor());
+	
+			StringBuffer buf=new StringBuffer();
+			buf.append("<jbossesb-deployment>\r\n");
+			
+			java.util.Iterator<ESBService> iter=model.getServices().iterator();
+			
+			while (iter.hasNext()) {
+				ESBService service=iter.next();
+				
+				String dest=model.getJMSDefinition(service.getJMSBusIdRef());
+				
+				if (dest != null) {
+					buf.append("\t<depends>"+service.getCategory()+
+							".destination:service=Queue,name="+dest+
+							"</depends>\r\n");
+				} else {
+					logger.severe("Failed to find destination for JMS bus id '"+
+							service.getJMSBusIdRef()+"'");
+				}
+			}
+			
+			buf.append("</jbossesb-deployment>\r\n");
+			
+			deploymentFile.setContents(new java.io.ByteArrayInputStream(
+						buf.toString().getBytes()), true, false,
+						new org.eclipse.core.runtime.NullProgressMonitor());
+		} catch(Exception e) {
+			throw new GeneratorException("Failed to save deployment file", e);
+		}
+	}
+
+	private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.runtime.jbossesb.generator");
+}

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/Generator.java (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Generator.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/Generator.java	                        (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/Generator.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -0,0 +1,519 @@
+/*
+ * 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.jbossesb.generator;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
+import org.eclipse.core.resources.IFile;
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.scribble.conformance.model.transform.StatelessTransformer;
+import org.scribble.conversation.model.ConversationModel;
+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.scribble.conversation.model.*;
+import org.w3c.dom.Node;
+import org.eclipse.jdt.core.*;
+import org.eclipse.core.resources.*;
+import org.eclipse.core.runtime.*;
+
+/**
+ * This class provides the mechanism for generating JBossESB
+ * service artefacts.
+ */
+public class Generator {
+
+	private static final String CLASSPATH_FILENAME = ".classpath";
+	private static final String OUTPUT_LOCATION = "classes";
+	
+	/**
+	 * This is the constructor for the generator.
+	 * 
+	 */
+	public Generator(IFile file, GeneratorContext context) {
+		m_file = file;
+		m_context = context;
+		
+		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 artefact generators
+		m_conversationBasedGen.add(new BusinessObjectTypeGenerator());
+		
+		m_modelBasedGen.add(new BuildConfigurationGenerator());
+		m_modelBasedGen.add(new MessagingConfigurationGenerator());
+		m_modelBasedGen.add(new DeploymentFileGenerator());
+		
+		// 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.severe("Unable to load model used to generate " +
+					"the ESB artefacts");
+		}
+	}
+	
+	/**
+	 * This method returns the local models that can be generated.
+	 * 
+	 * @return The local models
+	 */
+	public java.util.List<ModelReference> getLocalModels() {
+		return(m_localModelRefs);
+	}
+	
+	/**
+	 * This method generates the project associated with the
+	 * supplied role.
+	 * 
+	 * @param localModelRef The local model reference
+	 * @param stateless Whether the generated role should be stateless
+	 * @param projectName The project name
+	 * @throws Exception Failed to generate role
+	 */
+	public void generateRole(ModelReference localModelRef,
+					boolean stateless, String projectName)
+						throws Exception {
+		
+		if (logger.isLoggable(Level.FINEST)) {
+			logger.finest("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 ref=new ModelReference(ConversationNotation.NOTATION_CODE);
+			
+			Model localModel=projector.project(ref,
+					m_conversationModel, localModelRef.getSubDefinitionPath(),
+					role, new DefaultModelListener());
+			
+			if (localModel instanceof ConversationModel &&
+					((ConversationModel)localModel).getConversation() != null) {
+				ConversationModel lcm=(ConversationModel)localModel;
+				
+				// Check if stateless version of model is required
+				if (stateless) {
+					StatelessTransformer transformer=
+						(StatelessTransformer)
+							RegistryFactory.getRegistry().getExtension(
+								StatelessTransformer.class,null);
+
+					if (transformer != null) {				
+						Conversation statelessConversation=(Conversation)
+							transformer.transform(lcm.getConversation(),
+								new ModelReference(JBossESBNotation.NOTATION_CODE));
+								
+						if (statelessConversation != null) {
+							
+							if (logger.isLoggable(Level.FINEST)) {
+								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(JBossESBNotation.NOTATION_CODE),
+											statelessConversation, formatter);
+									
+									String str=new String(os.toByteArray());
+									
+									System.out.println("EXPORTED CDM TO JBESB STATELESS:");
+									System.out.println(str);
+									
+								} catch(Exception e) {
+									e.printStackTrace();
+								}
+							}
+
+							lcm.setConversation(statelessConversation);
+						} else {
+							logger.severe("Failed to transform to stateless conversation");
+						}
+					}
+				}
+				
+				ModelReference targetRef=
+					new ModelReference(JBossESBNotation.NOTATION_CODE);
+				
+				DefaultESBLanguageModel target=
+					new DefaultESBLanguageModel(targetRef, stateless);
+				
+				ModelGenerator generator=(ModelGenerator)
+					RegistryFactory.getRegistry().getExtension(
+							ModelGenerator.class, null);
+				
+				if (generator != null) {
+					generator.generate(targetRef, role, target,
+								lcm);
+					
+					generateRoleProject(projectName,
+								target.getESBConfiguration(),
+								lcm, target);
+				} else {
+					logger.severe("Unable to find model generator");
+				}
+			}
+		}
+	}
+	
+	protected void generateRoleProject(String projectName,
+			org.w3c.dom.Element esbConfig, ConversationModel localcm,
+			ESBLanguageModel model)	throws Exception {
+		
+		final IJavaProject jproj=createJavaProject(projectName);
+		
+		if (jproj != null && esbConfig != null) {
+			// Generate business object types for
+			// local conversation model
+			localcm.visit(new Visitor() {
+
+				public boolean visit(ModelObject obj) {
+					
+					if (obj instanceof Conversation) {
+						for (int i=0; i < m_conversationBasedGen.size(); i++) {
+							try {
+								m_conversationBasedGen.get(i).generate(jproj,
+									(Conversation)obj, getContext());
+							} catch(GeneratorException e) {
+								logger.log(java.util.logging.Level.SEVERE,
+										"Failed to generate conversation based artefact",
+										e);
+							}
+						}
+					}
+					
+					return true;
+				}	
+			});
+			
+			// Store ESB configuration
+			IPath esbConfigPath=jproj.getPath().append(
+					new Path(getContext().getBuildSystem().getESBConfigFilePath()));
+			
+			IFile esbConfigFile=jproj.getProject().getWorkspace().getRoot().getFile(esbConfigPath);
+			GeneratorUtil.createParentFolder(esbConfigFile);
+			esbConfigFile.create(null, true,
+					new org.eclipse.core.runtime.NullProgressMonitor());
+			
+			String config=getText(esbConfig);
+			
+			if (config != null) {
+				esbConfigFile.setContents(new java.io.ByteArrayInputStream(
+						config.getBytes()), true, false,
+						new org.eclipse.core.runtime.NullProgressMonitor());
+			}
+			
+			for (int i=0; i < m_modelBasedGen.size(); i++) {
+				try {
+					m_modelBasedGen.get(i).generate(jproj, model,
+							getContext());
+				} catch(GeneratorException e) {
+					logger.log(java.util.logging.Level.SEVERE,
+							"Failed to generate model based artefact",
+							e);
+				}
+			}
+		}
+	}
+			
+	protected IJavaProject createJavaProject(String projectName)
+							throws Exception {
+		
+		// Create project
+		IProject project=m_file.getWorkspace().getRoot().getProject(projectName);
+		project.create(new org.eclipse.core.runtime.NullProgressMonitor());
+
+		IJavaProject jproj=JavaCore.create(project);
+		
+		project.open(new org.eclipse.core.runtime.NullProgressMonitor());
+		
+		IProjectDescription description = jproj.getProject().getDescription();
+		
+		// Update the project natures to include Java Nature
+		String[] prevNatures= description.getNatureIds();
+		String[] newNatures= new String[prevNatures.length + 1];
+		System.arraycopy(prevNatures, 0, newNatures, 0, prevNatures.length);
+		newNatures[prevNatures.length]= JavaCore.NATURE_ID;
+		description.setNatureIds(newNatures);
+		
+		// Setup project reference to CDM project
+		IProject[] prevProjects=description.getReferencedProjects();
+		IProject[] newProjects=new IProject[prevProjects.length+1];
+		System.arraycopy(prevProjects, 0, newProjects, 0, prevProjects.length);
+		newProjects[prevProjects.length] = m_file.getProject();
+		description.setReferencedProjects(newProjects);
+		
+		// Set the description
+		jproj.getProject().setDescription(description,
+				new org.eclipse.core.runtime.NullProgressMonitor());
+		
+		IPath outputLocation=jproj.getPath().append(new Path(OUTPUT_LOCATION));
+		IPath classpathLocation=jproj.getPath().append(new Path(CLASSPATH_FILENAME));
+		IPath sourceLocation=jproj.getPath().append(
+				new Path(getContext().getBuildSystem().getJavaSourcePath()));
+		IPath libLocation=null;
+		
+		if (getContext().getBuildSystem().getLibraryPath() != null) {
+			libLocation=jproj.getPath().append(
+					new Path(getContext().getBuildSystem().getLibraryPath()));
+		}
+		
+		// create and set the output and source paths first
+		IFolder outputFolder= jproj.getProject().getWorkspace().getRoot().getFolder(outputLocation);
+		GeneratorUtil.createParentFolder(outputFolder);
+		outputFolder.create(true, true, new org.eclipse.core.runtime.NullProgressMonitor());
+		outputFolder.setDerived(true);		
+		
+		IFolder sourceFolder= jproj.getProject().getWorkspace().getRoot().getFolder(sourceLocation);
+		GeneratorUtil.createParentFolder(sourceFolder);
+		sourceFolder.create(true, true, new org.eclipse.core.runtime.NullProgressMonitor());
+		sourceFolder.setDerived(true);		
+		
+		if (libLocation != null) {
+			IFolder libFolder= jproj.getProject().getWorkspace().getRoot().getFolder(libLocation);
+			GeneratorUtil.createParentFolder(libFolder);
+			libFolder.create(true, true, new org.eclipse.core.runtime.NullProgressMonitor());
+			libFolder.setDerived(true);		
+		}
+		
+		IFile file=jproj.getProject().getWorkspace().getRoot().getFile(classpathLocation);
+		file.create(null, true, new org.eclipse.core.runtime.NullProgressMonitor());
+		file.setDerived(true);
+		
+		// Write empty contents, to overcome 'Resource '..' is not local' exception
+		String classpath="<classpath/>";
+		file.setContents(new java.io.ByteArrayInputStream(classpath.getBytes()), true,
+				false, new org.eclipse.core.runtime.NullProgressMonitor());
+			
+		IClasspathEntry[] classpaths=new IClasspathEntry[2];
+		
+		classpaths[0] = JavaCore.newContainerEntry(
+				new Path("org.eclipse.jdt.launching.JRE_CONTAINER"));
+					
+		classpaths[1] = JavaCore.newSourceEntry(sourceLocation);
+					
+		jproj.setRawClasspath(classpaths, outputLocation,
+				new org.eclipse.core.runtime.NullProgressMonitor());
+		
+		return(jproj);
+	}
+
+	/**
+	 * This class converts a DOM representation node to
+	 * text.
+	 * 
+	 * @param node The DOM node
+	 * @return The text
+	 * @throws Exception Failed to convert
+	 */
+	protected String getText(Node node) throws Exception {
+		String ret=null;
+			
+		try {
+			// Transform the DOM represent to text
+			java.io.ByteArrayOutputStream xmlstr=
+					new java.io.ByteArrayOutputStream();
+				
+			DOMSource source=new DOMSource();
+			source.setNode(node);
+			
+			StreamResult result=new StreamResult(xmlstr);
+			
+			Transformer trans=
+					TransformerFactory.newInstance().newTransformer();
+			trans.transform(source, result);
+			
+			xmlstr.close();
+			
+			ret = new String(xmlstr.toByteArray());
+			
+			if ((node instanceof org.w3c.dom.Document) == false) {
+				
+				// Strip off any <?xml> header
+				int index=ret.indexOf("<?xml");
+				if (index != -1) {
+					index = ret.indexOf("<", 1);
+					
+					if (index != -1) {
+						ret = ret.substring(index);
+					} else {
+						index = ret.indexOf("?>");
+						
+						if (index != -1) {
+							index += 2;
+							
+							// Remove any trailing whitespaces
+							// after XML header
+							while (index < ret.length() &&
+									Character.isWhitespace(ret.charAt(index))) {
+								index++;
+							}
+							
+							ret = ret.substring(index);
+						}
+					}
+				}
+			}
+
+		} catch(Exception e) {
+			throw new Exception("Failed to transform " +
+					"DOM representation into text", e);
+		}
+		
+		int pos=0;
+		int prevpos=0;
+		StringBuffer buf=new StringBuffer();
+		int level=0;
+		
+		while ((pos=ret.indexOf('<', prevpos)) != -1) {
+			
+			if (prevpos < pos &&
+					ret.substring(prevpos, pos).trim().length() > 0 &&
+					ret.charAt(prevpos-1) != '?') {
+				
+				if (ret.charAt(prevpos) == '\r' &&
+						ret.charAt(prevpos+1) == '\n') {
+					prevpos += 2;
+				}
+				for (int i=0; i < level; i++) {
+					buf.append("    ");
+				}
+				
+				buf.append(ret.substring(prevpos, pos).trim());
+				buf.append("\r\n");
+			}
+			
+			int endpos=ret.indexOf('>', pos);
+		
+			if (endpos > 0) {
+				boolean noreturn=false;
+				
+				if (pos > 0 && ret.charAt(pos+1) == '/') {
+					level--;
+				}
+				
+				for (int i=0; i < level; i++) {
+					buf.append("    ");
+				}
+				buf.append(ret.substring(pos, endpos+1));
+				
+				if (ret.charAt(endpos-1)== '?') {
+					//noreturn = true;
+					
+				} else if (ret.charAt(endpos-1) == '/') {
+					// Ignore
+				} else if (pos > 0 && ret.charAt(pos+1) == '/') {
+					// Ignore
+					
+				} else if (pos > 0 && ret.charAt(pos+1) == '!') {
+					// Ignore
+					
+				} else {
+					level++;
+				}
+							
+				if (noreturn == false) {
+					buf.append("\r\n");
+				}
+				
+				pos = endpos+1;
+			}
+			
+			prevpos = pos;
+		}
+		
+		if (prevpos != -1 &&
+				ret.substring(prevpos).trim().length() > 0) {
+			buf.append(ret.substring(prevpos));
+		}
+		
+		ret = buf.toString();
+		
+		return(ret);
+	}
+	
+	public GeneratorContext getContext() {
+		return(m_context);
+	}
+
+	private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.runtime.jbossesb.generator");
+
+	private IFile m_file=null;
+	private java.util.List<ModelReference> m_localModelRefs=null;
+	private ConversationModel m_conversationModel=null;
+	private GeneratorContext m_context=null;
+	private java.util.List<ConversationBasedGenerator> m_conversationBasedGen=
+		new java.util.Vector<ConversationBasedGenerator>();
+	private java.util.List<ModelBasedGenerator> m_modelBasedGen=
+		new java.util.Vector<ModelBasedGenerator>();
+}

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/GeneratorContext.java (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/GeneratorContext.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/GeneratorContext.java	                        (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/GeneratorContext.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -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.jbossesb.generator;
+
+/**
+ * This class provides context information used by the
+ * generator.
+ */
+public class GeneratorContext {
+
+	/**
+	 * This is the constructor for the generator context.
+	 * 
+	 * @param buildSystem The build system
+	 * @param messagingSystem The messaging system
+	 */
+	public GeneratorContext(BuildSystem buildSystem,
+					MessagingSystem messagingSystem) {
+		m_buildSystem = buildSystem;
+		m_messagingSystem = messagingSystem;
+	}
+	
+	/**
+	 * This method returns the build system.
+	 * 
+	 * @return The build system
+	 */
+	public BuildSystem getBuildSystem() {
+		return(m_buildSystem);
+	}
+	
+	public MessagingSystem getMessagingSystem() {
+		return(m_messagingSystem);
+	}
+	
+	private BuildSystem m_buildSystem=null;
+	private MessagingSystem m_messagingSystem=null;
+}

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/GeneratorException.java (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/GeneratorException.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/GeneratorException.java	                        (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/GeneratorException.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -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.jbossesb.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.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/GeneratorUtil.java (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/GeneratorUtil.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/GeneratorUtil.java	                        (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/GeneratorUtil.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -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.jbossesb.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.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/JBMMessagingSystem.java (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/JBMMessagingSystem.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/JBMMessagingSystem.java	                        (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/JBMMessagingSystem.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -0,0 +1,82 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ */
+package org.jboss.savara.tools.jbossesb.generator;
+
+import java.util.logging.Logger;
+
+import org.jboss.savara.tools.jbossesb.model.ESBLanguageModel;
+import org.jboss.savara.tools.jbossesb.model.ESBService;
+
+/**
+ * This class provides the information related to the JBM
+ * messaging system.
+ */
+public class JBMMessagingSystem extends MessagingSystem {
+
+	private static final String JBOSS_MESSAGING = "JBoss Messaging";
+	private static final String JBM_CONFIG_FILE = "jbm-queue-service.xml";
+
+	/**
+	 * The default constructor.
+	 */
+	public JBMMessagingSystem() {
+		super(JBOSS_MESSAGING);
+	}
+	
+	/**
+	 * This method returns the configuration filename.
+	 * 
+	 * @return The configuration filename
+	 */
+	public String getConfigFileName() {
+		return(JBM_CONFIG_FILE);
+	}
+	
+	/**
+	 * This method returns the messaging configuration for the
+	 * supplied service.
+	 * 
+	 * @param model The model
+	 * @param service The service
+	 * @return The messaging configuration
+	 */
+	protected String getServiceConfig(ESBLanguageModel model,
+							ESBService service) {
+		StringBuffer buf=new StringBuffer();
+
+		String dest=model.getJMSDefinition(service.getJMSBusIdRef());
+				
+		if (dest != null) {
+			buf.append("\t<mbean code=\"org.jboss.jms.server.destination.QueueService\"\r\n");
+			buf.append("\t\t\tname=\""+service.getCategory()+".destination:service=Queue,name="+dest+"\"\r\n");
+			buf.append("\t\t\txmbean-dd=\"xmdesc/Queue-xmbean.xml\">\r\n");
+			buf.append("\t\t<depends optional-attribute-name=\"ServerPeer\">\r\n");
+			buf.append("\t\t\tjboss.messaging:service=ServerPeer\r\n");
+			buf.append("\t\t</depends>\r\n");
+			buf.append("\t\t<depends>jboss.messaging:service=PostOffice</depends>\r\n");
+			buf.append("\t</mbean>\r\n");
+		} else {
+			logger.severe("Failed to find destination for JMS bus id '"+
+					service.getJMSBusIdRef()+"'");
+		}
+		
+		return(buf.toString());
+	}
+
+	private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.runtime.jbossesb.generator");
+}

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/JBossMQMessagingSystem.java (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/JBossMQMessagingSystem.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/JBossMQMessagingSystem.java	                        (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/JBossMQMessagingSystem.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -0,0 +1,84 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ */
+package org.jboss.savara.tools.jbossesb.generator;
+
+import java.util.logging.Logger;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jdt.core.IJavaProject;
+import org.jboss.savara.tools.jbossesb.model.ESBLanguageModel;
+import org.jboss.savara.tools.jbossesb.model.ESBService;
+
+/**
+ * This class provides the information related to the JBossMQ
+ * messaging system.
+ */
+public class JBossMQMessagingSystem extends MessagingSystem {
+
+	private static final String JBOSSMQ_MESSAGING = "JBossMQ";
+	private static final String JBOSSMQ_CONFIG_FILE = "jbmq-queue-service.xml";
+
+	/**
+	 * The default constructor.
+	 */
+	public JBossMQMessagingSystem() {
+		super(JBOSSMQ_MESSAGING);
+	}
+	
+	/**
+	 * This method returns the configuration filename.
+	 * 
+	 * @return The configuration filename
+	 */
+	public String getConfigFileName() {
+		return(JBOSSMQ_CONFIG_FILE);
+	}
+	
+	/**
+	 * This method returns the messaging configuration for the
+	 * supplied service.
+	 * 
+	 * @param model The model
+	 * @param service The service
+	 * @return The messaging configuration
+	 */
+	protected String getServiceConfig(ESBLanguageModel model,
+							ESBService service) {
+		StringBuffer buf=new StringBuffer();
+
+		String dest=model.getJMSDefinition(service.getJMSBusIdRef());
+				
+		if (dest != null) {
+			buf.append("\t<mbean code=\"org.jboss.mq.server.jmx.Queue\"\r\n");
+			buf.append("\t\t\tname=\""+service.getCategory()+".destination:service=Queue,name="+dest+"\">\r\n");
+			buf.append("\t\t<depends optional-attribute-name=\"DestinationManager\">\r\n");
+			buf.append("\t\t\tjboss.mq:service=DestinationManager\r\n");
+			buf.append("\t\t</depends>\r\n");
+			buf.append("\t</mbean>\r\n");
+		} else {
+			logger.severe("Failed to find destination for JMS bus id '"+
+					service.getJMSBusIdRef()+"'");
+		}
+		
+		return(buf.toString());
+	}
+
+	private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.runtime.jbossesb.generator");
+}

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/MavenBuildSystem.java (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/MavenBuildSystem.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/MavenBuildSystem.java	                        (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/MavenBuildSystem.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -0,0 +1,99 @@
+/*
+ * 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.jbossesb.generator;
+
+/**
+ * This class represents the Ant build system.
+ */
+public class MavenBuildSystem extends BuildSystem {
+
+	private static final String BUILD_FILE = "pom.xml";
+	private static final String MAVEN = "Maven";
+	private static final String ESB_CONFIG_PATH = "src/main/resources/META-INF/jboss-esb.xml";
+	private static final String DEPLOYMENT_PATH = "src/main/resources/META-INF/deployment.xml";
+	private static final String MESSAGING_CONFIG_PATH = "src/main/resources";
+	private static final String JAVA_SOURCE_PATH = "src/main/java";
+	private static final String LIBRARY_PATH = null;
+
+	/**
+	 * This is the default constructor for the Maven build
+	 * system. 
+	 */
+	public MavenBuildSystem() {
+		super(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 ESB configuration file
+	 * path.
+	 * 
+	 * @return The ESB configuration file path
+	 */
+	public String getESBConfigFilePath() {
+		return(ESB_CONFIG_PATH);
+	}
+	
+	/**
+	 * This method returns the deployment file
+	 * path.
+	 * 
+	 * @return The deployment file path
+	 */
+	public String getDeploymentFilePath() {
+		return(DEPLOYMENT_PATH);
+	}
+	
+	/**
+	 * This method returns the messaging configuration
+	 * path.
+	 * 
+	 * @return The messaging configuration path
+	 */
+	public String getMessagingConfigPath() {
+		return(MESSAGING_CONFIG_PATH);
+	}
+	
+	/**
+	 * This method returns the Java source path.
+	 * 
+	 * @return The Java source path
+	 */
+	public String getJavaSourcePath() {
+		return(JAVA_SOURCE_PATH);
+	}
+	
+	/**
+	 * This method returns the library path.
+	 * 
+	 * @return The library path
+	 */
+	public String getLibraryPath() {
+		return(LIBRARY_PATH);
+	}
+		
+}

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/Messages.properties (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Messages.properties)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/Messages.properties	                        (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/Messages.properties	2009-08-20 13:22:27 UTC (rev 784)
@@ -0,0 +1,20 @@
+# /*
+#  * 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.
+#  */
+
+_ACCESSOR_DESCRIPTION=The accessor method for variable '{0}'.
+_MODIFIER_DESCRIPTION=The modifier method for variable '{0}'.

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/MessagingConfigurationGenerator.java (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/MessagingConfigurationGenerator.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/MessagingConfigurationGenerator.java	                        (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/MessagingConfigurationGenerator.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -0,0 +1,67 @@
+/*
+ * 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.jbossesb.generator;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.jdt.core.IJavaProject;
+import org.jboss.savara.tools.jbossesb.model.ESBLanguageModel;
+
+/**
+ * This class implements the model based generator to generate
+ * the JBMQ configuration.
+ */
+public class MessagingConfigurationGenerator implements ModelBasedGenerator {
+
+	/**
+	 * This method generates the relevant artefacts based on
+	 * the supplied model, within the specified Java project.
+	 * 
+	 * @param jproj The Java project
+	 * @param model The model
+	 * @param context The generator context
+	 * @throws GeneratorException Failed to generate
+	 */
+	public void generate(IJavaProject jproj,
+			ESBLanguageModel model, GeneratorContext context)
+					throws GeneratorException {
+		IPath buildConfigPath=jproj.getPath().append(
+				context.getBuildSystem().getMessagingConfigPath());
+				
+		buildConfigPath = buildConfigPath.append(java.io.File.separator);
+		buildConfigPath = buildConfigPath.append(context.getMessagingSystem().getConfigFileName());
+		
+		IFile configFile=jproj.getProject().getWorkspace().getRoot().getFile(buildConfigPath);
+		GeneratorUtil.createParentFolder(configFile);
+		
+		try {
+			configFile.create(null, true,
+					new org.eclipse.core.runtime.NullProgressMonitor());
+			
+			String config=context.getMessagingSystem().getFileContents(model);
+			
+			if (config != null) {
+				configFile.setContents(new java.io.ByteArrayInputStream(
+						config.getBytes()), true, false,
+						new org.eclipse.core.runtime.NullProgressMonitor());
+			}
+		} catch(Exception e) {
+			throw new GeneratorException("Failed to save messaging configuration", e);
+		}
+	}
+}

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/MessagingSystem.java (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/MessagingSystem.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/MessagingSystem.java	                        (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/MessagingSystem.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -0,0 +1,94 @@
+/*
+ * 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.jbossesb.generator;
+
+import org.jboss.savara.tools.jbossesb.model.ESBLanguageModel;
+import org.jboss.savara.tools.jbossesb.model.ESBService;
+
+/**
+ * This class represents an abstract messaging system.
+ */
+public abstract class MessagingSystem {
+
+	/**
+	 * This is the constructor for the messaging system.
+	 * 
+	 * @param name The name of the messaging system
+	 */
+	public MessagingSystem(String name) {
+		m_name = name;
+	}
+	/**
+	 * This method represents the name of the messaging
+	 * system.
+	 * 
+	 * @return The name
+	 */
+	public String getName() {
+		return(m_name);
+	}
+	
+	/**
+	 * This method returns the configuration filename.
+	 * 
+	 * @return The configuration filename
+	 */
+	public abstract String getConfigFileName();
+	
+	/**
+	 * This method returns the contents for the messaging
+	 * configuration file.
+	 * 
+	 * @param jproj The Java project
+	 * @param model The model
+	 * @return The file contents
+	 */
+	public String getFileContents(ESBLanguageModel model) {
+		StringBuffer buf=new StringBuffer();
+		buf.append("<server>\r\n");
+		
+		java.util.Iterator<ESBService> iter=model.getServices().iterator();
+		
+		while (iter.hasNext()) {
+			ESBService service=iter.next();
+			
+			String serviceConfig=getServiceConfig(model, service);
+			
+			if (serviceConfig != null) {
+				buf.append(serviceConfig);
+			}
+		}
+		
+		buf.append("</server>\r\n");
+		
+		return(buf.toString());
+	}	
+
+	/**
+	 * This method returns the messaging configuration for the
+	 * supplied service.
+	 * 
+	 * @param model The model
+	 * @param service The service
+	 * @return The messaging configuration
+	 */
+	protected abstract String getServiceConfig(ESBLanguageModel model,
+							ESBService service);
+	
+	private String m_name=null;
+}

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/ModelBasedGenerator.java (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/ModelBasedGenerator.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/ModelBasedGenerator.java	                        (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/ModelBasedGenerator.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -0,0 +1,42 @@
+/*
+ * 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.jbossesb.generator;
+
+import org.eclipse.jdt.core.IJavaProject;
+import org.jboss.savara.tools.jbossesb.model.ESBLanguageModel;
+
+/**
+ * This interface represents a module that generates artefacts
+ * based on the complete model.
+ */
+public interface ModelBasedGenerator {
+
+	/**
+	 * This method generates the relevant artefacts based on
+	 * the supplied model, within the specified Java project.
+	 * 
+	 * @param jproj The Java project
+	 * @param model The model
+	 * @param context The generator context
+	 * @throws GeneratorException Failed to generate
+	 */
+	public void generate(IJavaProject jproj,
+			ESBLanguageModel model, GeneratorContext context)
+					throws GeneratorException;
+	
+}

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/TypeMapper.java (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/TypeMapper.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/TypeMapper.java	                        (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/TypeMapper.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -0,0 +1,61 @@
+/*
+ * 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.jbossesb.generator;
+
+public class TypeMapper {
+
+	private static final String BOOLEAN_TYPE = "boolean";
+	private static final String STRING_TYPE = "string";
+	private static final String DECIMAL_TYPE = "decimal";
+	private static final String INTEGER_TYPE = "integer";
+	private static final String INT_TYPE = "int";
+	public static final String JAVA_PREFIX = "java:";
+	public static final String XSD_NAMESPACE = "http://www.w3.org/2001/XMLSchema";
+	
+	/**
+	 * This method determines the appropriate Java type associated
+	 * with the supplied type namespace and localpart.
+	 * 
+	 * @param namespace The namespace
+	 * @param localpart The local part
+	 * @return The Java type
+	 */
+	public static String getJavaType(String namespace, String localpart) {
+		String ret=org.w3c.dom.Element.class.getName();
+		
+		if (namespace != null && localpart != null) {
+			
+			if (namespace.startsWith(JAVA_PREFIX)) {
+				ret = namespace.substring(JAVA_PREFIX.length())
+							+"."+localpart;
+			} else if (namespace.equals(XSD_NAMESPACE)) {
+				
+				if (localpart.equals(STRING_TYPE)) {
+					ret = String.class.getName();
+				} else if (localpart.equals(DECIMAL_TYPE) ||
+						localpart.equals(INTEGER_TYPE)) {
+					ret = INT_TYPE;
+				} else if (localpart.equals(BOOLEAN_TYPE)) {
+					ret = BOOLEAN_TYPE;
+				}
+			}
+		}
+		
+		return(ret);
+	}
+}

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/template (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/template)

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/ConversionContext.java (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ConversionContext.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/ConversionContext.java	                        (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/ConversionContext.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -0,0 +1,86 @@
+/*
+ * 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.jbossesb.model;
+
+public interface ConversionContext {
+
+	/**
+	 * This method returns the role associated with the
+	 * endpoint being converted.
+	 * 
+	 *@return The role
+	 */
+	public String getRole();
+	
+	/**
+	 * This method is invoked when an ESB service is being processed.
+	 * 
+	 * @param service The service
+	 */
+	public void processing(ESBService service);
+	
+	/**
+	 * This method is invoked when an ESB service has been processed.
+	 * 
+	 * @param service The service
+	 */
+	public void processed(ESBService service);
+	
+	/**
+	 * Push service on the stack of services in which the current
+	 * context is contained.
+	 * 
+	 * @param service The service
+	 */
+	public void push(ESBService service);
+	
+	/**
+	 * Pop service from the stack of services in which the current
+	 * context is contained.
+	 * 
+	 * @param service The service
+	 */
+	public void pop(ESBService service);
+	
+	/**
+	 * This method determines whether the supplied service is on
+	 * the stack of services in which the current context is
+	 * contained.
+	 * 
+	 * @param service The service
+	 * @return Whether the service is on the stack
+	 */
+	public boolean isOnStack(ESBService service);
+	
+	/**
+	 * This method marks an ESB service as being a join state.
+	 * 
+	 * @param service The service
+	 */
+	public void markJoin(ESBService service);
+	
+	/**
+	 * This method determines whether the ESB service is a join
+	 * state.
+	 * 
+	 * @param service The serviice
+	 * @return Whether the service is a join state
+	 */
+	public boolean isJoin(ESBService service);
+	
+}

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/DefaultConversionContext.java (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultConversionContext.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/DefaultConversionContext.java	                        (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/DefaultConversionContext.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -0,0 +1,127 @@
+/*
+ * 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.jbossesb.model;
+
+import java.util.logging.Logger;
+
+public class DefaultConversionContext implements ConversionContext {
+
+	/**
+	 * This constructor initializes the role associated with
+	 * the conversion.
+	 * 
+	 * @param role The role
+	 */
+	public DefaultConversionContext(String role) {
+		m_role = role;
+	}
+	
+	/**
+	 * This method returns the role associated with the
+	 * endpoint being converted.
+	 * 
+	 *@return The role
+	 */
+	public String getRole() {
+		return(m_role);
+	}
+	
+	/**
+	 * This method is invoked when an ESB service is being processed.
+	 * 
+	 * @param service The service
+	 */
+	public void processing(ESBService service) {
+		m_joins.remove(service);
+	}
+	
+	/**
+	 * This method is invoked when an ESB service has been processed.
+	 * 
+	 * @param service The service
+	 */
+	public void processed(ESBService service) {
+		
+	}
+	
+	/**
+	 * Push service on the stack of services in which the current
+	 * context is contained.
+	 * 
+	 * @param service The service
+	 */
+	public void push(ESBService service) {
+		m_serviceStack.add(service);
+	}
+	
+	/**
+	 * Pop service from the stack of services in which the current
+	 * context is contained.
+	 * 
+	 * @param service The service
+	 */
+	public void pop(ESBService service) {
+		
+		// Check if the service is the last element on the stack
+		if (m_serviceStack.size() == 0 ||
+				m_serviceStack.get(m_serviceStack.size()-1) != service) {
+			logger.severe("Request to pop service '"+service+
+					"' that is not the most recent entry on the stack");
+		}
+		
+		m_serviceStack.remove(service);
+	}
+	
+	/**
+	 * This method determines whether the supplied service is on
+	 * the stack of services in which the current context is
+	 * contained.
+	 * 
+	 * @param service The service
+	 * @return Whether the service is on the stack
+	 */
+	public boolean isOnStack(ESBService service) {
+		return(m_serviceStack.contains(service));
+	}
+	
+	/**
+	 * This method marks an ESB service as being a join state.
+	 * 
+	 * @param service The service
+	 */
+	public void markJoin(ESBService service) {
+		m_joins.add(service);
+	}
+	
+	/**
+	 * This method determines whether the ESB service is a join
+	 * state.
+	 * 
+	 * @param service The service
+	 * @return Whether the service is a join state
+	 */
+	public boolean isJoin(ESBService service) {
+		return(m_joins.contains(service));
+	}
+	
+	private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.runtime.jbossesb.model");
+	
+	private java.util.List<ESBService> m_serviceStack=new java.util.Vector<ESBService>();
+	private java.util.List<ESBService> m_joins=new java.util.Vector<ESBService>();
+	private String m_role=null;
+}

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/DefaultESBLanguageModel.java (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBLanguageModel.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/DefaultESBLanguageModel.java	                        (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/DefaultESBLanguageModel.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -0,0 +1,706 @@
+/*
+ * 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.jbossesb.model;
+
+import java.util.logging.Logger;
+
+import org.scribble.conversation.model.*;
+import org.scribble.extensions.RegistryFactory;
+import org.scribble.model.*;
+import org.scribble.model.admin.DependencyType;
+import org.scribble.model.admin.ModelIssue;
+import org.scribble.model.admin.ModelListener;
+import org.scribble.model.resolutions.*;
+
+/**
+ * This class represents an ESB model.
+ *  
+ * @author gary
+ */
+public class DefaultESBLanguageModel extends org.scribble.lang.model.LanguageModel
+					implements ESBLanguageModel {
+
+	private static final String SERVICE_NAME_SEPARATOR = "__";
+	public static final String DEST_NAME_PREFIX = "queue/";
+	public static final String DEST_NAME_ATTR = "dest-name";
+	public static final String DEST_TYPE_VALUE = "QUEUE";
+	public static final String DEST_TYPE_ATTR = "dest-type";
+	public static final String JMS_MESSAGE_FILTER_ELEMENT = "jms-message-filter";
+	public static final String JMS_BUS_ELEMENT = "jms-bus";
+	public static final String BUSID_ATTR = "busid";
+	public static final String JBOSSESB_XML_NAMESPACE = "http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd";
+	public static final String XMLNS = "xmlns";
+	public static final String TOP_LEVEL_ELEMENT = "jbossesb";
+	public static final String PARAMETER_RELOAD_SECS_ATTR = "parameterReloadSecs";
+	public static final String PROVIDERS_ELEMENT = "providers";
+	public static final String JMS_PROVIDER_ELEMENT = "jms-provider";
+	public static final String JAVA_NOTATION = "java";
+	public static final String SERVICE_ELEMENT = "service";
+	public static final String SERVICES_ELEMENT = "services";
+
+	public static final String JBOSSESB_NOTATION = "jboss-esb.xml";
+
+	/**
+	 * This constructor is initialized with the ESB configuration.
+	 * 
+	 * @param source The model reference for the JBossESB configuration source
+	 * @param elem The ESB configuration
+	 * @param contents The textual contents
+	 */
+	public DefaultESBLanguageModel(ModelReference source, org.w3c.dom.Element elem,
+							String contents) {
+		m_source = source;
+		m_esbConfig = elem;
+		m_contents = contents;
+
+		// Extract service action pipelines
+		initializeExistingConfig();
+	}
+	
+	/**
+	 * This constructor initializes a new ESB configuration.
+	 * 
+	 * @param source The model reference for the JBossESB configuration
+	 * @param stateless Whether the model is stateless
+	 */
+	public DefaultESBLanguageModel(ModelReference source, boolean stateless) {
+		m_source = source;
+		m_stateless = stateless;
+		
+		initializeNewConfig();
+	}
+	
+	/**
+	 * This method creates a new ESB configuration.
+	 */
+	protected void initializeNewConfig() {
+		
+		org.w3c.dom.Document doc=null;
+		
+		// Create an empty document
+		try {
+			doc = javax.xml.parsers.DocumentBuilderFactory.
+				newInstance().newDocumentBuilder().newDocument();
+			
+			m_esbConfig = doc.createElement(TOP_LEVEL_ELEMENT);
+			
+			m_esbConfig.setAttribute(XMLNS, 
+					JBOSSESB_XML_NAMESPACE);
+			m_esbConfig.setAttribute(PARAMETER_RELOAD_SECS_ATTR,"5000");
+			
+			doc.appendChild(m_esbConfig);
+			
+			// Create provider information
+			org.w3c.dom.Element providers=doc.createElement(PROVIDERS_ELEMENT);
+			m_esbConfig.appendChild(providers);
+			
+			m_jmsProviderElem = doc.createElement(JMS_PROVIDER_ELEMENT);
+			providers.appendChild(m_jmsProviderElem);
+			
+			// Configure the jms provider
+			m_jmsProviderElem.setAttribute("name", "JBossMQ");
+			m_jmsProviderElem.setAttribute("connection-factory", "ConnectionFactory");
+			m_jmsProviderElem.setAttribute("jndi-context-factory", "org.jnp.interfaces.NamingContextFactory");
+			m_jmsProviderElem.setAttribute("jndi-URL", "localhost");
+			
+			// Create services element
+			m_servicesElem = doc.createElement(SERVICES_ELEMENT);
+			m_esbConfig.appendChild(m_servicesElem);
+			
+		} catch(Exception e) {
+			logger.severe("Failed to create initial jbossesb document: "+e);
+		}
+		
+	}
+	
+	/**
+	 * This method initializes the ESB Model.
+	 */
+	protected void initializeExistingConfig() {
+		org.w3c.dom.NodeList services=
+				m_esbConfig.getElementsByTagName(SERVICES_ELEMENT);
+		
+		org.scribble.model.admin.DependencyManager dm=
+			(org.scribble.model.admin.DependencyManager)
+			org.scribble.extensions.RegistryFactory.getRegistry().getExtension(
+					org.scribble.model.admin.DependencyManager.class, null);
+		
+		LocatedName mname=new LocatedName();
+		mname.setName(m_source.getLocalpart());
+		
+		setModelName(mname);
+		
+		Namespace ns=new Namespace();
+		ns.setName(m_source.getNamespace());
+		setNamespace(ns);
+
+		if (services != null && services.getLength() == 1 &&
+				services.item(0) instanceof org.w3c.dom.Element) {
+			org.w3c.dom.NodeList nl=((org.w3c.dom.Element)
+						services.item(0)).getChildNodes();
+			
+			for (int i=0; i < nl.getLength(); i++) {
+				
+				if (nl.item(i) instanceof org.w3c.dom.Element &&
+						nl.item(i).getNodeName().equals(SERVICE_ELEMENT)) {
+					
+					ESBService service=new DefaultESBService(this,
+								(org.w3c.dom.Element)nl.item(i));
+					String key=getKey(service.getCategory(),
+							service.getName());
+					
+					m_services.put(key, service);
+				}
+			}
+			
+			java.util.Iterator<ESBService> iter=m_services.values().iterator();
+			
+			while (iter.hasNext()) {
+				iter.next().initializeLinks();
+			}
+			
+			// Initialize the conversations
+			java.util.List<String> sessionClasses=new java.util.Vector<String>();
+			java.util.Iterator<ESBService> serviter=getServices().iterator();
+			
+			while (serviter.hasNext()) {
+				ESBService service=serviter.next();
+				
+				// If any service is stateless, then mark the model
+				// as stateless
+				if (service.isStateless()) {
+					m_stateless = true;
+				}
+				
+				if (service.isRoot()) {
+					
+					/*
+					String convType=service.getConversationType();
+					String role=null;
+					
+					if (convType != null) {
+						int index=convType.indexOf('@');
+					
+						if (index != -1) {
+							// TODO: Need to think whether this should be
+							// 'implements' reference. If so, then need to change
+							// Java Lang Model parser and also Lang Model conformance
+							// rule.
+							ImplementsReference iref=
+								new ImplementsReference(ConversationModel.CONVERSATION);
+							//ConformanceReference iref=
+							//	new ConformanceReference(ConversationModel.CONVERSATION);
+						
+							role = convType.substring(index+1);
+							
+							iref.setLocatedRole(role);
+							
+							// Need to locate the model name
+							modelName.setLocatedRole(new Role(iref.getLocatedRole()));
+							
+							String mainpart=convType.substring(0, index);
+							
+							index = mainpart.lastIndexOf(".");
+							
+							if (index == -1) {
+								iref.setNamespace("");
+								iref.setLocalpart(mainpart);
+							} else {
+								iref.setNamespace(mainpart.substring(0, index));								
+								iref.setLocalpart(mainpart.substring(index+1));
+							}
+							
+							conv.getImplements().add(iref);
+							//conv.getConformsTo().add(iref);
+							
+							dm.recordDependency(m_source, iref,
+									DependencyType.Implements);
+
+						} else {
+							logger.warning("Conversation type does not " +
+									"contain '@' located role separator");
+						}
+					} else {
+						logger.warning("No conversation type specified");
+					}
+													
+					conv.setBlock(new Block());
+					
+					service.convert(conv.getBlock().getContents(),
+									new DefaultConversionContext(role));
+					
+					*/
+					
+					Conversation conv=service.convert(null);
+					
+					if (conv != null) {
+						getConversations().add(conv);
+					}
+				}
+				
+				//Add session class to list
+				String sessionClass=service.getSessionName();
+				
+				if (sessionClass != null &&
+						sessionClasses.contains(sessionClass) == false) {
+					sessionClasses.add(sessionClass);
+				}
+			}
+			
+			// Add dependency on session classes
+			for (int i=0; i < sessionClasses.size(); i++) {
+				String sessionClass=sessionClasses.get(i);
+				int index=sessionClass.lastIndexOf('.');
+				String nspace="";
+				String local=sessionClass;
+				
+				if (index != -1) {
+					nspace = sessionClass.substring(0, index);
+					local = sessionClass.substring(index+1);
+					
+					dm.recordDependency(getModelReference(),
+							new ModelReference(nspace, local,
+									null, JAVA_NOTATION),
+									DependencyType.Uses);
+				}
+			}
+		}
+		
+		if (logger.isLoggable(java.util.logging.Level.FINEST)) {
+			
+			org.scribble.export.Exporter exporter=
+				(org.scribble.export.Exporter)
+				RegistryFactory.getRegistry().getExtension(
+						org.scribble.export.Exporter.class, null);
+			
+			try {
+				for (int i=0; i < getConversations().size(); i++) {
+					ConversationModel model=new ConversationModel();
+					Conversation conv=getConversations().get(i);
+					ModelObject parent=conv.getParent();
+					
+					// This command will overwrite the parent of
+					// the conversation, so need to set this back
+					// at the end
+					model.setConversation(conv);
+					
+					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(getModelReference(),
+								model, formatter);
+					
+					String str=new String(os.toByteArray());
+					
+					System.out.println("EXPORTED JBOSS-ESB TEXT:");
+					System.out.println(str);
+					
+					// Re-establish the true parent
+					conv.setParent(parent);
+				}
+			} catch(Exception e) {
+				e.printStackTrace();
+			}
+		}
+	}
+	
+	/**
+	 * This method returns the source model reference.
+	 * 
+	 * @return The source model reference
+	 */
+	public ModelReference getModelReference() {
+		return(m_source);
+	}
+
+	/**
+	 * Generate a key for use in accessing the service related to
+	 * the supplied category and name.
+	 * 
+	 * @param category The category
+	 * @param name The service name
+	 * @return The key
+	 */
+	protected String getKey(String category, String name) {
+		return(category+"/"+name);
+	}
+	
+	/**
+	 * This method validates the ESB model and reports warnings or
+	 * errors to the supplied model listener.
+	 * 
+	 * @param l The model listener
+	 */
+	public void validate(ModelListener l) {
+
+		java.util.Iterator<ESBService> iter=m_services.values().iterator();
+		
+		while (iter.hasNext()) {
+			ESBService service=iter.next();
+			
+			service.validate(l);
+		}
+	}
+	
+	/**
+	 * This method returns the ESB service for the supplied
+	 * category and name.
+	 * 
+	 * @param category The service category
+	 * @param name The service name
+	 * @return The ESB service, or null if not found
+	 */
+	public ESBService getService(String category, String name) {
+		return(m_services.get(getKey(category, name)));
+	}
+
+	/**
+	 * This method returns the collection of ESB services associated
+	 * with the model.
+	 * 
+	 * @return The collection of ESB services
+	 */
+	public java.util.Collection<ESBService> getServices() {
+		return(m_services.values());
+	}
+	
+	/**
+	 * This method creates a new ESB service.
+	 * 
+	 * @param category The category
+	 * @param name The name
+	 * @return The new ESB service
+	 */
+	public ESBService createService(String category, String name) {
+		return(new DefaultESBService(this, category, name));
+	}
+	
+	/**
+	 * This method adds a new service to the model.
+	 * 
+	 * @param service The service
+	 */
+	public void addService(ESBService service) {
+		m_services.put(getKey(service.getCategory(), service.getName()),
+				service);
+		
+		// Add service
+		if (service.getService() != null) {
+			m_servicesElem.appendChild(service.getService());
+		}
+		
+		// Add provider information
+		String busId=service.getJMSBusIdRef();
+		
+		// Check if busId is unique
+		if (busId == null || findJMSBus(busId) != null) {
+			busId = getUniqueBusId();
+			service.setJMSBusIdRef(busId);
+		}
+		
+		if (busId != null) {
+			addJMSBus(busId, getJMSDestination(service.getCategory(),
+					service.getName()));
+		} else {
+			logger.severe("Service '"+service+
+						"' does not have a bus Id");
+		}
+	}
+	
+	protected String getUniqueBusId() {
+		int index=1;
+		String ret="busId"+index;
+		
+		while (findJMSBus(ret) != null) {
+			index++;
+			ret = "busId"+index;
+		}
+		
+		return(ret);
+	}
+	
+	/**
+	 * This method returns the JMS destination associated with
+	 * the supplied JMS Bus Id.
+	 * 
+	 * @param jmsBusId The JMS bus id
+	 * @return The JMS definition, or null if not found
+	 */
+	public String getJMSDefinition(String jmsBusId) {
+		String ret=null;
+		
+		org.w3c.dom.Element elem=findJMSBus(jmsBusId);
+		
+		if (elem != null) {
+			org.w3c.dom.NodeList nl=
+				elem.getElementsByTagName(JMS_MESSAGE_FILTER_ELEMENT);
+			
+			if (nl.getLength() != 0 &&
+					nl.item(0) instanceof org.w3c.dom.Element) {
+				org.w3c.dom.Element filter=(org.w3c.dom.Element)
+							nl.item(0);
+				
+				if (filter.hasAttribute(DEST_NAME_ATTR)) {
+					ret = filter.getAttribute(DEST_NAME_ATTR);
+					
+					// If prefixed, then strip prefix away
+					if (ret.startsWith(DEST_NAME_PREFIX)) {
+						ret = ret.substring(DEST_NAME_PREFIX.length());
+					}
+				}
+			}
+		}
+		
+		return(ret);
+	}
+	
+	protected void addJMSBus(String jmsBusId, String dest) {
+		
+		org.w3c.dom.Element jmsBus=
+				m_esbConfig.getOwnerDocument().createElement(JMS_BUS_ELEMENT);
+		m_jmsProviderElem.appendChild(jmsBus);
+		
+		jmsBus.setAttribute(BUSID_ATTR, jmsBusId);
+		
+		org.w3c.dom.Element mesgFilter=
+				m_esbConfig.getOwnerDocument().createElement(JMS_MESSAGE_FILTER_ELEMENT);
+		jmsBus.appendChild(mesgFilter);
+		
+		mesgFilter.setAttribute(DEST_TYPE_ATTR, DEST_TYPE_VALUE);
+		mesgFilter.setAttribute(DEST_NAME_ATTR, DEST_NAME_PREFIX+dest);
+	}
+	
+	protected org.w3c.dom.Element findJMSBus(String jmsBusId) {
+		org.w3c.dom.Element ret=null;
+		
+		org.w3c.dom.NodeList nl=m_jmsProviderElem.getChildNodes();
+		for (int i=0; i < nl.getLength(); i++) {
+			if (nl.item(i) instanceof org.w3c.dom.Element &&
+					nl.item(i).getNodeName().equals(JMS_BUS_ELEMENT) &&
+					((org.w3c.dom.Element)nl.item(i)).
+						getAttribute(BUSID_ATTR).equals(jmsBusId)) {
+				ret = (org.w3c.dom.Element)nl.item(i);
+			}
+		}
+		
+		return(ret);
+	}
+	
+	protected void removeJMSBus(String jmsBusId) {
+		org.w3c.dom.Element bus=findJMSBus(jmsBusId);
+		
+		if (bus != null) {
+			m_jmsProviderElem.removeChild(bus);
+		} else {
+			logger.severe("Remove JMS bus '"+jmsBusId+
+					"' failed, unable to find bus");
+		}
+	}
+	
+	protected String getJMSDestination(String category, String name) {
+		String ret=category.replace('.', '_');
+		
+		ret += "_"+name;
+		
+		return(ret);
+	}
+	
+	/**
+	 * This method removes a service from the model.
+	 * 
+	 * @param service The service
+	 */
+	public void removeService(ESBService service) {
+		m_services.remove(getKey(service.getCategory(),
+						service.getName()));
+		
+		// Remove provider information
+		String busId=service.getJMSBusIdRef();
+		
+		if (busId != null) {
+			removeJMSBus(busId);
+		} else {
+			logger.severe("Service '"+service+
+						"' does not have a bus Id");
+		}
+	}
+	
+	/**
+	 * This textual contents of the model.
+	 * 
+	 * @return The textual contents
+	 */
+	public String getOriginalContents() {
+		return(m_contents);
+	}
+	
+	/**
+	 * This method returns a unique service name within
+	 * the supplied category.
+	 * 
+	 * @param category The category
+	 * @param currentServiceName The name of the service creating
+	 * 							the new service
+	 * @return The unique service name
+	 */
+	public String getUniqueServiceName(String category, String currentServiceName) {
+		String ret=null;
+		
+		int index=currentServiceName.indexOf(SERVICE_NAME_SEPARATOR);
+		if (index != -1) {
+			currentServiceName = currentServiceName.substring(0, index);
+		}
+		
+		index = 0;
+		do {
+			index++;
+			ret = currentServiceName+SERVICE_NAME_SEPARATOR+index;
+		} while(getService(category, ret) != null);
+		
+		return(ret);
+	}
+	
+	/**
+	 * This method returns the gateway service.
+	 * 
+	 * @return The gateway service, or null if not found
+	 */
+	public ESBService getGatewayService() {
+		ESBService ret=null;
+		
+		java.util.Iterator<ESBService> iter=getServices().iterator();
+		while (ret == null && iter.hasNext()) {
+			ret = iter.next();
+			
+			if (ret.isGateway() == false) {
+				ret = null;
+			}
+		}
+
+		return(ret);
+	}
+	
+	/**
+	 * This method returns the reference to the DOM
+	 * representation of the ESB configuration.
+	 * 
+	 * @return The ESB configuration
+	 */
+	public org.w3c.dom.Element getESBConfiguration() {
+		return(m_esbConfig);
+	}
+	
+	/**
+	 * This method returns whether the model is stateless.
+	 * 
+	 * @return Whether the model is stateless
+	 */
+	public boolean isStateless() {
+		return(m_stateless);
+	}
+	
+	/**
+	 * This method returns a custom classloader that uses the project's
+	 * classpath to locate classes referenced by the ESB config file.
+	 * 
+	 * @see http://dev.eclipse.org/newslists/news.eclipse.tools.jdt/msg17769.html
+	 * 
+	 * @return The classloader
+	 * @throws Exception Failed to obtain the classloader
+	 */
+	public synchronized ClassLoader getModelClassLoader() throws Exception {
+		
+		if (m_classLoader == null) {
+			m_classLoader = org.jboss.savara.tools.jbossesb.model.util.ClasspathUtil.createClassLoader(getModelReference());
+		}
+		
+		return(m_classLoader);
+	}
+	
+	
+	private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.runtime.jbossesb.model");
+
+	private ModelReference m_source=null;
+	private org.w3c.dom.Element m_esbConfig=null;
+	private org.w3c.dom.Element m_jmsProviderElem=null;
+	private org.w3c.dom.Element m_servicesElem=null;
+	private String m_contents=null;
+	private java.util.Map<String,ESBService> m_services=new java.util.Hashtable<String,ESBService>();
+	private ClassLoader m_classLoader=null;
+	private boolean m_stateless=false;
+	
+	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.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/DefaultESBService.java (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBService.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/DefaultESBService.java	                        (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/DefaultESBService.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -0,0 +1,923 @@
+/*
+ * 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.jbossesb.model;
+
+import java.util.logging.Logger;
+
+import org.jboss.savara.tools.jbossesb.model.util.ESBModelUtil;
+import org.scribble.model.*;
+import org.scribble.model.admin.DependencyType;
+import org.scribble.model.admin.ModelIssue;
+import org.scribble.model.admin.ModelListener;
+import org.scribble.conversation.model.*;
+
+/**
+ * This class represents an ESB service.
+ *  
+ * @author gary
+ */
+public class DefaultESBService extends ModelObject implements ESBService {
+
+	private static final long serialVersionUID = 1266018368857224091L;
+
+	public static final String LISTENERS_ELEMENT = "listeners";
+	public static final String BUSIDREF_ATTR = "busidref";
+	public static final String JMS_LISTENER_ELEMENT = "jms-listener";
+	public static final String MAX_THREADS_ATTR = "maxThreads";
+	public static final String NAME_ATTR = "name";
+	public static final String DESCRIPTION_ATTR = "description";
+	public static final String CATEGORY_ATTR = "category";
+	public static final String ROOT_PROPERTY = "root";
+	public static final String BUSINESS_OBJECT_TYPE_PROPERTY = "session";
+	public static final String CONVERSATION_TYPE_PROPERTY = "conversationType";
+	public static final String SERVICE_DESCRIPTION_NAME_PROPERTY = "serviceDescriptionName";
+	public static final String SERVICE_ANNOTATION = "org.jboss.soa.overlord.jbossesb.stateful.actions.Service";
+	public static final String SERVICE_ELEMENT = "service";
+	public static final String RETRIEVE_SESSION_ACTION_CLASS = "org.jboss.soa.overlord.jbossesb.stateful.actions.RetrieveSessionAction";
+	public static final String ACTION_ELEMENT = "action";
+	public static final String ACTIONS_ELEMENT = "actions";
+	
+	/**
+	 * This is the constructor for the ESB service. This construct
+	 * creates a new DOM element, contained within the supplied
+	 * model, to represent the service associated with the
+	 * supplied category and name.
+	 * 
+	 * @param model The ESB model in which the service has been defined
+	 * @param service The XML configuration of the service
+	 */
+	public DefaultESBService(ESBLanguageModel model,
+					String category, String name) {
+		m_model = model;
+		
+		// Create new element for the service
+		initializeNewServiceElement(category, name);
+	}
+	
+	/**
+	 * This is the constructor for the ESB service. This construct
+	 * creates a wrapper around the supplied DOM representation of
+	 * the existing service element within an ESB configuration.
+	 * 
+	 * @param model The ESB model in which the service has been defined
+	 * @param service The XML configuration of the service
+	 */
+	public DefaultESBService(ESBLanguageModel model, org.w3c.dom.Element service) {
+		m_model = model;
+		m_service = service;
+		
+		if (m_model != null && m_service != null) {
+			initializeExistingServiceElement();
+		}
+	}
+	
+	protected void initializeNewServiceElement(String category, String name) {
+		
+		m_service = m_model.getESBConfiguration().
+					getOwnerDocument().createElement(SERVICE_ELEMENT);
+		
+		m_service.setAttribute(CATEGORY_ATTR, category);
+		m_service.setAttribute(NAME_ATTR, name);
+		m_service.setAttribute(DESCRIPTION_ATTR, "");
+		
+		m_actionsElem = m_model.getESBConfiguration().
+				getOwnerDocument().createElement(ACTIONS_ELEMENT);
+		m_service.appendChild(m_actionsElem);
+	}
+	
+	/**
+	 * This method initializes the service.
+	 */
+	protected void initializeExistingServiceElement() {
+		// Check if relevant action
+		org.w3c.dom.NodeList actions=m_service.getElementsByTagName(ACTIONS_ELEMENT); 
+	
+		if (actions != null && actions.getLength() == 1 &&
+				actions.item(0) instanceof org.w3c.dom.Element) {
+			
+			m_actionsElem = (org.w3c.dom.Element)actions.item(0);
+			
+			org.w3c.dom.NodeList nl=((org.w3c.dom.Element)
+						actions.item(0)).getChildNodes();
+			
+			for (int i=0; i < nl.getLength(); i++) {
+				if (nl.item(i) instanceof org.w3c.dom.Element &&
+						nl.item(i).getNodeName().equals(ACTION_ELEMENT)) {
+					m_actions.add(ESBActionFactory.createAction(this,
+							((org.w3c.dom.Element)nl.item(i))));
+				}
+			}
+		}
+
+		// Find positional information
+		int servCount=getServicePosition();
+		
+		String str=getModel().getOriginalContents();
+
+		if (str != null) {
+			int startPosition=str.indexOf("<service ");
+			int endPosition=-1;
+			int loggedEndPosition=-1;
+			
+			while (startPosition != -1 && servCount > 0) {
+				servCount--;
+				
+				loggedEndPosition = str.indexOf('>', startPosition);
+				
+				endPosition = str.indexOf("</service>", startPosition);
+				
+				if (servCount > 0) {
+					startPosition=str.indexOf("<service ", endPosition);
+				}
+			}
+			
+			if (startPosition != -1) {
+				endPosition = str.indexOf("</service>", startPosition);
+					
+				getSource().setStartPosition(startPosition);
+				getSource().setEndPosition(loggedEndPosition);
+				
+				getSource().getProperties().put("path",
+							ESBModelUtil.getPath(m_service));
+			}
+		}
+		
+		// Get jms listener
+		org.w3c.dom.NodeList nl=m_service.getElementsByTagName(DefaultESBService.JMS_LISTENER_ELEMENT);
+		
+		if (nl.getLength() > 0 && nl.item(0) instanceof org.w3c.dom.Element) {
+			m_jmsListenerElem = (org.w3c.dom.Element)nl.item(0);
+		}
+	}
+	
+	/**
+	 * This method initializes the links.
+	 */
+	public void initializeLinks() {
+		
+		// Work through actions requesting them to
+		// establish their links
+		for (int i=0; i < m_actions.size(); i++) {
+			m_actions.get(i).initializeLinks();
+		}
+	}
+	
+	/**
+	 * This method validates the ESB service and reports warnings or
+	 * errors to the supplied model listener.
+	 * 
+	 * @param l The model listener
+	 */
+	public void validate(ModelListener l) {
+		
+		// Check that the service specifies a session
+		if (isSessionBased() && getSessionClass() == null) {
+			
+			// Find first conversation based action to use as
+			// focus - if not found then use the service itself
+			ESBAction focus=getFirstSessionBasedAction();
+			ModelObject src=this;
+			
+			if (focus instanceof ModelObject) {
+				src = (ModelObject)focus;
+			}
+			
+			l.error(new ModelIssue(src, org.scribble.util.MessageUtil.format(
+					java.util.PropertyResourceBundle.getBundle(
+					"org.jboss.tools.overlord.cdl.runtime.jbossesb.model.Messages"),
+						"_NOT_SPECIFIED_SESSION_CLASS",
+						new String[]{})));
+		}
+		
+		for (int i=0; i < m_actions.size(); i++) {
+			m_actions.get(i).validate(l);
+		}
+	}
+	
+	/**
+	 * This method returns the ESB model.
+	 * 
+	 * @return The ESB model
+	 */
+	public ESBLanguageModel getModel() {
+		return(m_model);
+	}
+	
+	/**
+	 * This method returns the category associated with the service
+	 * descriptor.
+	 * 
+	 * @return The service category
+	 */
+	public String getCategory() {
+		return(m_service.getAttribute(CATEGORY_ATTR));
+	}
+	
+	/**
+	 * This method returns the name associated with the service
+	 * descriptor.
+	 * 
+	 * @return The service name
+	 */
+	public String getName() {
+		return(m_service.getAttribute(NAME_ATTR));
+	}
+	
+	/**
+	 * This method sets the name associated with the service
+	 * descriptor.
+	 * 
+	 * @param name The service name
+	 */
+	public void setName(String name) {
+		m_service.setAttribute(NAME_ATTR, name);
+	}
+	
+	/**
+	 * This method returns the XML configuration representation of the service.
+	 * 
+	 * @return The XML configuration for the service
+	 */
+	public org.w3c.dom.Element getService() {
+		return(m_service);
+	}
+	
+	/**
+	 * This method returns the list of ESB actions.
+	 * 
+	 * @return The ESB actions
+	 */
+	public java.util.List<ESBAction> getActions() {
+		return(m_actions);
+	}
+	
+	/**
+	 * This method adds an action to the service.
+	 * 
+	 * @param action The action to be added
+	 * @param pos The position to add, or -1 if at the end
+	 */
+	public void addAction(ESBAction action, int pos) {
+		// If position specified, then find element at
+		// the position and insert after the previous
+		// element
+		
+		if (action.getAction() != null) {
+			
+			if (pos == -1 || pos >= m_actions.size()) {
+				m_actionsElem.appendChild(action.getAction());
+				m_actions.add(action);
+			} else {
+				org.w3c.dom.NodeList nl=m_actionsElem.getChildNodes();
+				org.w3c.dom.Element elem=null;
+				int cur=-1;
+				
+				for (int i=0; i < nl.getLength(); i++) {
+					if (nl.item(i) instanceof org.w3c.dom.Element &&
+							nl.item(i).getNodeName().equals(ACTION_ELEMENT)) {
+						cur++;
+						
+						if (cur == pos) {
+							elem = (org.w3c.dom.Element)nl.item(i);
+						}
+					}
+				}
+				
+				if (elem != null) {
+					m_actionsElem.insertBefore(action.getAction(), elem);
+				} else {
+					m_actionsElem.appendChild(action.getAction());
+				}
+				
+				m_actions.add(pos, action);
+			}
+		}
+	}
+	
+	/**
+	 * This method removes an action from the service.
+	 * 
+	 * @param action The action to be removed
+	 * @return Whether the action was removed
+	 */
+	public boolean removeAction(ESBAction action) {
+		return(false);
+	}
+	
+	protected java.lang.annotation.Annotation getServiceAnnotation(String session) {
+		java.lang.annotation.Annotation ret=null;
+		
+		try {
+			ClassLoader cl=
+				org.jboss.savara.tools.jbossesb.model.util.ClasspathUtil.getClassLoader(getModel());
+			
+			Class<?> cls=Class.forName(session, true, cl);
+			
+			// TODO: This should be replaced by direct lookup
+			// of Service annotation - but library not available
+			// at the moment
+			java.lang.annotation.Annotation[] annotations=
+							cls.getAnnotations();
+			for (int i=0; ret == null &&
+							i < annotations.length; i++) {
+				try {
+					if (annotations[i].annotationType().getName().equals(
+							SERVICE_ANNOTATION)) {
+						ret = annotations[i];
+					}
+				} catch(Throwable ex) {
+					logger.log(java.util.logging.Level.SEVERE,
+							"ANNOTATION: "+
+							annotations[i].annotationType(), ex);
+				}
+			}
+			
+		} catch(Throwable e) {
+			logger.log(java.util.logging.Level.SEVERE,
+					"Failed to get session class '"+session+"'", e);
+		}
+		
+		return(ret);
+	}
+	
+	/**
+	 * This method determines whether the ESB service represents a
+	 * loop construct.
+	 * 
+	 * @return Whether the service represents a loop
+	 */
+	public boolean isLoop() {
+		boolean ret=false;
+		ESBAction action=getFirstSessionBasedAction();
+		
+		if (action != null) {
+			ret = action.isLoop();
+		}
+		
+		return(ret);
+	}
+	
+	/**
+	 * This method determines whether the ESB service descriptor represents
+	 * a 'root' conversation.
+	 * 
+	 * @return Whether the ESB service is associated with a root conversation
+	 */
+	public boolean isRoot() {
+		boolean ret=false;
+		
+		if (isStateless()) {
+			// Check for gateway service
+			ret = isGateway();
+			
+		} else {
+			// Determine if the root property is true
+			// on the create session action
+			ESBAction action=getFirstSessionBasedAction();
+			
+			if (action != null) {
+				if (action.isSessionType()) {
+					String bool=action.getPropertyValue(ROOT_PROPERTY);
+					if (bool != null) {
+						ret = bool.equalsIgnoreCase("true");
+					} else {				
+						String session=action.getPropertyValue(BUSINESS_OBJECT_TYPE_PROPERTY);
+	
+						java.lang.annotation.Annotation annotation=
+									getServiceAnnotation(session);
+						
+						if (annotation != null) {
+							try {
+								java.lang.reflect.Method method=
+									annotation.getClass().getMethod(ROOT_PROPERTY,
+												(Class<?>[])null);
+								
+								Object val=method.invoke(annotation, (Object[])null);
+								
+								if (val instanceof Boolean) {
+									ret = ((Boolean)val).booleanValue();
+								}
+							} catch(Throwable t) {
+								logger.log(java.util.logging.Level.SEVERE,
+										"Failed to get 'root' annotation value", t);
+							}
+						}
+					}
+				}
+			}
+		}
+		
+		return(ret);
+	}
+	
+	/**
+	 * This method determines whether the ESB service descriptor represents
+	 * a new session type.
+	 * 
+	 * @return Whether the service descriptor represents a new session type
+	 */
+	public boolean isSessionType() {
+		boolean ret=false;
+		ESBAction action=null;
+		
+		if (isStateless()) {
+			if (getActions().size() > 0) {
+				action = getActions().get(0);
+			}
+		} else {
+			action = getFirstSessionBasedAction();
+		}
+		
+		if (action != null) {
+			ret = action.isSessionType();
+		}
+		
+		return(ret);
+	}
+	
+	/**
+	 * This method determines whether the service is a gateway
+	 * for inbound requests.
+	 * 
+	 * @return Whether the service is a gateway
+	 */
+	public boolean isGateway() {
+		boolean ret=false;
+
+		if (m_actions.size() == 1) {
+			ret = m_actions.get(0).isGateway();
+		}
+
+		return(ret);
+	}
+	
+	/**
+	 * This method returns the gateway action if this is a
+	 * gateway service.
+	 * 
+	 * @return The gateway action
+	 */
+	public ESBAction getGatewayAction() {
+		ESBAction ret=null;
+
+		for (int i=0; ret == null && i < m_actions.size(); i++) {
+			if (m_actions.get(i).isGateway()) {
+				ret = m_actions.get(i);
+			}
+		}
+
+		return(ret);
+	}
+	
+	/**
+	 * This method determines whether the gateway service is
+	 * related to a stateless session.
+	 * 
+	 * @return Whether the gateway service is stateless
+	 */
+	public boolean isStateless() {
+		boolean ret=false;
+		
+		for (int i=0; ret == false && i < m_actions.size(); i++) {
+			if (m_actions.get(i).isStateless()) {
+				ret = true;
+			}
+		}
+		
+		return(ret);
+	}
+	
+	/**
+	 * This method returns the first session based action in the
+	 * service descriptor.
+	 * 
+	 * @return The first session based action, or null if none exist
+	 */
+	public ESBAction getFirstSessionBasedAction() {
+		ESBAction ret=null;
+		
+		for (int i=0; ret == null && i < m_actions.size(); i++) {
+			ret=m_actions.get(i);
+			
+			if (ret.isSessionBased() == false) {
+				ret = null;
+			}
+		}
+		
+		return(ret);
+	}
+	
+	/**
+	 * This method returns the service description name associated with the
+	 * ESB service.
+	 * 
+	 * @return The service description name
+	 */
+	public String getServiceDescriptionName() {
+		String ret=null;
+		
+		if (isStateless()) {
+			ESBAction action=getGatewayAction();
+			
+			if (action != null) {
+				ret = action.getPropertyValue(SERVICE_DESCRIPTION_NAME_PROPERTY);
+			}
+		} else {
+			ESBAction action=getFirstSessionBasedAction();
+			
+			if (action != null) {			
+				if (action.isSessionType() || (action.getActionClass() != null &&
+						action.getActionClass().equals(RETRIEVE_SESSION_ACTION_CLASS))) {
+					ret = action.getPropertyValue(SERVICE_DESCRIPTION_NAME_PROPERTY);
+					
+					if (ret == null) {
+						String session=action.getPropertyValue(BUSINESS_OBJECT_TYPE_PROPERTY);
+						
+						java.lang.annotation.Annotation annotation=
+										getServiceAnnotation(session);
+				
+						if (annotation != null) {
+							try {
+								java.lang.reflect.Method method=
+									annotation.getClass().getMethod(NAME_ATTR, (Class<?>[])null);
+								
+								Object val=method.invoke(annotation, (Object[])null);
+								
+								if (val instanceof String) {
+									ret = (String)val;
+								}
+							} catch(Throwable t) {
+								logger.log(java.util.logging.Level.SEVERE,
+										"Failed to get 'name' annotation value", t);
+							}
+						}
+					}
+				}
+			}
+		}
+		
+		return(ret);
+	}
+
+	/**
+	 * This method returns the conversation type associated with the
+	 * ESB service.
+	 * 
+	 * @return The conversation type
+	 */
+	public String getConversationType() {
+		String ret=null;
+		
+		if (isStateless()) {
+			ESBAction action=getGatewayAction();
+			
+			if (action != null) {
+				ret = action.getPropertyValue(CONVERSATION_TYPE_PROPERTY);
+			}
+		} else {
+			ESBAction action=getFirstSessionBasedAction();
+		
+			if (action != null) {
+				if (action.isSessionType()) {
+					ret = action.getPropertyValue(CONVERSATION_TYPE_PROPERTY);
+					
+					if (ret == null) {
+						String session=action.getPropertyValue(BUSINESS_OBJECT_TYPE_PROPERTY);
+						
+						java.lang.annotation.Annotation annotation=
+										getServiceAnnotation(session);
+				
+						if (annotation != null) {
+							try {
+								java.lang.reflect.Method method=
+									annotation.getClass().getMethod(CONVERSATION_TYPE_PROPERTY,
+														(Class<?>[])null);
+								
+								Object val=method.invoke(annotation, (Object[])null);
+								
+								if (val instanceof String) {
+									ret = (String)val;
+								}
+							} catch(Throwable t) {
+								logger.log(java.util.logging.Level.SEVERE,
+										"Failed to get 'name' annotation value", t);
+							}
+						}
+					}
+				}
+			}
+		}
+		
+		return(ret);
+	}
+	
+	/**
+	 * This method returns the session name associated with the service
+	 * descriptor.
+	 * 
+	 * @return The session name
+	 */
+	public String getSessionName() {
+		String ret=null;
+		ESBAction action=getFirstSessionBasedAction();
+		
+		if (action != null) {
+			ret = action.getPropertyValue(BUSINESS_OBJECT_TYPE_PROPERTY);
+		}
+		
+		return(ret);
+	}
+
+	/**
+	 * This method returns the session class associated with the service
+	 * descriptor.
+	 * 
+	 * @return The session class
+	 */
+	public Class<?> getSessionClass() {
+		Class<?> ret=null;
+		String session=getSessionName();
+		
+		if (session != null) {
+			try {
+				ClassLoader cl=
+					org.jboss.savara.tools.jbossesb.model.util.ClasspathUtil.getClassLoader(getModel());
+				
+				ret = Class.forName(session, true, cl);
+				
+			} catch(Exception e) {
+				logger.log(java.util.logging.Level.SEVERE,
+						"Failed to get session class '"+session+"'", e);
+			}
+		}
+
+		return(ret);
+	}
+
+	/**
+	 * This method determines whether the service is related to a behavioural
+	 * session.
+	 * 
+	 * @return Whether the service is session based
+	 */
+	public boolean isSessionBased() {
+		boolean ret=false;
+		
+		for (int i=0; ret == false && i < m_actions.size(); i++) {
+			ret = m_actions.get(i).isSessionBased();
+		}
+		
+		return(ret);
+	}
+	
+	/**
+	 * This method converts the ESB service into a Conversation, if
+	 * the service represents a conversation.
+	 * 
+	 * @param context The conversion context, or null if this is the
+	 * 					root conversation
+	 * @return The conversation
+	 */
+	public Conversation convert(ConversionContext context) {
+		Conversation ret=null;
+		
+		if (isSessionType()) {
+			ret = new Conversation();
+		
+			ret.derivedFrom(this);
+			ret.getBlock().derivedFrom(this);
+			
+			// Determine if conversation is stateless
+			ret.setStateless(isStateless());
+			
+			// Configure model name
+			LocatedName modelName=new LocatedName();
+			modelName.setName(getServiceDescriptionName());
+			
+			ret.setLocatedName(modelName);
+			
+			String convType=getConversationType();
+			String role=null;
+			
+			if (convType != null) {
+				int index=convType.indexOf('@');
+			
+				if (index != -1) {
+					// TODO: Need to think whether this should be
+					// 'implements' reference. If so, then need to change
+					// Java Lang Model parser and also Lang Model conformance
+					// rule.
+					ImplementsReference iref=
+						new ImplementsReference(ConversationNotation.NOTATION_CODE);
+				
+					role = convType.substring(index+1);
+					
+					iref.setLocatedRole(role);
+					
+					// Need to locate the model name
+					modelName.setRole(new Role(iref.getLocatedRole()));
+					
+					String mainpart=convType.substring(0, index);
+					
+					index = mainpart.lastIndexOf(".");
+					
+					if (index == -1) {
+						iref.setNamespace("");
+						iref.setLocalpart(mainpart);
+					} else {
+						iref.setNamespace(mainpart.substring(0, index));								
+						iref.setLocalpart(mainpart.substring(index+1));
+					}
+					
+					ret.getImplements().add(iref);
+					//ret.getConformsTo().add(iref);
+					
+					org.scribble.model.admin.DependencyManager dm=
+						(org.scribble.model.admin.DependencyManager)
+						org.scribble.extensions.RegistryFactory.getRegistry().getExtension(
+								org.scribble.model.admin.DependencyManager.class, null);
+					
+					if (dm != null) {
+						dm.recordDependency(getModel().getModelReference(),
+								iref, DependencyType.Implements);
+					}
+
+				} else {
+					logger.warning("Conversation type does not " +
+							"contain '@' located role separator");
+				}
+			} else {
+				logger.warning("No conversation type specified");
+			}
+											
+			//ret.setBlock(new Block());
+			
+			context = new DefaultConversionContext(role);
+					
+			context.processing(this);
+			
+			for (int i=0; i < m_actions.size(); i++) {
+				((ESBAction)m_actions.get(i)).convert(
+						ret.getBlock().getContents(), context);
+			}
+			
+			context.processed(this);
+		}
+		
+		return(ret);
+	}
+
+	/**
+	 * This method converts the actions associated with the ESB service into
+	 * activities that can be checked for conformance against a conversation
+	 * type.
+	 * 
+	 * @param activities The target list of activities associated with the
+	 * 					ESB actions being converted
+	 * @param context The conversion context
+	 */
+	public void convert(java.util.List<Activity> activities,
+					ConversionContext context) {
+		context.processing(this);
+		
+		for (int i=0; i < m_actions.size(); i++) {
+			((ESBAction)m_actions.get(i)).convert(
+					activities, context);
+		}
+		
+		context.processed(this);
+	}
+
+	/**
+	 * This method returns the position of the service node within the
+	 * ESB configuration.
+	 * 
+	 * @return The service node position
+	 */
+	public int getServicePosition() {
+		org.w3c.dom.Node services=m_service.getParentNode();
+		int servCount=0;
+		boolean f_end=false;
+		
+		for (int i=0; f_end == false &&
+				i < services.getChildNodes().getLength(); i++) {
+			org.w3c.dom.Node serv=services.getChildNodes().item(i);
+			
+			if (serv.getNodeName().equals(SERVICE_ELEMENT)) {
+				servCount++;
+				if (serv == m_service) {
+					f_end = true;
+				}
+			}
+		}
+		
+		return(servCount);
+	}
+		
+	/**
+	 * This method returns the JMS Bus Id Ref associated with the
+	 * service's JMS listener.
+	 * 
+	 * @return The JMS Bus Id Ref
+	 */
+	public String getJMSBusIdRef() {
+		String ret=null;
+		
+		if (m_jmsListenerElem != null) {
+			ret = m_jmsListenerElem.getAttribute(BUSIDREF_ATTR);
+		}
+		
+		return(ret);
+	}
+	
+	/**
+	 * This method sets the JMS Bus Id Ref associated with the
+	 * service's JMS listener.
+	 * 
+	 * @param busId The JMS Bus Id Ref
+	 */
+	public void setJMSBusIdRef(String busId) {
+		if (m_jmsListenerElem == null) {
+			m_jmsListenerElem = m_service.getOwnerDocument().createElement(JMS_LISTENER_ELEMENT);
+			
+			org.w3c.dom.NodeList nl=m_service.getElementsByTagName(LISTENERS_ELEMENT);
+			org.w3c.dom.Element listeners=null;
+			
+			if (nl.getLength() > 0) {
+				listeners = (org.w3c.dom.Element)nl.item(0);
+			} else {
+				listeners = m_service.getOwnerDocument().createElement(LISTENERS_ELEMENT);
+				
+				if (m_service.getFirstChild() != null) {
+					m_service.insertBefore(listeners,
+							m_service.getFirstChild());
+				} else {
+					m_service.appendChild(listeners);
+				}
+			}
+			
+			if (listeners != null) {
+				listeners.appendChild(m_jmsListenerElem);
+			}
+		}
+	
+		if (m_jmsListenerElem != null) {
+			m_jmsListenerElem.setAttribute(BUSIDREF_ATTR,
+					busId);		
+			
+			if (m_jmsListenerElem.hasAttribute(NAME_ATTR) == false) {
+				m_jmsListenerElem.setAttribute(NAME_ATTR,
+						getCategory()+"-"+getName());
+			}
+			
+			if (m_jmsListenerElem.hasAttribute(MAX_THREADS_ATTR) == false) {
+				m_jmsListenerElem.setAttribute(MAX_THREADS_ATTR, "1");
+			}
+		}
+	}
+	
+	public int hashCode() {
+		return(m_service.hashCode());
+	}
+	
+	public boolean equals(Object obj) {
+		boolean ret=false;
+		
+		if (obj instanceof DefaultESBService) {
+			DefaultESBService other=(DefaultESBService)obj;
+			
+			if (m_service == other.m_service) {
+				ret = true;
+			}
+		}
+		
+		return(ret);
+	}
+	
+	public String toString() {
+		return("ESBService: "+getCategory()+"/"+getName()+"["+getSource()+"]");
+	}
+	
+	private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.runtime.jbossesb.model");
+
+	private ESBLanguageModel m_model=null;
+	private org.w3c.dom.Element m_service=null;
+	private org.w3c.dom.Element m_jmsListenerElem=null;
+	private org.w3c.dom.Element m_actionsElem=null;
+	private java.util.List<ESBAction> m_actions=new java.util.Vector<ESBAction>();
+}

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/ESBAction.java (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBAction.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/ESBAction.java	                        (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/ESBAction.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -0,0 +1,144 @@
+/*
+ * 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.jbossesb.model;
+
+import org.scribble.model.*;
+import org.scribble.model.admin.ModelListener;
+
+/**
+ * This interface represents the generic ESB action class.
+ *  
+ * @author gary
+ */
+public interface ESBAction {
+
+	/**
+	 * This method initializes the links with the ESB service descriptors
+	 * identified in each path of the action.
+	 */
+	public void initializeLinks();
+
+	/**
+	 * This method validates the ESB action and reports warnings or
+	 * errors to the supplied model listener.
+	 * 
+	 * @param l The model listener
+	 */
+	public void validate(ModelListener l);
+	
+	/**
+	 * This method determines if the action represents a loop construct.
+	 * 
+	 * @return Whether the action represents a loop construct
+	 */
+	public boolean isLoop();
+	
+	/**
+	 * This method determines whether the action is related to a behavioural
+	 * session.
+	 * 
+	 * @return Whether the action is session based
+	 */
+	public boolean isSessionBased();
+	
+	/**
+	 * This method determines whether the ESB action represents
+	 * a new session type.
+	 * 
+	 * @return Whether the action represents a new session type
+	 */
+	public boolean isSessionType();
+	
+	/**
+	 * This method determines whether the action is a gateway
+	 * for inbound requests.
+	 * 
+	 * @return Whether the action is a gateway
+	 */
+	public boolean isGateway();
+	
+	/**
+	 * This method determines whether a gateway action is
+	 * stateless. This method is only relevant when the
+	 * isGateway() method returns true.
+	 * 
+	 * @return Whether the action is a stateless
+	 */
+	public boolean isStateless();
+	
+	/**
+	 * This method indicates whether this action performs another
+	 * sub-conversation.
+	 * 
+	 * @return Whether the action is a 'perform'
+	 */
+	public boolean isPerform();
+	
+	/**
+	 * This method indicates whether the action is an initiator.
+	 * Initiator actions must precede any other session based
+	 * action, within an ESB service.
+	 * 
+	 * @return Whether the action is an initiator
+	 */
+	public boolean isInitiator();
+	
+	/**
+	 * This method returns the action's class name.
+	 * 
+	 * @return The action's class name
+	 */
+	public String getActionClass();
+		
+	/**
+	 * This method returns the property value associated
+	 * with the supplied name.
+	 * 
+	 * @param property The property name
+	 * @return The property value, or null if not found
+	 */
+	public String getPropertyValue(String property);
+	
+	/**
+	 * This method determines the property value, associated
+	 * with the supplied name, is defined.
+	 * 
+	 * @param property The property name
+	 * @return Whether the property has been defined
+	 */
+	public boolean hasProperty(String property);
+	
+	/**
+	 * This method returns the XML configuration representation of the action.
+	 * 
+	 * @return The XML configuration for the action
+	 */
+	public org.w3c.dom.Element getAction();
+	
+	/**
+	 * This method converts the ESB action into an equivalent
+	 * behavioural description for conformance checking.
+	 * 
+	 * @param activities The list of activities that will contain
+	 * 				the converted action(s)
+	 * @param context The conversion context
+	 */
+	public void convert(java.util.List<Activity> activities,
+					ConversionContext context);
+		
+}

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/ESBActionFactory.java (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBActionFactory.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/ESBActionFactory.java	                        (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/ESBActionFactory.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -0,0 +1,132 @@
+/*
+ * 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.jbossesb.model;
+
+import java.util.logging.Logger;
+
+import org.jboss.savara.tools.jbossesb.model.stateful.actions.UnsupportedAction;
+
+/**
+ * This class provides a factory for ESBAction instances.
+ *  
+ * @author gary
+ */
+public class ESBActionFactory {
+
+	public static final String MODEL_ACTION_PACKAGE =
+						"org.jboss.tools.overlord.cdl.runtime.jbossesb.model.";
+	public static final String CLASS_ATTR = "class";
+	public static final String CONVERSATION_ACTION_PACKAGE = 
+						"org.jboss.soa.overlord.jbossesb.";
+	public static final String STATELESS="stateless.actions.";
+	public static final String STATEFUL="stateful.actions.";
+
+	/**
+	 * This method creates an ESBAction instance relevant to the
+	 * supplied JBossESB action, associated with the supplied
+	 * service.
+	 * 
+	 * @param service The service
+	 * @param action The XML configuration of the action
+	 * @return The ESBAction instance
+	 */
+	public static ESBAction createAction(ESBService service,
+					org.w3c.dom.Element action) {
+		ESBAction ret=null;
+		String actionType=action.getAttribute(CLASS_ATTR);
+		
+		// Check that it is a conversation based ESB action
+		if (actionType.startsWith(CONVERSATION_ACTION_PACKAGE)) {
+			actionType = actionType.substring(CONVERSATION_ACTION_PACKAGE.length());
+
+			String stateValue=null;
+			
+			if (actionType.startsWith(STATEFUL)) {
+				actionType = actionType.substring(STATEFUL.length());
+				stateValue = STATEFUL;
+			} else if (actionType.startsWith(STATELESS)) {
+				actionType = actionType.substring(STATELESS.length());
+				stateValue = STATELESS;
+			}
+			
+			if (stateValue != null) {
+				
+				try {
+					Class<?> cls=(Class<?>)
+							Class.forName(MODEL_ACTION_PACKAGE+
+									stateValue+actionType);
+					
+					java.lang.reflect.Constructor<?> con=
+						cls.getConstructor(new Class<?>[]{ESBService.class,
+							org.w3c.dom.Element.class});
+					
+					ret = (ESBAction)con.newInstance(new Object[]{service, action});
+					
+				} catch(Exception e) {
+					logger.log(java.util.logging.Level.SEVERE,
+							"Unable to find action class '"+
+							MODEL_ACTION_PACKAGE+stateValue+
+								actionType+"'", e);
+				}
+			}
+		}
+		
+		if (ret == null) {
+			// Unrecognised or unsupported action
+			ret = new UnsupportedAction(service, action);
+		}
+		
+		return(ret);
+	}
+	
+	/**
+	 * This method determines the runtime action class based on
+	 * the ESB model action class.
+	 * 
+	 * @param cls The ESB model action class
+	 * @return The conversation action class
+	 */
+	public static String getConversationAction(Class<?> cls) {
+		String actionType=cls.getName();
+		String ret=null;
+		
+		// Check that it is a conversation based ESB action
+		if (actionType.startsWith(MODEL_ACTION_PACKAGE)) {
+			actionType = actionType.substring(MODEL_ACTION_PACKAGE.length());
+
+			String stateValue=null;
+			
+			if (actionType.startsWith(STATEFUL)) {
+				actionType = actionType.substring(STATEFUL.length());
+				stateValue = STATEFUL;
+			} else if (actionType.startsWith(STATELESS)) {
+				actionType = actionType.substring(STATELESS.length());
+				stateValue = STATELESS;
+			}
+			
+			if (stateValue != null) {
+				ret = CONVERSATION_ACTION_PACKAGE+
+							stateValue+actionType;
+			}
+		}
+		
+		return(ret);
+	}
+
+	private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.runtime.jbossesb.model");
+}

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/ESBLanguageModel.java (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBLanguageModel.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/ESBLanguageModel.java	                        (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/ESBLanguageModel.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -0,0 +1,136 @@
+/*
+ * 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.jbossesb.model;
+
+import org.scribble.model.*;
+import org.scribble.model.admin.ModelListener;
+
+/**
+ * This class represents an ESB model.
+ *  
+ * @author gary
+ */
+public interface ESBLanguageModel {
+
+	/**
+	 * This method validates the ESB model and reports warnings or
+	 * errors to the supplied model listener.
+	 * 
+	 * @param l The model listener
+	 */
+	public void validate(ModelListener l);
+	
+	/**
+	 * This method returns the source model reference.
+	 * 
+	 * @return The source model reference
+	 */
+	public ModelReference getModelReference();
+
+	/**
+	 * This method returns the ESB service for the supplied
+	 * category and name.
+	 * 
+	 * @param category The service category
+	 * @param name The service name
+	 * @return The ESB service, or null if not found
+	 */
+	public ESBService getService(String category, String name);
+
+	/**
+	 * This method returns the collection of ESB services associated
+	 * with the model.
+	 * 
+	 * @return The collection of ESB services
+	 */
+	public java.util.Collection<ESBService> getServices();
+	
+	/**
+	 * This textual contents of the model.
+	 * 
+	 * @return The textual contents
+	 */
+	public String getOriginalContents();
+	
+	/**
+	 * This method returns the gateway service.
+	 * 
+	 * @return The gateway service, or null if not found
+	 */
+	public ESBService getGatewayService();
+	
+	/**
+	 * This method creates a new ESB service.
+	 * 
+	 * @param category The category
+	 * @param name The name
+	 * @return The new ESB service
+	 */
+	public ESBService createService(String category, String name);
+
+	/**
+	 * This method adds a new service to the model.
+	 * 
+	 * @param service The service
+	 */
+	public void addService(ESBService service);
+	
+	/**
+	 * This method removes a service from the model.
+	 * 
+	 * @param service The service
+	 */
+	public void removeService(ESBService service);
+	
+	/**
+	 * This method returns a unique service name within
+	 * the supplied category.
+	 * 
+	 * @param category The category
+	 * @param currentServiceName The name of the service creating
+	 * 							the new service
+	 * @return The unique service name
+	 */
+	public String getUniqueServiceName(String category,
+					String currentServiceName);
+	
+	/**
+	 * This method returns the reference to the DOM
+	 * representation of the ESB configuration.
+	 * 
+	 * @return The ESB configuration
+	 */
+	public org.w3c.dom.Element getESBConfiguration();
+
+	/**
+	 * This method returns the JMS destination associated with
+	 * the supplied JMS Bus Id.
+	 * 
+	 * @param jmsBusId The JMS bus id
+	 * @return The JMS definition, or null if not found
+	 */
+	public String getJMSDefinition(String jmsBusId);
+	
+	/**
+	 * This method returns whether the model is stateless.
+	 * 
+	 * @return Whether the model is stateless
+	 */
+	public boolean isStateless();
+	
+}

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/ESBLink.java (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBLink.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/ESBLink.java	                        (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/ESBLink.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -0,0 +1,117 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ */
+package org.jboss.savara.tools.jbossesb.model;
+
+/**
+ * This class represents the link from a ESB action to a service
+ * descriptor.
+ *  
+ * @author gary
+ */
+public class ESBLink {
+
+	/**
+	 * This is the constructor for the link.
+	 * 
+	 * @param category The service category of the target service descriptor
+	 * @param name The service name of the target descriptor
+	 * @param service A reference to the service model containing the action
+	 * 							that links to the service descriptor
+	 * @param control Whether the link is a control link, if not then it
+	 * 					represents a message link (i.e. to another service)
+	 */
+	public ESBLink(String category, String name,
+						ESBService service, boolean control) {
+		this(category, name, service, control, false);
+	}
+
+	/**
+	 * This is the constructor for the link.
+	 * 
+	 * @param category The service category of the target service descriptor
+	 * @param name The service name of the target descriptor
+	 * @param service A reference to the service model containing the action
+	 * 							that links to the service descriptor
+	 * @param control Whether the link is a control link, if not then it
+	 * 					represents a message link (i.e. to another service)
+	 * @param remote Whether the link is to a remote service
+	 */
+	public ESBLink(String category, String name,
+						ESBService service, boolean control, boolean remote) {
+		m_category = category;
+		m_name = name;
+		m_service = service;
+		m_control = control;
+		m_remote = remote;
+	}
+
+	/**
+	 * This method indicates whether this is a control
+	 * link, as opposed to a message link.
+	 * 
+	 * @return Whether the link is a control link
+	 */
+	public boolean isControl() {
+		return(m_control);
+	}
+	
+	/**
+	 * This method indicates whether this is a
+	 * link to a remote service.
+	 * 
+	 * @return Whether the link is to a remote service
+	 */
+	public boolean isRemote() {
+		return(m_remote);
+	}
+	
+	/**
+	 * This method returns the service category.
+	 * 
+	 * @return The service category
+	 */
+	public String getCategory() {
+		return(m_category);
+	}
+	
+	/**
+	 * This method returns the service name.
+	 * 
+	 * @return The service name
+	 */
+	public String getName() {
+		return(m_name);
+	}
+	
+	/**
+	 * This method returns the reference to ESB Service
+	 * model containing the action that links to the
+	 * target service descriptor.
+	 * 
+	 * @return The ESB service
+	 */
+	public ESBService getService() {
+		return(m_service);
+	}
+	
+	private String m_category=null;
+	private String m_name=null;
+	private ESBService m_service=null;
+	private boolean m_control=false;
+	private boolean m_remote=false;
+}

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/ESBService.java (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBService.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/ESBService.java	                        (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/ESBService.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -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.jbossesb.model;
+
+import org.scribble.conversation.model.Conversation;
+import org.scribble.model.*;
+import org.scribble.model.admin.ModelListener;
+
+/**
+ * This interface represents an ESB service.
+ *  
+ * @author gary
+ */
+public interface ESBService {
+
+	/**
+	 * This method initializes the links.
+	 */
+	public void initializeLinks();
+	
+	/**
+	 * This method validates the ESB service and reports warnings or
+	 * errors to the supplied model listener.
+	 * 
+	 * @param l The model listener
+	 */
+	public void validate(ModelListener l);
+	
+	/**
+	 * This method returns the category associated with the service
+	 * descriptor.
+	 * 
+	 * @return The service category
+	 */
+	public String getCategory();
+	
+	/**
+	 * This method returns the name associated with the service
+	 * descriptor.
+	 * 
+	 * @return The service name
+	 */
+	public String getName();
+	
+	/**
+	 * This method sets the name associated with the service
+	 * descriptor.
+	 * 
+	 * @param name The service name
+	 */
+	public void setName(String name);
+	
+	/**
+	 * This method returns the ESB model.
+	 * 
+	 * @return The ESB model
+	 */
+	public ESBLanguageModel getModel();
+	
+	/**
+	 * This method returns the XML configuration representation of the service.
+	 * 
+	 * @return The XML configuration for the service
+	 */
+	public org.w3c.dom.Element getService();
+	
+	/**
+	 * This method returns the list of ESB actions.
+	 * 
+	 * @return The ESB actions
+	 */
+	public java.util.List<ESBAction> getActions();
+	
+	/**
+	 * This method adds an action to the service.
+	 * 
+	 * @param action The action to be added
+	 * @param pos The position to add, or -1 if at the end
+	 */
+	public void addAction(ESBAction action, int pos);
+	
+	/**
+	 * This method removes an action from the service.
+	 * 
+	 * @param action The action to be removed
+	 * @return Whether the action was removed
+	 */
+	public boolean removeAction(ESBAction action);
+	
+	/**
+	 * This method determines whether the ESB service represents a
+	 * loop construct.
+	 * 
+	 * @return Whether the service represents a loop
+	 */
+	public boolean isLoop();
+	
+	/**
+	 * This method determines whether the ESB service descriptor represents
+	 * a 'root' conversation.
+	 * 
+	 * @return Whether the ESB service is associated with a root conversation
+	 */
+	public boolean isRoot();
+	
+	/**
+	 * This method determines whether the ESB service descriptor represents
+	 * a new session type.
+	 * 
+	 * @return Whether the service descriptor represents a new session type
+	 */
+	public boolean isSessionType();
+	
+	/**
+	 * This method determines whether the service is a gateway
+	 * for inbound requests.
+	 * 
+	 * @return Whether the service is a gateway
+	 */
+	public boolean isGateway();
+	
+	/**
+	 * This method returns the gateway action if this is a
+	 * gateway service.
+	 * 
+	 * @return The gateway action
+	 */
+	public ESBAction getGatewayAction();
+	
+	/**
+	 * This method determines whether the gateway service is
+	 * related to a stateless session.
+	 * 
+	 * @return Whether the gateway service is stateless
+	 */
+	public boolean isStateless();
+	
+	/**
+	 * This method returns the service description name associated with the
+	 * ESB service.
+	 * 
+	 * @return The service description name
+	 */
+	public String getServiceDescriptionName();
+
+	/**
+	 * This method returns the conversation type associated with the
+	 * ESB service.
+	 * 
+	 * @return The conversation type
+	 */
+	public String getConversationType();
+	
+	/**
+	 * This method returns the session name associated with the service
+	 * descriptor.
+	 * 
+	 * @return The session name
+	 */
+	public String getSessionName();
+
+	/**
+	 * This method returns the session class associated with the service
+	 * descriptor.
+	 * 
+	 * @return The session class
+	 */
+	public Class<?> getSessionClass();
+	
+	/**
+	 * This method determines whether the service is related to a behavioural
+	 * session.
+	 * 
+	 * @return Whether the service is session based
+	 */
+	public boolean isSessionBased();
+	
+	/**
+	 * This method returns the first session based action in the
+	 * service descriptor.
+	 * 
+	 * @return The first session based action, or null if none exist
+	 */
+	public ESBAction getFirstSessionBasedAction();
+	
+	/**
+	 * This method converts the actions associated with the ESB service into
+	 * activities that can be checked for conformance against a conversation
+	 * type.
+	 * 
+	 * @param activities The target list of activities associated with the
+	 * 					ESB actions being converted
+	 * @param context The conversion context
+	 */
+	public void convert(java.util.List<Activity> activities,
+					ConversionContext context);
+
+	/**
+	 * This method converts the ESB service into a Conversation, if
+	 * the service represents a conversation.
+	 * 
+	 * @param context The conversion context, or null if this is the
+	 * 					root conversation
+	 * @return The conversation
+	 */
+	public Conversation convert(ConversionContext context);
+	
+	/**
+	 * This method returns the position of the service node within the
+	 * ESB configuration.
+	 * 
+	 * @return The service node position
+	 */
+	public int getServicePosition();
+
+	/**
+	 * This method returns the JMS Bus Id Ref associated with the
+	 * service's JMS listener.
+	 * 
+	 * @return The JMS Bus Id Ref
+	 */
+	public String getJMSBusIdRef();
+	
+	/**
+	 * This method sets the JMS Bus Id Ref associated with the
+	 * service's JMS listener.
+	 * 
+	 * @param busId The JMS Bus Id Ref
+	 */
+	public void setJMSBusIdRef(String busId);
+	
+}

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/JBossESBNotation.java (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/JBossESBNotation.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/JBossESBNotation.java	                        (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/JBossESBNotation.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -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.jbossesb.model;
+
+import org.scribble.extensions.*;
+import org.scribble.model.ModelReference;
+import org.scribble.model.Notation;
+
+/**
+ * This class represents the JBossESB notation.
+ */
+ at RegistryInfo(extension=org.scribble.model.Notation.class)
+public class JBossESBNotation extends org.scribble.model.AbstractNotation {
+
+	public static final String NOTATION_CODE = "jboss-esb.xml";
+
+	/**
+	 * This is the default constructor for the JBossESB notation.
+	 */
+	public JBossESBNotation() {
+		super(NOTATION_CODE, "JBossESB", 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
+	 */
+	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.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/Messages.properties (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/Messages.properties)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/Messages.properties	                        (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/Messages.properties	2009-08-20 13:22:27 UTC (rev 784)
@@ -0,0 +1,21 @@
+# /*
+#  * JBoss, Home of Professional Open Source
+#  * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+#  * by the @authors tag. All rights reserved.
+#  * See the copyright.txt in the distribution for a
+#  * full listing of individual contributors.
+#  * This copyrighted material is made available to anyone wishing to use,
+#  * modify, copy, or redistribute it subject to the terms and conditions
+#  * of the GNU Lesser General Public License, v. 2.1.
+#  * This program is distributed in the hope that it will be useful, but WITHOUT A
+#  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+#  * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+#  * You should have received a copy of the GNU Lesser General Public License,
+#  * v.2.1 along with this distribution; if not, write to the Free Software
+#  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+#  * MA  02110-1301, USA.
+#  */
+
+_NOT_FOUND_BUSINESS_OBJECT_TYPE=Business object type '{0}' could not be found
+_NOT_FOUND_SERVICE_DESCRIPTOR=Service descriptor for category '{0}' and name '{1}' not found
+_NOT_SPECIFIED_SESSION_CLASS=First conversation action must specify a valid session class

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions)

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/AbstractESBAction.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/AbstractESBAction.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/actions/AbstractESBAction.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,16 +15,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.actions;
+package org.jboss.savara.tools.jbossesb.model.actions;
 
 import java.util.logging.Logger;
 
 import org.scribble.model.*;
 import org.scribble.model.admin.ModelIssue;
 import org.scribble.model.admin.ModelListener;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.ESBModelUtil;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.ProblemDefinitions;
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.util.ESBModelUtil;
+import org.jboss.savara.tools.jbossesb.model.util.ProblemDefinitions;
 
 /**
  * This is the generic ESB action class.

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateful (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful)

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateful/AbstractStatefulESBModelChangeRule.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/AbstractStatefulESBModelChangeRule.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateful/AbstractStatefulESBModelChangeRule.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,10 +15,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateful;
+package org.jboss.savara.tools.jbossesb.model.change.stateful;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions.*;
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.stateful.actions.*;
 import org.scribble.model.*;
 import org.scribble.model.change.*;
 

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateful/ConversationInteractionModelChangeRule.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/ConversationInteractionModelChangeRule.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateful/ConversationInteractionModelChangeRule.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,13 +15,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateful;
+package org.jboss.savara.tools.jbossesb.model.change.stateful;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.ConversationUtil;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.IdentityUtil;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.InteractionUtil;
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.stateful.actions.*;
+import org.jboss.savara.tools.jbossesb.model.util.ConversationUtil;
+import org.jboss.savara.tools.jbossesb.model.util.IdentityUtil;
+import org.jboss.savara.tools.jbossesb.model.util.InteractionUtil;
 import org.scribble.model.*;
 import org.scribble.model.change.*;
 import org.scribble.conversation.model.*;

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateful/ConversationModelChangeRule.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/ConversationModelChangeRule.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateful/ConversationModelChangeRule.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,11 +15,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateful;
+package org.jboss.savara.tools.jbossesb.model.change.stateful;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.ConversationUtil;
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.stateful.actions.*;
+import org.jboss.savara.tools.jbossesb.model.util.ConversationUtil;
 import org.scribble.model.*;
 import org.scribble.model.change.*;
 import org.scribble.conversation.model.*;

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateful/IfModelChangeRule.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/IfModelChangeRule.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateful/IfModelChangeRule.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,14 +15,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateful;
+package org.jboss.savara.tools.jbossesb.model.change.stateful;
 
 import java.util.logging.Logger;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.ConversationUtil;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.InteractionUtil;
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.stateful.actions.*;
+import org.jboss.savara.tools.jbossesb.model.util.ConversationUtil;
+import org.jboss.savara.tools.jbossesb.model.util.InteractionUtil;
 import org.scribble.model.*;
 import org.scribble.model.change.*;
 import org.scribble.model.analysis.*;

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateful/LanguageToConversationModelChangeRule.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/LanguageToConversationModelChangeRule.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateful/LanguageToConversationModelChangeRule.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,10 +15,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateful;
+package org.jboss.savara.tools.jbossesb.model.change.stateful;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions.*;
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.stateful.actions.*;
 import org.scribble.model.*;
 import org.scribble.model.change.*;
 import org.scribble.conversation.model.*;

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateful/MessageSignatureModelChangeRule.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/MessageSignatureModelChangeRule.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateful/MessageSignatureModelChangeRule.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,11 +15,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateful;
+package org.jboss.savara.tools.jbossesb.model.change.stateful;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.InteractionUtil;
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.stateful.actions.*;
+import org.jboss.savara.tools.jbossesb.model.util.InteractionUtil;
 import org.scribble.model.*;
 import org.scribble.model.change.*;
 import org.scribble.conversation.model.*;

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateful/ParallelModelChangeRule.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/ParallelModelChangeRule.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateful/ParallelModelChangeRule.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,13 +15,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateful;
+package org.jboss.savara.tools.jbossesb.model.change.stateful;
 
 import java.util.logging.Logger;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.*;
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.stateful.actions.*;
+import org.jboss.savara.tools.jbossesb.model.util.*;
 import org.scribble.model.*;
 import org.scribble.model.change.*;
 import org.scribble.model.analysis.*;

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateful/RunModelChangeRule.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/RunModelChangeRule.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateful/RunModelChangeRule.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,13 +15,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateful;
+package org.jboss.savara.tools.jbossesb.model.change.stateful;
 
 import java.util.logging.Logger;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.*;
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.stateful.actions.*;
+import org.jboss.savara.tools.jbossesb.model.util.*;
 import org.scribble.model.*;
 import org.scribble.model.change.*;
 import org.scribble.model.analysis.*;

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateful/SpawnModelChangeRule.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/SpawnModelChangeRule.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateful/SpawnModelChangeRule.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,13 +15,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateful;
+package org.jboss.savara.tools.jbossesb.model.change.stateful;
 
 //import java.util.logging.Logger;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.*;
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.stateful.actions.*;
+import org.jboss.savara.tools.jbossesb.model.util.*;
 import org.scribble.model.*;
 import org.scribble.model.change.*;
 import org.scribble.conversation.model.*;

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateful/TypeReferenceModelChangeRule.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/TypeReferenceModelChangeRule.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateful/TypeReferenceModelChangeRule.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,11 +15,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateful;
+package org.jboss.savara.tools.jbossesb.model.change.stateful;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.InteractionUtil;
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.stateful.actions.*;
+import org.jboss.savara.tools.jbossesb.model.util.InteractionUtil;
 import org.scribble.model.*;
 import org.scribble.model.change.*;
 import org.scribble.conversation.model.*;

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateful/WhenModelChangeRule.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/WhenModelChangeRule.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateful/WhenModelChangeRule.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,13 +15,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateful;
+package org.jboss.savara.tools.jbossesb.model.change.stateful;
 
 import java.util.logging.Logger;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.*;
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.stateful.actions.*;
+import org.jboss.savara.tools.jbossesb.model.util.*;
 import org.scribble.model.*;
 import org.scribble.model.change.*;
 import org.scribble.model.analysis.*;

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateful/WhileModelChangeRule.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/WhileModelChangeRule.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateful/WhileModelChangeRule.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,13 +15,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateful;
+package org.jboss.savara.tools.jbossesb.model.change.stateful;
 
 import java.util.logging.Logger;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.*;
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.stateful.actions.*;
+import org.jboss.savara.tools.jbossesb.model.util.*;
 import org.scribble.model.*;
 import org.scribble.model.change.*;
 import org.scribble.model.analysis.*;

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateless (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateless)

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateless/AbstractStatelessESBModelChangeRule.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateless/AbstractStatelessESBModelChangeRule.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateless/AbstractStatelessESBModelChangeRule.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,10 +15,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateless;
+package org.jboss.savara.tools.jbossesb.model.change.stateless;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.actions.*;
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.actions.*;
 import org.scribble.model.*;
 import org.scribble.model.change.*;
 

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateless/ConversationInteractionModelChangeRule.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateless/ConversationInteractionModelChangeRule.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateless/ConversationInteractionModelChangeRule.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,12 +15,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateless;
+package org.jboss.savara.tools.jbossesb.model.change.stateless;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateless.actions.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.ConversationUtil;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.InteractionUtil;
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.stateless.actions.*;
+import org.jboss.savara.tools.jbossesb.model.util.ConversationUtil;
+import org.jboss.savara.tools.jbossesb.model.util.InteractionUtil;
 import org.scribble.model.*;
 import org.scribble.model.change.*;
 import org.scribble.conversation.model.*;

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateless/ConversationModelChangeRule.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateless/ConversationModelChangeRule.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateless/ConversationModelChangeRule.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,11 +15,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateless;
+package org.jboss.savara.tools.jbossesb.model.change.stateless;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateless.actions.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.ConversationUtil;
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.stateless.actions.*;
+import org.jboss.savara.tools.jbossesb.model.util.ConversationUtil;
 import org.scribble.model.*;
 import org.scribble.model.change.*;
 import org.scribble.conversation.model.*;

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateless/IfModelChangeRule.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateless/IfModelChangeRule.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateless/IfModelChangeRule.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,14 +15,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateless;
+package org.jboss.savara.tools.jbossesb.model.change.stateless;
 
 import java.util.logging.Logger;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateless.actions.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.ConversationUtil;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.InteractionUtil;
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.stateless.actions.*;
+import org.jboss.savara.tools.jbossesb.model.util.ConversationUtil;
+import org.jboss.savara.tools.jbossesb.model.util.InteractionUtil;
 import org.scribble.model.*;
 import org.scribble.model.change.*;
 import org.scribble.model.analysis.*;

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateless/LanguageToConversationModelChangeRule.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateless/LanguageToConversationModelChangeRule.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateless/LanguageToConversationModelChangeRule.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,10 +15,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateless;
+package org.jboss.savara.tools.jbossesb.model.change.stateless;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions.*;
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.stateful.actions.*;
 import org.scribble.model.*;
 import org.scribble.model.change.*;
 import org.scribble.conversation.model.*;

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateless/TypeReferenceModelChangeRule.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateless/TypeReferenceModelChangeRule.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/change/stateless/TypeReferenceModelChangeRule.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,11 +15,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateless;
+package org.jboss.savara.tools.jbossesb.model.change.stateless;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateless.actions.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.InteractionUtil;
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.stateless.actions.*;
+import org.jboss.savara.tools.jbossesb.model.util.InteractionUtil;
 import org.scribble.model.*;
 import org.scribble.model.change.*;
 import org.scribble.conversation.model.*;

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/stateful/actions)

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/AbstractInteractionMessageAction.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/stateful/actions/AbstractInteractionMessageAction.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/AbstractInteractionMessageAction.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,9 +15,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions;
+package org.jboss.savara.tools.jbossesb.model.stateful.actions;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.*;
 
 /**
  * The abstract model component for the 'ReceiveMessageAction'

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/AbstractStatefulESBAction.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/stateful/actions/AbstractStatefulESBAction.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/AbstractStatefulESBAction.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,15 +15,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions;
+package org.jboss.savara.tools.jbossesb.model.stateful.actions;
 
 import java.util.logging.Logger;
 
 import org.scribble.model.admin.ModelIssue;
 import org.scribble.model.admin.ModelListener;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.actions.AbstractESBAction;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.ProblemDefinitions;
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.actions.AbstractESBAction;
+import org.jboss.savara.tools.jbossesb.model.util.ProblemDefinitions;
 
 /**
  * This is the generic ESB action class.
@@ -73,7 +73,7 @@
 			// Validate that the business object type exists
 			try {
 				ClassLoader cl=
-					org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.ClasspathUtil.getClassLoader(getService().getModel());
+					org.jboss.savara.tools.jbossesb.model.util.ClasspathUtil.getClassLoader(getService().getModel());
 				
 				try {
 					Class.forName(session, true, cl);

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/CreateSessionAction.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/stateful/actions/CreateSessionAction.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/CreateSessionAction.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,12 +15,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions;
+package org.jboss.savara.tools.jbossesb.model.stateful.actions;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.ConversionContext;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.ESBAction;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.ESBActionFactory;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.ESBService;
+import org.jboss.savara.tools.jbossesb.model.ConversionContext;
+import org.jboss.savara.tools.jbossesb.model.ESBAction;
+import org.jboss.savara.tools.jbossesb.model.ESBActionFactory;
+import org.jboss.savara.tools.jbossesb.model.ESBService;
 import org.scribble.model.*;
 import org.scribble.model.admin.ModelIssue;
 import org.scribble.model.admin.ModelListener;

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/IfAction.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/stateful/actions/IfAction.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/IfAction.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,9 +15,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions;
+package org.jboss.savara.tools.jbossesb.model.stateful.actions;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.*;
 import org.scribble.model.*;
 import org.scribble.model.admin.ModelIssue;
 import org.scribble.model.admin.ModelListener;

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/MessageRouterAction.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/stateful/actions/MessageRouterAction.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/MessageRouterAction.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,13 +15,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions;
+package org.jboss.savara.tools.jbossesb.model.stateful.actions;
 
 import java.util.logging.Logger;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.IdentityUtil;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.InteractionUtil;
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.util.IdentityUtil;
+import org.jboss.savara.tools.jbossesb.model.util.InteractionUtil;
 import org.scribble.conversation.model.*;
 import org.scribble.model.*;
 import org.scribble.model.admin.ModelIssue;

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/ParallelAction.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/stateful/actions/ParallelAction.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/ParallelAction.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,9 +15,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions;
+package org.jboss.savara.tools.jbossesb.model.stateful.actions;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.*;
 import org.scribble.model.*;
 import org.scribble.model.admin.ModelIssue;
 import org.scribble.model.admin.ModelListener;

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/PerformAction.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/stateful/actions/PerformAction.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/PerformAction.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,10 +15,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions;
+package org.jboss.savara.tools.jbossesb.model.stateful.actions;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.PropertyUtil;
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.util.PropertyUtil;
 import org.scribble.model.*;
 import org.scribble.model.admin.ModelIssue;
 import org.scribble.model.admin.ModelListener;

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/ReceiveMessageAction.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/stateful/actions/ReceiveMessageAction.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/ReceiveMessageAction.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,9 +15,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions;
+package org.jboss.savara.tools.jbossesb.model.stateful.actions;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.*;
 import org.scribble.conversation.model.*;
 import org.scribble.model.*;
 

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/RetrieveSessionAction.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/stateful/actions/RetrieveSessionAction.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/RetrieveSessionAction.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,9 +15,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions;
+package org.jboss.savara.tools.jbossesb.model.stateful.actions;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.*;
 import org.scribble.model.*;
 import org.scribble.model.admin.ModelIssue;
 import org.scribble.model.admin.ModelListener;

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/ScheduleStateAction.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/stateful/actions/ScheduleStateAction.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/ScheduleStateAction.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,9 +15,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions;
+package org.jboss.savara.tools.jbossesb.model.stateful.actions;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.*;
 import org.scribble.model.*;
 import org.scribble.model.admin.ModelIssue;
 import org.scribble.model.admin.ModelListener;

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/SendMessageAction.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/stateful/actions/SendMessageAction.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/SendMessageAction.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,9 +15,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions;
+package org.jboss.savara.tools.jbossesb.model.stateful.actions;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.*;
 import org.scribble.conversation.model.*;
 import org.scribble.model.*;
 import org.scribble.model.admin.ModelIssue;

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/SetMessageAction.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/stateful/actions/SetMessageAction.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/SetMessageAction.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,9 +15,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions;
+package org.jboss.savara.tools.jbossesb.model.stateful.actions;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.*;
 import org.scribble.model.*;
 import org.scribble.model.admin.ModelListener;
 

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/SetStateAction.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/stateful/actions/SetStateAction.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/SetStateAction.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,12 +15,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions;
+package org.jboss.savara.tools.jbossesb.model.stateful.actions;
 
 import java.util.logging.Logger;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.PropertyUtil;
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.util.PropertyUtil;
 import org.scribble.model.*;
 import org.scribble.model.admin.ModelIssue;
 import org.scribble.model.admin.ModelListener;

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/SwitchAction.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/stateful/actions/SwitchAction.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/SwitchAction.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,10 +15,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions;
+package org.jboss.savara.tools.jbossesb.model.stateful.actions;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.InteractionUtil;
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.util.InteractionUtil;
 import org.scribble.model.*;
 import org.scribble.model.admin.ModelIssue;
 import org.scribble.model.admin.ModelListener;

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/UnsupportedAction.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/stateful/actions/UnsupportedAction.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/UnsupportedAction.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,9 +15,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions;
+package org.jboss.savara.tools.jbossesb.model.stateful.actions;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.*;
 import org.scribble.model.*;
 import org.scribble.model.admin.ModelListener;
 

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/WhenAction.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/stateful/actions/WhenAction.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/WhenAction.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,9 +15,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions;
+package org.jboss.savara.tools.jbossesb.model.stateful.actions;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.*;
 import org.scribble.model.*;
 import org.scribble.model.admin.ModelIssue;
 import org.scribble.model.admin.ModelListener;

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/WhileAction.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/stateful/actions/WhileAction.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateful/actions/WhileAction.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,9 +15,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions;
+package org.jboss.savara.tools.jbossesb.model.stateful.actions;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.*;
 import org.scribble.model.*;
 import org.scribble.model.admin.ModelIssue;
 import org.scribble.model.admin.ModelListener;

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateless/actions (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/stateless/actions)

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateless/actions/AbstractInteractionMessageAction.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/stateless/actions/AbstractInteractionMessageAction.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateless/actions/AbstractInteractionMessageAction.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,9 +15,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateless.actions;
+package org.jboss.savara.tools.jbossesb.model.stateless.actions;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.*;
 
 /**
  * The abstract model component for the 'ReceiveMessageAction'

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateless/actions/AbstractStatelessESBAction.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/stateless/actions/AbstractStatelessESBAction.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateless/actions/AbstractStatelessESBAction.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,15 +15,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateless.actions;
+package org.jboss.savara.tools.jbossesb.model.stateless.actions;
 
 import java.util.logging.Logger;
 
 import org.scribble.model.admin.ModelIssue;
 import org.scribble.model.admin.ModelListener;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.actions.AbstractESBAction;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.ProblemDefinitions;
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.actions.AbstractESBAction;
+import org.jboss.savara.tools.jbossesb.model.util.ProblemDefinitions;
 
 /**
  * This is the generic ESB action class.

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateless/actions/IfAction.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/stateless/actions/IfAction.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateless/actions/IfAction.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,9 +15,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateless.actions;
+package org.jboss.savara.tools.jbossesb.model.stateless.actions;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.*;
 import org.scribble.model.*;
 import org.scribble.model.admin.ModelIssue;
 import org.scribble.model.admin.ModelListener;

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateless/actions/ReceiveMessageAction.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/stateless/actions/ReceiveMessageAction.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateless/actions/ReceiveMessageAction.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,9 +15,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateless.actions;
+package org.jboss.savara.tools.jbossesb.model.stateless.actions;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.*;
 import org.scribble.conversation.model.*;
 import org.scribble.model.*;
 

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateless/actions/SendMessageAction.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/stateless/actions/SendMessageAction.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateless/actions/SendMessageAction.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,11 +15,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateless.actions;
+package org.jboss.savara.tools.jbossesb.model.stateless.actions;
 
 import java.util.logging.Logger;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.*;
 import org.scribble.conversation.model.*;
 import org.scribble.model.*;
 import org.scribble.model.admin.ModelIssue;

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateless/actions/SwitchAction.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/stateless/actions/SwitchAction.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/stateless/actions/SwitchAction.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,10 +15,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateless.actions;
+package org.jboss.savara.tools.jbossesb.model.stateless.actions;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.InteractionUtil;
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.util.InteractionUtil;
 import org.scribble.model.*;
 import org.scribble.model.admin.ModelIssue;
 import org.scribble.model.admin.ModelListener;

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/util (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/util)

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/util/ClasspathUtil.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/util/ClasspathUtil.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/util/ClasspathUtil.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,7 +15,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util;
+package org.jboss.savara.tools.jbossesb.model.util;
 
 import org.scribble.model.*;
 import org.scribble.eclipse.model.admin.OSGIModelRepository;
@@ -26,7 +26,7 @@
 import org.eclipse.jdt.core.IClasspathEntry;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.JavaCore;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.*;
 
 public class ClasspathUtil {
 

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/util/ConversationUtil.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/util/ConversationUtil.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/util/ConversationUtil.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,7 +15,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util;
+package org.jboss.savara.tools.jbossesb.model.util;
 
 import org.scribble.conversation.model.*;
 import org.scribble.model.Model;

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/util/ESBModelUtil.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/util/ESBModelUtil.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/util/ESBModelUtil.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -17,7 +17,7 @@
  * Change History:
  * 21 Aug 2008 : Initial version created by gary
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util;
+package org.jboss.savara.tools.jbossesb.model.util;
 
 public class ESBModelUtil {
 

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/util/IdentityUtil.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/util/IdentityUtil.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/util/IdentityUtil.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,7 +15,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util;
+package org.jboss.savara.tools.jbossesb.model.util;
 
 import org.scribble.model.*;
 import org.scribble.conversation.model.*;

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/util/InteractionUtil.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/util/InteractionUtil.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/util/InteractionUtil.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,7 +15,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util;
+package org.jboss.savara.tools.jbossesb.model.util;
 
 import org.scribble.model.*;
 

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/util/ProblemDefinitions.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/util/ProblemDefinitions.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/util/ProblemDefinitions.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,7 +15,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util;
+package org.jboss.savara.tools.jbossesb.model.util;
 
 public class ProblemDefinitions {
 

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/util/PropertyUtil.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/util/PropertyUtil.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/model/util/PropertyUtil.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -17,7 +17,7 @@
  * Change History:
  * 27 Aug 2008 : Initial version created by gary
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util;
+package org.jboss.savara.tools.jbossesb.model.util;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/parser (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/parser)

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/parser/JBossESBModelParserRule.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/parser/JBossESBModelParserRule.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/parser/JBossESBModelParserRule.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,7 +15,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.parser;
+package org.jboss.savara.tools.jbossesb.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.runtime.jbossesb.model.DefaultESBLanguageModel;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.JBossESBNotation;
+import org.jboss.savara.tools.jbossesb.model.DefaultESBLanguageModel;
+import org.jboss.savara.tools.jbossesb.model.JBossESBNotation;
 
 /**
  * This class provides the model parser for the JBossESB notation.

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/parser/JBossESBTokenizer.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/parser/JBossESBTokenizer.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/parser/JBossESBTokenizer.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,9 +15,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.parser;
+package org.jboss.savara.tools.jbossesb.parser;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.JBossESBNotation;
+import org.jboss.savara.tools.jbossesb.model.JBossESBNotation;
 import org.scribble.extensions.RegistryInfo;
 import org.scribble.model.ModelReference;
 import org.scribble.parser.*;

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/validation (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/validation)

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/validation/ESBLanguageModelValidationRule.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/validation/ESBLanguageModelValidationRule.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/validation/ESBLanguageModelValidationRule.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,13 +15,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.validation;
+package org.jboss.savara.tools.jbossesb.validation;
 
 import org.scribble.validation.*;
 import org.scribble.extensions.*;
 import org.scribble.model.*;
 import org.scribble.model.admin.ModelListener;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.*;
 
 /**
  * This class implements the validation rule for the

Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/AntBuildSystem.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/AntBuildSystem.java	2009-08-20 10:12:35 UTC (rev 783)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/AntBuildSystem.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -1,98 +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.runtime.jbossesb.generator;
-
-/**
- * This class represents the Ant build system.
- */
-public class AntBuildSystem extends BuildSystem {
-
-	private static final String BUILD_FILE = "build.xml";
-	private static final String ANT = "Ant";
-	private static final String ESB_CONFIG_PATH = "src/conf/jboss-esb.xml";
-	private static final String DEPLOYMENT_PATH = "src/conf/deployment.xml";
-	private static final String MESSAGING_CONFIG_PATH = "src/conf";
-	private static final String JAVA_SOURCE_PATH = "src/java";
-	private static final String LIBRARY_PATH = "src/lib";
-
-	/**
-	 * This is the default constructor for the Ant build system.
-	 */
-	public AntBuildSystem() {
-		super(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 ESB configuration file
-	 * path.
-	 * 
-	 * @return The ESB configuration file path
-	 */
-	public String getESBConfigFilePath() {
-		return(ESB_CONFIG_PATH);
-	}
-	
-	/**
-	 * This method returns the deployment file
-	 * path.
-	 * 
-	 * @return The deployment file path
-	 */
-	public String getDeploymentFilePath() {
-		return(DEPLOYMENT_PATH);
-	}
-	
-	/**
-	 * This method returns the messaging configuration
-	 * path.
-	 * 
-	 * @return The messaging configuration path
-	 */
-	public String getMessagingConfigPath() {
-		return(MESSAGING_CONFIG_PATH);
-	}
-	
-	/**
-	 * This method returns the Java source path.
-	 * 
-	 * @return The Java source path
-	 */
-	public String getJavaSourcePath() {
-		return(JAVA_SOURCE_PATH);
-	}
-	
-	/**
-	 * This method returns the library path.
-	 * 
-	 * @return The library path
-	 */
-	public String getLibraryPath() {
-		return(LIBRARY_PATH);
-	}
-		
-}

Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/BuildConfigurationGenerator.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/BuildConfigurationGenerator.java	2009-08-20 10:12:35 UTC (rev 783)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/BuildConfigurationGenerator.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -1,67 +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.runtime.jbossesb.generator;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IJavaProject;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.ESBLanguageModel;
-
-/**
- * This class implements the model based generator to generate
- * the build configuration.
- */
-public class BuildConfigurationGenerator implements ModelBasedGenerator {
-
-	/**
-	 * This method generates the relevant artefacts based on
-	 * the supplied model, within the specified Java project.
-	 * 
-	 * @param jproj The Java project
-	 * @param model The model
-	 * @param context The generator context
-	 * @throws GeneratorException Failed to generate
-	 */
-	public void generate(IJavaProject jproj,
-			ESBLanguageModel model, GeneratorContext context)
-					throws GeneratorException {
-	
-		IPath buildConfigPath=jproj.getPath().append(
-				new Path(context.getBuildSystem().getBuildFilePath()));
-		
-		IFile buildConfigFile=jproj.getProject().getWorkspace().getRoot().getFile(buildConfigPath);
-		
-		GeneratorUtil.createParentFolder(buildConfigFile);
-		
-		try {
-			buildConfigFile.create(null, true,
-					new org.eclipse.core.runtime.NullProgressMonitor());
-			
-			String config=context.getBuildSystem().getBuildFileContents(jproj.getProject().getName());
-			
-			if (config != null) {
-				buildConfigFile.setContents(new java.io.ByteArrayInputStream(
-						config.getBytes()), true, false,
-						new org.eclipse.core.runtime.NullProgressMonitor());
-			}
-		} catch(Exception e) {
-			throw new GeneratorException("Failed to create build config", e);
-		}
-	}
-}

Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/BuildSystem.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/BuildSystem.java	2009-08-20 10:12:35 UTC (rev 783)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/BuildSystem.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -1,124 +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.runtime.jbossesb.generator;
-
-/**
- * This class represents an abstract build system.
- */
-public abstract class BuildSystem {
-
-	private static final String TEMPLATE_SUFFIX = ".template";
-	private static final String TEMPLATE_PREFIX = "template/";
-
-	/**
-	 * This is the constructor for the build system.
-	 * 
-	 * @param name The name of the build system
-	 */
-	public BuildSystem(String name) {
-		m_name = name;
-	}
-	/**
-	 * This method represents the name of the build
-	 * system.
-	 * 
-	 * @return The name
-	 */
-	public String getName() {
-		return(m_name);
-	}
-	
-	/**
-	 * This method returns the build configuration file
-	 * path.
-	 * 
-	 * @return The build configuration file path
-	 */
-	public abstract String getBuildFilePath();
-	
-	/**
-	 * This method returns the ESB configuration file
-	 * path.
-	 * 
-	 * @return The ESB configuration file path
-	 */
-	public abstract String getESBConfigFilePath();
-	
-	/**
-	 * This method returns the deployment file
-	 * path.
-	 * 
-	 * @return The deployment file path
-	 */
-	public abstract String getDeploymentFilePath();
-	
-	/**
-	 * This method returns the messaging configuration
-	 * path.
-	 * 
-	 * @return The messaging configuration path
-	 */
-	public abstract String getMessagingConfigPath();
-	
-	/**
-	 * This method returns the Java source path.
-	 * 
-	 * @return The Java source path
-	 */
-	public abstract String getJavaSourcePath();
-	
-	/**
-	 * This method returns the library path.
-	 * 
-	 * @return The library path, or null if not required
-	 */
-	public abstract String getLibraryPath();
-
-	/**
-	 * 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=
-				BuildSystem.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);
-	}	
-	
-	private String m_name=null;
-}

Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/BusinessObjectTypeGenerator.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/BusinessObjectTypeGenerator.java	2009-08-20 10:12:35 UTC (rev 783)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/BusinessObjectTypeGenerator.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -1,429 +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.runtime.jbossesb.generator;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTParser;
-import org.eclipse.jdt.core.dom.Assignment;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.ExpressionStatement;
-import org.eclipse.jdt.core.dom.FieldDeclaration;
-import org.eclipse.jdt.core.dom.Javadoc;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.Modifier;
-import org.eclipse.jdt.core.dom.PackageDeclaration;
-import org.eclipse.jdt.core.dom.PrimitiveType;
-import org.eclipse.jdt.core.dom.ReturnStatement;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.jdt.core.dom.TagElement;
-import org.eclipse.jdt.core.dom.TextElement;
-import org.eclipse.jdt.core.dom.Type;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
-import org.eclipse.jdt.core.dom.Modifier.ModifierKeyword;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.ConversationUtil;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.InteractionUtil;
-import org.scribble.conversation.model.Conversation;
-import org.scribble.conversation.model.Variable;
-import org.scribble.conversation.model.VariableList;
-import org.scribble.model.Interaction;
-import org.scribble.model.ModelObject;
-import org.scribble.model.Role;
-import org.scribble.model.Visitor;
-
-/**
- * This class implements the conversation based generator
- * for generating the business object type associated with
- * a conversation.
- */
-public class BusinessObjectTypeGenerator implements ConversationBasedGenerator {
-
-	private static final String GENERATOR_MESSAGES = "org.jboss.tools.overlord.cdl.runtime.jbossesb.generator.Messages";
-
-	/**
-	 * This method generates the relevant artefacts based on
-	 * the supplied conversation, within the specified Java project.
-	 * 
-	 * @param jproj The Java project
-	 * @param conversation The conversation
-	 * @param context The generator context
-	 * @throws GeneratorException Failed to generate
-	 */
-	public void generate(IJavaProject jproj,
-			Conversation conversation, GeneratorContext context)
-						throws GeneratorException {
-		IPath sourceLocation=jproj.getPath().append(
-				new Path(context.getBuildSystem().getJavaSourcePath()));
-		
-		String javaClass=ConversationUtil.getBusinessObjectType(conversation);
-		
-		String javaPath=javaClass.replace('.', '/')+".java";
-		
-		IPath javaFile=sourceLocation.append(new Path(javaPath));
-				
-		IFile file=jproj.getProject().getWorkspace().getRoot().getFile(javaFile);
-
-		GeneratorUtil.createParentFolder(file);
-		
-		try {
-			file.create(null, true, new org.eclipse.core.runtime.NullProgressMonitor());
-		} catch(Exception e) {
-			throw new GeneratorException("Failed to create the file", e);
-		}
-		
-		ASTParser parser = ASTParser.newParser(AST.JLS3);
-		parser.setResolveBindings(true);
-		parser.setSource(new char[0]);
-		
-		CompilationUnit root=(CompilationUnit)parser.createAST(null);
-		
-		AST ast=root.getAST();
-		
-		org.eclipse.jface.text.IDocument doc=
-					new org.eclipse.jface.text.Document();
-
-		root.recordModifications();
-		
-		PackageDeclaration pd=ast.newPackageDeclaration();
-		pd.setName(ast.newName(ConversationUtil.getBusinessObjectTypePackageName(conversation)));
-		root.setPackage(pd);
-		
-		TypeDeclaration type=ast.newTypeDeclaration();
-		
-		type.setName(ast.newSimpleName(ConversationUtil.getBusinessObjectTypeClassName(conversation)));
-
-		Modifier pubmod=ast.newModifier(ModifierKeyword.PUBLIC_KEYWORD);
-		type.modifiers().add(pubmod);
-		
-		root.types().add(type);
-		
-		// Process conversation to obtain necessary methods and
-		// properties
-		generateBusinessObjectTypeMethods(type, conversation);
-		
-		org.eclipse.text.edits.TextEdit edits=root.rewrite(doc, null);
-		
-		try {
-			edits.apply(doc);
-		} catch(Exception e) {
-			e.printStackTrace();
-		}
-		
-		java.io.ByteArrayInputStream is=
-			new java.io.ByteArrayInputStream(doc.get().getBytes());
-		
-		try {
-			file.setContents(is, false, true, null);
-			
-			is.close();
-		} catch(Exception e) {
-			throw new GeneratorException("Failed to set file contents and close", e);
-		}
-	}
-	
-	protected void generateBusinessObjectTypeMethods(TypeDeclaration type,
-					final Conversation conversation) throws GeneratorException {
-		final java.util.List<Role> roles=new java.util.Vector<Role>();
-		final java.util.List<Variable> variables=new java.util.Vector<Variable>();
-		
-		conversation.visit(new Visitor() {
-			public boolean visit(ModelObject obj) {
-				boolean ret=true;
-				
-				if (obj instanceof Conversation &&
-						obj != conversation) {
-					ret = false;
-				} else if (obj instanceof Interaction) {
-					Interaction interaction=(Interaction)obj;
-					
-					// If send and a response, then create
-					// 'to' role service category/name
-					// methods
-					if (InteractionUtil.isSend(interaction) &&
-							interaction.getReplyToLabel() == null &&
-							interaction.getToRole() != null &&
-							roles.contains(interaction.getToRole()) == false) {
-						roles.add(interaction.getToRole());
-					}
-				} else if (obj instanceof VariableList) {
-					VariableList vars=(VariableList)obj;
-					
-					variables.addAll(vars.getVariables());
-				}
-				
-				return(ret);
-			}
-		});
-
-		generateServiceCategoryAndNameMethods(type, roles);
-		
-		generateAccessorAndModifierMethods(type, variables);
-		generateMemberVariables(type, variables);
-	}
-	
-	/**
-	 * This method generates the methods for returning the
-	 * service category and name associated with a service
-	 * being invoked.
-	 * 
-	 * @param type The type declaration
-	 * @param roles The list of roles representing the invoked
-	 * 						services
-	 */
-	protected void generateServiceCategoryAndNameMethods(TypeDeclaration type,
-							java.util.List<Role> roles) {
-		AST ast=type.getAST();
-
-		for (int i=0; i < roles.size(); i++) {
-			String methodName=
-				InteractionUtil.getRoleServiceCategoryAccessorMethod(roles.get(i).getName());
-			
-			MethodDeclaration method=ast.newMethodDeclaration();
-			method.setName(ast.newSimpleName(methodName));
-			method.setReturnType2(ast.newSimpleType(
-					ast.newName("String")));
-	
-			method.modifiers().add(ast.newModifier(Modifier.ModifierKeyword.PUBLIC_KEYWORD));
-	
-			org.eclipse.jdt.core.dom.Block block=ast.newBlock();
-						
-			ReturnStatement retStatement=ast.newReturnStatement();
-			
-			retStatement.setExpression(ast.newNullLiteral());
-			
-			block.statements().add(retStatement);
-			
-			method.setBody(block);				
-			
-			type.bodyDeclarations().add(method);
-			
-			methodName=
-				InteractionUtil.getRoleServiceNameAccessorMethod(roles.get(i).getName());
-			
-			method=ast.newMethodDeclaration();
-			method.setName(ast.newSimpleName(methodName));
-			method.setReturnType2(ast.newSimpleType(
-					ast.newName("String")));
-	
-			method.modifiers().add(ast.newModifier(Modifier.ModifierKeyword.PUBLIC_KEYWORD));
-	
-			block=ast.newBlock();
-			
-			retStatement=ast.newReturnStatement();
-			
-			retStatement.setExpression(ast.newNullLiteral());
-			
-			block.statements().add(retStatement);
-			
-			method.setBody(block);				
-			
-			type.bodyDeclarations().add(method);
-		}
-	}
-	
-	/**
-	 * This method generates the accessor and modifier methods
-	 * associated with the business state variables used by
-	 * the conversation based actions.
-	 * 
-	 * @param type The type declaration
-	 * @param variables The list of variables
-	 */
-	protected void generateAccessorAndModifierMethods(TypeDeclaration type,
-			java.util.List<Variable> variables) {
-		AST ast=type.getAST();
-	
-		for (int i=0; i < variables.size(); i++) {			
-			String methodName=
-				ConversationUtil.getVariableAccessorMethod(variables.get(i).getName());
-			String memberVariableName=
-				ConversationUtil.getMemberVariableName(variables.get(i).getName());
-			
-			MethodDeclaration method=ast.newMethodDeclaration();
-			method.setName(ast.newSimpleName(methodName));
-			
-			String typeName=TypeMapper.getJavaType(
-					variables.get(i).getType().getNamespace(),
-					variables.get(i).getType().getLocalpart());
-			
-			Type returnType=null;
-			
-			// Check if qualified or base type
-			if (typeName.indexOf('.') == -1) {
-				returnType = ast.newPrimitiveType(PrimitiveType.toCode(typeName));
-			} else {
-				returnType = getType(ast, typeName);			
-			}
-	
-			method.setReturnType2(returnType);
-			
-			method.modifiers().add(ast.newModifier(Modifier.ModifierKeyword.PUBLIC_KEYWORD));
-	
-			org.eclipse.jdt.core.dom.Block block=ast.newBlock();
-			
-			ReturnStatement retStatement=ast.newReturnStatement();
-			
-			retStatement.setExpression(ast.newSimpleName(memberVariableName));
-			
-			block.statements().add(retStatement);
-			
-			method.setBody(block);				
-			
-			Javadoc jdoc=ast.newJavadoc();
-			TagElement tag=ast.newTagElement();
-			
-			TextElement text=ast.newTextElement();
-			
-			text.setText(org.scribble.util.MessageUtil.format(
-					java.util.PropertyResourceBundle.getBundle(
-							GENERATOR_MESSAGES),
-								"_ACCESSOR_DESCRIPTION",
-							new String[]{variables.get(i).getName()}));
-			
-			tag.fragments().add(text);
-			
-			jdoc.tags().add(tag);
-			
-			method.setJavadoc(jdoc);
-
-			type.bodyDeclarations().add(method);
-			
-			// Generate setter method
-			methodName=
-				ConversationUtil.getVariableModifierMethod(variables.get(i).getName());
-			
-			method=ast.newMethodDeclaration();
-			method.setName(ast.newSimpleName(methodName));
-			method.setReturnType2(ast.newPrimitiveType(PrimitiveType.VOID));
-			
-			SingleVariableDeclaration svd=ast.newSingleVariableDeclaration();
-			svd.setName(ast.newSimpleName("value"));
-
-			Type paramType=null;
-			
-			// Check if qualified or base type
-			if (typeName.indexOf('.') == -1) {
-				paramType = ast.newPrimitiveType(PrimitiveType.toCode(typeName));
-			} else {
-				paramType = getType(ast, typeName);			
-			}
-			
-			svd.setType(paramType);
-			
-			method.parameters().add(svd);
-	
-			method.modifiers().add(ast.newModifier(Modifier.ModifierKeyword.PUBLIC_KEYWORD));
-	
-			block=ast.newBlock();
-			
-			method.setBody(block);
-			
-			// Assign value to member variable
-			Assignment assign=ast.newAssignment();
-			assign.setLeftHandSide(ast.newSimpleName(memberVariableName));
-			assign.setRightHandSide(ast.newSimpleName("value"));
-			
-			ExpressionStatement statement=ast.newExpressionStatement(assign);
-			
-			block.statements().add(statement);
-			
-			jdoc = ast.newJavadoc();
-			tag = ast.newTagElement();
-			
-			text = ast.newTextElement();
-			
-			text.setText(org.scribble.util.MessageUtil.format(
-					java.util.PropertyResourceBundle.getBundle(
-							GENERATOR_MESSAGES),
-								"_MODIFIER_DESCRIPTION",
-							new String[]{variables.get(i).getName()}));
-			
-			tag.fragments().add(text);
-			
-			jdoc.tags().add(tag);
-			
-			method.setJavadoc(jdoc);
-			
-			type.bodyDeclarations().add(method);
-		}
-	}
-	
-	/**
-	 * This method generates the member variables
-	 * associated with the business state variables used by
-	 * the conversation based actions.
-	 * 
-	 * @param type The type declaration
-	 * @param variables The list of variables
-	 */
-	protected void generateMemberVariables(TypeDeclaration type,
-			java.util.List<Variable> variables) {
-		AST ast=type.getAST();
-
-		for (int i=0; i < variables.size(); i++) {			
-			String memberVariableName=
-				ConversationUtil.getMemberVariableName(variables.get(i).getName());
-			
-			VariableDeclarationFragment fragment=
-				ast.newVariableDeclarationFragment();
-			fragment.setName(ast.newSimpleName(memberVariableName));
-
-			FieldDeclaration memberVariable=ast.newFieldDeclaration(fragment);
-
-			Type paramType=null;
-			String typeName=TypeMapper.getJavaType(
-					variables.get(i).getType().getNamespace(),
-					variables.get(i).getType().getLocalpart());
-			
-			// Check if qualified or base type
-			if (typeName.indexOf('.') == -1) {
-				paramType = ast.newPrimitiveType(PrimitiveType.toCode(typeName));
-			} else {
-				paramType = getType(ast, typeName);			
-			}
-			
-			memberVariable.setType(paramType);
-			
-			memberVariable.modifiers().add(ast.newModifier(Modifier.ModifierKeyword.PRIVATE_KEYWORD));
-			
-			type.bodyDeclarations().add(memberVariable);
-		}
-	}
-	
-	protected Type getType(AST ast, String typeName) {
-		Type ret=null;
-		
-		java.util.StringTokenizer st=new java.util.StringTokenizer(typeName, ".");
-		while (st.hasMoreTokens()) {
-			String token=st.nextToken();
-			
-			if (ret == null) {
-				ret = ast.newSimpleType(ast.newSimpleName(token));
-			} else {
-				ret = ast.newQualifiedType(ret, ast.newSimpleName(token));
-			}
-		}
-		
-		return(ret);
-	}
-		
-}

Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/ConversationBasedGenerator.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/ConversationBasedGenerator.java	2009-08-20 10:12:35 UTC (rev 783)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/ConversationBasedGenerator.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -1,42 +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.runtime.jbossesb.generator;
-
-import org.eclipse.jdt.core.IJavaProject;
-import org.scribble.conversation.model.Conversation;
-
-/**
- * This interface represents a module that generates artefacts
- * based on a specific conversation.
- */
-public interface ConversationBasedGenerator {
-
-	/**
-	 * This method generates the relevant artefacts based on
-	 * the supplied conversation, within the specified Java project.
-	 * 
-	 * @param jproj The Java project
-	 * @param conversation The conversation
-	 * @param context The generator context
-	 * @throws GeneratorException Failed to generate
-	 */
-	public void generate(IJavaProject jproj,
-			Conversation conversation, GeneratorContext context)
-					throws GeneratorException;
-	
-}

Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/DeploymentFileGenerator.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/DeploymentFileGenerator.java	2009-08-20 10:12:35 UTC (rev 783)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/DeploymentFileGenerator.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -1,88 +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.runtime.jbossesb.generator;
-
-import java.util.logging.Logger;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IJavaProject;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.ESBLanguageModel;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.ESBService;
-
-/**
- * This class implements the model based generator to generate
- * the deployment file.
- */
-public class DeploymentFileGenerator implements ModelBasedGenerator {
-
-	/**
-	 * This method generates the relevant artefacts based on
-	 * the supplied model, within the specified Java project.
-	 * 
-	 * @param jproj The Java project
-	 * @param model The model
-	 * @param context The generator context
-	 * @throws GeneratorException Failed to generate
-	 */
-	public void generate(IJavaProject jproj,
-			ESBLanguageModel model, GeneratorContext context)
-					throws GeneratorException {
-		
-		try {
-			IPath deploymentPath=jproj.getPath().append(
-					new Path(context.getBuildSystem().getDeploymentFilePath()));
-			
-			IFile deploymentFile=jproj.getProject().getWorkspace().getRoot().getFile(deploymentPath);
-			GeneratorUtil.createParentFolder(deploymentFile);
-			deploymentFile.create(null, true,
-					new org.eclipse.core.runtime.NullProgressMonitor());
-	
-			StringBuffer buf=new StringBuffer();
-			buf.append("<jbossesb-deployment>\r\n");
-			
-			java.util.Iterator<ESBService> iter=model.getServices().iterator();
-			
-			while (iter.hasNext()) {
-				ESBService service=iter.next();
-				
-				String dest=model.getJMSDefinition(service.getJMSBusIdRef());
-				
-				if (dest != null) {
-					buf.append("\t<depends>"+service.getCategory()+
-							".destination:service=Queue,name="+dest+
-							"</depends>\r\n");
-				} else {
-					logger.severe("Failed to find destination for JMS bus id '"+
-							service.getJMSBusIdRef()+"'");
-				}
-			}
-			
-			buf.append("</jbossesb-deployment>\r\n");
-			
-			deploymentFile.setContents(new java.io.ByteArrayInputStream(
-						buf.toString().getBytes()), true, false,
-						new org.eclipse.core.runtime.NullProgressMonitor());
-		} catch(Exception e) {
-			throw new GeneratorException("Failed to save deployment file", e);
-		}
-	}
-
-	private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.runtime.jbossesb.generator");
-}

Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Generator.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Generator.java	2009-08-20 10:12:35 UTC (rev 783)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Generator.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -1,519 +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.runtime.jbossesb.generator;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.eclipse.core.resources.IFile;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
-import org.scribble.conformance.model.transform.StatelessTransformer;
-import org.scribble.conversation.model.ConversationModel;
-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.scribble.conversation.model.*;
-import org.w3c.dom.Node;
-import org.eclipse.jdt.core.*;
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-
-/**
- * This class provides the mechanism for generating JBossESB
- * service artefacts.
- */
-public class Generator {
-
-	private static final String CLASSPATH_FILENAME = ".classpath";
-	private static final String OUTPUT_LOCATION = "classes";
-	
-	/**
-	 * This is the constructor for the generator.
-	 * 
-	 */
-	public Generator(IFile file, GeneratorContext context) {
-		m_file = file;
-		m_context = context;
-		
-		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 artefact generators
-		m_conversationBasedGen.add(new BusinessObjectTypeGenerator());
-		
-		m_modelBasedGen.add(new BuildConfigurationGenerator());
-		m_modelBasedGen.add(new MessagingConfigurationGenerator());
-		m_modelBasedGen.add(new DeploymentFileGenerator());
-		
-		// 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.severe("Unable to load model used to generate " +
-					"the ESB artefacts");
-		}
-	}
-	
-	/**
-	 * This method returns the local models that can be generated.
-	 * 
-	 * @return The local models
-	 */
-	public java.util.List<ModelReference> getLocalModels() {
-		return(m_localModelRefs);
-	}
-	
-	/**
-	 * This method generates the project associated with the
-	 * supplied role.
-	 * 
-	 * @param localModelRef The local model reference
-	 * @param stateless Whether the generated role should be stateless
-	 * @param projectName The project name
-	 * @throws Exception Failed to generate role
-	 */
-	public void generateRole(ModelReference localModelRef,
-					boolean stateless, String projectName)
-						throws Exception {
-		
-		if (logger.isLoggable(Level.FINEST)) {
-			logger.finest("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 ref=new ModelReference(ConversationNotation.NOTATION_CODE);
-			
-			Model localModel=projector.project(ref,
-					m_conversationModel, localModelRef.getSubDefinitionPath(),
-					role, new DefaultModelListener());
-			
-			if (localModel instanceof ConversationModel &&
-					((ConversationModel)localModel).getConversation() != null) {
-				ConversationModel lcm=(ConversationModel)localModel;
-				
-				// Check if stateless version of model is required
-				if (stateless) {
-					StatelessTransformer transformer=
-						(StatelessTransformer)
-							RegistryFactory.getRegistry().getExtension(
-								StatelessTransformer.class,null);
-
-					if (transformer != null) {				
-						Conversation statelessConversation=(Conversation)
-							transformer.transform(lcm.getConversation(),
-								new ModelReference(JBossESBNotation.NOTATION_CODE));
-								
-						if (statelessConversation != null) {
-							
-							if (logger.isLoggable(Level.FINEST)) {
-								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(JBossESBNotation.NOTATION_CODE),
-											statelessConversation, formatter);
-									
-									String str=new String(os.toByteArray());
-									
-									System.out.println("EXPORTED CDM TO JBESB STATELESS:");
-									System.out.println(str);
-									
-								} catch(Exception e) {
-									e.printStackTrace();
-								}
-							}
-
-							lcm.setConversation(statelessConversation);
-						} else {
-							logger.severe("Failed to transform to stateless conversation");
-						}
-					}
-				}
-				
-				ModelReference targetRef=
-					new ModelReference(JBossESBNotation.NOTATION_CODE);
-				
-				DefaultESBLanguageModel target=
-					new DefaultESBLanguageModel(targetRef, stateless);
-				
-				ModelGenerator generator=(ModelGenerator)
-					RegistryFactory.getRegistry().getExtension(
-							ModelGenerator.class, null);
-				
-				if (generator != null) {
-					generator.generate(targetRef, role, target,
-								lcm);
-					
-					generateRoleProject(projectName,
-								target.getESBConfiguration(),
-								lcm, target);
-				} else {
-					logger.severe("Unable to find model generator");
-				}
-			}
-		}
-	}
-	
-	protected void generateRoleProject(String projectName,
-			org.w3c.dom.Element esbConfig, ConversationModel localcm,
-			ESBLanguageModel model)	throws Exception {
-		
-		final IJavaProject jproj=createJavaProject(projectName);
-		
-		if (jproj != null && esbConfig != null) {
-			// Generate business object types for
-			// local conversation model
-			localcm.visit(new Visitor() {
-
-				public boolean visit(ModelObject obj) {
-					
-					if (obj instanceof Conversation) {
-						for (int i=0; i < m_conversationBasedGen.size(); i++) {
-							try {
-								m_conversationBasedGen.get(i).generate(jproj,
-									(Conversation)obj, getContext());
-							} catch(GeneratorException e) {
-								logger.log(java.util.logging.Level.SEVERE,
-										"Failed to generate conversation based artefact",
-										e);
-							}
-						}
-					}
-					
-					return true;
-				}	
-			});
-			
-			// Store ESB configuration
-			IPath esbConfigPath=jproj.getPath().append(
-					new Path(getContext().getBuildSystem().getESBConfigFilePath()));
-			
-			IFile esbConfigFile=jproj.getProject().getWorkspace().getRoot().getFile(esbConfigPath);
-			GeneratorUtil.createParentFolder(esbConfigFile);
-			esbConfigFile.create(null, true,
-					new org.eclipse.core.runtime.NullProgressMonitor());
-			
-			String config=getText(esbConfig);
-			
-			if (config != null) {
-				esbConfigFile.setContents(new java.io.ByteArrayInputStream(
-						config.getBytes()), true, false,
-						new org.eclipse.core.runtime.NullProgressMonitor());
-			}
-			
-			for (int i=0; i < m_modelBasedGen.size(); i++) {
-				try {
-					m_modelBasedGen.get(i).generate(jproj, model,
-							getContext());
-				} catch(GeneratorException e) {
-					logger.log(java.util.logging.Level.SEVERE,
-							"Failed to generate model based artefact",
-							e);
-				}
-			}
-		}
-	}
-			
-	protected IJavaProject createJavaProject(String projectName)
-							throws Exception {
-		
-		// Create project
-		IProject project=m_file.getWorkspace().getRoot().getProject(projectName);
-		project.create(new org.eclipse.core.runtime.NullProgressMonitor());
-
-		IJavaProject jproj=JavaCore.create(project);
-		
-		project.open(new org.eclipse.core.runtime.NullProgressMonitor());
-		
-		IProjectDescription description = jproj.getProject().getDescription();
-		
-		// Update the project natures to include Java Nature
-		String[] prevNatures= description.getNatureIds();
-		String[] newNatures= new String[prevNatures.length + 1];
-		System.arraycopy(prevNatures, 0, newNatures, 0, prevNatures.length);
-		newNatures[prevNatures.length]= JavaCore.NATURE_ID;
-		description.setNatureIds(newNatures);
-		
-		// Setup project reference to CDM project
-		IProject[] prevProjects=description.getReferencedProjects();
-		IProject[] newProjects=new IProject[prevProjects.length+1];
-		System.arraycopy(prevProjects, 0, newProjects, 0, prevProjects.length);
-		newProjects[prevProjects.length] = m_file.getProject();
-		description.setReferencedProjects(newProjects);
-		
-		// Set the description
-		jproj.getProject().setDescription(description,
-				new org.eclipse.core.runtime.NullProgressMonitor());
-		
-		IPath outputLocation=jproj.getPath().append(new Path(OUTPUT_LOCATION));
-		IPath classpathLocation=jproj.getPath().append(new Path(CLASSPATH_FILENAME));
-		IPath sourceLocation=jproj.getPath().append(
-				new Path(getContext().getBuildSystem().getJavaSourcePath()));
-		IPath libLocation=null;
-		
-		if (getContext().getBuildSystem().getLibraryPath() != null) {
-			libLocation=jproj.getPath().append(
-					new Path(getContext().getBuildSystem().getLibraryPath()));
-		}
-		
-		// create and set the output and source paths first
-		IFolder outputFolder= jproj.getProject().getWorkspace().getRoot().getFolder(outputLocation);
-		GeneratorUtil.createParentFolder(outputFolder);
-		outputFolder.create(true, true, new org.eclipse.core.runtime.NullProgressMonitor());
-		outputFolder.setDerived(true);		
-		
-		IFolder sourceFolder= jproj.getProject().getWorkspace().getRoot().getFolder(sourceLocation);
-		GeneratorUtil.createParentFolder(sourceFolder);
-		sourceFolder.create(true, true, new org.eclipse.core.runtime.NullProgressMonitor());
-		sourceFolder.setDerived(true);		
-		
-		if (libLocation != null) {
-			IFolder libFolder= jproj.getProject().getWorkspace().getRoot().getFolder(libLocation);
-			GeneratorUtil.createParentFolder(libFolder);
-			libFolder.create(true, true, new org.eclipse.core.runtime.NullProgressMonitor());
-			libFolder.setDerived(true);		
-		}
-		
-		IFile file=jproj.getProject().getWorkspace().getRoot().getFile(classpathLocation);
-		file.create(null, true, new org.eclipse.core.runtime.NullProgressMonitor());
-		file.setDerived(true);
-		
-		// Write empty contents, to overcome 'Resource '..' is not local' exception
-		String classpath="<classpath/>";
-		file.setContents(new java.io.ByteArrayInputStream(classpath.getBytes()), true,
-				false, new org.eclipse.core.runtime.NullProgressMonitor());
-			
-		IClasspathEntry[] classpaths=new IClasspathEntry[2];
-		
-		classpaths[0] = JavaCore.newContainerEntry(
-				new Path("org.eclipse.jdt.launching.JRE_CONTAINER"));
-					
-		classpaths[1] = JavaCore.newSourceEntry(sourceLocation);
-					
-		jproj.setRawClasspath(classpaths, outputLocation,
-				new org.eclipse.core.runtime.NullProgressMonitor());
-		
-		return(jproj);
-	}
-
-	/**
-	 * This class converts a DOM representation node to
-	 * text.
-	 * 
-	 * @param node The DOM node
-	 * @return The text
-	 * @throws Exception Failed to convert
-	 */
-	protected String getText(Node node) throws Exception {
-		String ret=null;
-			
-		try {
-			// Transform the DOM represent to text
-			java.io.ByteArrayOutputStream xmlstr=
-					new java.io.ByteArrayOutputStream();
-				
-			DOMSource source=new DOMSource();
-			source.setNode(node);
-			
-			StreamResult result=new StreamResult(xmlstr);
-			
-			Transformer trans=
-					TransformerFactory.newInstance().newTransformer();
-			trans.transform(source, result);
-			
-			xmlstr.close();
-			
-			ret = new String(xmlstr.toByteArray());
-			
-			if ((node instanceof org.w3c.dom.Document) == false) {
-				
-				// Strip off any <?xml> header
-				int index=ret.indexOf("<?xml");
-				if (index != -1) {
-					index = ret.indexOf("<", 1);
-					
-					if (index != -1) {
-						ret = ret.substring(index);
-					} else {
-						index = ret.indexOf("?>");
-						
-						if (index != -1) {
-							index += 2;
-							
-							// Remove any trailing whitespaces
-							// after XML header
-							while (index < ret.length() &&
-									Character.isWhitespace(ret.charAt(index))) {
-								index++;
-							}
-							
-							ret = ret.substring(index);
-						}
-					}
-				}
-			}
-
-		} catch(Exception e) {
-			throw new Exception("Failed to transform " +
-					"DOM representation into text", e);
-		}
-		
-		int pos=0;
-		int prevpos=0;
-		StringBuffer buf=new StringBuffer();
-		int level=0;
-		
-		while ((pos=ret.indexOf('<', prevpos)) != -1) {
-			
-			if (prevpos < pos &&
-					ret.substring(prevpos, pos).trim().length() > 0 &&
-					ret.charAt(prevpos-1) != '?') {
-				
-				if (ret.charAt(prevpos) == '\r' &&
-						ret.charAt(prevpos+1) == '\n') {
-					prevpos += 2;
-				}
-				for (int i=0; i < level; i++) {
-					buf.append("    ");
-				}
-				
-				buf.append(ret.substring(prevpos, pos).trim());
-				buf.append("\r\n");
-			}
-			
-			int endpos=ret.indexOf('>', pos);
-		
-			if (endpos > 0) {
-				boolean noreturn=false;
-				
-				if (pos > 0 && ret.charAt(pos+1) == '/') {
-					level--;
-				}
-				
-				for (int i=0; i < level; i++) {
-					buf.append("    ");
-				}
-				buf.append(ret.substring(pos, endpos+1));
-				
-				if (ret.charAt(endpos-1)== '?') {
-					//noreturn = true;
-					
-				} else if (ret.charAt(endpos-1) == '/') {
-					// Ignore
-				} else if (pos > 0 && ret.charAt(pos+1) == '/') {
-					// Ignore
-					
-				} else if (pos > 0 && ret.charAt(pos+1) == '!') {
-					// Ignore
-					
-				} else {
-					level++;
-				}
-							
-				if (noreturn == false) {
-					buf.append("\r\n");
-				}
-				
-				pos = endpos+1;
-			}
-			
-			prevpos = pos;
-		}
-		
-		if (prevpos != -1 &&
-				ret.substring(prevpos).trim().length() > 0) {
-			buf.append(ret.substring(prevpos));
-		}
-		
-		ret = buf.toString();
-		
-		return(ret);
-	}
-	
-	public GeneratorContext getContext() {
-		return(m_context);
-	}
-
-	private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.runtime.jbossesb.generator");
-
-	private IFile m_file=null;
-	private java.util.List<ModelReference> m_localModelRefs=null;
-	private ConversationModel m_conversationModel=null;
-	private GeneratorContext m_context=null;
-	private java.util.List<ConversationBasedGenerator> m_conversationBasedGen=
-		new java.util.Vector<ConversationBasedGenerator>();
-	private java.util.List<ModelBasedGenerator> m_modelBasedGen=
-		new java.util.Vector<ModelBasedGenerator>();
-}

Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/GeneratorContext.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/GeneratorContext.java	2009-08-20 10:12:35 UTC (rev 783)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/GeneratorContext.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -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.runtime.jbossesb.generator;
-
-/**
- * This class provides context information used by the
- * generator.
- */
-public class GeneratorContext {
-
-	/**
-	 * This is the constructor for the generator context.
-	 * 
-	 * @param buildSystem The build system
-	 * @param messagingSystem The messaging system
-	 */
-	public GeneratorContext(BuildSystem buildSystem,
-					MessagingSystem messagingSystem) {
-		m_buildSystem = buildSystem;
-		m_messagingSystem = messagingSystem;
-	}
-	
-	/**
-	 * This method returns the build system.
-	 * 
-	 * @return The build system
-	 */
-	public BuildSystem getBuildSystem() {
-		return(m_buildSystem);
-	}
-	
-	public MessagingSystem getMessagingSystem() {
-		return(m_messagingSystem);
-	}
-	
-	private BuildSystem m_buildSystem=null;
-	private MessagingSystem m_messagingSystem=null;
-}

Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/GeneratorException.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/GeneratorException.java	2009-08-20 10:12:35 UTC (rev 783)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/GeneratorException.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -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.runtime.jbossesb.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.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/GeneratorUtil.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/GeneratorUtil.java	2009-08-20 10:12:35 UTC (rev 783)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/GeneratorUtil.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -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.runtime.jbossesb.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.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/JBMMessagingSystem.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/JBMMessagingSystem.java	2009-08-20 10:12:35 UTC (rev 783)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/JBMMessagingSystem.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -1,82 +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.runtime.jbossesb.generator;
-
-import java.util.logging.Logger;
-
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.ESBLanguageModel;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.ESBService;
-
-/**
- * This class provides the information related to the JBM
- * messaging system.
- */
-public class JBMMessagingSystem extends MessagingSystem {
-
-	private static final String JBOSS_MESSAGING = "JBoss Messaging";
-	private static final String JBM_CONFIG_FILE = "jbm-queue-service.xml";
-
-	/**
-	 * The default constructor.
-	 */
-	public JBMMessagingSystem() {
-		super(JBOSS_MESSAGING);
-	}
-	
-	/**
-	 * This method returns the configuration filename.
-	 * 
-	 * @return The configuration filename
-	 */
-	public String getConfigFileName() {
-		return(JBM_CONFIG_FILE);
-	}
-	
-	/**
-	 * This method returns the messaging configuration for the
-	 * supplied service.
-	 * 
-	 * @param model The model
-	 * @param service The service
-	 * @return The messaging configuration
-	 */
-	protected String getServiceConfig(ESBLanguageModel model,
-							ESBService service) {
-		StringBuffer buf=new StringBuffer();
-
-		String dest=model.getJMSDefinition(service.getJMSBusIdRef());
-				
-		if (dest != null) {
-			buf.append("\t<mbean code=\"org.jboss.jms.server.destination.QueueService\"\r\n");
-			buf.append("\t\t\tname=\""+service.getCategory()+".destination:service=Queue,name="+dest+"\"\r\n");
-			buf.append("\t\t\txmbean-dd=\"xmdesc/Queue-xmbean.xml\">\r\n");
-			buf.append("\t\t<depends optional-attribute-name=\"ServerPeer\">\r\n");
-			buf.append("\t\t\tjboss.messaging:service=ServerPeer\r\n");
-			buf.append("\t\t</depends>\r\n");
-			buf.append("\t\t<depends>jboss.messaging:service=PostOffice</depends>\r\n");
-			buf.append("\t</mbean>\r\n");
-		} else {
-			logger.severe("Failed to find destination for JMS bus id '"+
-					service.getJMSBusIdRef()+"'");
-		}
-		
-		return(buf.toString());
-	}
-
-	private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.runtime.jbossesb.generator");
-}

Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/JBossMQMessagingSystem.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/JBossMQMessagingSystem.java	2009-08-20 10:12:35 UTC (rev 783)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/JBossMQMessagingSystem.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -1,84 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.generator;
-
-import java.util.logging.Logger;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IJavaProject;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.ESBLanguageModel;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.ESBService;
-
-/**
- * This class provides the information related to the JBossMQ
- * messaging system.
- */
-public class JBossMQMessagingSystem extends MessagingSystem {
-
-	private static final String JBOSSMQ_MESSAGING = "JBossMQ";
-	private static final String JBOSSMQ_CONFIG_FILE = "jbmq-queue-service.xml";
-
-	/**
-	 * The default constructor.
-	 */
-	public JBossMQMessagingSystem() {
-		super(JBOSSMQ_MESSAGING);
-	}
-	
-	/**
-	 * This method returns the configuration filename.
-	 * 
-	 * @return The configuration filename
-	 */
-	public String getConfigFileName() {
-		return(JBOSSMQ_CONFIG_FILE);
-	}
-	
-	/**
-	 * This method returns the messaging configuration for the
-	 * supplied service.
-	 * 
-	 * @param model The model
-	 * @param service The service
-	 * @return The messaging configuration
-	 */
-	protected String getServiceConfig(ESBLanguageModel model,
-							ESBService service) {
-		StringBuffer buf=new StringBuffer();
-
-		String dest=model.getJMSDefinition(service.getJMSBusIdRef());
-				
-		if (dest != null) {
-			buf.append("\t<mbean code=\"org.jboss.mq.server.jmx.Queue\"\r\n");
-			buf.append("\t\t\tname=\""+service.getCategory()+".destination:service=Queue,name="+dest+"\">\r\n");
-			buf.append("\t\t<depends optional-attribute-name=\"DestinationManager\">\r\n");
-			buf.append("\t\t\tjboss.mq:service=DestinationManager\r\n");
-			buf.append("\t\t</depends>\r\n");
-			buf.append("\t</mbean>\r\n");
-		} else {
-			logger.severe("Failed to find destination for JMS bus id '"+
-					service.getJMSBusIdRef()+"'");
-		}
-		
-		return(buf.toString());
-	}
-
-	private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.runtime.jbossesb.generator");
-}

Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/MavenBuildSystem.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/MavenBuildSystem.java	2009-08-20 10:12:35 UTC (rev 783)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/MavenBuildSystem.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -1,99 +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.runtime.jbossesb.generator;
-
-/**
- * This class represents the Ant build system.
- */
-public class MavenBuildSystem extends BuildSystem {
-
-	private static final String BUILD_FILE = "pom.xml";
-	private static final String MAVEN = "Maven";
-	private static final String ESB_CONFIG_PATH = "src/main/resources/META-INF/jboss-esb.xml";
-	private static final String DEPLOYMENT_PATH = "src/main/resources/META-INF/deployment.xml";
-	private static final String MESSAGING_CONFIG_PATH = "src/main/resources";
-	private static final String JAVA_SOURCE_PATH = "src/main/java";
-	private static final String LIBRARY_PATH = null;
-
-	/**
-	 * This is the default constructor for the Maven build
-	 * system. 
-	 */
-	public MavenBuildSystem() {
-		super(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 ESB configuration file
-	 * path.
-	 * 
-	 * @return The ESB configuration file path
-	 */
-	public String getESBConfigFilePath() {
-		return(ESB_CONFIG_PATH);
-	}
-	
-	/**
-	 * This method returns the deployment file
-	 * path.
-	 * 
-	 * @return The deployment file path
-	 */
-	public String getDeploymentFilePath() {
-		return(DEPLOYMENT_PATH);
-	}
-	
-	/**
-	 * This method returns the messaging configuration
-	 * path.
-	 * 
-	 * @return The messaging configuration path
-	 */
-	public String getMessagingConfigPath() {
-		return(MESSAGING_CONFIG_PATH);
-	}
-	
-	/**
-	 * This method returns the Java source path.
-	 * 
-	 * @return The Java source path
-	 */
-	public String getJavaSourcePath() {
-		return(JAVA_SOURCE_PATH);
-	}
-	
-	/**
-	 * This method returns the library path.
-	 * 
-	 * @return The library path
-	 */
-	public String getLibraryPath() {
-		return(LIBRARY_PATH);
-	}
-		
-}

Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Messages.properties
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Messages.properties	2009-08-20 10:12:35 UTC (rev 783)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Messages.properties	2009-08-20 13:22:27 UTC (rev 784)
@@ -1,20 +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.
-#  */
-
-_ACCESSOR_DESCRIPTION=The accessor method for variable '{0}'.
-_MODIFIER_DESCRIPTION=The modifier method for variable '{0}'.

Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/MessagingConfigurationGenerator.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/MessagingConfigurationGenerator.java	2009-08-20 10:12:35 UTC (rev 783)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/MessagingConfigurationGenerator.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -1,67 +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.runtime.jbossesb.generator;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IJavaProject;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.ESBLanguageModel;
-
-/**
- * This class implements the model based generator to generate
- * the JBMQ configuration.
- */
-public class MessagingConfigurationGenerator implements ModelBasedGenerator {
-
-	/**
-	 * This method generates the relevant artefacts based on
-	 * the supplied model, within the specified Java project.
-	 * 
-	 * @param jproj The Java project
-	 * @param model The model
-	 * @param context The generator context
-	 * @throws GeneratorException Failed to generate
-	 */
-	public void generate(IJavaProject jproj,
-			ESBLanguageModel model, GeneratorContext context)
-					throws GeneratorException {
-		IPath buildConfigPath=jproj.getPath().append(
-				context.getBuildSystem().getMessagingConfigPath());
-				
-		buildConfigPath = buildConfigPath.append(java.io.File.separator);
-		buildConfigPath = buildConfigPath.append(context.getMessagingSystem().getConfigFileName());
-		
-		IFile configFile=jproj.getProject().getWorkspace().getRoot().getFile(buildConfigPath);
-		GeneratorUtil.createParentFolder(configFile);
-		
-		try {
-			configFile.create(null, true,
-					new org.eclipse.core.runtime.NullProgressMonitor());
-			
-			String config=context.getMessagingSystem().getFileContents(model);
-			
-			if (config != null) {
-				configFile.setContents(new java.io.ByteArrayInputStream(
-						config.getBytes()), true, false,
-						new org.eclipse.core.runtime.NullProgressMonitor());
-			}
-		} catch(Exception e) {
-			throw new GeneratorException("Failed to save messaging configuration", e);
-		}
-	}
-}

Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/MessagingSystem.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/MessagingSystem.java	2009-08-20 10:12:35 UTC (rev 783)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/MessagingSystem.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -1,94 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.generator;
-
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.ESBLanguageModel;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.ESBService;
-
-/**
- * This class represents an abstract messaging system.
- */
-public abstract class MessagingSystem {
-
-	/**
-	 * This is the constructor for the messaging system.
-	 * 
-	 * @param name The name of the messaging system
-	 */
-	public MessagingSystem(String name) {
-		m_name = name;
-	}
-	/**
-	 * This method represents the name of the messaging
-	 * system.
-	 * 
-	 * @return The name
-	 */
-	public String getName() {
-		return(m_name);
-	}
-	
-	/**
-	 * This method returns the configuration filename.
-	 * 
-	 * @return The configuration filename
-	 */
-	public abstract String getConfigFileName();
-	
-	/**
-	 * This method returns the contents for the messaging
-	 * configuration file.
-	 * 
-	 * @param jproj The Java project
-	 * @param model The model
-	 * @return The file contents
-	 */
-	public String getFileContents(ESBLanguageModel model) {
-		StringBuffer buf=new StringBuffer();
-		buf.append("<server>\r\n");
-		
-		java.util.Iterator<ESBService> iter=model.getServices().iterator();
-		
-		while (iter.hasNext()) {
-			ESBService service=iter.next();
-			
-			String serviceConfig=getServiceConfig(model, service);
-			
-			if (serviceConfig != null) {
-				buf.append(serviceConfig);
-			}
-		}
-		
-		buf.append("</server>\r\n");
-		
-		return(buf.toString());
-	}	
-
-	/**
-	 * This method returns the messaging configuration for the
-	 * supplied service.
-	 * 
-	 * @param model The model
-	 * @param service The service
-	 * @return The messaging configuration
-	 */
-	protected abstract String getServiceConfig(ESBLanguageModel model,
-							ESBService service);
-	
-	private String m_name=null;
-}

Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/ModelBasedGenerator.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/ModelBasedGenerator.java	2009-08-20 10:12:35 UTC (rev 783)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/ModelBasedGenerator.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -1,42 +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.runtime.jbossesb.generator;
-
-import org.eclipse.jdt.core.IJavaProject;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.ESBLanguageModel;
-
-/**
- * This interface represents a module that generates artefacts
- * based on the complete model.
- */
-public interface ModelBasedGenerator {
-
-	/**
-	 * This method generates the relevant artefacts based on
-	 * the supplied model, within the specified Java project.
-	 * 
-	 * @param jproj The Java project
-	 * @param model The model
-	 * @param context The generator context
-	 * @throws GeneratorException Failed to generate
-	 */
-	public void generate(IJavaProject jproj,
-			ESBLanguageModel model, GeneratorContext context)
-					throws GeneratorException;
-	
-}

Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/TypeMapper.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/TypeMapper.java	2009-08-20 10:12:35 UTC (rev 783)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/TypeMapper.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -1,61 +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.runtime.jbossesb.generator;
-
-public class TypeMapper {
-
-	private static final String BOOLEAN_TYPE = "boolean";
-	private static final String STRING_TYPE = "string";
-	private static final String DECIMAL_TYPE = "decimal";
-	private static final String INTEGER_TYPE = "integer";
-	private static final String INT_TYPE = "int";
-	public static final String JAVA_PREFIX = "java:";
-	public static final String XSD_NAMESPACE = "http://www.w3.org/2001/XMLSchema";
-	
-	/**
-	 * This method determines the appropriate Java type associated
-	 * with the supplied type namespace and localpart.
-	 * 
-	 * @param namespace The namespace
-	 * @param localpart The local part
-	 * @return The Java type
-	 */
-	public static String getJavaType(String namespace, String localpart) {
-		String ret=org.w3c.dom.Element.class.getName();
-		
-		if (namespace != null && localpart != null) {
-			
-			if (namespace.startsWith(JAVA_PREFIX)) {
-				ret = namespace.substring(JAVA_PREFIX.length())
-							+"."+localpart;
-			} else if (namespace.equals(XSD_NAMESPACE)) {
-				
-				if (localpart.equals(STRING_TYPE)) {
-					ret = String.class.getName();
-				} else if (localpart.equals(DECIMAL_TYPE) ||
-						localpart.equals(INTEGER_TYPE)) {
-					ret = INT_TYPE;
-				} else if (localpart.equals(BOOLEAN_TYPE)) {
-					ret = BOOLEAN_TYPE;
-				}
-			}
-		}
-		
-		return(ret);
-	}
-}

Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ConversionContext.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ConversionContext.java	2009-08-20 10:12:35 UTC (rev 783)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ConversionContext.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -1,86 +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.runtime.jbossesb.model;
-
-public interface ConversionContext {
-
-	/**
-	 * This method returns the role associated with the
-	 * endpoint being converted.
-	 * 
-	 *@return The role
-	 */
-	public String getRole();
-	
-	/**
-	 * This method is invoked when an ESB service is being processed.
-	 * 
-	 * @param service The service
-	 */
-	public void processing(ESBService service);
-	
-	/**
-	 * This method is invoked when an ESB service has been processed.
-	 * 
-	 * @param service The service
-	 */
-	public void processed(ESBService service);
-	
-	/**
-	 * Push service on the stack of services in which the current
-	 * context is contained.
-	 * 
-	 * @param service The service
-	 */
-	public void push(ESBService service);
-	
-	/**
-	 * Pop service from the stack of services in which the current
-	 * context is contained.
-	 * 
-	 * @param service The service
-	 */
-	public void pop(ESBService service);
-	
-	/**
-	 * This method determines whether the supplied service is on
-	 * the stack of services in which the current context is
-	 * contained.
-	 * 
-	 * @param service The service
-	 * @return Whether the service is on the stack
-	 */
-	public boolean isOnStack(ESBService service);
-	
-	/**
-	 * This method marks an ESB service as being a join state.
-	 * 
-	 * @param service The service
-	 */
-	public void markJoin(ESBService service);
-	
-	/**
-	 * This method determines whether the ESB service is a join
-	 * state.
-	 * 
-	 * @param service The serviice
-	 * @return Whether the service is a join state
-	 */
-	public boolean isJoin(ESBService service);
-	
-}

Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultConversionContext.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultConversionContext.java	2009-08-20 10:12:35 UTC (rev 783)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultConversionContext.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -1,127 +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.runtime.jbossesb.model;
-
-import java.util.logging.Logger;
-
-public class DefaultConversionContext implements ConversionContext {
-
-	/**
-	 * This constructor initializes the role associated with
-	 * the conversion.
-	 * 
-	 * @param role The role
-	 */
-	public DefaultConversionContext(String role) {
-		m_role = role;
-	}
-	
-	/**
-	 * This method returns the role associated with the
-	 * endpoint being converted.
-	 * 
-	 *@return The role
-	 */
-	public String getRole() {
-		return(m_role);
-	}
-	
-	/**
-	 * This method is invoked when an ESB service is being processed.
-	 * 
-	 * @param service The service
-	 */
-	public void processing(ESBService service) {
-		m_joins.remove(service);
-	}
-	
-	/**
-	 * This method is invoked when an ESB service has been processed.
-	 * 
-	 * @param service The service
-	 */
-	public void processed(ESBService service) {
-		
-	}
-	
-	/**
-	 * Push service on the stack of services in which the current
-	 * context is contained.
-	 * 
-	 * @param service The service
-	 */
-	public void push(ESBService service) {
-		m_serviceStack.add(service);
-	}
-	
-	/**
-	 * Pop service from the stack of services in which the current
-	 * context is contained.
-	 * 
-	 * @param service The service
-	 */
-	public void pop(ESBService service) {
-		
-		// Check if the service is the last element on the stack
-		if (m_serviceStack.size() == 0 ||
-				m_serviceStack.get(m_serviceStack.size()-1) != service) {
-			logger.severe("Request to pop service '"+service+
-					"' that is not the most recent entry on the stack");
-		}
-		
-		m_serviceStack.remove(service);
-	}
-	
-	/**
-	 * This method determines whether the supplied service is on
-	 * the stack of services in which the current context is
-	 * contained.
-	 * 
-	 * @param service The service
-	 * @return Whether the service is on the stack
-	 */
-	public boolean isOnStack(ESBService service) {
-		return(m_serviceStack.contains(service));
-	}
-	
-	/**
-	 * This method marks an ESB service as being a join state.
-	 * 
-	 * @param service The service
-	 */
-	public void markJoin(ESBService service) {
-		m_joins.add(service);
-	}
-	
-	/**
-	 * This method determines whether the ESB service is a join
-	 * state.
-	 * 
-	 * @param service The service
-	 * @return Whether the service is a join state
-	 */
-	public boolean isJoin(ESBService service) {
-		return(m_joins.contains(service));
-	}
-	
-	private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.runtime.jbossesb.model");
-	
-	private java.util.List<ESBService> m_serviceStack=new java.util.Vector<ESBService>();
-	private java.util.List<ESBService> m_joins=new java.util.Vector<ESBService>();
-	private String m_role=null;
-}

Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBLanguageModel.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBLanguageModel.java	2009-08-20 10:12:35 UTC (rev 783)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBLanguageModel.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -1,706 +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.runtime.jbossesb.model;
-
-import java.util.logging.Logger;
-
-import org.scribble.conversation.model.*;
-import org.scribble.extensions.RegistryFactory;
-import org.scribble.model.*;
-import org.scribble.model.admin.DependencyType;
-import org.scribble.model.admin.ModelIssue;
-import org.scribble.model.admin.ModelListener;
-import org.scribble.model.resolutions.*;
-
-/**
- * This class represents an ESB model.
- *  
- * @author gary
- */
-public class DefaultESBLanguageModel extends org.scribble.lang.model.LanguageModel
-					implements ESBLanguageModel {
-
-	private static final String SERVICE_NAME_SEPARATOR = "__";
-	public static final String DEST_NAME_PREFIX = "queue/";
-	public static final String DEST_NAME_ATTR = "dest-name";
-	public static final String DEST_TYPE_VALUE = "QUEUE";
-	public static final String DEST_TYPE_ATTR = "dest-type";
-	public static final String JMS_MESSAGE_FILTER_ELEMENT = "jms-message-filter";
-	public static final String JMS_BUS_ELEMENT = "jms-bus";
-	public static final String BUSID_ATTR = "busid";
-	public static final String JBOSSESB_XML_NAMESPACE = "http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd";
-	public static final String XMLNS = "xmlns";
-	public static final String TOP_LEVEL_ELEMENT = "jbossesb";
-	public static final String PARAMETER_RELOAD_SECS_ATTR = "parameterReloadSecs";
-	public static final String PROVIDERS_ELEMENT = "providers";
-	public static final String JMS_PROVIDER_ELEMENT = "jms-provider";
-	public static final String JAVA_NOTATION = "java";
-	public static final String SERVICE_ELEMENT = "service";
-	public static final String SERVICES_ELEMENT = "services";
-
-	public static final String JBOSSESB_NOTATION = "jboss-esb.xml";
-
-	/**
-	 * This constructor is initialized with the ESB configuration.
-	 * 
-	 * @param source The model reference for the JBossESB configuration source
-	 * @param elem The ESB configuration
-	 * @param contents The textual contents
-	 */
-	public DefaultESBLanguageModel(ModelReference source, org.w3c.dom.Element elem,
-							String contents) {
-		m_source = source;
-		m_esbConfig = elem;
-		m_contents = contents;
-
-		// Extract service action pipelines
-		initializeExistingConfig();
-	}
-	
-	/**
-	 * This constructor initializes a new ESB configuration.
-	 * 
-	 * @param source The model reference for the JBossESB configuration
-	 * @param stateless Whether the model is stateless
-	 */
-	public DefaultESBLanguageModel(ModelReference source, boolean stateless) {
-		m_source = source;
-		m_stateless = stateless;
-		
-		initializeNewConfig();
-	}
-	
-	/**
-	 * This method creates a new ESB configuration.
-	 */
-	protected void initializeNewConfig() {
-		
-		org.w3c.dom.Document doc=null;
-		
-		// Create an empty document
-		try {
-			doc = javax.xml.parsers.DocumentBuilderFactory.
-				newInstance().newDocumentBuilder().newDocument();
-			
-			m_esbConfig = doc.createElement(TOP_LEVEL_ELEMENT);
-			
-			m_esbConfig.setAttribute(XMLNS, 
-					JBOSSESB_XML_NAMESPACE);
-			m_esbConfig.setAttribute(PARAMETER_RELOAD_SECS_ATTR,"5000");
-			
-			doc.appendChild(m_esbConfig);
-			
-			// Create provider information
-			org.w3c.dom.Element providers=doc.createElement(PROVIDERS_ELEMENT);
-			m_esbConfig.appendChild(providers);
-			
-			m_jmsProviderElem = doc.createElement(JMS_PROVIDER_ELEMENT);
-			providers.appendChild(m_jmsProviderElem);
-			
-			// Configure the jms provider
-			m_jmsProviderElem.setAttribute("name", "JBossMQ");
-			m_jmsProviderElem.setAttribute("connection-factory", "ConnectionFactory");
-			m_jmsProviderElem.setAttribute("jndi-context-factory", "org.jnp.interfaces.NamingContextFactory");
-			m_jmsProviderElem.setAttribute("jndi-URL", "localhost");
-			
-			// Create services element
-			m_servicesElem = doc.createElement(SERVICES_ELEMENT);
-			m_esbConfig.appendChild(m_servicesElem);
-			
-		} catch(Exception e) {
-			logger.severe("Failed to create initial jbossesb document: "+e);
-		}
-		
-	}
-	
-	/**
-	 * This method initializes the ESB Model.
-	 */
-	protected void initializeExistingConfig() {
-		org.w3c.dom.NodeList services=
-				m_esbConfig.getElementsByTagName(SERVICES_ELEMENT);
-		
-		org.scribble.model.admin.DependencyManager dm=
-			(org.scribble.model.admin.DependencyManager)
-			org.scribble.extensions.RegistryFactory.getRegistry().getExtension(
-					org.scribble.model.admin.DependencyManager.class, null);
-		
-		LocatedName mname=new LocatedName();
-		mname.setName(m_source.getLocalpart());
-		
-		setModelName(mname);
-		
-		Namespace ns=new Namespace();
-		ns.setName(m_source.getNamespace());
-		setNamespace(ns);
-
-		if (services != null && services.getLength() == 1 &&
-				services.item(0) instanceof org.w3c.dom.Element) {
-			org.w3c.dom.NodeList nl=((org.w3c.dom.Element)
-						services.item(0)).getChildNodes();
-			
-			for (int i=0; i < nl.getLength(); i++) {
-				
-				if (nl.item(i) instanceof org.w3c.dom.Element &&
-						nl.item(i).getNodeName().equals(SERVICE_ELEMENT)) {
-					
-					ESBService service=new DefaultESBService(this,
-								(org.w3c.dom.Element)nl.item(i));
-					String key=getKey(service.getCategory(),
-							service.getName());
-					
-					m_services.put(key, service);
-				}
-			}
-			
-			java.util.Iterator<ESBService> iter=m_services.values().iterator();
-			
-			while (iter.hasNext()) {
-				iter.next().initializeLinks();
-			}
-			
-			// Initialize the conversations
-			java.util.List<String> sessionClasses=new java.util.Vector<String>();
-			java.util.Iterator<ESBService> serviter=getServices().iterator();
-			
-			while (serviter.hasNext()) {
-				ESBService service=serviter.next();
-				
-				// If any service is stateless, then mark the model
-				// as stateless
-				if (service.isStateless()) {
-					m_stateless = true;
-				}
-				
-				if (service.isRoot()) {
-					
-					/*
-					String convType=service.getConversationType();
-					String role=null;
-					
-					if (convType != null) {
-						int index=convType.indexOf('@');
-					
-						if (index != -1) {
-							// TODO: Need to think whether this should be
-							// 'implements' reference. If so, then need to change
-							// Java Lang Model parser and also Lang Model conformance
-							// rule.
-							ImplementsReference iref=
-								new ImplementsReference(ConversationModel.CONVERSATION);
-							//ConformanceReference iref=
-							//	new ConformanceReference(ConversationModel.CONVERSATION);
-						
-							role = convType.substring(index+1);
-							
-							iref.setLocatedRole(role);
-							
-							// Need to locate the model name
-							modelName.setLocatedRole(new Role(iref.getLocatedRole()));
-							
-							String mainpart=convType.substring(0, index);
-							
-							index = mainpart.lastIndexOf(".");
-							
-							if (index == -1) {
-								iref.setNamespace("");
-								iref.setLocalpart(mainpart);
-							} else {
-								iref.setNamespace(mainpart.substring(0, index));								
-								iref.setLocalpart(mainpart.substring(index+1));
-							}
-							
-							conv.getImplements().add(iref);
-							//conv.getConformsTo().add(iref);
-							
-							dm.recordDependency(m_source, iref,
-									DependencyType.Implements);
-
-						} else {
-							logger.warning("Conversation type does not " +
-									"contain '@' located role separator");
-						}
-					} else {
-						logger.warning("No conversation type specified");
-					}
-													
-					conv.setBlock(new Block());
-					
-					service.convert(conv.getBlock().getContents(),
-									new DefaultConversionContext(role));
-					
-					*/
-					
-					Conversation conv=service.convert(null);
-					
-					if (conv != null) {
-						getConversations().add(conv);
-					}
-				}
-				
-				//Add session class to list
-				String sessionClass=service.getSessionName();
-				
-				if (sessionClass != null &&
-						sessionClasses.contains(sessionClass) == false) {
-					sessionClasses.add(sessionClass);
-				}
-			}
-			
-			// Add dependency on session classes
-			for (int i=0; i < sessionClasses.size(); i++) {
-				String sessionClass=sessionClasses.get(i);
-				int index=sessionClass.lastIndexOf('.');
-				String nspace="";
-				String local=sessionClass;
-				
-				if (index != -1) {
-					nspace = sessionClass.substring(0, index);
-					local = sessionClass.substring(index+1);
-					
-					dm.recordDependency(getModelReference(),
-							new ModelReference(nspace, local,
-									null, JAVA_NOTATION),
-									DependencyType.Uses);
-				}
-			}
-		}
-		
-		if (logger.isLoggable(java.util.logging.Level.FINEST)) {
-			
-			org.scribble.export.Exporter exporter=
-				(org.scribble.export.Exporter)
-				RegistryFactory.getRegistry().getExtension(
-						org.scribble.export.Exporter.class, null);
-			
-			try {
-				for (int i=0; i < getConversations().size(); i++) {
-					ConversationModel model=new ConversationModel();
-					Conversation conv=getConversations().get(i);
-					ModelObject parent=conv.getParent();
-					
-					// This command will overwrite the parent of
-					// the conversation, so need to set this back
-					// at the end
-					model.setConversation(conv);
-					
-					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(getModelReference(),
-								model, formatter);
-					
-					String str=new String(os.toByteArray());
-					
-					System.out.println("EXPORTED JBOSS-ESB TEXT:");
-					System.out.println(str);
-					
-					// Re-establish the true parent
-					conv.setParent(parent);
-				}
-			} catch(Exception e) {
-				e.printStackTrace();
-			}
-		}
-	}
-	
-	/**
-	 * This method returns the source model reference.
-	 * 
-	 * @return The source model reference
-	 */
-	public ModelReference getModelReference() {
-		return(m_source);
-	}
-
-	/**
-	 * Generate a key for use in accessing the service related to
-	 * the supplied category and name.
-	 * 
-	 * @param category The category
-	 * @param name The service name
-	 * @return The key
-	 */
-	protected String getKey(String category, String name) {
-		return(category+"/"+name);
-	}
-	
-	/**
-	 * This method validates the ESB model and reports warnings or
-	 * errors to the supplied model listener.
-	 * 
-	 * @param l The model listener
-	 */
-	public void validate(ModelListener l) {
-
-		java.util.Iterator<ESBService> iter=m_services.values().iterator();
-		
-		while (iter.hasNext()) {
-			ESBService service=iter.next();
-			
-			service.validate(l);
-		}
-	}
-	
-	/**
-	 * This method returns the ESB service for the supplied
-	 * category and name.
-	 * 
-	 * @param category The service category
-	 * @param name The service name
-	 * @return The ESB service, or null if not found
-	 */
-	public ESBService getService(String category, String name) {
-		return(m_services.get(getKey(category, name)));
-	}
-
-	/**
-	 * This method returns the collection of ESB services associated
-	 * with the model.
-	 * 
-	 * @return The collection of ESB services
-	 */
-	public java.util.Collection<ESBService> getServices() {
-		return(m_services.values());
-	}
-	
-	/**
-	 * This method creates a new ESB service.
-	 * 
-	 * @param category The category
-	 * @param name The name
-	 * @return The new ESB service
-	 */
-	public ESBService createService(String category, String name) {
-		return(new DefaultESBService(this, category, name));
-	}
-	
-	/**
-	 * This method adds a new service to the model.
-	 * 
-	 * @param service The service
-	 */
-	public void addService(ESBService service) {
-		m_services.put(getKey(service.getCategory(), service.getName()),
-				service);
-		
-		// Add service
-		if (service.getService() != null) {
-			m_servicesElem.appendChild(service.getService());
-		}
-		
-		// Add provider information
-		String busId=service.getJMSBusIdRef();
-		
-		// Check if busId is unique
-		if (busId == null || findJMSBus(busId) != null) {
-			busId = getUniqueBusId();
-			service.setJMSBusIdRef(busId);
-		}
-		
-		if (busId != null) {
-			addJMSBus(busId, getJMSDestination(service.getCategory(),
-					service.getName()));
-		} else {
-			logger.severe("Service '"+service+
-						"' does not have a bus Id");
-		}
-	}
-	
-	protected String getUniqueBusId() {
-		int index=1;
-		String ret="busId"+index;
-		
-		while (findJMSBus(ret) != null) {
-			index++;
-			ret = "busId"+index;
-		}
-		
-		return(ret);
-	}
-	
-	/**
-	 * This method returns the JMS destination associated with
-	 * the supplied JMS Bus Id.
-	 * 
-	 * @param jmsBusId The JMS bus id
-	 * @return The JMS definition, or null if not found
-	 */
-	public String getJMSDefinition(String jmsBusId) {
-		String ret=null;
-		
-		org.w3c.dom.Element elem=findJMSBus(jmsBusId);
-		
-		if (elem != null) {
-			org.w3c.dom.NodeList nl=
-				elem.getElementsByTagName(JMS_MESSAGE_FILTER_ELEMENT);
-			
-			if (nl.getLength() != 0 &&
-					nl.item(0) instanceof org.w3c.dom.Element) {
-				org.w3c.dom.Element filter=(org.w3c.dom.Element)
-							nl.item(0);
-				
-				if (filter.hasAttribute(DEST_NAME_ATTR)) {
-					ret = filter.getAttribute(DEST_NAME_ATTR);
-					
-					// If prefixed, then strip prefix away
-					if (ret.startsWith(DEST_NAME_PREFIX)) {
-						ret = ret.substring(DEST_NAME_PREFIX.length());
-					}
-				}
-			}
-		}
-		
-		return(ret);
-	}
-	
-	protected void addJMSBus(String jmsBusId, String dest) {
-		
-		org.w3c.dom.Element jmsBus=
-				m_esbConfig.getOwnerDocument().createElement(JMS_BUS_ELEMENT);
-		m_jmsProviderElem.appendChild(jmsBus);
-		
-		jmsBus.setAttribute(BUSID_ATTR, jmsBusId);
-		
-		org.w3c.dom.Element mesgFilter=
-				m_esbConfig.getOwnerDocument().createElement(JMS_MESSAGE_FILTER_ELEMENT);
-		jmsBus.appendChild(mesgFilter);
-		
-		mesgFilter.setAttribute(DEST_TYPE_ATTR, DEST_TYPE_VALUE);
-		mesgFilter.setAttribute(DEST_NAME_ATTR, DEST_NAME_PREFIX+dest);
-	}
-	
-	protected org.w3c.dom.Element findJMSBus(String jmsBusId) {
-		org.w3c.dom.Element ret=null;
-		
-		org.w3c.dom.NodeList nl=m_jmsProviderElem.getChildNodes();
-		for (int i=0; i < nl.getLength(); i++) {
-			if (nl.item(i) instanceof org.w3c.dom.Element &&
-					nl.item(i).getNodeName().equals(JMS_BUS_ELEMENT) &&
-					((org.w3c.dom.Element)nl.item(i)).
-						getAttribute(BUSID_ATTR).equals(jmsBusId)) {
-				ret = (org.w3c.dom.Element)nl.item(i);
-			}
-		}
-		
-		return(ret);
-	}
-	
-	protected void removeJMSBus(String jmsBusId) {
-		org.w3c.dom.Element bus=findJMSBus(jmsBusId);
-		
-		if (bus != null) {
-			m_jmsProviderElem.removeChild(bus);
-		} else {
-			logger.severe("Remove JMS bus '"+jmsBusId+
-					"' failed, unable to find bus");
-		}
-	}
-	
-	protected String getJMSDestination(String category, String name) {
-		String ret=category.replace('.', '_');
-		
-		ret += "_"+name;
-		
-		return(ret);
-	}
-	
-	/**
-	 * This method removes a service from the model.
-	 * 
-	 * @param service The service
-	 */
-	public void removeService(ESBService service) {
-		m_services.remove(getKey(service.getCategory(),
-						service.getName()));
-		
-		// Remove provider information
-		String busId=service.getJMSBusIdRef();
-		
-		if (busId != null) {
-			removeJMSBus(busId);
-		} else {
-			logger.severe("Service '"+service+
-						"' does not have a bus Id");
-		}
-	}
-	
-	/**
-	 * This textual contents of the model.
-	 * 
-	 * @return The textual contents
-	 */
-	public String getOriginalContents() {
-		return(m_contents);
-	}
-	
-	/**
-	 * This method returns a unique service name within
-	 * the supplied category.
-	 * 
-	 * @param category The category
-	 * @param currentServiceName The name of the service creating
-	 * 							the new service
-	 * @return The unique service name
-	 */
-	public String getUniqueServiceName(String category, String currentServiceName) {
-		String ret=null;
-		
-		int index=currentServiceName.indexOf(SERVICE_NAME_SEPARATOR);
-		if (index != -1) {
-			currentServiceName = currentServiceName.substring(0, index);
-		}
-		
-		index = 0;
-		do {
-			index++;
-			ret = currentServiceName+SERVICE_NAME_SEPARATOR+index;
-		} while(getService(category, ret) != null);
-		
-		return(ret);
-	}
-	
-	/**
-	 * This method returns the gateway service.
-	 * 
-	 * @return The gateway service, or null if not found
-	 */
-	public ESBService getGatewayService() {
-		ESBService ret=null;
-		
-		java.util.Iterator<ESBService> iter=getServices().iterator();
-		while (ret == null && iter.hasNext()) {
-			ret = iter.next();
-			
-			if (ret.isGateway() == false) {
-				ret = null;
-			}
-		}
-
-		return(ret);
-	}
-	
-	/**
-	 * This method returns the reference to the DOM
-	 * representation of the ESB configuration.
-	 * 
-	 * @return The ESB configuration
-	 */
-	public org.w3c.dom.Element getESBConfiguration() {
-		return(m_esbConfig);
-	}
-	
-	/**
-	 * This method returns whether the model is stateless.
-	 * 
-	 * @return Whether the model is stateless
-	 */
-	public boolean isStateless() {
-		return(m_stateless);
-	}
-	
-	/**
-	 * This method returns a custom classloader that uses the project's
-	 * classpath to locate classes referenced by the ESB config file.
-	 * 
-	 * @see http://dev.eclipse.org/newslists/news.eclipse.tools.jdt/msg17769.html
-	 * 
-	 * @return The classloader
-	 * @throws Exception Failed to obtain the classloader
-	 */
-	public synchronized ClassLoader getModelClassLoader() throws Exception {
-		
-		if (m_classLoader == null) {
-			m_classLoader = org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.ClasspathUtil.createClassLoader(getModelReference());
-		}
-		
-		return(m_classLoader);
-	}
-	
-	
-	private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.runtime.jbossesb.model");
-
-	private ModelReference m_source=null;
-	private org.w3c.dom.Element m_esbConfig=null;
-	private org.w3c.dom.Element m_jmsProviderElem=null;
-	private org.w3c.dom.Element m_servicesElem=null;
-	private String m_contents=null;
-	private java.util.Map<String,ESBService> m_services=new java.util.Hashtable<String,ESBService>();
-	private ClassLoader m_classLoader=null;
-	private boolean m_stateless=false;
-	
-	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;
-	}
-}

Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBService.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBService.java	2009-08-20 10:12:35 UTC (rev 783)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBService.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -1,923 +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.runtime.jbossesb.model;
-
-import java.util.logging.Logger;
-
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.ESBModelUtil;
-import org.scribble.model.*;
-import org.scribble.model.admin.DependencyType;
-import org.scribble.model.admin.ModelIssue;
-import org.scribble.model.admin.ModelListener;
-import org.scribble.conversation.model.*;
-
-/**
- * This class represents an ESB service.
- *  
- * @author gary
- */
-public class DefaultESBService extends ModelObject implements ESBService {
-
-	private static final long serialVersionUID = 1266018368857224091L;
-
-	public static final String LISTENERS_ELEMENT = "listeners";
-	public static final String BUSIDREF_ATTR = "busidref";
-	public static final String JMS_LISTENER_ELEMENT = "jms-listener";
-	public static final String MAX_THREADS_ATTR = "maxThreads";
-	public static final String NAME_ATTR = "name";
-	public static final String DESCRIPTION_ATTR = "description";
-	public static final String CATEGORY_ATTR = "category";
-	public static final String ROOT_PROPERTY = "root";
-	public static final String BUSINESS_OBJECT_TYPE_PROPERTY = "session";
-	public static final String CONVERSATION_TYPE_PROPERTY = "conversationType";
-	public static final String SERVICE_DESCRIPTION_NAME_PROPERTY = "serviceDescriptionName";
-	public static final String SERVICE_ANNOTATION = "org.jboss.soa.overlord.jbossesb.stateful.actions.Service";
-	public static final String SERVICE_ELEMENT = "service";
-	public static final String RETRIEVE_SESSION_ACTION_CLASS = "org.jboss.soa.overlord.jbossesb.stateful.actions.RetrieveSessionAction";
-	public static final String ACTION_ELEMENT = "action";
-	public static final String ACTIONS_ELEMENT = "actions";
-	
-	/**
-	 * This is the constructor for the ESB service. This construct
-	 * creates a new DOM element, contained within the supplied
-	 * model, to represent the service associated with the
-	 * supplied category and name.
-	 * 
-	 * @param model The ESB model in which the service has been defined
-	 * @param service The XML configuration of the service
-	 */
-	public DefaultESBService(ESBLanguageModel model,
-					String category, String name) {
-		m_model = model;
-		
-		// Create new element for the service
-		initializeNewServiceElement(category, name);
-	}
-	
-	/**
-	 * This is the constructor for the ESB service. This construct
-	 * creates a wrapper around the supplied DOM representation of
-	 * the existing service element within an ESB configuration.
-	 * 
-	 * @param model The ESB model in which the service has been defined
-	 * @param service The XML configuration of the service
-	 */
-	public DefaultESBService(ESBLanguageModel model, org.w3c.dom.Element service) {
-		m_model = model;
-		m_service = service;
-		
-		if (m_model != null && m_service != null) {
-			initializeExistingServiceElement();
-		}
-	}
-	
-	protected void initializeNewServiceElement(String category, String name) {
-		
-		m_service = m_model.getESBConfiguration().
-					getOwnerDocument().createElement(SERVICE_ELEMENT);
-		
-		m_service.setAttribute(CATEGORY_ATTR, category);
-		m_service.setAttribute(NAME_ATTR, name);
-		m_service.setAttribute(DESCRIPTION_ATTR, "");
-		
-		m_actionsElem = m_model.getESBConfiguration().
-				getOwnerDocument().createElement(ACTIONS_ELEMENT);
-		m_service.appendChild(m_actionsElem);
-	}
-	
-	/**
-	 * This method initializes the service.
-	 */
-	protected void initializeExistingServiceElement() {
-		// Check if relevant action
-		org.w3c.dom.NodeList actions=m_service.getElementsByTagName(ACTIONS_ELEMENT); 
-	
-		if (actions != null && actions.getLength() == 1 &&
-				actions.item(0) instanceof org.w3c.dom.Element) {
-			
-			m_actionsElem = (org.w3c.dom.Element)actions.item(0);
-			
-			org.w3c.dom.NodeList nl=((org.w3c.dom.Element)
-						actions.item(0)).getChildNodes();
-			
-			for (int i=0; i < nl.getLength(); i++) {
-				if (nl.item(i) instanceof org.w3c.dom.Element &&
-						nl.item(i).getNodeName().equals(ACTION_ELEMENT)) {
-					m_actions.add(ESBActionFactory.createAction(this,
-							((org.w3c.dom.Element)nl.item(i))));
-				}
-			}
-		}
-
-		// Find positional information
-		int servCount=getServicePosition();
-		
-		String str=getModel().getOriginalContents();
-
-		if (str != null) {
-			int startPosition=str.indexOf("<service ");
-			int endPosition=-1;
-			int loggedEndPosition=-1;
-			
-			while (startPosition != -1 && servCount > 0) {
-				servCount--;
-				
-				loggedEndPosition = str.indexOf('>', startPosition);
-				
-				endPosition = str.indexOf("</service>", startPosition);
-				
-				if (servCount > 0) {
-					startPosition=str.indexOf("<service ", endPosition);
-				}
-			}
-			
-			if (startPosition != -1) {
-				endPosition = str.indexOf("</service>", startPosition);
-					
-				getSource().setStartPosition(startPosition);
-				getSource().setEndPosition(loggedEndPosition);
-				
-				getSource().getProperties().put("path",
-							ESBModelUtil.getPath(m_service));
-			}
-		}
-		
-		// Get jms listener
-		org.w3c.dom.NodeList nl=m_service.getElementsByTagName(DefaultESBService.JMS_LISTENER_ELEMENT);
-		
-		if (nl.getLength() > 0 && nl.item(0) instanceof org.w3c.dom.Element) {
-			m_jmsListenerElem = (org.w3c.dom.Element)nl.item(0);
-		}
-	}
-	
-	/**
-	 * This method initializes the links.
-	 */
-	public void initializeLinks() {
-		
-		// Work through actions requesting them to
-		// establish their links
-		for (int i=0; i < m_actions.size(); i++) {
-			m_actions.get(i).initializeLinks();
-		}
-	}
-	
-	/**
-	 * This method validates the ESB service and reports warnings or
-	 * errors to the supplied model listener.
-	 * 
-	 * @param l The model listener
-	 */
-	public void validate(ModelListener l) {
-		
-		// Check that the service specifies a session
-		if (isSessionBased() && getSessionClass() == null) {
-			
-			// Find first conversation based action to use as
-			// focus - if not found then use the service itself
-			ESBAction focus=getFirstSessionBasedAction();
-			ModelObject src=this;
-			
-			if (focus instanceof ModelObject) {
-				src = (ModelObject)focus;
-			}
-			
-			l.error(new ModelIssue(src, org.scribble.util.MessageUtil.format(
-					java.util.PropertyResourceBundle.getBundle(
-					"org.jboss.tools.overlord.cdl.runtime.jbossesb.model.Messages"),
-						"_NOT_SPECIFIED_SESSION_CLASS",
-						new String[]{})));
-		}
-		
-		for (int i=0; i < m_actions.size(); i++) {
-			m_actions.get(i).validate(l);
-		}
-	}
-	
-	/**
-	 * This method returns the ESB model.
-	 * 
-	 * @return The ESB model
-	 */
-	public ESBLanguageModel getModel() {
-		return(m_model);
-	}
-	
-	/**
-	 * This method returns the category associated with the service
-	 * descriptor.
-	 * 
-	 * @return The service category
-	 */
-	public String getCategory() {
-		return(m_service.getAttribute(CATEGORY_ATTR));
-	}
-	
-	/**
-	 * This method returns the name associated with the service
-	 * descriptor.
-	 * 
-	 * @return The service name
-	 */
-	public String getName() {
-		return(m_service.getAttribute(NAME_ATTR));
-	}
-	
-	/**
-	 * This method sets the name associated with the service
-	 * descriptor.
-	 * 
-	 * @param name The service name
-	 */
-	public void setName(String name) {
-		m_service.setAttribute(NAME_ATTR, name);
-	}
-	
-	/**
-	 * This method returns the XML configuration representation of the service.
-	 * 
-	 * @return The XML configuration for the service
-	 */
-	public org.w3c.dom.Element getService() {
-		return(m_service);
-	}
-	
-	/**
-	 * This method returns the list of ESB actions.
-	 * 
-	 * @return The ESB actions
-	 */
-	public java.util.List<ESBAction> getActions() {
-		return(m_actions);
-	}
-	
-	/**
-	 * This method adds an action to the service.
-	 * 
-	 * @param action The action to be added
-	 * @param pos The position to add, or -1 if at the end
-	 */
-	public void addAction(ESBAction action, int pos) {
-		// If position specified, then find element at
-		// the position and insert after the previous
-		// element
-		
-		if (action.getAction() != null) {
-			
-			if (pos == -1 || pos >= m_actions.size()) {
-				m_actionsElem.appendChild(action.getAction());
-				m_actions.add(action);
-			} else {
-				org.w3c.dom.NodeList nl=m_actionsElem.getChildNodes();
-				org.w3c.dom.Element elem=null;
-				int cur=-1;
-				
-				for (int i=0; i < nl.getLength(); i++) {
-					if (nl.item(i) instanceof org.w3c.dom.Element &&
-							nl.item(i).getNodeName().equals(ACTION_ELEMENT)) {
-						cur++;
-						
-						if (cur == pos) {
-							elem = (org.w3c.dom.Element)nl.item(i);
-						}
-					}
-				}
-				
-				if (elem != null) {
-					m_actionsElem.insertBefore(action.getAction(), elem);
-				} else {
-					m_actionsElem.appendChild(action.getAction());
-				}
-				
-				m_actions.add(pos, action);
-			}
-		}
-	}
-	
-	/**
-	 * This method removes an action from the service.
-	 * 
-	 * @param action The action to be removed
-	 * @return Whether the action was removed
-	 */
-	public boolean removeAction(ESBAction action) {
-		return(false);
-	}
-	
-	protected java.lang.annotation.Annotation getServiceAnnotation(String session) {
-		java.lang.annotation.Annotation ret=null;
-		
-		try {
-			ClassLoader cl=
-				org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.ClasspathUtil.getClassLoader(getModel());
-			
-			Class<?> cls=Class.forName(session, true, cl);
-			
-			// TODO: This should be replaced by direct lookup
-			// of Service annotation - but library not available
-			// at the moment
-			java.lang.annotation.Annotation[] annotations=
-							cls.getAnnotations();
-			for (int i=0; ret == null &&
-							i < annotations.length; i++) {
-				try {
-					if (annotations[i].annotationType().getName().equals(
-							SERVICE_ANNOTATION)) {
-						ret = annotations[i];
-					}
-				} catch(Throwable ex) {
-					logger.log(java.util.logging.Level.SEVERE,
-							"ANNOTATION: "+
-							annotations[i].annotationType(), ex);
-				}
-			}
-			
-		} catch(Throwable e) {
-			logger.log(java.util.logging.Level.SEVERE,
-					"Failed to get session class '"+session+"'", e);
-		}
-		
-		return(ret);
-	}
-	
-	/**
-	 * This method determines whether the ESB service represents a
-	 * loop construct.
-	 * 
-	 * @return Whether the service represents a loop
-	 */
-	public boolean isLoop() {
-		boolean ret=false;
-		ESBAction action=getFirstSessionBasedAction();
-		
-		if (action != null) {
-			ret = action.isLoop();
-		}
-		
-		return(ret);
-	}
-	
-	/**
-	 * This method determines whether the ESB service descriptor represents
-	 * a 'root' conversation.
-	 * 
-	 * @return Whether the ESB service is associated with a root conversation
-	 */
-	public boolean isRoot() {
-		boolean ret=false;
-		
-		if (isStateless()) {
-			// Check for gateway service
-			ret = isGateway();
-			
-		} else {
-			// Determine if the root property is true
-			// on the create session action
-			ESBAction action=getFirstSessionBasedAction();
-			
-			if (action != null) {
-				if (action.isSessionType()) {
-					String bool=action.getPropertyValue(ROOT_PROPERTY);
-					if (bool != null) {
-						ret = bool.equalsIgnoreCase("true");
-					} else {				
-						String session=action.getPropertyValue(BUSINESS_OBJECT_TYPE_PROPERTY);
-	
-						java.lang.annotation.Annotation annotation=
-									getServiceAnnotation(session);
-						
-						if (annotation != null) {
-							try {
-								java.lang.reflect.Method method=
-									annotation.getClass().getMethod(ROOT_PROPERTY,
-												(Class<?>[])null);
-								
-								Object val=method.invoke(annotation, (Object[])null);
-								
-								if (val instanceof Boolean) {
-									ret = ((Boolean)val).booleanValue();
-								}
-							} catch(Throwable t) {
-								logger.log(java.util.logging.Level.SEVERE,
-										"Failed to get 'root' annotation value", t);
-							}
-						}
-					}
-				}
-			}
-		}
-		
-		return(ret);
-	}
-	
-	/**
-	 * This method determines whether the ESB service descriptor represents
-	 * a new session type.
-	 * 
-	 * @return Whether the service descriptor represents a new session type
-	 */
-	public boolean isSessionType() {
-		boolean ret=false;
-		ESBAction action=null;
-		
-		if (isStateless()) {
-			if (getActions().size() > 0) {
-				action = getActions().get(0);
-			}
-		} else {
-			action = getFirstSessionBasedAction();
-		}
-		
-		if (action != null) {
-			ret = action.isSessionType();
-		}
-		
-		return(ret);
-	}
-	
-	/**
-	 * This method determines whether the service is a gateway
-	 * for inbound requests.
-	 * 
-	 * @return Whether the service is a gateway
-	 */
-	public boolean isGateway() {
-		boolean ret=false;
-
-		if (m_actions.size() == 1) {
-			ret = m_actions.get(0).isGateway();
-		}
-
-		return(ret);
-	}
-	
-	/**
-	 * This method returns the gateway action if this is a
-	 * gateway service.
-	 * 
-	 * @return The gateway action
-	 */
-	public ESBAction getGatewayAction() {
-		ESBAction ret=null;
-
-		for (int i=0; ret == null && i < m_actions.size(); i++) {
-			if (m_actions.get(i).isGateway()) {
-				ret = m_actions.get(i);
-			}
-		}
-
-		return(ret);
-	}
-	
-	/**
-	 * This method determines whether the gateway service is
-	 * related to a stateless session.
-	 * 
-	 * @return Whether the gateway service is stateless
-	 */
-	public boolean isStateless() {
-		boolean ret=false;
-		
-		for (int i=0; ret == false && i < m_actions.size(); i++) {
-			if (m_actions.get(i).isStateless()) {
-				ret = true;
-			}
-		}
-		
-		return(ret);
-	}
-	
-	/**
-	 * This method returns the first session based action in the
-	 * service descriptor.
-	 * 
-	 * @return The first session based action, or null if none exist
-	 */
-	public ESBAction getFirstSessionBasedAction() {
-		ESBAction ret=null;
-		
-		for (int i=0; ret == null && i < m_actions.size(); i++) {
-			ret=m_actions.get(i);
-			
-			if (ret.isSessionBased() == false) {
-				ret = null;
-			}
-		}
-		
-		return(ret);
-	}
-	
-	/**
-	 * This method returns the service description name associated with the
-	 * ESB service.
-	 * 
-	 * @return The service description name
-	 */
-	public String getServiceDescriptionName() {
-		String ret=null;
-		
-		if (isStateless()) {
-			ESBAction action=getGatewayAction();
-			
-			if (action != null) {
-				ret = action.getPropertyValue(SERVICE_DESCRIPTION_NAME_PROPERTY);
-			}
-		} else {
-			ESBAction action=getFirstSessionBasedAction();
-			
-			if (action != null) {			
-				if (action.isSessionType() || (action.getActionClass() != null &&
-						action.getActionClass().equals(RETRIEVE_SESSION_ACTION_CLASS))) {
-					ret = action.getPropertyValue(SERVICE_DESCRIPTION_NAME_PROPERTY);
-					
-					if (ret == null) {
-						String session=action.getPropertyValue(BUSINESS_OBJECT_TYPE_PROPERTY);
-						
-						java.lang.annotation.Annotation annotation=
-										getServiceAnnotation(session);
-				
-						if (annotation != null) {
-							try {
-								java.lang.reflect.Method method=
-									annotation.getClass().getMethod(NAME_ATTR, (Class<?>[])null);
-								
-								Object val=method.invoke(annotation, (Object[])null);
-								
-								if (val instanceof String) {
-									ret = (String)val;
-								}
-							} catch(Throwable t) {
-								logger.log(java.util.logging.Level.SEVERE,
-										"Failed to get 'name' annotation value", t);
-							}
-						}
-					}
-				}
-			}
-		}
-		
-		return(ret);
-	}
-
-	/**
-	 * This method returns the conversation type associated with the
-	 * ESB service.
-	 * 
-	 * @return The conversation type
-	 */
-	public String getConversationType() {
-		String ret=null;
-		
-		if (isStateless()) {
-			ESBAction action=getGatewayAction();
-			
-			if (action != null) {
-				ret = action.getPropertyValue(CONVERSATION_TYPE_PROPERTY);
-			}
-		} else {
-			ESBAction action=getFirstSessionBasedAction();
-		
-			if (action != null) {
-				if (action.isSessionType()) {
-					ret = action.getPropertyValue(CONVERSATION_TYPE_PROPERTY);
-					
-					if (ret == null) {
-						String session=action.getPropertyValue(BUSINESS_OBJECT_TYPE_PROPERTY);
-						
-						java.lang.annotation.Annotation annotation=
-										getServiceAnnotation(session);
-				
-						if (annotation != null) {
-							try {
-								java.lang.reflect.Method method=
-									annotation.getClass().getMethod(CONVERSATION_TYPE_PROPERTY,
-														(Class<?>[])null);
-								
-								Object val=method.invoke(annotation, (Object[])null);
-								
-								if (val instanceof String) {
-									ret = (String)val;
-								}
-							} catch(Throwable t) {
-								logger.log(java.util.logging.Level.SEVERE,
-										"Failed to get 'name' annotation value", t);
-							}
-						}
-					}
-				}
-			}
-		}
-		
-		return(ret);
-	}
-	
-	/**
-	 * This method returns the session name associated with the service
-	 * descriptor.
-	 * 
-	 * @return The session name
-	 */
-	public String getSessionName() {
-		String ret=null;
-		ESBAction action=getFirstSessionBasedAction();
-		
-		if (action != null) {
-			ret = action.getPropertyValue(BUSINESS_OBJECT_TYPE_PROPERTY);
-		}
-		
-		return(ret);
-	}
-
-	/**
-	 * This method returns the session class associated with the service
-	 * descriptor.
-	 * 
-	 * @return The session class
-	 */
-	public Class<?> getSessionClass() {
-		Class<?> ret=null;
-		String session=getSessionName();
-		
-		if (session != null) {
-			try {
-				ClassLoader cl=
-					org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.ClasspathUtil.getClassLoader(getModel());
-				
-				ret = Class.forName(session, true, cl);
-				
-			} catch(Exception e) {
-				logger.log(java.util.logging.Level.SEVERE,
-						"Failed to get session class '"+session+"'", e);
-			}
-		}
-
-		return(ret);
-	}
-
-	/**
-	 * This method determines whether the service is related to a behavioural
-	 * session.
-	 * 
-	 * @return Whether the service is session based
-	 */
-	public boolean isSessionBased() {
-		boolean ret=false;
-		
-		for (int i=0; ret == false && i < m_actions.size(); i++) {
-			ret = m_actions.get(i).isSessionBased();
-		}
-		
-		return(ret);
-	}
-	
-	/**
-	 * This method converts the ESB service into a Conversation, if
-	 * the service represents a conversation.
-	 * 
-	 * @param context The conversion context, or null if this is the
-	 * 					root conversation
-	 * @return The conversation
-	 */
-	public Conversation convert(ConversionContext context) {
-		Conversation ret=null;
-		
-		if (isSessionType()) {
-			ret = new Conversation();
-		
-			ret.derivedFrom(this);
-			ret.getBlock().derivedFrom(this);
-			
-			// Determine if conversation is stateless
-			ret.setStateless(isStateless());
-			
-			// Configure model name
-			LocatedName modelName=new LocatedName();
-			modelName.setName(getServiceDescriptionName());
-			
-			ret.setLocatedName(modelName);
-			
-			String convType=getConversationType();
-			String role=null;
-			
-			if (convType != null) {
-				int index=convType.indexOf('@');
-			
-				if (index != -1) {
-					// TODO: Need to think whether this should be
-					// 'implements' reference. If so, then need to change
-					// Java Lang Model parser and also Lang Model conformance
-					// rule.
-					ImplementsReference iref=
-						new ImplementsReference(ConversationNotation.NOTATION_CODE);
-				
-					role = convType.substring(index+1);
-					
-					iref.setLocatedRole(role);
-					
-					// Need to locate the model name
-					modelName.setRole(new Role(iref.getLocatedRole()));
-					
-					String mainpart=convType.substring(0, index);
-					
-					index = mainpart.lastIndexOf(".");
-					
-					if (index == -1) {
-						iref.setNamespace("");
-						iref.setLocalpart(mainpart);
-					} else {
-						iref.setNamespace(mainpart.substring(0, index));								
-						iref.setLocalpart(mainpart.substring(index+1));
-					}
-					
-					ret.getImplements().add(iref);
-					//ret.getConformsTo().add(iref);
-					
-					org.scribble.model.admin.DependencyManager dm=
-						(org.scribble.model.admin.DependencyManager)
-						org.scribble.extensions.RegistryFactory.getRegistry().getExtension(
-								org.scribble.model.admin.DependencyManager.class, null);
-					
-					if (dm != null) {
-						dm.recordDependency(getModel().getModelReference(),
-								iref, DependencyType.Implements);
-					}
-
-				} else {
-					logger.warning("Conversation type does not " +
-							"contain '@' located role separator");
-				}
-			} else {
-				logger.warning("No conversation type specified");
-			}
-											
-			//ret.setBlock(new Block());
-			
-			context = new DefaultConversionContext(role);
-					
-			context.processing(this);
-			
-			for (int i=0; i < m_actions.size(); i++) {
-				((ESBAction)m_actions.get(i)).convert(
-						ret.getBlock().getContents(), context);
-			}
-			
-			context.processed(this);
-		}
-		
-		return(ret);
-	}
-
-	/**
-	 * This method converts the actions associated with the ESB service into
-	 * activities that can be checked for conformance against a conversation
-	 * type.
-	 * 
-	 * @param activities The target list of activities associated with the
-	 * 					ESB actions being converted
-	 * @param context The conversion context
-	 */
-	public void convert(java.util.List<Activity> activities,
-					ConversionContext context) {
-		context.processing(this);
-		
-		for (int i=0; i < m_actions.size(); i++) {
-			((ESBAction)m_actions.get(i)).convert(
-					activities, context);
-		}
-		
-		context.processed(this);
-	}
-
-	/**
-	 * This method returns the position of the service node within the
-	 * ESB configuration.
-	 * 
-	 * @return The service node position
-	 */
-	public int getServicePosition() {
-		org.w3c.dom.Node services=m_service.getParentNode();
-		int servCount=0;
-		boolean f_end=false;
-		
-		for (int i=0; f_end == false &&
-				i < services.getChildNodes().getLength(); i++) {
-			org.w3c.dom.Node serv=services.getChildNodes().item(i);
-			
-			if (serv.getNodeName().equals(SERVICE_ELEMENT)) {
-				servCount++;
-				if (serv == m_service) {
-					f_end = true;
-				}
-			}
-		}
-		
-		return(servCount);
-	}
-		
-	/**
-	 * This method returns the JMS Bus Id Ref associated with the
-	 * service's JMS listener.
-	 * 
-	 * @return The JMS Bus Id Ref
-	 */
-	public String getJMSBusIdRef() {
-		String ret=null;
-		
-		if (m_jmsListenerElem != null) {
-			ret = m_jmsListenerElem.getAttribute(BUSIDREF_ATTR);
-		}
-		
-		return(ret);
-	}
-	
-	/**
-	 * This method sets the JMS Bus Id Ref associated with the
-	 * service's JMS listener.
-	 * 
-	 * @param busId The JMS Bus Id Ref
-	 */
-	public void setJMSBusIdRef(String busId) {
-		if (m_jmsListenerElem == null) {
-			m_jmsListenerElem = m_service.getOwnerDocument().createElement(JMS_LISTENER_ELEMENT);
-			
-			org.w3c.dom.NodeList nl=m_service.getElementsByTagName(LISTENERS_ELEMENT);
-			org.w3c.dom.Element listeners=null;
-			
-			if (nl.getLength() > 0) {
-				listeners = (org.w3c.dom.Element)nl.item(0);
-			} else {
-				listeners = m_service.getOwnerDocument().createElement(LISTENERS_ELEMENT);
-				
-				if (m_service.getFirstChild() != null) {
-					m_service.insertBefore(listeners,
-							m_service.getFirstChild());
-				} else {
-					m_service.appendChild(listeners);
-				}
-			}
-			
-			if (listeners != null) {
-				listeners.appendChild(m_jmsListenerElem);
-			}
-		}
-	
-		if (m_jmsListenerElem != null) {
-			m_jmsListenerElem.setAttribute(BUSIDREF_ATTR,
-					busId);		
-			
-			if (m_jmsListenerElem.hasAttribute(NAME_ATTR) == false) {
-				m_jmsListenerElem.setAttribute(NAME_ATTR,
-						getCategory()+"-"+getName());
-			}
-			
-			if (m_jmsListenerElem.hasAttribute(MAX_THREADS_ATTR) == false) {
-				m_jmsListenerElem.setAttribute(MAX_THREADS_ATTR, "1");
-			}
-		}
-	}
-	
-	public int hashCode() {
-		return(m_service.hashCode());
-	}
-	
-	public boolean equals(Object obj) {
-		boolean ret=false;
-		
-		if (obj instanceof DefaultESBService) {
-			DefaultESBService other=(DefaultESBService)obj;
-			
-			if (m_service == other.m_service) {
-				ret = true;
-			}
-		}
-		
-		return(ret);
-	}
-	
-	public String toString() {
-		return("ESBService: "+getCategory()+"/"+getName()+"["+getSource()+"]");
-	}
-	
-	private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.runtime.jbossesb.model");
-
-	private ESBLanguageModel m_model=null;
-	private org.w3c.dom.Element m_service=null;
-	private org.w3c.dom.Element m_jmsListenerElem=null;
-	private org.w3c.dom.Element m_actionsElem=null;
-	private java.util.List<ESBAction> m_actions=new java.util.Vector<ESBAction>();
-}

Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBAction.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBAction.java	2009-08-20 10:12:35 UTC (rev 783)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBAction.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -1,144 +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.runtime.jbossesb.model;
-
-import org.scribble.model.*;
-import org.scribble.model.admin.ModelListener;
-
-/**
- * This interface represents the generic ESB action class.
- *  
- * @author gary
- */
-public interface ESBAction {
-
-	/**
-	 * This method initializes the links with the ESB service descriptors
-	 * identified in each path of the action.
-	 */
-	public void initializeLinks();
-
-	/**
-	 * This method validates the ESB action and reports warnings or
-	 * errors to the supplied model listener.
-	 * 
-	 * @param l The model listener
-	 */
-	public void validate(ModelListener l);
-	
-	/**
-	 * This method determines if the action represents a loop construct.
-	 * 
-	 * @return Whether the action represents a loop construct
-	 */
-	public boolean isLoop();
-	
-	/**
-	 * This method determines whether the action is related to a behavioural
-	 * session.
-	 * 
-	 * @return Whether the action is session based
-	 */
-	public boolean isSessionBased();
-	
-	/**
-	 * This method determines whether the ESB action represents
-	 * a new session type.
-	 * 
-	 * @return Whether the action represents a new session type
-	 */
-	public boolean isSessionType();
-	
-	/**
-	 * This method determines whether the action is a gateway
-	 * for inbound requests.
-	 * 
-	 * @return Whether the action is a gateway
-	 */
-	public boolean isGateway();
-	
-	/**
-	 * This method determines whether a gateway action is
-	 * stateless. This method is only relevant when the
-	 * isGateway() method returns true.
-	 * 
-	 * @return Whether the action is a stateless
-	 */
-	public boolean isStateless();
-	
-	/**
-	 * This method indicates whether this action performs another
-	 * sub-conversation.
-	 * 
-	 * @return Whether the action is a 'perform'
-	 */
-	public boolean isPerform();
-	
-	/**
-	 * This method indicates whether the action is an initiator.
-	 * Initiator actions must precede any other session based
-	 * action, within an ESB service.
-	 * 
-	 * @return Whether the action is an initiator
-	 */
-	public boolean isInitiator();
-	
-	/**
-	 * This method returns the action's class name.
-	 * 
-	 * @return The action's class name
-	 */
-	public String getActionClass();
-		
-	/**
-	 * This method returns the property value associated
-	 * with the supplied name.
-	 * 
-	 * @param property The property name
-	 * @return The property value, or null if not found
-	 */
-	public String getPropertyValue(String property);
-	
-	/**
-	 * This method determines the property value, associated
-	 * with the supplied name, is defined.
-	 * 
-	 * @param property The property name
-	 * @return Whether the property has been defined
-	 */
-	public boolean hasProperty(String property);
-	
-	/**
-	 * This method returns the XML configuration representation of the action.
-	 * 
-	 * @return The XML configuration for the action
-	 */
-	public org.w3c.dom.Element getAction();
-	
-	/**
-	 * This method converts the ESB action into an equivalent
-	 * behavioural description for conformance checking.
-	 * 
-	 * @param activities The list of activities that will contain
-	 * 				the converted action(s)
-	 * @param context The conversion context
-	 */
-	public void convert(java.util.List<Activity> activities,
-					ConversionContext context);
-		
-}

Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBActionFactory.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBActionFactory.java	2009-08-20 10:12:35 UTC (rev 783)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBActionFactory.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -1,132 +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.runtime.jbossesb.model;
-
-import java.util.logging.Logger;
-
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions.UnsupportedAction;
-
-/**
- * This class provides a factory for ESBAction instances.
- *  
- * @author gary
- */
-public class ESBActionFactory {
-
-	public static final String MODEL_ACTION_PACKAGE =
-						"org.jboss.tools.overlord.cdl.runtime.jbossesb.model.";
-	public static final String CLASS_ATTR = "class";
-	public static final String CONVERSATION_ACTION_PACKAGE = 
-						"org.jboss.soa.overlord.jbossesb.";
-	public static final String STATELESS="stateless.actions.";
-	public static final String STATEFUL="stateful.actions.";
-
-	/**
-	 * This method creates an ESBAction instance relevant to the
-	 * supplied JBossESB action, associated with the supplied
-	 * service.
-	 * 
-	 * @param service The service
-	 * @param action The XML configuration of the action
-	 * @return The ESBAction instance
-	 */
-	public static ESBAction createAction(ESBService service,
-					org.w3c.dom.Element action) {
-		ESBAction ret=null;
-		String actionType=action.getAttribute(CLASS_ATTR);
-		
-		// Check that it is a conversation based ESB action
-		if (actionType.startsWith(CONVERSATION_ACTION_PACKAGE)) {
-			actionType = actionType.substring(CONVERSATION_ACTION_PACKAGE.length());
-
-			String stateValue=null;
-			
-			if (actionType.startsWith(STATEFUL)) {
-				actionType = actionType.substring(STATEFUL.length());
-				stateValue = STATEFUL;
-			} else if (actionType.startsWith(STATELESS)) {
-				actionType = actionType.substring(STATELESS.length());
-				stateValue = STATELESS;
-			}
-			
-			if (stateValue != null) {
-				
-				try {
-					Class<?> cls=(Class<?>)
-							Class.forName(MODEL_ACTION_PACKAGE+
-									stateValue+actionType);
-					
-					java.lang.reflect.Constructor<?> con=
-						cls.getConstructor(new Class<?>[]{ESBService.class,
-							org.w3c.dom.Element.class});
-					
-					ret = (ESBAction)con.newInstance(new Object[]{service, action});
-					
-				} catch(Exception e) {
-					logger.log(java.util.logging.Level.SEVERE,
-							"Unable to find action class '"+
-							MODEL_ACTION_PACKAGE+stateValue+
-								actionType+"'", e);
-				}
-			}
-		}
-		
-		if (ret == null) {
-			// Unrecognised or unsupported action
-			ret = new UnsupportedAction(service, action);
-		}
-		
-		return(ret);
-	}
-	
-	/**
-	 * This method determines the runtime action class based on
-	 * the ESB model action class.
-	 * 
-	 * @param cls The ESB model action class
-	 * @return The conversation action class
-	 */
-	public static String getConversationAction(Class<?> cls) {
-		String actionType=cls.getName();
-		String ret=null;
-		
-		// Check that it is a conversation based ESB action
-		if (actionType.startsWith(MODEL_ACTION_PACKAGE)) {
-			actionType = actionType.substring(MODEL_ACTION_PACKAGE.length());
-
-			String stateValue=null;
-			
-			if (actionType.startsWith(STATEFUL)) {
-				actionType = actionType.substring(STATEFUL.length());
-				stateValue = STATEFUL;
-			} else if (actionType.startsWith(STATELESS)) {
-				actionType = actionType.substring(STATELESS.length());
-				stateValue = STATELESS;
-			}
-			
-			if (stateValue != null) {
-				ret = CONVERSATION_ACTION_PACKAGE+
-							stateValue+actionType;
-			}
-		}
-		
-		return(ret);
-	}
-
-	private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.runtime.jbossesb.model");
-}

Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBLanguageModel.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBLanguageModel.java	2009-08-20 10:12:35 UTC (rev 783)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBLanguageModel.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -1,136 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model;
-
-import org.scribble.model.*;
-import org.scribble.model.admin.ModelListener;
-
-/**
- * This class represents an ESB model.
- *  
- * @author gary
- */
-public interface ESBLanguageModel {
-
-	/**
-	 * This method validates the ESB model and reports warnings or
-	 * errors to the supplied model listener.
-	 * 
-	 * @param l The model listener
-	 */
-	public void validate(ModelListener l);
-	
-	/**
-	 * This method returns the source model reference.
-	 * 
-	 * @return The source model reference
-	 */
-	public ModelReference getModelReference();
-
-	/**
-	 * This method returns the ESB service for the supplied
-	 * category and name.
-	 * 
-	 * @param category The service category
-	 * @param name The service name
-	 * @return The ESB service, or null if not found
-	 */
-	public ESBService getService(String category, String name);
-
-	/**
-	 * This method returns the collection of ESB services associated
-	 * with the model.
-	 * 
-	 * @return The collection of ESB services
-	 */
-	public java.util.Collection<ESBService> getServices();
-	
-	/**
-	 * This textual contents of the model.
-	 * 
-	 * @return The textual contents
-	 */
-	public String getOriginalContents();
-	
-	/**
-	 * This method returns the gateway service.
-	 * 
-	 * @return The gateway service, or null if not found
-	 */
-	public ESBService getGatewayService();
-	
-	/**
-	 * This method creates a new ESB service.
-	 * 
-	 * @param category The category
-	 * @param name The name
-	 * @return The new ESB service
-	 */
-	public ESBService createService(String category, String name);
-
-	/**
-	 * This method adds a new service to the model.
-	 * 
-	 * @param service The service
-	 */
-	public void addService(ESBService service);
-	
-	/**
-	 * This method removes a service from the model.
-	 * 
-	 * @param service The service
-	 */
-	public void removeService(ESBService service);
-	
-	/**
-	 * This method returns a unique service name within
-	 * the supplied category.
-	 * 
-	 * @param category The category
-	 * @param currentServiceName The name of the service creating
-	 * 							the new service
-	 * @return The unique service name
-	 */
-	public String getUniqueServiceName(String category,
-					String currentServiceName);
-	
-	/**
-	 * This method returns the reference to the DOM
-	 * representation of the ESB configuration.
-	 * 
-	 * @return The ESB configuration
-	 */
-	public org.w3c.dom.Element getESBConfiguration();
-
-	/**
-	 * This method returns the JMS destination associated with
-	 * the supplied JMS Bus Id.
-	 * 
-	 * @param jmsBusId The JMS bus id
-	 * @return The JMS definition, or null if not found
-	 */
-	public String getJMSDefinition(String jmsBusId);
-	
-	/**
-	 * This method returns whether the model is stateless.
-	 * 
-	 * @return Whether the model is stateless
-	 */
-	public boolean isStateless();
-	
-}

Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBLink.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBLink.java	2009-08-20 10:12:35 UTC (rev 783)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBLink.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -1,117 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model;
-
-/**
- * This class represents the link from a ESB action to a service
- * descriptor.
- *  
- * @author gary
- */
-public class ESBLink {
-
-	/**
-	 * This is the constructor for the link.
-	 * 
-	 * @param category The service category of the target service descriptor
-	 * @param name The service name of the target descriptor
-	 * @param service A reference to the service model containing the action
-	 * 							that links to the service descriptor
-	 * @param control Whether the link is a control link, if not then it
-	 * 					represents a message link (i.e. to another service)
-	 */
-	public ESBLink(String category, String name,
-						ESBService service, boolean control) {
-		this(category, name, service, control, false);
-	}
-
-	/**
-	 * This is the constructor for the link.
-	 * 
-	 * @param category The service category of the target service descriptor
-	 * @param name The service name of the target descriptor
-	 * @param service A reference to the service model containing the action
-	 * 							that links to the service descriptor
-	 * @param control Whether the link is a control link, if not then it
-	 * 					represents a message link (i.e. to another service)
-	 * @param remote Whether the link is to a remote service
-	 */
-	public ESBLink(String category, String name,
-						ESBService service, boolean control, boolean remote) {
-		m_category = category;
-		m_name = name;
-		m_service = service;
-		m_control = control;
-		m_remote = remote;
-	}
-
-	/**
-	 * This method indicates whether this is a control
-	 * link, as opposed to a message link.
-	 * 
-	 * @return Whether the link is a control link
-	 */
-	public boolean isControl() {
-		return(m_control);
-	}
-	
-	/**
-	 * This method indicates whether this is a
-	 * link to a remote service.
-	 * 
-	 * @return Whether the link is to a remote service
-	 */
-	public boolean isRemote() {
-		return(m_remote);
-	}
-	
-	/**
-	 * This method returns the service category.
-	 * 
-	 * @return The service category
-	 */
-	public String getCategory() {
-		return(m_category);
-	}
-	
-	/**
-	 * This method returns the service name.
-	 * 
-	 * @return The service name
-	 */
-	public String getName() {
-		return(m_name);
-	}
-	
-	/**
-	 * This method returns the reference to ESB Service
-	 * model containing the action that links to the
-	 * target service descriptor.
-	 * 
-	 * @return The ESB service
-	 */
-	public ESBService getService() {
-		return(m_service);
-	}
-	
-	private String m_category=null;
-	private String m_name=null;
-	private ESBService m_service=null;
-	private boolean m_control=false;
-	private boolean m_remote=false;
-}

Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBService.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBService.java	2009-08-20 10:12:35 UTC (rev 783)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBService.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -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.runtime.jbossesb.model;
-
-import org.scribble.conversation.model.Conversation;
-import org.scribble.model.*;
-import org.scribble.model.admin.ModelListener;
-
-/**
- * This interface represents an ESB service.
- *  
- * @author gary
- */
-public interface ESBService {
-
-	/**
-	 * This method initializes the links.
-	 */
-	public void initializeLinks();
-	
-	/**
-	 * This method validates the ESB service and reports warnings or
-	 * errors to the supplied model listener.
-	 * 
-	 * @param l The model listener
-	 */
-	public void validate(ModelListener l);
-	
-	/**
-	 * This method returns the category associated with the service
-	 * descriptor.
-	 * 
-	 * @return The service category
-	 */
-	public String getCategory();
-	
-	/**
-	 * This method returns the name associated with the service
-	 * descriptor.
-	 * 
-	 * @return The service name
-	 */
-	public String getName();
-	
-	/**
-	 * This method sets the name associated with the service
-	 * descriptor.
-	 * 
-	 * @param name The service name
-	 */
-	public void setName(String name);
-	
-	/**
-	 * This method returns the ESB model.
-	 * 
-	 * @return The ESB model
-	 */
-	public ESBLanguageModel getModel();
-	
-	/**
-	 * This method returns the XML configuration representation of the service.
-	 * 
-	 * @return The XML configuration for the service
-	 */
-	public org.w3c.dom.Element getService();
-	
-	/**
-	 * This method returns the list of ESB actions.
-	 * 
-	 * @return The ESB actions
-	 */
-	public java.util.List<ESBAction> getActions();
-	
-	/**
-	 * This method adds an action to the service.
-	 * 
-	 * @param action The action to be added
-	 * @param pos The position to add, or -1 if at the end
-	 */
-	public void addAction(ESBAction action, int pos);
-	
-	/**
-	 * This method removes an action from the service.
-	 * 
-	 * @param action The action to be removed
-	 * @return Whether the action was removed
-	 */
-	public boolean removeAction(ESBAction action);
-	
-	/**
-	 * This method determines whether the ESB service represents a
-	 * loop construct.
-	 * 
-	 * @return Whether the service represents a loop
-	 */
-	public boolean isLoop();
-	
-	/**
-	 * This method determines whether the ESB service descriptor represents
-	 * a 'root' conversation.
-	 * 
-	 * @return Whether the ESB service is associated with a root conversation
-	 */
-	public boolean isRoot();
-	
-	/**
-	 * This method determines whether the ESB service descriptor represents
-	 * a new session type.
-	 * 
-	 * @return Whether the service descriptor represents a new session type
-	 */
-	public boolean isSessionType();
-	
-	/**
-	 * This method determines whether the service is a gateway
-	 * for inbound requests.
-	 * 
-	 * @return Whether the service is a gateway
-	 */
-	public boolean isGateway();
-	
-	/**
-	 * This method returns the gateway action if this is a
-	 * gateway service.
-	 * 
-	 * @return The gateway action
-	 */
-	public ESBAction getGatewayAction();
-	
-	/**
-	 * This method determines whether the gateway service is
-	 * related to a stateless session.
-	 * 
-	 * @return Whether the gateway service is stateless
-	 */
-	public boolean isStateless();
-	
-	/**
-	 * This method returns the service description name associated with the
-	 * ESB service.
-	 * 
-	 * @return The service description name
-	 */
-	public String getServiceDescriptionName();
-
-	/**
-	 * This method returns the conversation type associated with the
-	 * ESB service.
-	 * 
-	 * @return The conversation type
-	 */
-	public String getConversationType();
-	
-	/**
-	 * This method returns the session name associated with the service
-	 * descriptor.
-	 * 
-	 * @return The session name
-	 */
-	public String getSessionName();
-
-	/**
-	 * This method returns the session class associated with the service
-	 * descriptor.
-	 * 
-	 * @return The session class
-	 */
-	public Class<?> getSessionClass();
-	
-	/**
-	 * This method determines whether the service is related to a behavioural
-	 * session.
-	 * 
-	 * @return Whether the service is session based
-	 */
-	public boolean isSessionBased();
-	
-	/**
-	 * This method returns the first session based action in the
-	 * service descriptor.
-	 * 
-	 * @return The first session based action, or null if none exist
-	 */
-	public ESBAction getFirstSessionBasedAction();
-	
-	/**
-	 * This method converts the actions associated with the ESB service into
-	 * activities that can be checked for conformance against a conversation
-	 * type.
-	 * 
-	 * @param activities The target list of activities associated with the
-	 * 					ESB actions being converted
-	 * @param context The conversion context
-	 */
-	public void convert(java.util.List<Activity> activities,
-					ConversionContext context);
-
-	/**
-	 * This method converts the ESB service into a Conversation, if
-	 * the service represents a conversation.
-	 * 
-	 * @param context The conversion context, or null if this is the
-	 * 					root conversation
-	 * @return The conversation
-	 */
-	public Conversation convert(ConversionContext context);
-	
-	/**
-	 * This method returns the position of the service node within the
-	 * ESB configuration.
-	 * 
-	 * @return The service node position
-	 */
-	public int getServicePosition();
-
-	/**
-	 * This method returns the JMS Bus Id Ref associated with the
-	 * service's JMS listener.
-	 * 
-	 * @return The JMS Bus Id Ref
-	 */
-	public String getJMSBusIdRef();
-	
-	/**
-	 * This method sets the JMS Bus Id Ref associated with the
-	 * service's JMS listener.
-	 * 
-	 * @param busId The JMS Bus Id Ref
-	 */
-	public void setJMSBusIdRef(String busId);
-	
-}

Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/JBossESBNotation.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/JBossESBNotation.java	2009-08-20 10:12:35 UTC (rev 783)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/JBossESBNotation.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -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.runtime.jbossesb.model;
-
-import org.scribble.extensions.*;
-import org.scribble.model.ModelReference;
-import org.scribble.model.Notation;
-
-/**
- * This class represents the JBossESB notation.
- */
- at RegistryInfo(extension=org.scribble.model.Notation.class)
-public class JBossESBNotation extends org.scribble.model.AbstractNotation {
-
-	public static final String NOTATION_CODE = "jboss-esb.xml";
-
-	/**
-	 * This is the default constructor for the JBossESB notation.
-	 */
-	public JBossESBNotation() {
-		super(NOTATION_CODE, "JBossESB", 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
-	 */
-	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.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/Messages.properties
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/Messages.properties	2009-08-20 10:12:35 UTC (rev 783)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/Messages.properties	2009-08-20 13:22:27 UTC (rev 784)
@@ -1,21 +0,0 @@
-# /*
-#  * JBoss, Home of Professional Open Source
-#  * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
-#  * by the @authors tag. All rights reserved.
-#  * See the copyright.txt in the distribution for a
-#  * full listing of individual contributors.
-#  * This copyrighted material is made available to anyone wishing to use,
-#  * modify, copy, or redistribute it subject to the terms and conditions
-#  * of the GNU Lesser General Public License, v. 2.1.
-#  * This program is distributed in the hope that it will be useful, but WITHOUT A
-#  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-#  * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
-#  * You should have received a copy of the GNU Lesser General Public License,
-#  * v.2.1 along with this distribution; if not, write to the Free Software
-#  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-#  * MA  02110-1301, USA.
-#  */
-
-_NOT_FOUND_BUSINESS_OBJECT_TYPE=Business object type '{0}' could not be found
-_NOT_FOUND_SERVICE_DESCRIPTOR=Service descriptor for category '{0}' and name '{1}' not found
-_NOT_SPECIFIED_SESSION_CLASS=First conversation action must specify a valid session class

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/plugintest/org/jboss/savara/tools/jbossesb/generator/GeneratorTest.java (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/plugintest/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/GeneratorTest.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/plugintest/org/jboss/savara/tools/jbossesb/generator/GeneratorTest.java	                        (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/plugintest/org/jboss/savara/tools/jbossesb/generator/GeneratorTest.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -0,0 +1,356 @@
+/*
+ * 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.jbossesb.generator;
+
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
+import org.scribble.conversation.model.*;
+import org.scribble.extensions.RegistryFactory;
+import org.scribble.model.Definition;
+import org.scribble.model.ModelReference;
+import org.scribble.model.change.ModelGenerator;
+import org.w3c.dom.Node;
+import org.jboss.savara.tools.jbossesb.model.*;
+
+import junit.framework.*;
+
+public class GeneratorTest extends TestCase {
+
+    public static TestSuite suite() {
+        TestSuite suite = new TestSuite("Conversation->jboss-esb.xml Generator Tests");       
+        suite.addTest(new ConversationToJBossESBTest("ESBBrokerProcess at Broker"));
+        return suite;
+    }
+    
+    /**
+     * The test case for running the conversation to jboss-esb.xml test.
+     */
+	protected static class ConversationToJBossESBTest extends TestCase {
+
+		/**
+		 * This constructor is initialized with the test
+		 * name.
+		 * 
+		 * @param name The test name
+		 */
+		public ConversationToJBossESBTest(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.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 ConversationModel) == false) {
+					result.addError(this, new Throwable("Model is null"));
+					
+				} else if (l.getErrors().size() != 0) {
+					result.addError(this, new Throwable("Failed to parse Conversation Model"));
+					
+					for (int i=0; i < l.getErrors().size(); i++) {
+						System.err.println("ModelIssue: "+
+								l.getErrors().get(i).getMessage());
+					}
+				} else {
+					ConversationModel cm=(ConversationModel)model;
+					
+					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(JBossESBNotation.NOTATION_CODE);
+						
+						DefaultESBLanguageModel target=
+							new DefaultESBLanguageModel(targetRef,
+									cm.getConversation().isStateless());
+
+						generator.generate(targetRef,
+								defn.getLocatedName().getRole(),
+									target, model);
+						
+						if (target.getESBConfiguration() != null) {
+							try {
+								String text=getText(target.getESBConfiguration(), true);
+							
+								checkResults(result, text);
+							} catch(Exception e) {
+								result.addError(this, e);
+							}
+						} else {
+							result.addError(this,
+									new Throwable("No jboss-esb.xml generated"));						
+						}
+						
+					} else {
+						result.addError(this,
+								new Throwable("Unable to find Model Generator"));						
+					}
+				}
+			}
+			
+			result.endTest(this);
+		}
+		
+		/**
+		 * This method checks the generated jboss-esb.xml against a
+		 * previously stored correct version.
+		 * 
+		 * @param result The test result
+		 * @param esbconfig The ESB configuration
+		 */
+		protected void checkResults(TestResult result, String esbconfig) {
+
+			String filename="results/"+m_name+".jboss-esb.xml";
+			
+			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(esbconfig) == false) {
+						result.addError(this,
+							new Throwable("Generated ESB configuration does not match stored version"));
+						
+						System.out.println("COMPARED GENERATED:");
+						System.out.println(esbconfig);
+						System.out.println("WITH ORIGINAL:");
+						System.out.println(orig);
+					}
+				} catch(Exception e) {
+					result.addError(this, e);
+				}
+			} else {
+				result.addError(this,
+						new Throwable("Resulting ESB configuration '"+filename+
+								"' not found for comparison"));
+			}
+		}
+		
+		/**
+		 * This class converts a DOM representation node to
+		 * text with appropriate presentation formatting.
+		 * 
+		 * @param node The DOM node
+		 * @param pretty Whether to format the text for presentation
+		 * @return The text
+		 * @throws Exception Failed to convert
+		 */
+		public static String getText(Node node, boolean pretty) throws Exception {
+			String ret=getText(node);
+			
+			if (pretty) {
+				ret = reformat(ret);
+			}
+			
+			return(ret);
+		}
+
+		/**
+		 * This method reformats the XML text for presentation.
+		 * 
+		 * @param xmltext The original XML text
+		 * @return The reformatted text
+		 */
+		protected static String reformat(String xmltext) {
+			String ret=xmltext;
+			int pos=0;
+			int prevpos=0;
+			StringBuffer buf=new StringBuffer();
+			int level=0;
+			
+			while ((pos=ret.indexOf('<', prevpos)) != -1) {
+				
+				if (prevpos < pos &&
+						ret.substring(prevpos, pos).trim().length() > 0 &&
+						ret.charAt(prevpos-1) != '?') {
+					
+					if (ret.charAt(prevpos) == '\r' &&
+							ret.charAt(prevpos+1) == '\n') {
+						prevpos += 2;
+					}
+					for (int i=0; i < level; i++) {
+						buf.append("    ");
+					}
+					
+					buf.append(ret.substring(prevpos, pos).trim());
+					buf.append("\r\n");
+				}
+				
+				int endpos=ret.indexOf('>', pos);
+			
+				if (endpos > 0) {
+					boolean noreturn=false;
+					
+					if (pos > 0 && ret.charAt(pos+1) == '/') {
+						level--;
+					}
+					
+					for (int i=0; i < level; i++) {
+						buf.append("    ");
+					}
+					buf.append(ret.substring(pos, endpos+1));
+					
+					if (ret.charAt(endpos-1)== '?') {
+						//noreturn = true;
+						
+					} else if (ret.charAt(endpos-1) == '/') {
+						// Ignore
+					} else if (pos > 0 && ret.charAt(pos+1) == '/') {
+						// Ignore
+						
+					} else if (pos > 0 && ret.charAt(pos+1) == '!') {
+						// Ignore
+						
+					} else {
+						level++;
+					}
+								
+					if (noreturn == false) {
+						buf.append("\r\n");
+					}
+					
+					pos = endpos+1;
+				}
+				
+				prevpos = pos;
+			}
+			
+			if (prevpos != -1 &&
+					ret.substring(prevpos).trim().length() > 0) {
+				buf.append(ret.substring(prevpos));
+			}
+			
+			ret = buf.toString();
+			
+			return(ret);
+		}
+			
+		/**
+		 * This class converts a DOM representation node to
+		 * text.
+		 * 
+		 * @param node The DOM node
+		 * @return The text
+		 * @throws Exception Failed to convert
+		 */
+		public static String getText(Node node) throws Exception {
+			String ret=null;
+				
+			try {
+				// Transform the DOM represent to text
+				java.io.ByteArrayOutputStream xmlstr=
+						new java.io.ByteArrayOutputStream();
+					
+				DOMSource source=new DOMSource();
+				source.setNode(node);
+				
+				StreamResult result=new StreamResult(xmlstr);
+				
+				Transformer trans=
+						TransformerFactory.newInstance().newTransformer();
+				trans.transform(source, result);
+				
+				xmlstr.close();
+				
+				ret = new String(xmlstr.toByteArray());
+				
+				if ((node instanceof org.w3c.dom.Document) == false) {
+					
+					// Strip off any <?xml> header
+					int index=ret.indexOf("<?xml");
+					if (index != -1) {
+						index = ret.indexOf("<", 1);
+						
+						if (index != -1) {
+							ret = ret.substring(index);
+						} else {
+							index = ret.indexOf("?>");
+							
+							if (index != -1) {
+								index += 2;
+								
+								// Remove any trailing whitespaces
+								// after XML header
+								while (index < ret.length() &&
+										Character.isWhitespace(ret.charAt(index))) {
+									index++;
+								}
+								
+								ret = ret.substring(index);
+							}
+						}
+					}
+				}
+
+			} catch(Exception e) {
+				throw new Exception("Failed to transform " +
+						"DOM representation into text", e);
+			}
+			
+			return(ret);
+		}
+
+		private String m_name=null;
+	}
+}

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/plugintest/org/jboss/savara/tools/jbossesb/generator/TypeMapperTest.java (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/plugintest/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/TypeMapperTest.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/plugintest/org/jboss/savara/tools/jbossesb/generator/TypeMapperTest.java	                        (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/plugintest/org/jboss/savara/tools/jbossesb/generator/TypeMapperTest.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -0,0 +1,122 @@
+/*
+ * 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.jbossesb.generator;
+
+import org.jboss.savara.tools.jbossesb.generator.TypeMapper;
+
+import junit.framework.TestCase;
+
+public class TypeMapperTest extends TestCase {
+
+	public void testGetJavaTypeCustomClass() {
+		String pack="org.acme.service";
+		String namespace=TypeMapper.JAVA_PREFIX+pack;
+		String localpart="Message";
+		String clsName=pack+"."+localpart;
+		
+		String type=TypeMapper.getJavaType(namespace, localpart);
+		
+		if (type == null) {
+			fail("Type not returned");
+		}
+		
+		if (type.equals(clsName) == false) {
+			fail("Expecting '"+clsName+"', but got: "+type);
+		}
+	}
+	
+	public void testGetJavaTypeDOMElement() {
+		String namespace="http://www.jboss.org/example";
+		String localpart="Message";
+		String clsName=org.w3c.dom.Element.class.getName();
+		
+		String type=TypeMapper.getJavaType(namespace, localpart);
+		
+		if (type == null) {
+			fail("Type not returned");
+		}
+		
+		if (type.equals(clsName) == false) {
+			fail("Expecting '"+clsName+"', but got: "+type);
+		}
+	}
+	
+	public void testGetJavaTypeXSDString() {
+		String namespace=TypeMapper.XSD_NAMESPACE;
+		String localpart="string";
+		String clsName=String.class.getName();
+		
+		String type=TypeMapper.getJavaType(namespace, localpart);
+		
+		if (type == null) {
+			fail("Type not returned");
+		}
+		
+		if (type.equals(clsName) == false) {
+			fail("Expecting '"+clsName+"', but got: "+type);
+		}
+	}
+	
+	public void testGetJavaTypeXSDBoolean() {
+		String namespace=TypeMapper.XSD_NAMESPACE;
+		String localpart="boolean";
+		String clsName="boolean";
+		
+		String type=TypeMapper.getJavaType(namespace, localpart);
+		
+		if (type == null) {
+			fail("Type not returned");
+		}
+		
+		if (type.equals(clsName) == false) {
+			fail("Expecting '"+clsName+"', but got: "+type);
+		}
+	}
+	
+	public void testGetJavaTypeXSDDecimal() {
+		String namespace=TypeMapper.XSD_NAMESPACE;
+		String localpart="decimal";
+		String clsName="int";
+		
+		String type=TypeMapper.getJavaType(namespace, localpart);
+		
+		if (type == null) {
+			fail("Type not returned");
+		}
+		
+		if (type.equals(clsName) == false) {
+			fail("Expecting '"+clsName+"', but got: "+type);
+		}
+	}
+	
+	public void testGetJavaTypeXSDInteger() {
+		String namespace=TypeMapper.XSD_NAMESPACE;
+		String localpart="integer";
+		String clsName="int";
+		
+		String type=TypeMapper.getJavaType(namespace, localpart);
+		
+		if (type == null) {
+			fail("Type not returned");
+		}
+		
+		if (type.equals(clsName) == false) {
+			fail("Expecting '"+clsName+"', but got: "+type);
+		}
+	}
+}

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/plugintest/org/jboss/savara/tools/jbossesb/generator/results (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/plugintest/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/results)

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/plugintest/org/jboss/savara/tools/jbossesb/generator/testmodels (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/plugintest/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/testmodels)

Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/plugintest/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/GeneratorTest.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/plugintest/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/GeneratorTest.java	2009-08-20 10:12:35 UTC (rev 783)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/plugintest/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/GeneratorTest.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -1,356 +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.runtime.jbossesb.generator;
-
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.scribble.conversation.model.*;
-import org.scribble.extensions.RegistryFactory;
-import org.scribble.model.Definition;
-import org.scribble.model.ModelReference;
-import org.scribble.model.change.ModelGenerator;
-import org.w3c.dom.Node;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
-
-import junit.framework.*;
-
-public class GeneratorTest extends TestCase {
-
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite("Conversation->jboss-esb.xml Generator Tests");       
-        suite.addTest(new ConversationToJBossESBTest("ESBBrokerProcess at Broker"));
-        return suite;
-    }
-    
-    /**
-     * The test case for running the conversation to jboss-esb.xml test.
-     */
-	protected static class ConversationToJBossESBTest extends TestCase {
-
-		/**
-		 * This constructor is initialized with the test
-		 * name.
-		 * 
-		 * @param name The test name
-		 */
-		public ConversationToJBossESBTest(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.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 ConversationModel) == false) {
-					result.addError(this, new Throwable("Model is null"));
-					
-				} else if (l.getErrors().size() != 0) {
-					result.addError(this, new Throwable("Failed to parse Conversation Model"));
-					
-					for (int i=0; i < l.getErrors().size(); i++) {
-						System.err.println("ModelIssue: "+
-								l.getErrors().get(i).getMessage());
-					}
-				} else {
-					ConversationModel cm=(ConversationModel)model;
-					
-					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(JBossESBNotation.NOTATION_CODE);
-						
-						DefaultESBLanguageModel target=
-							new DefaultESBLanguageModel(targetRef,
-									cm.getConversation().isStateless());
-
-						generator.generate(targetRef,
-								defn.getLocatedName().getRole(),
-									target, model);
-						
-						if (target.getESBConfiguration() != null) {
-							try {
-								String text=getText(target.getESBConfiguration(), true);
-							
-								checkResults(result, text);
-							} catch(Exception e) {
-								result.addError(this, e);
-							}
-						} else {
-							result.addError(this,
-									new Throwable("No jboss-esb.xml generated"));						
-						}
-						
-					} else {
-						result.addError(this,
-								new Throwable("Unable to find Model Generator"));						
-					}
-				}
-			}
-			
-			result.endTest(this);
-		}
-		
-		/**
-		 * This method checks the generated jboss-esb.xml against a
-		 * previously stored correct version.
-		 * 
-		 * @param result The test result
-		 * @param esbconfig The ESB configuration
-		 */
-		protected void checkResults(TestResult result, String esbconfig) {
-
-			String filename="results/"+m_name+".jboss-esb.xml";
-			
-			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(esbconfig) == false) {
-						result.addError(this,
-							new Throwable("Generated ESB configuration does not match stored version"));
-						
-						System.out.println("COMPARED GENERATED:");
-						System.out.println(esbconfig);
-						System.out.println("WITH ORIGINAL:");
-						System.out.println(orig);
-					}
-				} catch(Exception e) {
-					result.addError(this, e);
-				}
-			} else {
-				result.addError(this,
-						new Throwable("Resulting ESB configuration '"+filename+
-								"' not found for comparison"));
-			}
-		}
-		
-		/**
-		 * This class converts a DOM representation node to
-		 * text with appropriate presentation formatting.
-		 * 
-		 * @param node The DOM node
-		 * @param pretty Whether to format the text for presentation
-		 * @return The text
-		 * @throws Exception Failed to convert
-		 */
-		public static String getText(Node node, boolean pretty) throws Exception {
-			String ret=getText(node);
-			
-			if (pretty) {
-				ret = reformat(ret);
-			}
-			
-			return(ret);
-		}
-
-		/**
-		 * This method reformats the XML text for presentation.
-		 * 
-		 * @param xmltext The original XML text
-		 * @return The reformatted text
-		 */
-		protected static String reformat(String xmltext) {
-			String ret=xmltext;
-			int pos=0;
-			int prevpos=0;
-			StringBuffer buf=new StringBuffer();
-			int level=0;
-			
-			while ((pos=ret.indexOf('<', prevpos)) != -1) {
-				
-				if (prevpos < pos &&
-						ret.substring(prevpos, pos).trim().length() > 0 &&
-						ret.charAt(prevpos-1) != '?') {
-					
-					if (ret.charAt(prevpos) == '\r' &&
-							ret.charAt(prevpos+1) == '\n') {
-						prevpos += 2;
-					}
-					for (int i=0; i < level; i++) {
-						buf.append("    ");
-					}
-					
-					buf.append(ret.substring(prevpos, pos).trim());
-					buf.append("\r\n");
-				}
-				
-				int endpos=ret.indexOf('>', pos);
-			
-				if (endpos > 0) {
-					boolean noreturn=false;
-					
-					if (pos > 0 && ret.charAt(pos+1) == '/') {
-						level--;
-					}
-					
-					for (int i=0; i < level; i++) {
-						buf.append("    ");
-					}
-					buf.append(ret.substring(pos, endpos+1));
-					
-					if (ret.charAt(endpos-1)== '?') {
-						//noreturn = true;
-						
-					} else if (ret.charAt(endpos-1) == '/') {
-						// Ignore
-					} else if (pos > 0 && ret.charAt(pos+1) == '/') {
-						// Ignore
-						
-					} else if (pos > 0 && ret.charAt(pos+1) == '!') {
-						// Ignore
-						
-					} else {
-						level++;
-					}
-								
-					if (noreturn == false) {
-						buf.append("\r\n");
-					}
-					
-					pos = endpos+1;
-				}
-				
-				prevpos = pos;
-			}
-			
-			if (prevpos != -1 &&
-					ret.substring(prevpos).trim().length() > 0) {
-				buf.append(ret.substring(prevpos));
-			}
-			
-			ret = buf.toString();
-			
-			return(ret);
-		}
-			
-		/**
-		 * This class converts a DOM representation node to
-		 * text.
-		 * 
-		 * @param node The DOM node
-		 * @return The text
-		 * @throws Exception Failed to convert
-		 */
-		public static String getText(Node node) throws Exception {
-			String ret=null;
-				
-			try {
-				// Transform the DOM represent to text
-				java.io.ByteArrayOutputStream xmlstr=
-						new java.io.ByteArrayOutputStream();
-					
-				DOMSource source=new DOMSource();
-				source.setNode(node);
-				
-				StreamResult result=new StreamResult(xmlstr);
-				
-				Transformer trans=
-						TransformerFactory.newInstance().newTransformer();
-				trans.transform(source, result);
-				
-				xmlstr.close();
-				
-				ret = new String(xmlstr.toByteArray());
-				
-				if ((node instanceof org.w3c.dom.Document) == false) {
-					
-					// Strip off any <?xml> header
-					int index=ret.indexOf("<?xml");
-					if (index != -1) {
-						index = ret.indexOf("<", 1);
-						
-						if (index != -1) {
-							ret = ret.substring(index);
-						} else {
-							index = ret.indexOf("?>");
-							
-							if (index != -1) {
-								index += 2;
-								
-								// Remove any trailing whitespaces
-								// after XML header
-								while (index < ret.length() &&
-										Character.isWhitespace(ret.charAt(index))) {
-									index++;
-								}
-								
-								ret = ret.substring(index);
-							}
-						}
-					}
-				}
-
-			} catch(Exception e) {
-				throw new Exception("Failed to transform " +
-						"DOM representation into text", e);
-			}
-			
-			return(ret);
-		}
-
-		private String m_name=null;
-	}
-}

Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/plugintest/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/TypeMapperTest.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/plugintest/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/TypeMapperTest.java	2009-08-20 10:12:35 UTC (rev 783)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/plugintest/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/TypeMapperTest.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -1,122 +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.runtime.jbossesb.generator;
-
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.generator.TypeMapper;
-
-import junit.framework.TestCase;
-
-public class TypeMapperTest extends TestCase {
-
-	public void testGetJavaTypeCustomClass() {
-		String pack="org.acme.service";
-		String namespace=TypeMapper.JAVA_PREFIX+pack;
-		String localpart="Message";
-		String clsName=pack+"."+localpart;
-		
-		String type=TypeMapper.getJavaType(namespace, localpart);
-		
-		if (type == null) {
-			fail("Type not returned");
-		}
-		
-		if (type.equals(clsName) == false) {
-			fail("Expecting '"+clsName+"', but got: "+type);
-		}
-	}
-	
-	public void testGetJavaTypeDOMElement() {
-		String namespace="http://www.jboss.org/example";
-		String localpart="Message";
-		String clsName=org.w3c.dom.Element.class.getName();
-		
-		String type=TypeMapper.getJavaType(namespace, localpart);
-		
-		if (type == null) {
-			fail("Type not returned");
-		}
-		
-		if (type.equals(clsName) == false) {
-			fail("Expecting '"+clsName+"', but got: "+type);
-		}
-	}
-	
-	public void testGetJavaTypeXSDString() {
-		String namespace=TypeMapper.XSD_NAMESPACE;
-		String localpart="string";
-		String clsName=String.class.getName();
-		
-		String type=TypeMapper.getJavaType(namespace, localpart);
-		
-		if (type == null) {
-			fail("Type not returned");
-		}
-		
-		if (type.equals(clsName) == false) {
-			fail("Expecting '"+clsName+"', but got: "+type);
-		}
-	}
-	
-	public void testGetJavaTypeXSDBoolean() {
-		String namespace=TypeMapper.XSD_NAMESPACE;
-		String localpart="boolean";
-		String clsName="boolean";
-		
-		String type=TypeMapper.getJavaType(namespace, localpart);
-		
-		if (type == null) {
-			fail("Type not returned");
-		}
-		
-		if (type.equals(clsName) == false) {
-			fail("Expecting '"+clsName+"', but got: "+type);
-		}
-	}
-	
-	public void testGetJavaTypeXSDDecimal() {
-		String namespace=TypeMapper.XSD_NAMESPACE;
-		String localpart="decimal";
-		String clsName="int";
-		
-		String type=TypeMapper.getJavaType(namespace, localpart);
-		
-		if (type == null) {
-			fail("Type not returned");
-		}
-		
-		if (type.equals(clsName) == false) {
-			fail("Expecting '"+clsName+"', but got: "+type);
-		}
-	}
-	
-	public void testGetJavaTypeXSDInteger() {
-		String namespace=TypeMapper.XSD_NAMESPACE;
-		String localpart="integer";
-		String clsName="int";
-		
-		String type=TypeMapper.getJavaType(namespace, localpart);
-		
-		if (type == null) {
-			fail("Type not returned");
-		}
-		
-		if (type.equals(clsName) == false) {
-			fail("Expecting '"+clsName+"', but got: "+type);
-		}
-	}
-}

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/DefaultConversionContextTest.java (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultConversionContextTest.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/DefaultConversionContextTest.java	                        (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/DefaultConversionContextTest.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -0,0 +1,116 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ */
+package org.jboss.savara.tools.jbossesb.model;
+
+import org.jboss.savara.tools.jbossesb.model.DefaultConversionContext;
+import org.jboss.savara.tools.jbossesb.model.DefaultESBService;
+
+import junit.framework.TestCase;
+
+public class DefaultConversionContextTest extends TestCase {
+
+	public void testIsJoin() {
+		DefaultESBService service=new DefaultESBService(null, null);
+		
+		DefaultConversionContext context=new DefaultConversionContext(null);
+		context.markJoin(service);
+		
+		if (context.isJoin(service) == false) {
+			fail("Service should be join");
+		}
+	}
+
+	public void testIsJoinFalse() {
+		DefaultESBService service=new DefaultESBService(null, null);
+		
+		DefaultConversionContext context=new DefaultConversionContext(null);
+		
+		if (context.isJoin(service)) {
+			fail("Service should not be join");
+		}
+	}
+	
+	public void testJoinProcessing() {
+		DefaultESBService service=new DefaultESBService(null, null);
+		
+		DefaultConversionContext context=new DefaultConversionContext(null);
+		context.markJoin(service);
+		
+		if (context.isJoin(service) == false) {
+			fail("Service should be join");
+		}
+		
+		context.processing(service);
+		
+		if (context.isJoin(service)) {
+			fail("Service should no longer be marked as join");
+		}		
+	}
+
+	public void testIsOnStack() {
+		DefaultESBService service=new DefaultESBService(null, null);
+		
+		DefaultConversionContext context=new DefaultConversionContext(null);
+		context.push(service);
+		
+		if (context.isOnStack(service) == false) {
+			fail("Service should be on stack");
+		}
+	}
+
+	public void testIsOnStackFalse() {
+		DefaultESBService service=new DefaultESBService(null, null);
+		
+		DefaultConversionContext context=new DefaultConversionContext(null);
+		
+		if (context.isOnStack(service)) {
+			fail("Service should not be on stack");
+		}
+	}
+	
+	public void testStackPushPop() {
+		DefaultESBService service=new DefaultESBService(null, null);
+		
+		DefaultConversionContext context=new DefaultConversionContext(null);
+		context.push(service);
+		
+		if (context.isOnStack(service) == false) {
+			fail("Service should be on stack");
+		}
+		
+		context.pop(service);
+
+		if (context.isOnStack(service)) {
+			fail("Service should no longer be on stack after pop");
+		}
+	}
+
+	public void testGetRole() {
+		String role="myRole";
+		
+		DefaultConversionContext context=new DefaultConversionContext(role);
+		
+		if (context.getRole() == null) {
+			fail("Role is null");
+		}
+		
+		if (context.getRole().equals(role) == false) {
+			fail("Role should be '"+role+"', but got: "+context.getRole());
+		}
+	}
+}

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/DefaultESBLanguageModelTest.java (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBLanguageModelTest.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/DefaultESBLanguageModelTest.java	                        (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/DefaultESBLanguageModelTest.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -0,0 +1,271 @@
+/*
+ * 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.jbossesb.model;
+
+import junit.framework.TestCase;
+
+import org.jboss.savara.tools.jbossesb.model.DefaultESBLanguageModel;
+import org.jboss.savara.tools.jbossesb.model.ESBLanguageModel;
+import org.jboss.savara.tools.jbossesb.model.JBossESBNotation;
+import org.scribble.model.*;
+
+public class DefaultESBLanguageModelTest extends TestCase {
+
+	public void testBaseConfiguration() {
+		
+		ModelReference ref=new ModelReference(JBossESBNotation.NOTATION_CODE);
+		
+		DefaultESBLanguageModel model=new DefaultESBLanguageModel(ref, false);
+		
+		org.w3c.dom.Element config=model.getESBConfiguration();
+		
+		if (config.getNodeName().equals(DefaultESBLanguageModel.TOP_LEVEL_ELEMENT) == false) {
+			fail("Top level element should be '"+
+					DefaultESBLanguageModel.TOP_LEVEL_ELEMENT+"' but found: "+
+					config.getNodeName());
+		}
+		
+		boolean f_providers=false;
+		boolean f_services=false;
+		
+		org.w3c.dom.NodeList nl=config.getChildNodes();
+		
+		for (int i=0; i < nl.getLength(); i++) {
+			if (nl.item(i) instanceof org.w3c.dom.Element) {
+				org.w3c.dom.Element elem=
+					(org.w3c.dom.Element)nl.item(i);
+				
+				if (elem.getNodeName().equals(DefaultESBLanguageModel.PROVIDERS_ELEMENT)) {
+					
+					if (f_providers) {
+						fail("Duplicate '"+DefaultESBLanguageModel.PROVIDERS_ELEMENT+"' elements");
+					} else {
+						
+						// Check if jms provider defined
+						org.w3c.dom.NodeList nl2=
+							elem.getChildNodes();
+						boolean f_jmsProvider=false;
+						
+						for (int j=0; j < nl2.getLength(); j++) {
+							if (nl2.item(j) instanceof org.w3c.dom.Element) {
+								
+								if (nl2.item(j).getNodeName().equals(
+											DefaultESBLanguageModel.JMS_PROVIDER_ELEMENT)) {
+								
+									if (f_jmsProvider) {
+										fail("JMS Provider already defined");
+									}
+									
+									f_jmsProvider = true;
+								} else {
+									fail("Unknown provider element: "+
+											nl2.item(j).getNodeName());
+								}
+							}
+						}
+						
+						if (f_jmsProvider == false) {
+							fail("JMS provider not defined");
+						}
+					}
+					
+					f_providers = true;
+				} else if (elem.getNodeName().equals(DefaultESBLanguageModel.SERVICES_ELEMENT)) {
+					
+					if (f_services) {
+						fail("Duplicate '"+DefaultESBLanguageModel.SERVICES_ELEMENT+"' elements");
+					}
+					
+					f_services = true;
+				} else {
+					fail("Unknown element: "+nl.item(i).getNodeName());
+				}
+			}
+		}
+		
+		if (f_providers == false) {
+			fail("Element '"+DefaultESBLanguageModel.PROVIDERS_ELEMENT+"' not found");
+		}
+		
+		if (f_services == false) {
+			fail("Element '"+DefaultESBLanguageModel.SERVICES_ELEMENT+"' not found");
+		}
+	}
+	
+	public void testAddService() {
+		String busId="TestBusId";
+		String category="category.one";
+		String name="serviceName";
+		
+		ModelReference ref=new ModelReference(JBossESBNotation.NOTATION_CODE);
+		
+		DefaultESBLanguageModel model=new DefaultESBLanguageModel(ref, false);
+		
+		org.w3c.dom.Element config=model.getESBConfiguration();
+		
+		TestESBService service=new TestESBService();
+		service.setJMSBusIdRef(busId);
+		service.setCategory(category);
+		service.setName(name);
+		
+		model.addService(service);
+		
+		if (service.getJMSBusIdRef() == null) {
+			fail("JMS BusIdRef not set");
+		}
+		
+		if (service.getJMSBusIdRef().equals(busId) == false) {
+			fail("Bus Id should be '"+busId+"', but got: "+service.getJMSBusIdRef());
+		}
+		
+		// Check that the jms bus id has been created
+		org.w3c.dom.NodeList nl=config.getElementsByTagName(
+						DefaultESBLanguageModel.JMS_PROVIDER_ELEMENT);
+
+		if (nl.getLength() != 1) {
+			fail("JMS provider element not found");
+		}
+		
+		org.w3c.dom.Element provider=(org.w3c.dom.Element)nl.item(0);
+		
+		nl = provider.getElementsByTagName(
+				DefaultESBLanguageModel.JMS_BUS_ELEMENT);
+
+		if (nl.getLength() != 1) {
+			fail("JMS bus element not found");
+		}
+
+		org.w3c.dom.Element bus=(org.w3c.dom.Element)nl.item(0);
+
+		if (bus.getAttribute("busid").equals(busId) == false) {
+			fail("Bus had invalid busid '"+bus.getAttribute("busid")+
+					"', was expecting: "+busId);
+		}
+		
+		if (bus.getParentNode() != provider) {
+			fail("Bus not contained directly within provider");
+		}
+		
+		// Check bus retrieved directly
+		org.w3c.dom.Element bus2=model.findJMSBus(busId);
+		
+		if (bus2 != bus) {
+			fail("Bus elements not the same");
+		}
+	}
+	
+	public void testRemoveService() {
+		String busId="TestBusId";
+		String category="category.two";
+		String name="serviceName";
+		
+		ModelReference ref=new ModelReference(JBossESBNotation.NOTATION_CODE);
+		
+		DefaultESBLanguageModel model=new DefaultESBLanguageModel(ref, false);
+		
+		org.w3c.dom.Element config=model.getESBConfiguration();
+		
+		TestESBService service=new TestESBService();
+		service.setJMSBusIdRef(busId);
+		service.setCategory(category);
+		service.setName(name);
+		
+		model.addService(service);
+		
+		// Check that the jms bus id has been created
+		org.w3c.dom.NodeList nl=config.getElementsByTagName(
+						DefaultESBLanguageModel.JMS_PROVIDER_ELEMENT);
+
+		if (nl.getLength() != 1) {
+			fail("JMS provider element not found");
+		}
+		
+		org.w3c.dom.Element provider=(org.w3c.dom.Element)nl.item(0);
+		
+		nl = provider.getElementsByTagName(
+				DefaultESBLanguageModel.JMS_BUS_ELEMENT);
+
+		if (nl.getLength() != 1) {
+			fail("JMS bus element not found");
+		}
+
+		// Remove the service and check that the bus entry
+		// is no longer there
+		model.removeService(service);
+		
+		nl = provider.getElementsByTagName(
+				DefaultESBLanguageModel.JMS_BUS_ELEMENT);
+
+		if (nl.getLength() != 0) {
+			fail("JMS bus element should NOT be found");
+		}
+	}
+
+	public void testAddServiceWithNoBusId() {
+		String category="category.one";
+		String name="serviceName";
+		
+		ModelReference ref=new ModelReference(JBossESBNotation.NOTATION_CODE);
+		
+		DefaultESBLanguageModel model=new DefaultESBLanguageModel(ref, false);
+		
+		TestESBService service=new TestESBService();
+		service.setCategory(category);
+		service.setName(name);
+		
+		model.addService(service);
+		
+		if (service.getJMSBusIdRef() == null) {
+			fail("JMS BusIdRef not set");
+		}
+	}
+	
+	public void testAddMultipleServiceWithNoBusId() {
+		String category="category.one";
+		String name1="serviceName1";
+		String name2="serviceName2";
+		
+		ModelReference ref=new ModelReference(JBossESBNotation.NOTATION_CODE);
+		
+		DefaultESBLanguageModel model=new DefaultESBLanguageModel(ref, false);
+		
+		TestESBService service1=new TestESBService();
+		service1.setCategory(category);
+		service1.setName(name1);
+		
+		model.addService(service1);
+		
+		if (service1.getJMSBusIdRef() == null) {
+			fail("JMS BusIdRef1 not set");
+		}
+		
+		TestESBService service2=new TestESBService();
+		service2.setCategory(category);
+		service2.setName(name2);
+		
+		model.addService(service2);
+		
+		if (service2.getJMSBusIdRef() == null) {
+			fail("JMS BusIdRef2 not set");
+		}
+		
+		if (service1.getJMSBusIdRef().equals(service2.getJMSBusIdRef())) {
+			fail("Service JMS bus ids should be unique");
+		}
+	}
+}

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/DefaultESBServiceTest.java (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBServiceTest.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/DefaultESBServiceTest.java	                        (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/DefaultESBServiceTest.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -0,0 +1,365 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ */
+package org.jboss.savara.tools.jbossesb.model;
+
+import junit.framework.TestCase;
+
+import org.jboss.savara.tools.jbossesb.model.DefaultESBLanguageModel;
+import org.jboss.savara.tools.jbossesb.model.DefaultESBService;
+import org.jboss.savara.tools.jbossesb.model.stateful.actions.*;
+
+public class DefaultESBServiceTest extends TestCase {
+
+	public void testValidateSessionClassRequired() {
+		DefaultESBService service=new DefaultESBService(null, null);
+
+		TestESBAction act1=new TestESBAction();
+		act1.setSessionBased(true);
+		
+		service.getActions().add(act1);
+		
+		TestModelListener l=new TestModelListener();
+		
+		l.addExpectedError(org.scribble.util.MessageUtil.format(
+						java.util.PropertyResourceBundle.getBundle(
+						"org.jboss.tools.overlord.cdl.runtime.jbossesb.model.Messages"),
+							"_NOT_SPECIFIED_SESSION_CLASS",
+							new String[]{}));
+		
+		service.validate(l);
+		
+		if (l.isValid() == false) {
+			fail(l.invalidMessage());
+		}
+	}
+
+	public void testValidateSessionClassNotRequired() {
+		DefaultESBService service=new DefaultESBService(null, null);
+
+		TestModelListener l=new TestModelListener();
+		
+		service.validate(l);
+		
+		if (l.isValid() == false) {
+			fail(l.invalidMessage());
+		}
+	}
+	
+	public void testIsLoop() {
+		DefaultESBService service=new DefaultESBService(null, null);
+
+		TestESBAction act1=new TestESBAction();
+		act1.setSessionBased(true);
+		act1.setLoop(true);
+		
+		service.getActions().add(act1);
+
+		if (service.isLoop() == false) {
+			fail("Service should be loop");
+		}
+	}
+
+	public void testIsLoopFalse() {
+		DefaultESBService service=new DefaultESBService(null, null);
+
+		TestESBAction act1=new TestESBAction();
+		act1.setSessionBased(true);
+		
+		service.getActions().add(act1);
+		
+		if (service.isLoop()) {
+			fail("Service is not a loop");
+		}
+	}
+	
+	public void testIsRoot() {
+		DefaultESBService service=new DefaultESBService(null, null);
+
+		TestESBAction act1=new TestESBAction();
+		act1.setSessionBased(true);
+		act1.setCreateSession(true);
+		act1.setPropertyValue(DefaultESBService.ROOT_PROPERTY, "true");
+		
+		service.getActions().add(act1);
+		
+		if (service.isRoot() == false) {
+			fail("Service should be root");
+		}
+	}
+	
+	public void testIsRootFalse() {
+		DefaultESBService service=new DefaultESBService(null, null);
+
+		TestESBAction act1=new TestESBAction();
+		
+		service.getActions().add(act1);
+		
+		if (service.isRoot()) {
+			fail("Service should NOT be root");
+		}
+	}
+	
+	public void testIsSessionBased() {
+		DefaultESBService service=new DefaultESBService(null, null);
+
+		TestESBAction act1=new TestESBAction();
+		act1.setSessionBased(true);
+		
+		service.getActions().add(act1);
+		
+		if (service.isSessionBased() == false) {
+			fail("Service should be SessionBased");
+		}
+	}
+	
+	public void testIsSessionBasedFalse() {
+		DefaultESBService service=new DefaultESBService(null, null);
+
+		TestESBAction act1=new TestESBAction();
+		
+		service.getActions().add(act1);
+		
+		if (service.isSessionBased()) {
+			fail("Service should NOT be SessionBased");
+		}
+	}
+	
+	public void testIsCreateSession() {
+		DefaultESBService service=new DefaultESBService(null, null);
+
+		TestESBAction act1=new TestESBAction();
+		act1.setSessionBased(true);
+		act1.setCreateSession(true);
+		
+		service.getActions().add(act1);
+		
+		if (service.isSessionType() == false) {
+			fail("Service should be 'create session'");
+		}
+	}
+	
+	public void testIsCreateSessionFalse() {
+		DefaultESBService service=new DefaultESBService(null, null);
+
+		TestESBAction act1=new TestESBAction();
+		
+		service.getActions().add(act1);
+		
+		if (service.isSessionType()) {
+			fail("Service should NOT be 'create session'");
+		}
+	}
+	
+	public void testGetServiceName() {
+		String name="serviceName1";
+		
+		DefaultESBService service=new DefaultESBService(null, null);
+
+		TestESBAction act1=new TestESBAction();
+		act1.setSessionBased(true);
+		act1.setCreateSession(true);
+		act1.setPropertyValue(DefaultESBService.SERVICE_DESCRIPTION_NAME_PROPERTY,
+									name);
+		
+		service.getActions().add(act1);
+		
+		if (service.getServiceDescriptionName().equals(name) == false) {
+			fail("Service name '"+service.getServiceDescriptionName()+
+					"' invalid, expecting: "+name);
+		}		
+	}
+	
+	public void testGetConversationType() {
+		String name="convType1";
+		
+		DefaultESBService service=new DefaultESBService(null, null);
+
+		TestESBAction act1=new TestESBAction();
+		act1.setSessionBased(true);
+		act1.setCreateSession(true);
+		act1.setPropertyValue(DefaultESBService.CONVERSATION_TYPE_PROPERTY,
+									name);
+		
+		service.getActions().add(act1);
+		
+		if (service.getConversationType().equals(name) == false) {
+			fail("Conversation type '"+service.getConversationType()+
+					"' invalid, expecting: "+name);
+		}		
+	}
+	
+	public void testGetSessionName() {
+		String name="session1";
+		
+		DefaultESBService service=new DefaultESBService(null, null);
+
+		TestESBAction act1=new TestESBAction();
+		act1.setSessionBased(true);
+		act1.setPropertyValue(DefaultESBService.BUSINESS_OBJECT_TYPE_PROPERTY,
+									name);
+		
+		service.getActions().add(act1);
+		
+		if (service.getSessionName().equals(name) == false) {
+			fail("Session name '"+service.getSessionName()+
+					"' invalid, expecting: "+name);
+		}		
+	}
+	
+	public void testBaseConfiguration() {
+		String category="category";
+		String name="name";
+		
+		DefaultESBService service=new DefaultESBService(new TestESBLanguageModel(),
+				category, name);
+		
+		org.w3c.dom.Element servElem=service.getService();
+		
+		if (servElem == null) {
+			fail("Service element is null");
+		}
+		
+		if (servElem.getNodeName().equals(DefaultESBService.SERVICE_ELEMENT) == false) {
+			fail("Root element is incorrect: "+servElem.getNodeName());
+		}
+		
+		if (servElem.getAttribute(DefaultESBService.CATEGORY_ATTR).equals(category) == false) {
+			fail("Category invalid: "+servElem.getAttribute(DefaultESBService.CATEGORY_ATTR));
+		}
+		
+		if (servElem.getAttribute(DefaultESBService.NAME_ATTR).equals(name) == false) {
+			fail("Name invalid: "+servElem.getAttribute(DefaultESBService.NAME_ATTR));
+		}
+	}
+	
+	public void testSetInitialBusIdRef() {
+		String category="category";
+		String name="name";
+		String busId="myBusId";
+		
+		DefaultESBService service=new DefaultESBService(new TestESBLanguageModel(),
+				category, name);
+		
+		org.w3c.dom.Element servElem=service.getService();
+		
+		service.setJMSBusIdRef(busId);
+		
+		if (service.getJMSBusIdRef() == null) {
+			fail("Bus id not set");
+		}
+		
+		if (service.getJMSBusIdRef().equals(busId) == false) {
+			fail("Bus Id not '"+busId+"', got: "+service.getJMSBusIdRef());
+		}
+		
+		org.w3c.dom.NodeList nl=servElem.getElementsByTagName(DefaultESBService.JMS_LISTENER_ELEMENT);
+		
+		if (nl.getLength() != 1) {
+			fail("Expecting one JMS listener element, but got: "+
+					nl.getLength());
+		}
+		
+		org.w3c.dom.Element jmslistener=(org.w3c.dom.Element)nl.item(0);
+		
+		if (jmslistener.getParentNode().getNodeName().equals(DefaultESBService.LISTENERS_ELEMENT) == false) {
+			fail("JMS listener parent not expected");
+		}
+		
+		if (jmslistener.getParentNode().getParentNode() != servElem) {
+			fail("JMS listener grandparent should be service");
+		}
+		
+		if (jmslistener.getAttribute(DefaultESBService.BUSIDREF_ATTR).equals(busId) == false) {
+			fail("Bus Id not '"+busId+"', got: "+jmslistener.getAttribute(DefaultESBService.BUSIDREF_ATTR));
+		}
+		
+		if (jmslistener.hasAttribute(DefaultESBService.NAME_ATTR) == false) {
+			fail("Name attribute not set on jms listener");
+		}
+		
+		if (jmslistener.hasAttribute(DefaultESBService.MAX_THREADS_ATTR) == false) {
+			fail("Max Threads attribute not set on jms listener");
+		}		
+	}
+	
+	public void testChangeBusIdRef() {
+		String initialBusId="busId1";
+		String initialName="name1";
+		String initialMaxThreads="2";
+		String changedBusId="busId2";
+		
+		org.w3c.dom.Element top=null;
+		
+		// Create an empty document
+		org.w3c.dom.Document doc=null;
+		try {
+			doc = javax.xml.parsers.DocumentBuilderFactory.
+				newInstance().newDocumentBuilder().newDocument();
+			
+			top = doc.createElement(DefaultESBLanguageModel.TOP_LEVEL_ELEMENT);
+
+		} catch(Exception e) {
+			e.printStackTrace();
+		}
+		
+		org.w3c.dom.Element services=doc.createElement(DefaultESBLanguageModel.SERVICES_ELEMENT);
+		top.appendChild(services);
+		
+		org.w3c.dom.Element serviceElem=doc.createElement(DefaultESBLanguageModel.SERVICE_ELEMENT);
+		services.appendChild(serviceElem);
+		
+		org.w3c.dom.Element listeners=doc.createElement(DefaultESBService.LISTENERS_ELEMENT);
+		serviceElem.appendChild(listeners);
+		
+		org.w3c.dom.Element jmslistener=doc.createElement(DefaultESBService.JMS_LISTENER_ELEMENT);
+		listeners.appendChild(jmslistener);
+		
+		jmslistener.setAttribute(DefaultESBService.BUSIDREF_ATTR, initialBusId);
+		jmslistener.setAttribute(DefaultESBService.NAME_ATTR, initialName);
+		jmslistener.setAttribute(DefaultESBService.MAX_THREADS_ATTR, initialMaxThreads);
+		
+		DefaultESBService service=new DefaultESBService(new TestESBLanguageModel(),
+				serviceElem);
+		
+		if (service.getJMSBusIdRef() == null) {
+			fail("JMS bus id not set");
+		}
+		
+		if (service.getJMSBusIdRef().equals(initialBusId) == false) {
+			fail("JMS bus id not '"+initialBusId+"', got: "+service.getJMSBusIdRef());
+		}
+		
+		service.setJMSBusIdRef(changedBusId);
+		
+		if (service.getJMSBusIdRef().equals(changedBusId) == false) {
+			fail("Changed JMS bus id not '"+changedBusId+"', got: "+service.getJMSBusIdRef());
+		}
+		
+		if (jmslistener.getAttribute(DefaultESBService.BUSIDREF_ATTR).equals(changedBusId)==false) {
+			fail("Changed bus id not reflected in element");
+		}
+		
+		if (jmslistener.getAttribute(DefaultESBService.NAME_ATTR).equals(initialName)==false) {
+			fail("Name attribute incorrect");
+		}
+		
+		if (jmslistener.getAttribute(DefaultESBService.MAX_THREADS_ATTR).equals(initialMaxThreads)==false) {
+			fail("MaxThreads attribute incorrect");
+		}
+	}
+}

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/TestESBAction.java (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/TestESBAction.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/TestESBAction.java	                        (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/TestESBAction.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -0,0 +1,120 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ */
+package org.jboss.savara.tools.jbossesb.model;
+
+import java.util.List;
+
+import org.jboss.savara.tools.jbossesb.model.ConversionContext;
+import org.jboss.savara.tools.jbossesb.model.ESBAction;
+import org.scribble.model.Activity;
+import org.scribble.model.admin.ModelListener;
+import org.w3c.dom.Element;
+
+public class TestESBAction implements ESBAction {
+
+	public void convert(List<Activity> activities, ConversionContext context) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	public Element getAction() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public String getActionClass() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public String getPropertyValue(String property) {
+		return(m_property.get(property));
+	}
+
+	public void setPropertyValue(String property, String value) {
+		m_property.put(property, value);
+	}
+
+	public void initializeLinks() {
+		// TODO Auto-generated method stub
+		
+	}
+
+	public boolean isInitiator() {
+		return(m_initiator);
+	}
+	
+	public void setInitiator(boolean initiator) {
+		m_initiator = initiator;
+	}
+	
+	public boolean isLoop() {
+		return(m_loop);
+	}
+	
+	public void setLoop(boolean bool) {
+		m_loop = bool;
+	}
+
+	public boolean isPerform() {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	public boolean isSessionBased() {
+		return(m_sessionBased);
+	}
+	
+	public void setSessionBased(boolean bool) {
+		m_sessionBased = bool;
+	}
+
+	public boolean isSessionType() {
+		return(m_createSession);
+	}
+	
+	public void setCreateSession(boolean bool) {
+		m_createSession = bool;
+	}
+	
+	public boolean isGateway() {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	public boolean isStateless() {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	public boolean hasProperty(String property) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	public void validate(ModelListener l) {
+		// TODO Auto-generated method stub
+		
+	}
+	
+	private boolean m_sessionBased=false;
+	private boolean m_loop=false;
+	private boolean m_initiator=false;
+	private boolean m_createSession=false;
+	private java.util.Map<String,String> m_property=new java.util.Hashtable<String, String>();
+}

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/TestESBLanguageModel.java (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/TestESBLanguageModel.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/TestESBLanguageModel.java	                        (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/TestESBLanguageModel.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -0,0 +1,119 @@
+/*
+ * 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.jbossesb.model;
+
+import java.util.Collection;
+
+import org.jboss.savara.tools.jbossesb.model.DefaultESBLanguageModel;
+import org.jboss.savara.tools.jbossesb.model.DefaultESBService;
+import org.jboss.savara.tools.jbossesb.model.ESBService;
+import org.scribble.model.ModelReference;
+import org.scribble.model.admin.ModelListener;
+import org.w3c.dom.Element;
+
+public class TestESBLanguageModel extends org.scribble.lang.model.LanguageModel
+		implements org.jboss.savara.tools.jbossesb.model.ESBLanguageModel {
+
+	public TestESBLanguageModel() {
+		org.w3c.dom.Document doc=null;
+		
+		// Create an empty document
+		try {
+			doc = javax.xml.parsers.DocumentBuilderFactory.
+				newInstance().newDocumentBuilder().newDocument();
+			
+			m_esbConfig = doc.createElement(DefaultESBLanguageModel.TOP_LEVEL_ELEMENT);
+
+		} catch(Exception e) {
+			e.printStackTrace();
+		}
+	}
+	public String getOriginalContents() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public ModelReference getModelReference() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public ESBService createService(String category, String name) {
+		TestESBService ret=new TestESBService(category, name);
+		
+		org.w3c.dom.Element service=m_esbConfig.getOwnerDocument().
+					createElement(DefaultESBService.SERVICE_ELEMENT);
+		m_esbConfig.appendChild(service);
+		
+		ret.setService(service);
+		
+		return(ret);
+	}
+
+	public void addService(ESBService service) {
+		m_services.put(service.getCategory()+":"+service.getName(), service);
+	}
+	
+	public void removeService(ESBService service) {
+		m_services.remove(service.getCategory()+":"+service.getName());
+	}
+	
+	public ESBService getService(String category, String name) {
+		return(m_services.get(category+":"+name));
+	}
+
+	public Collection<ESBService> getServices() {
+		return(m_services.values());
+	}
+
+	public ESBService getGatewayService() {
+		return(m_gatewayService);
+	}
+	
+	public void setGatewayService(ESBService gw) {
+		m_gatewayService = gw;
+	}
+
+	public void validate(ModelListener l) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	public String getUniqueServiceName(String category, String name) {
+		return("serviceName__"+m_count++);
+	}
+
+	public Element getESBConfiguration() {
+		return(m_esbConfig);
+	}
+
+	public String getJMSDefinition(String jmsBusId) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public boolean isStateless() {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	private java.util.Map<String,ESBService> m_services=new java.util.Hashtable<String,ESBService>();
+	private ESBService m_gatewayService=null;
+	private org.w3c.dom.Element m_esbConfig=null;
+	private int m_count=0;
+}

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/TestESBService.java (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/TestESBService.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/TestESBService.java	                        (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/TestESBService.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -0,0 +1,228 @@
+/*
+ * 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.jbossesb.model;
+
+import java.util.List;
+
+import org.jboss.savara.tools.jbossesb.model.ConversionContext;
+import org.jboss.savara.tools.jbossesb.model.ESBAction;
+import org.jboss.savara.tools.jbossesb.model.ESBLanguageModel;
+import org.scribble.conversation.model.*;
+import org.scribble.model.*;
+import org.scribble.model.admin.ModelListener;
+import org.w3c.dom.Element;
+
+public class TestESBService extends ModelObject
+		implements org.jboss.savara.tools.jbossesb.model.ESBService {
+
+	public TestESBService() {
+	}
+	
+	public TestESBService(String category, String name) {
+		m_category = category;
+		m_name = name;
+	}
+	
+	public void convert(List<Activity> activities, ConversionContext context) {
+		activities.addAll(m_contents);
+	}
+	
+	public Conversation convert(ConversionContext context) {
+		return(null);
+	}
+	
+	public List<Activity> getContents() {
+		return(m_contents);
+	}
+
+	public List<ESBAction> getActions() {
+		return(m_actions);
+	}
+
+	public void setCategory(String cat) {
+		m_category = cat;
+	}
+	
+	public String getCategory() {
+		return(m_category);
+	}
+
+	public void setConversationType(String type) {
+		m_conversationType = type;
+	}
+	
+	public String getConversationType() {
+		return(m_conversationType);
+	}
+
+	public void setName(String name) {
+		m_name = name;
+	}
+	
+	public String getName() {
+		return(m_name);
+	}
+	
+	public void setModel(ESBLanguageModel model) {
+		m_model = model;
+	}
+
+	public ESBLanguageModel getModel() {
+		return(m_model);
+	}
+	
+	public Element getService() {
+		return(m_service);
+	}
+	
+	public void setService(Element service) {
+		m_service = service;
+	}
+
+	public ClassLoader getServiceClassLoader() throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public String getServiceDescriptionName() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public int getServicePosition() {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	public void setSessionClass(Class<?> cls) {
+		m_sessionClass = cls;
+	}
+	
+	public Class<?> getSessionClass() {
+		return(m_sessionClass);
+	}
+
+	public String getSessionName() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public void initializeLinks() {
+		// TODO Auto-generated method stub
+		
+	}
+
+	public void setLoop(boolean bool) {
+		m_loop = bool;
+	}
+
+	public boolean isLoop() {
+		return(m_loop);
+	}
+
+	public void setRoot(boolean bool) {
+		m_root = bool;
+	}
+	
+	public boolean isRoot() {
+		return(m_root);
+	}
+
+	public boolean isStateless() {
+		// TODO Auto-generated method stub
+		return false;
+	}
+	
+	public void setCreateSession(boolean bool) {
+		m_createSession = bool;
+	}
+	
+	public boolean isSessionType() {
+		return(m_createSession);
+	}
+	
+	public void setSessionBased(boolean bool) {
+		m_sessionBased = bool;
+	}
+	
+	public boolean isSessionBased() {
+		return(m_sessionBased);
+	}
+
+	public ESBAction getFirstSessionBasedAction() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public boolean isGateway() {
+		return(m_gateway);
+	}
+
+	public void setGateway(boolean gw) {
+		m_gateway = gw;	
+	}
+	
+	public ESBAction getGatewayAction() {
+		return(m_gatewayAction);
+	}
+	
+	public void setGatewayAction(ESBAction act) {
+		m_gatewayAction = act;
+	}
+
+	public void validate(ModelListener l) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	public String getJMSBusIdRef() {
+		return(m_jmsBusIdRef);
+	}
+	
+	public void setJMSBusIdRef(String busId) {
+		m_jmsBusIdRef = busId;
+	}
+
+	public void addAction(ESBAction action, int pos) {
+		if (pos == -1) {
+			m_actions.add(action);
+		} else {
+			m_actions.add(pos, action);
+		}
+	}
+
+	public boolean removeAction(ESBAction action) {
+		return(m_actions.remove(action));
+	}
+
+	private String m_category=null;
+	private String m_name=null;
+	private ESBLanguageModel m_model=null;
+	private Element m_service;
+	private List<ESBAction> m_actions=new java.util.Vector<ESBAction>();
+	private boolean m_root=false;
+	private boolean m_gateway=false;
+	private ESBAction m_gatewayAction=null;
+	private boolean m_loop=false;
+	private boolean m_sessionBased=false;
+	private boolean m_createSession=false;
+	private Class<?> m_sessionClass=null;
+	private String m_conversationType=null;
+	private List<Activity> m_contents=new java.util.Vector<Activity>();
+	private String m_jmsBusIdRef=null;
+}

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/TestModelListener.java (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/TestModelListener.java)
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/TestModelListener.java	                        (rev 0)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/TestModelListener.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -0,0 +1,83 @@
+/*
+ * 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.jbossesb.model;
+
+import org.scribble.model.ModelObject;
+import org.scribble.model.admin.ModelIssue;
+
+public class TestModelListener implements org.scribble.model.admin.ModelListener {
+
+	public void error(ModelIssue issue) {
+		reported(issue.getMessage());
+	}
+
+	public void warning(ModelIssue issue) {
+		reported(issue.getMessage());
+	}
+	
+	protected void reported(String mesg) {
+		if (mesg != null) {
+			
+			// Check if in the list of messages to be
+			// detected
+			if (m_errorsToDetect.contains(mesg)) {
+				m_errorsToDetect.remove(mesg);
+			} else {
+				m_unexpectedErrors.add(mesg);
+			}
+		}		
+	}
+
+	public void addExpectedError(String mesg) {
+		m_errorsToDetect.add(mesg);
+	}
+	
+	public boolean isValid() {
+		// If there are no more errors to detect, and no
+		// unexpected errors have been reported, then
+		// the expression has been validated as expected
+		return(m_errorsToDetect.size() == 0 &&
+				m_unexpectedErrors.size() == 0);
+	}
+	
+	public String invalidMessage() {
+		String ret="\r\n";
+		
+		if (m_errorsToDetect.size() > 0) {
+			ret += "Errors not detected:\r\n";
+			
+			for (int i=0; i < m_errorsToDetect.size(); i++) {
+				ret += m_errorsToDetect.get(i)+"\r\n";
+			}
+		}
+		
+		if (m_unexpectedErrors.size() > 0) {
+			ret += "Unexpected Errors:\r\n";
+			
+			for (int i=0; i < m_unexpectedErrors.size(); i++) {
+				ret += m_unexpectedErrors.get(i)+"\r\n";
+			}
+		}
+		
+		return(ret);
+	}
+
+	private java.util.List<String> m_errorsToDetect=new java.util.Vector<String>();
+	private java.util.List<String> m_unexpectedErrors=new java.util.Vector<String>();
+	private java.util.List<String> m_messages=new java.util.Vector<String>();
+}

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/actions (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions)

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/actions/ESBActionTestUtil.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/ESBActionTestUtil.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/actions/ESBActionTestUtil.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,7 +15,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.actions;
+package org.jboss.savara.tools.jbossesb.model.actions;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/actions/TestActivity.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/TestActivity.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/actions/TestActivity.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,7 +15,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.actions;
+package org.jboss.savara.tools.jbossesb.model.actions;
 
 public class TestActivity extends org.scribble.model.Activity {
 

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/change/stateful (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful)

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/change/stateful/ConversationInteractionModelChangeRuleTest.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/ConversationInteractionModelChangeRuleTest.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/change/stateful/ConversationInteractionModelChangeRuleTest.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,14 +15,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateful;
+package org.jboss.savara.tools.jbossesb.model.change.stateful;
 
 import junit.framework.TestCase;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateful.ConversationInteractionModelChangeRule;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.InteractionUtil;
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.change.stateful.ConversationInteractionModelChangeRule;
+import org.jboss.savara.tools.jbossesb.model.stateful.actions.*;
+import org.jboss.savara.tools.jbossesb.model.util.InteractionUtil;
 import org.scribble.model.*;
 import org.scribble.model.change.*;
 import org.scribble.conversation.model.*;

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/change/stateful/IfModelChangeRuleTest.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/IfModelChangeRuleTest.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/change/stateful/IfModelChangeRuleTest.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,13 +15,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateful;
+package org.jboss.savara.tools.jbossesb.model.change.stateful;
 
 import junit.framework.TestCase;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateful.IfModelChangeRule;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions.*;
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.change.stateful.IfModelChangeRule;
+import org.jboss.savara.tools.jbossesb.model.stateful.actions.*;
 import org.scribble.model.*;
 import org.scribble.model.change.*;
 import org.scribble.conversation.model.*;

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/change/stateful/ParallelModelChangeRuleTest.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/ParallelModelChangeRuleTest.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/change/stateful/ParallelModelChangeRuleTest.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,13 +15,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateful;
+package org.jboss.savara.tools.jbossesb.model.change.stateful;
 
 import junit.framework.TestCase;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateful.ParallelModelChangeRule;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions.*;
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.change.stateful.ParallelModelChangeRule;
+import org.jboss.savara.tools.jbossesb.model.stateful.actions.*;
 import org.scribble.model.*;
 import org.scribble.model.analysis.*;
 import org.scribble.model.change.*;

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/change/stateful/RunModelChangeRuleTest.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/RunModelChangeRuleTest.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/change/stateful/RunModelChangeRuleTest.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,15 +15,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateful;
+package org.jboss.savara.tools.jbossesb.model.change.stateful;
 
 import junit.framework.TestCase;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateful.RunModelChangeRule;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.ConversationUtil;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.InteractionUtil;
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.change.stateful.RunModelChangeRule;
+import org.jboss.savara.tools.jbossesb.model.stateful.actions.*;
+import org.jboss.savara.tools.jbossesb.model.util.ConversationUtil;
+import org.jboss.savara.tools.jbossesb.model.util.InteractionUtil;
 import org.scribble.model.*;
 import org.scribble.model.change.*;
 import org.scribble.conversation.model.*;

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/change/stateful/SpawnModelChangeRuleTest.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/SpawnModelChangeRuleTest.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/change/stateful/SpawnModelChangeRuleTest.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,16 +15,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateful;
+package org.jboss.savara.tools.jbossesb.model.change.stateful;
 
 import junit.framework.TestCase;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateful.RunModelChangeRule;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateful.SpawnModelChangeRule;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.ConversationUtil;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.InteractionUtil;
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.change.stateful.RunModelChangeRule;
+import org.jboss.savara.tools.jbossesb.model.change.stateful.SpawnModelChangeRule;
+import org.jboss.savara.tools.jbossesb.model.stateful.actions.*;
+import org.jboss.savara.tools.jbossesb.model.util.ConversationUtil;
+import org.jboss.savara.tools.jbossesb.model.util.InteractionUtil;
 import org.scribble.model.*;
 import org.scribble.model.change.*;
 import org.scribble.conversation.model.*;

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/change/stateful/WhenModelChangeRuleTest.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/WhenModelChangeRuleTest.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/change/stateful/WhenModelChangeRuleTest.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,13 +15,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateful;
+package org.jboss.savara.tools.jbossesb.model.change.stateful;
 
 import junit.framework.TestCase;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateful.WhenModelChangeRule;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions.*;
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.change.stateful.WhenModelChangeRule;
+import org.jboss.savara.tools.jbossesb.model.stateful.actions.*;
 import org.scribble.model.*;
 import org.scribble.model.change.*;
 import org.scribble.conversation.model.*;

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/change/stateful/WhileModelChangeRuleTest.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/WhileModelChangeRuleTest.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/change/stateful/WhileModelChangeRuleTest.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,13 +15,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateful;
+package org.jboss.savara.tools.jbossesb.model.change.stateful;
 
 import junit.framework.TestCase;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.change.stateful.WhileModelChangeRule;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions.*;
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.change.stateful.WhileModelChangeRule;
+import org.jboss.savara.tools.jbossesb.model.stateful.actions.*;
 import org.scribble.model.*;
 import org.scribble.model.analysis.TestLookaheadAnalyser;
 import org.scribble.model.change.*;

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/stateful/actions)

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions/CreateSessionActionTest.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/stateful/actions/CreateSessionActionTest.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions/CreateSessionActionTest.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,14 +15,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions;
+package org.jboss.savara.tools.jbossesb.model.stateful.actions;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.TestESBLanguageModel;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.TestESBService;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.TestModelListener;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.actions.ESBActionTestUtil;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions.CreateSessionAction;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions.UnsupportedAction;
+import org.jboss.savara.tools.jbossesb.model.TestESBLanguageModel;
+import org.jboss.savara.tools.jbossesb.model.TestESBService;
+import org.jboss.savara.tools.jbossesb.model.TestModelListener;
+import org.jboss.savara.tools.jbossesb.model.actions.ESBActionTestUtil;
+import org.jboss.savara.tools.jbossesb.model.stateful.actions.CreateSessionAction;
+import org.jboss.savara.tools.jbossesb.model.stateful.actions.UnsupportedAction;
 
 import junit.framework.TestCase;
 

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions/IfActionTest.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/stateful/actions/IfActionTest.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions/IfActionTest.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,16 +15,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions;
+package org.jboss.savara.tools.jbossesb.model.stateful.actions;
 
 import junit.framework.TestCase;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.TestESBLanguageModel;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.TestESBService;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.TestModelListener;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.actions.ESBActionTestUtil;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.actions.TestActivity;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions.IfAction;
+import org.jboss.savara.tools.jbossesb.model.TestESBLanguageModel;
+import org.jboss.savara.tools.jbossesb.model.TestESBService;
+import org.jboss.savara.tools.jbossesb.model.TestModelListener;
+import org.jboss.savara.tools.jbossesb.model.actions.ESBActionTestUtil;
+import org.jboss.savara.tools.jbossesb.model.actions.TestActivity;
+import org.jboss.savara.tools.jbossesb.model.stateful.actions.IfAction;
 import org.scribble.model.*;
 import org.scribble.conversation.model.*;
 

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions/MessageRouterActionTest.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/stateful/actions/MessageRouterActionTest.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions/MessageRouterActionTest.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,13 +15,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions;
+package org.jboss.savara.tools.jbossesb.model.stateful.actions;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.TestESBLanguageModel;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.TestESBService;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.TestModelListener;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.actions.ESBActionTestUtil;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions.MessageRouterAction;
+import org.jboss.savara.tools.jbossesb.model.TestESBLanguageModel;
+import org.jboss.savara.tools.jbossesb.model.TestESBService;
+import org.jboss.savara.tools.jbossesb.model.TestModelListener;
+import org.jboss.savara.tools.jbossesb.model.actions.ESBActionTestUtil;
+import org.jboss.savara.tools.jbossesb.model.stateful.actions.MessageRouterAction;
 
 import junit.framework.TestCase;
 

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions/ParallelActionTest.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/stateful/actions/ParallelActionTest.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions/ParallelActionTest.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,14 +15,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions;
+package org.jboss.savara.tools.jbossesb.model.stateful.actions;
 
 import org.scribble.conversation.model.*;
 import org.scribble.model.Activity;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.actions.ESBActionTestUtil;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.actions.TestActivity;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions.ParallelAction;
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.actions.ESBActionTestUtil;
+import org.jboss.savara.tools.jbossesb.model.actions.TestActivity;
+import org.jboss.savara.tools.jbossesb.model.stateful.actions.ParallelAction;
 
 import junit.framework.TestCase;
 

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions/PerformActionTest.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/stateful/actions/PerformActionTest.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions/PerformActionTest.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,14 +15,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions;
+package org.jboss.savara.tools.jbossesb.model.stateful.actions;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.TestESBLanguageModel;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.TestESBService;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.TestModelListener;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.actions.ESBActionTestUtil;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.actions.TestActivity;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions.PerformAction;
+import org.jboss.savara.tools.jbossesb.model.TestESBLanguageModel;
+import org.jboss.savara.tools.jbossesb.model.TestESBService;
+import org.jboss.savara.tools.jbossesb.model.TestModelListener;
+import org.jboss.savara.tools.jbossesb.model.actions.ESBActionTestUtil;
+import org.jboss.savara.tools.jbossesb.model.actions.TestActivity;
+import org.jboss.savara.tools.jbossesb.model.stateful.actions.PerformAction;
 import org.scribble.conversation.model.*;
 import org.scribble.model.Activity;
 

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions/ReceiveMessageActionTest.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/stateful/actions/ReceiveMessageActionTest.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions/ReceiveMessageActionTest.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,12 +15,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions;
+package org.jboss.savara.tools.jbossesb.model.stateful.actions;
 
 import org.scribble.model.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.actions.ESBActionTestUtil;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions.ReceiveMessageAction;
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.actions.ESBActionTestUtil;
+import org.jboss.savara.tools.jbossesb.model.stateful.actions.ReceiveMessageAction;
 
 import junit.framework.TestCase;
 

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions/RetrieveSessionActionTest.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/stateful/actions/RetrieveSessionActionTest.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions/RetrieveSessionActionTest.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,13 +15,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions;
+package org.jboss.savara.tools.jbossesb.model.stateful.actions;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.TestESBService;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.TestModelListener;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.actions.ESBActionTestUtil;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions.RetrieveSessionAction;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions.UnsupportedAction;
+import org.jboss.savara.tools.jbossesb.model.TestESBService;
+import org.jboss.savara.tools.jbossesb.model.TestModelListener;
+import org.jboss.savara.tools.jbossesb.model.actions.ESBActionTestUtil;
+import org.jboss.savara.tools.jbossesb.model.stateful.actions.RetrieveSessionAction;
+import org.jboss.savara.tools.jbossesb.model.stateful.actions.UnsupportedAction;
 
 import junit.framework.TestCase;
 

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions/ScheduleStateActionTest.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/stateful/actions/ScheduleStateActionTest.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions/ScheduleStateActionTest.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,13 +15,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions;
+package org.jboss.savara.tools.jbossesb.model.stateful.actions;
 
 import org.scribble.model.Activity;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.actions.ESBActionTestUtil;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.actions.TestActivity;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions.ScheduleStateAction;
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.actions.ESBActionTestUtil;
+import org.jboss.savara.tools.jbossesb.model.actions.TestActivity;
+import org.jboss.savara.tools.jbossesb.model.stateful.actions.ScheduleStateAction;
 
 import junit.framework.TestCase;
 

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions/SendMessageActionTest.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/stateful/actions/SendMessageActionTest.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions/SendMessageActionTest.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,14 +15,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions;
+package org.jboss.savara.tools.jbossesb.model.stateful.actions;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.DefaultConversionContext;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.TestESBLanguageModel;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.TestESBService;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.TestModelListener;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.actions.ESBActionTestUtil;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions.SendMessageAction;
+import org.jboss.savara.tools.jbossesb.model.DefaultConversionContext;
+import org.jboss.savara.tools.jbossesb.model.TestESBLanguageModel;
+import org.jboss.savara.tools.jbossesb.model.TestESBService;
+import org.jboss.savara.tools.jbossesb.model.TestModelListener;
+import org.jboss.savara.tools.jbossesb.model.actions.ESBActionTestUtil;
+import org.jboss.savara.tools.jbossesb.model.stateful.actions.SendMessageAction;
 import org.scribble.model.Activity;
 import org.scribble.model.Interaction;
 import org.scribble.model.TypeReference;

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions/SetMessageActionTest.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/stateful/actions/SetMessageActionTest.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions/SetMessageActionTest.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,12 +15,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions;
+package org.jboss.savara.tools.jbossesb.model.stateful.actions;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.TestESBService;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.TestModelListener;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.actions.ESBActionTestUtil;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions.SetMessageAction;
+import org.jboss.savara.tools.jbossesb.model.TestESBService;
+import org.jboss.savara.tools.jbossesb.model.TestModelListener;
+import org.jboss.savara.tools.jbossesb.model.actions.ESBActionTestUtil;
+import org.jboss.savara.tools.jbossesb.model.stateful.actions.SetMessageAction;
 
 import junit.framework.TestCase;
 

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions/SetStateActionTest.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/stateful/actions/SetStateActionTest.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions/SetStateActionTest.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,12 +15,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions;
+package org.jboss.savara.tools.jbossesb.model.stateful.actions;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.TestESBService;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.TestModelListener;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.actions.ESBActionTestUtil;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions.SetStateAction;
+import org.jboss.savara.tools.jbossesb.model.TestESBService;
+import org.jboss.savara.tools.jbossesb.model.TestModelListener;
+import org.jboss.savara.tools.jbossesb.model.actions.ESBActionTestUtil;
+import org.jboss.savara.tools.jbossesb.model.stateful.actions.SetStateAction;
 
 import junit.framework.TestCase;
 

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions/SwitchActionTest.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/stateful/actions/SwitchActionTest.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions/SwitchActionTest.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,14 +15,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions;
+package org.jboss.savara.tools.jbossesb.model.stateful.actions;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.TestESBLanguageModel;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.TestESBService;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.TestModelListener;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.actions.ESBActionTestUtil;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.actions.TestActivity;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions.SwitchAction;
+import org.jboss.savara.tools.jbossesb.model.TestESBLanguageModel;
+import org.jboss.savara.tools.jbossesb.model.TestESBService;
+import org.jboss.savara.tools.jbossesb.model.TestModelListener;
+import org.jboss.savara.tools.jbossesb.model.actions.ESBActionTestUtil;
+import org.jboss.savara.tools.jbossesb.model.actions.TestActivity;
+import org.jboss.savara.tools.jbossesb.model.stateful.actions.SwitchAction;
 import org.scribble.conversation.model.If;
 import org.scribble.model.Activity;
 

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions/WhenActionTest.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/stateful/actions/WhenActionTest.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions/WhenActionTest.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,14 +15,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions;
+package org.jboss.savara.tools.jbossesb.model.stateful.actions;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.TestESBLanguageModel;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.TestESBService;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.TestModelListener;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.actions.ESBActionTestUtil;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.actions.TestActivity;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions.WhenAction;
+import org.jboss.savara.tools.jbossesb.model.TestESBLanguageModel;
+import org.jboss.savara.tools.jbossesb.model.TestESBService;
+import org.jboss.savara.tools.jbossesb.model.TestModelListener;
+import org.jboss.savara.tools.jbossesb.model.actions.ESBActionTestUtil;
+import org.jboss.savara.tools.jbossesb.model.actions.TestActivity;
+import org.jboss.savara.tools.jbossesb.model.stateful.actions.WhenAction;
 import org.scribble.conversation.model.*;
 import org.scribble.model.*;
 

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions/WhileActionTest.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/stateful/actions/WhileActionTest.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/stateful/actions/WhileActionTest.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -15,14 +15,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions;
+package org.jboss.savara.tools.jbossesb.model.stateful.actions;
 
 import org.scribble.conversation.model.*;
 import org.scribble.model.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.actions.ESBActionTestUtil;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.actions.TestActivity;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions.WhileAction;
+import org.jboss.savara.tools.jbossesb.model.*;
+import org.jboss.savara.tools.jbossesb.model.actions.ESBActionTestUtil;
+import org.jboss.savara.tools.jbossesb.model.actions.TestActivity;
+import org.jboss.savara.tools.jbossesb.model.stateful.actions.WhileAction;
 
 import junit.framework.TestCase;
 

Copied: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/util (from rev 764, cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/util)

Modified: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/util/ESBModelUtilTest.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/util/ESBModelUtilTest.java	2009-08-18 11:57:46 UTC (rev 764)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/savara/tools/jbossesb/model/util/ESBModelUtilTest.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -17,9 +17,9 @@
  * Change History:
  * 21 Aug 2008 : Initial version created by gary
  */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util;
+package org.jboss.savara.tools.jbossesb.model.util;
 
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.ESBModelUtil;
+import org.jboss.savara.tools.jbossesb.model.util.ESBModelUtil;
 
 import junit.framework.TestCase;
 

Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultConversionContextTest.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultConversionContextTest.java	2009-08-20 10:12:35 UTC (rev 783)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultConversionContextTest.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -1,116 +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.runtime.jbossesb.model;
-
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.DefaultConversionContext;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.DefaultESBService;
-
-import junit.framework.TestCase;
-
-public class DefaultConversionContextTest extends TestCase {
-
-	public void testIsJoin() {
-		DefaultESBService service=new DefaultESBService(null, null);
-		
-		DefaultConversionContext context=new DefaultConversionContext(null);
-		context.markJoin(service);
-		
-		if (context.isJoin(service) == false) {
-			fail("Service should be join");
-		}
-	}
-
-	public void testIsJoinFalse() {
-		DefaultESBService service=new DefaultESBService(null, null);
-		
-		DefaultConversionContext context=new DefaultConversionContext(null);
-		
-		if (context.isJoin(service)) {
-			fail("Service should not be join");
-		}
-	}
-	
-	public void testJoinProcessing() {
-		DefaultESBService service=new DefaultESBService(null, null);
-		
-		DefaultConversionContext context=new DefaultConversionContext(null);
-		context.markJoin(service);
-		
-		if (context.isJoin(service) == false) {
-			fail("Service should be join");
-		}
-		
-		context.processing(service);
-		
-		if (context.isJoin(service)) {
-			fail("Service should no longer be marked as join");
-		}		
-	}
-
-	public void testIsOnStack() {
-		DefaultESBService service=new DefaultESBService(null, null);
-		
-		DefaultConversionContext context=new DefaultConversionContext(null);
-		context.push(service);
-		
-		if (context.isOnStack(service) == false) {
-			fail("Service should be on stack");
-		}
-	}
-
-	public void testIsOnStackFalse() {
-		DefaultESBService service=new DefaultESBService(null, null);
-		
-		DefaultConversionContext context=new DefaultConversionContext(null);
-		
-		if (context.isOnStack(service)) {
-			fail("Service should not be on stack");
-		}
-	}
-	
-	public void testStackPushPop() {
-		DefaultESBService service=new DefaultESBService(null, null);
-		
-		DefaultConversionContext context=new DefaultConversionContext(null);
-		context.push(service);
-		
-		if (context.isOnStack(service) == false) {
-			fail("Service should be on stack");
-		}
-		
-		context.pop(service);
-
-		if (context.isOnStack(service)) {
-			fail("Service should no longer be on stack after pop");
-		}
-	}
-
-	public void testGetRole() {
-		String role="myRole";
-		
-		DefaultConversionContext context=new DefaultConversionContext(role);
-		
-		if (context.getRole() == null) {
-			fail("Role is null");
-		}
-		
-		if (context.getRole().equals(role) == false) {
-			fail("Role should be '"+role+"', but got: "+context.getRole());
-		}
-	}
-}

Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBLanguageModelTest.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBLanguageModelTest.java	2009-08-20 10:12:35 UTC (rev 783)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBLanguageModelTest.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -1,270 +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.runtime.jbossesb.model;
-
-import junit.framework.TestCase;
-
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.DefaultESBLanguageModel;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.ESBLanguageModel;
-import org.scribble.model.*;
-
-public class DefaultESBLanguageModelTest extends TestCase {
-
-	public void testBaseConfiguration() {
-		
-		ModelReference ref=new ModelReference(JBossESBNotation.NOTATION_CODE);
-		
-		DefaultESBLanguageModel model=new DefaultESBLanguageModel(ref, false);
-		
-		org.w3c.dom.Element config=model.getESBConfiguration();
-		
-		if (config.getNodeName().equals(DefaultESBLanguageModel.TOP_LEVEL_ELEMENT) == false) {
-			fail("Top level element should be '"+
-					DefaultESBLanguageModel.TOP_LEVEL_ELEMENT+"' but found: "+
-					config.getNodeName());
-		}
-		
-		boolean f_providers=false;
-		boolean f_services=false;
-		
-		org.w3c.dom.NodeList nl=config.getChildNodes();
-		
-		for (int i=0; i < nl.getLength(); i++) {
-			if (nl.item(i) instanceof org.w3c.dom.Element) {
-				org.w3c.dom.Element elem=
-					(org.w3c.dom.Element)nl.item(i);
-				
-				if (elem.getNodeName().equals(DefaultESBLanguageModel.PROVIDERS_ELEMENT)) {
-					
-					if (f_providers) {
-						fail("Duplicate '"+DefaultESBLanguageModel.PROVIDERS_ELEMENT+"' elements");
-					} else {
-						
-						// Check if jms provider defined
-						org.w3c.dom.NodeList nl2=
-							elem.getChildNodes();
-						boolean f_jmsProvider=false;
-						
-						for (int j=0; j < nl2.getLength(); j++) {
-							if (nl2.item(j) instanceof org.w3c.dom.Element) {
-								
-								if (nl2.item(j).getNodeName().equals(
-											DefaultESBLanguageModel.JMS_PROVIDER_ELEMENT)) {
-								
-									if (f_jmsProvider) {
-										fail("JMS Provider already defined");
-									}
-									
-									f_jmsProvider = true;
-								} else {
-									fail("Unknown provider element: "+
-											nl2.item(j).getNodeName());
-								}
-							}
-						}
-						
-						if (f_jmsProvider == false) {
-							fail("JMS provider not defined");
-						}
-					}
-					
-					f_providers = true;
-				} else if (elem.getNodeName().equals(DefaultESBLanguageModel.SERVICES_ELEMENT)) {
-					
-					if (f_services) {
-						fail("Duplicate '"+DefaultESBLanguageModel.SERVICES_ELEMENT+"' elements");
-					}
-					
-					f_services = true;
-				} else {
-					fail("Unknown element: "+nl.item(i).getNodeName());
-				}
-			}
-		}
-		
-		if (f_providers == false) {
-			fail("Element '"+DefaultESBLanguageModel.PROVIDERS_ELEMENT+"' not found");
-		}
-		
-		if (f_services == false) {
-			fail("Element '"+DefaultESBLanguageModel.SERVICES_ELEMENT+"' not found");
-		}
-	}
-	
-	public void testAddService() {
-		String busId="TestBusId";
-		String category="category.one";
-		String name="serviceName";
-		
-		ModelReference ref=new ModelReference(JBossESBNotation.NOTATION_CODE);
-		
-		DefaultESBLanguageModel model=new DefaultESBLanguageModel(ref, false);
-		
-		org.w3c.dom.Element config=model.getESBConfiguration();
-		
-		TestESBService service=new TestESBService();
-		service.setJMSBusIdRef(busId);
-		service.setCategory(category);
-		service.setName(name);
-		
-		model.addService(service);
-		
-		if (service.getJMSBusIdRef() == null) {
-			fail("JMS BusIdRef not set");
-		}
-		
-		if (service.getJMSBusIdRef().equals(busId) == false) {
-			fail("Bus Id should be '"+busId+"', but got: "+service.getJMSBusIdRef());
-		}
-		
-		// Check that the jms bus id has been created
-		org.w3c.dom.NodeList nl=config.getElementsByTagName(
-						DefaultESBLanguageModel.JMS_PROVIDER_ELEMENT);
-
-		if (nl.getLength() != 1) {
-			fail("JMS provider element not found");
-		}
-		
-		org.w3c.dom.Element provider=(org.w3c.dom.Element)nl.item(0);
-		
-		nl = provider.getElementsByTagName(
-				DefaultESBLanguageModel.JMS_BUS_ELEMENT);
-
-		if (nl.getLength() != 1) {
-			fail("JMS bus element not found");
-		}
-
-		org.w3c.dom.Element bus=(org.w3c.dom.Element)nl.item(0);
-
-		if (bus.getAttribute("busid").equals(busId) == false) {
-			fail("Bus had invalid busid '"+bus.getAttribute("busid")+
-					"', was expecting: "+busId);
-		}
-		
-		if (bus.getParentNode() != provider) {
-			fail("Bus not contained directly within provider");
-		}
-		
-		// Check bus retrieved directly
-		org.w3c.dom.Element bus2=model.findJMSBus(busId);
-		
-		if (bus2 != bus) {
-			fail("Bus elements not the same");
-		}
-	}
-	
-	public void testRemoveService() {
-		String busId="TestBusId";
-		String category="category.two";
-		String name="serviceName";
-		
-		ModelReference ref=new ModelReference(JBossESBNotation.NOTATION_CODE);
-		
-		DefaultESBLanguageModel model=new DefaultESBLanguageModel(ref, false);
-		
-		org.w3c.dom.Element config=model.getESBConfiguration();
-		
-		TestESBService service=new TestESBService();
-		service.setJMSBusIdRef(busId);
-		service.setCategory(category);
-		service.setName(name);
-		
-		model.addService(service);
-		
-		// Check that the jms bus id has been created
-		org.w3c.dom.NodeList nl=config.getElementsByTagName(
-						DefaultESBLanguageModel.JMS_PROVIDER_ELEMENT);
-
-		if (nl.getLength() != 1) {
-			fail("JMS provider element not found");
-		}
-		
-		org.w3c.dom.Element provider=(org.w3c.dom.Element)nl.item(0);
-		
-		nl = provider.getElementsByTagName(
-				DefaultESBLanguageModel.JMS_BUS_ELEMENT);
-
-		if (nl.getLength() != 1) {
-			fail("JMS bus element not found");
-		}
-
-		// Remove the service and check that the bus entry
-		// is no longer there
-		model.removeService(service);
-		
-		nl = provider.getElementsByTagName(
-				DefaultESBLanguageModel.JMS_BUS_ELEMENT);
-
-		if (nl.getLength() != 0) {
-			fail("JMS bus element should NOT be found");
-		}
-	}
-
-	public void testAddServiceWithNoBusId() {
-		String category="category.one";
-		String name="serviceName";
-		
-		ModelReference ref=new ModelReference(JBossESBNotation.NOTATION_CODE);
-		
-		DefaultESBLanguageModel model=new DefaultESBLanguageModel(ref, false);
-		
-		TestESBService service=new TestESBService();
-		service.setCategory(category);
-		service.setName(name);
-		
-		model.addService(service);
-		
-		if (service.getJMSBusIdRef() == null) {
-			fail("JMS BusIdRef not set");
-		}
-	}
-	
-	public void testAddMultipleServiceWithNoBusId() {
-		String category="category.one";
-		String name1="serviceName1";
-		String name2="serviceName2";
-		
-		ModelReference ref=new ModelReference(JBossESBNotation.NOTATION_CODE);
-		
-		DefaultESBLanguageModel model=new DefaultESBLanguageModel(ref, false);
-		
-		TestESBService service1=new TestESBService();
-		service1.setCategory(category);
-		service1.setName(name1);
-		
-		model.addService(service1);
-		
-		if (service1.getJMSBusIdRef() == null) {
-			fail("JMS BusIdRef1 not set");
-		}
-		
-		TestESBService service2=new TestESBService();
-		service2.setCategory(category);
-		service2.setName(name2);
-		
-		model.addService(service2);
-		
-		if (service2.getJMSBusIdRef() == null) {
-			fail("JMS BusIdRef2 not set");
-		}
-		
-		if (service1.getJMSBusIdRef().equals(service2.getJMSBusIdRef())) {
-			fail("Service JMS bus ids should be unique");
-		}
-	}
-}

Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBServiceTest.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBServiceTest.java	2009-08-20 10:12:35 UTC (rev 783)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBServiceTest.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -1,365 +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.runtime.jbossesb.model;
-
-import junit.framework.TestCase;
-
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.DefaultESBLanguageModel;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.DefaultESBService;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.stateful.actions.*;
-
-public class DefaultESBServiceTest extends TestCase {
-
-	public void testValidateSessionClassRequired() {
-		DefaultESBService service=new DefaultESBService(null, null);
-
-		TestESBAction act1=new TestESBAction();
-		act1.setSessionBased(true);
-		
-		service.getActions().add(act1);
-		
-		TestModelListener l=new TestModelListener();
-		
-		l.addExpectedError(org.scribble.util.MessageUtil.format(
-						java.util.PropertyResourceBundle.getBundle(
-						"org.jboss.tools.overlord.cdl.runtime.jbossesb.model.Messages"),
-							"_NOT_SPECIFIED_SESSION_CLASS",
-							new String[]{}));
-		
-		service.validate(l);
-		
-		if (l.isValid() == false) {
-			fail(l.invalidMessage());
-		}
-	}
-
-	public void testValidateSessionClassNotRequired() {
-		DefaultESBService service=new DefaultESBService(null, null);
-
-		TestModelListener l=new TestModelListener();
-		
-		service.validate(l);
-		
-		if (l.isValid() == false) {
-			fail(l.invalidMessage());
-		}
-	}
-	
-	public void testIsLoop() {
-		DefaultESBService service=new DefaultESBService(null, null);
-
-		TestESBAction act1=new TestESBAction();
-		act1.setSessionBased(true);
-		act1.setLoop(true);
-		
-		service.getActions().add(act1);
-
-		if (service.isLoop() == false) {
-			fail("Service should be loop");
-		}
-	}
-
-	public void testIsLoopFalse() {
-		DefaultESBService service=new DefaultESBService(null, null);
-
-		TestESBAction act1=new TestESBAction();
-		act1.setSessionBased(true);
-		
-		service.getActions().add(act1);
-		
-		if (service.isLoop()) {
-			fail("Service is not a loop");
-		}
-	}
-	
-	public void testIsRoot() {
-		DefaultESBService service=new DefaultESBService(null, null);
-
-		TestESBAction act1=new TestESBAction();
-		act1.setSessionBased(true);
-		act1.setCreateSession(true);
-		act1.setPropertyValue(DefaultESBService.ROOT_PROPERTY, "true");
-		
-		service.getActions().add(act1);
-		
-		if (service.isRoot() == false) {
-			fail("Service should be root");
-		}
-	}
-	
-	public void testIsRootFalse() {
-		DefaultESBService service=new DefaultESBService(null, null);
-
-		TestESBAction act1=new TestESBAction();
-		
-		service.getActions().add(act1);
-		
-		if (service.isRoot()) {
-			fail("Service should NOT be root");
-		}
-	}
-	
-	public void testIsSessionBased() {
-		DefaultESBService service=new DefaultESBService(null, null);
-
-		TestESBAction act1=new TestESBAction();
-		act1.setSessionBased(true);
-		
-		service.getActions().add(act1);
-		
-		if (service.isSessionBased() == false) {
-			fail("Service should be SessionBased");
-		}
-	}
-	
-	public void testIsSessionBasedFalse() {
-		DefaultESBService service=new DefaultESBService(null, null);
-
-		TestESBAction act1=new TestESBAction();
-		
-		service.getActions().add(act1);
-		
-		if (service.isSessionBased()) {
-			fail("Service should NOT be SessionBased");
-		}
-	}
-	
-	public void testIsCreateSession() {
-		DefaultESBService service=new DefaultESBService(null, null);
-
-		TestESBAction act1=new TestESBAction();
-		act1.setSessionBased(true);
-		act1.setCreateSession(true);
-		
-		service.getActions().add(act1);
-		
-		if (service.isSessionType() == false) {
-			fail("Service should be 'create session'");
-		}
-	}
-	
-	public void testIsCreateSessionFalse() {
-		DefaultESBService service=new DefaultESBService(null, null);
-
-		TestESBAction act1=new TestESBAction();
-		
-		service.getActions().add(act1);
-		
-		if (service.isSessionType()) {
-			fail("Service should NOT be 'create session'");
-		}
-	}
-	
-	public void testGetServiceName() {
-		String name="serviceName1";
-		
-		DefaultESBService service=new DefaultESBService(null, null);
-
-		TestESBAction act1=new TestESBAction();
-		act1.setSessionBased(true);
-		act1.setCreateSession(true);
-		act1.setPropertyValue(DefaultESBService.SERVICE_DESCRIPTION_NAME_PROPERTY,
-									name);
-		
-		service.getActions().add(act1);
-		
-		if (service.getServiceDescriptionName().equals(name) == false) {
-			fail("Service name '"+service.getServiceDescriptionName()+
-					"' invalid, expecting: "+name);
-		}		
-	}
-	
-	public void testGetConversationType() {
-		String name="convType1";
-		
-		DefaultESBService service=new DefaultESBService(null, null);
-
-		TestESBAction act1=new TestESBAction();
-		act1.setSessionBased(true);
-		act1.setCreateSession(true);
-		act1.setPropertyValue(DefaultESBService.CONVERSATION_TYPE_PROPERTY,
-									name);
-		
-		service.getActions().add(act1);
-		
-		if (service.getConversationType().equals(name) == false) {
-			fail("Conversation type '"+service.getConversationType()+
-					"' invalid, expecting: "+name);
-		}		
-	}
-	
-	public void testGetSessionName() {
-		String name="session1";
-		
-		DefaultESBService service=new DefaultESBService(null, null);
-
-		TestESBAction act1=new TestESBAction();
-		act1.setSessionBased(true);
-		act1.setPropertyValue(DefaultESBService.BUSINESS_OBJECT_TYPE_PROPERTY,
-									name);
-		
-		service.getActions().add(act1);
-		
-		if (service.getSessionName().equals(name) == false) {
-			fail("Session name '"+service.getSessionName()+
-					"' invalid, expecting: "+name);
-		}		
-	}
-	
-	public void testBaseConfiguration() {
-		String category="category";
-		String name="name";
-		
-		DefaultESBService service=new DefaultESBService(new TestESBLanguageModel(),
-				category, name);
-		
-		org.w3c.dom.Element servElem=service.getService();
-		
-		if (servElem == null) {
-			fail("Service element is null");
-		}
-		
-		if (servElem.getNodeName().equals(DefaultESBService.SERVICE_ELEMENT) == false) {
-			fail("Root element is incorrect: "+servElem.getNodeName());
-		}
-		
-		if (servElem.getAttribute(DefaultESBService.CATEGORY_ATTR).equals(category) == false) {
-			fail("Category invalid: "+servElem.getAttribute(DefaultESBService.CATEGORY_ATTR));
-		}
-		
-		if (servElem.getAttribute(DefaultESBService.NAME_ATTR).equals(name) == false) {
-			fail("Name invalid: "+servElem.getAttribute(DefaultESBService.NAME_ATTR));
-		}
-	}
-	
-	public void testSetInitialBusIdRef() {
-		String category="category";
-		String name="name";
-		String busId="myBusId";
-		
-		DefaultESBService service=new DefaultESBService(new TestESBLanguageModel(),
-				category, name);
-		
-		org.w3c.dom.Element servElem=service.getService();
-		
-		service.setJMSBusIdRef(busId);
-		
-		if (service.getJMSBusIdRef() == null) {
-			fail("Bus id not set");
-		}
-		
-		if (service.getJMSBusIdRef().equals(busId) == false) {
-			fail("Bus Id not '"+busId+"', got: "+service.getJMSBusIdRef());
-		}
-		
-		org.w3c.dom.NodeList nl=servElem.getElementsByTagName(DefaultESBService.JMS_LISTENER_ELEMENT);
-		
-		if (nl.getLength() != 1) {
-			fail("Expecting one JMS listener element, but got: "+
-					nl.getLength());
-		}
-		
-		org.w3c.dom.Element jmslistener=(org.w3c.dom.Element)nl.item(0);
-		
-		if (jmslistener.getParentNode().getNodeName().equals(DefaultESBService.LISTENERS_ELEMENT) == false) {
-			fail("JMS listener parent not expected");
-		}
-		
-		if (jmslistener.getParentNode().getParentNode() != servElem) {
-			fail("JMS listener grandparent should be service");
-		}
-		
-		if (jmslistener.getAttribute(DefaultESBService.BUSIDREF_ATTR).equals(busId) == false) {
-			fail("Bus Id not '"+busId+"', got: "+jmslistener.getAttribute(DefaultESBService.BUSIDREF_ATTR));
-		}
-		
-		if (jmslistener.hasAttribute(DefaultESBService.NAME_ATTR) == false) {
-			fail("Name attribute not set on jms listener");
-		}
-		
-		if (jmslistener.hasAttribute(DefaultESBService.MAX_THREADS_ATTR) == false) {
-			fail("Max Threads attribute not set on jms listener");
-		}		
-	}
-	
-	public void testChangeBusIdRef() {
-		String initialBusId="busId1";
-		String initialName="name1";
-		String initialMaxThreads="2";
-		String changedBusId="busId2";
-		
-		org.w3c.dom.Element top=null;
-		
-		// Create an empty document
-		org.w3c.dom.Document doc=null;
-		try {
-			doc = javax.xml.parsers.DocumentBuilderFactory.
-				newInstance().newDocumentBuilder().newDocument();
-			
-			top = doc.createElement(DefaultESBLanguageModel.TOP_LEVEL_ELEMENT);
-
-		} catch(Exception e) {
-			e.printStackTrace();
-		}
-		
-		org.w3c.dom.Element services=doc.createElement(DefaultESBLanguageModel.SERVICES_ELEMENT);
-		top.appendChild(services);
-		
-		org.w3c.dom.Element serviceElem=doc.createElement(DefaultESBLanguageModel.SERVICE_ELEMENT);
-		services.appendChild(serviceElem);
-		
-		org.w3c.dom.Element listeners=doc.createElement(DefaultESBService.LISTENERS_ELEMENT);
-		serviceElem.appendChild(listeners);
-		
-		org.w3c.dom.Element jmslistener=doc.createElement(DefaultESBService.JMS_LISTENER_ELEMENT);
-		listeners.appendChild(jmslistener);
-		
-		jmslistener.setAttribute(DefaultESBService.BUSIDREF_ATTR, initialBusId);
-		jmslistener.setAttribute(DefaultESBService.NAME_ATTR, initialName);
-		jmslistener.setAttribute(DefaultESBService.MAX_THREADS_ATTR, initialMaxThreads);
-		
-		DefaultESBService service=new DefaultESBService(new TestESBLanguageModel(),
-				serviceElem);
-		
-		if (service.getJMSBusIdRef() == null) {
-			fail("JMS bus id not set");
-		}
-		
-		if (service.getJMSBusIdRef().equals(initialBusId) == false) {
-			fail("JMS bus id not '"+initialBusId+"', got: "+service.getJMSBusIdRef());
-		}
-		
-		service.setJMSBusIdRef(changedBusId);
-		
-		if (service.getJMSBusIdRef().equals(changedBusId) == false) {
-			fail("Changed JMS bus id not '"+changedBusId+"', got: "+service.getJMSBusIdRef());
-		}
-		
-		if (jmslistener.getAttribute(DefaultESBService.BUSIDREF_ATTR).equals(changedBusId)==false) {
-			fail("Changed bus id not reflected in element");
-		}
-		
-		if (jmslistener.getAttribute(DefaultESBService.NAME_ATTR).equals(initialName)==false) {
-			fail("Name attribute incorrect");
-		}
-		
-		if (jmslistener.getAttribute(DefaultESBService.MAX_THREADS_ATTR).equals(initialMaxThreads)==false) {
-			fail("MaxThreads attribute incorrect");
-		}
-	}
-}

Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/TestESBAction.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/TestESBAction.java	2009-08-20 10:12:35 UTC (rev 783)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/TestESBAction.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -1,120 +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.runtime.jbossesb.model;
-
-import java.util.List;
-
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.ConversionContext;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.ESBAction;
-import org.scribble.model.Activity;
-import org.scribble.model.admin.ModelListener;
-import org.w3c.dom.Element;
-
-public class TestESBAction implements ESBAction {
-
-	public void convert(List<Activity> activities, ConversionContext context) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	public Element getAction() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public String getActionClass() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public String getPropertyValue(String property) {
-		return(m_property.get(property));
-	}
-
-	public void setPropertyValue(String property, String value) {
-		m_property.put(property, value);
-	}
-
-	public void initializeLinks() {
-		// TODO Auto-generated method stub
-		
-	}
-
-	public boolean isInitiator() {
-		return(m_initiator);
-	}
-	
-	public void setInitiator(boolean initiator) {
-		m_initiator = initiator;
-	}
-	
-	public boolean isLoop() {
-		return(m_loop);
-	}
-	
-	public void setLoop(boolean bool) {
-		m_loop = bool;
-	}
-
-	public boolean isPerform() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	public boolean isSessionBased() {
-		return(m_sessionBased);
-	}
-	
-	public void setSessionBased(boolean bool) {
-		m_sessionBased = bool;
-	}
-
-	public boolean isSessionType() {
-		return(m_createSession);
-	}
-	
-	public void setCreateSession(boolean bool) {
-		m_createSession = bool;
-	}
-	
-	public boolean isGateway() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	public boolean isStateless() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	public boolean hasProperty(String property) {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	public void validate(ModelListener l) {
-		// TODO Auto-generated method stub
-		
-	}
-	
-	private boolean m_sessionBased=false;
-	private boolean m_loop=false;
-	private boolean m_initiator=false;
-	private boolean m_createSession=false;
-	private java.util.Map<String,String> m_property=new java.util.Hashtable<String, String>();
-}

Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/TestESBLanguageModel.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/TestESBLanguageModel.java	2009-08-20 10:12:35 UTC (rev 783)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/TestESBLanguageModel.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -1,119 +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.runtime.jbossesb.model;
-
-import java.util.Collection;
-
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.DefaultESBLanguageModel;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.DefaultESBService;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.ESBService;
-import org.scribble.model.ModelReference;
-import org.scribble.model.admin.ModelListener;
-import org.w3c.dom.Element;
-
-public class TestESBLanguageModel extends org.scribble.lang.model.LanguageModel
-		implements org.jboss.tools.overlord.cdl.runtime.jbossesb.model.ESBLanguageModel {
-
-	public TestESBLanguageModel() {
-		org.w3c.dom.Document doc=null;
-		
-		// Create an empty document
-		try {
-			doc = javax.xml.parsers.DocumentBuilderFactory.
-				newInstance().newDocumentBuilder().newDocument();
-			
-			m_esbConfig = doc.createElement(DefaultESBLanguageModel.TOP_LEVEL_ELEMENT);
-
-		} catch(Exception e) {
-			e.printStackTrace();
-		}
-	}
-	public String getOriginalContents() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public ModelReference getModelReference() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public ESBService createService(String category, String name) {
-		TestESBService ret=new TestESBService(category, name);
-		
-		org.w3c.dom.Element service=m_esbConfig.getOwnerDocument().
-					createElement(DefaultESBService.SERVICE_ELEMENT);
-		m_esbConfig.appendChild(service);
-		
-		ret.setService(service);
-		
-		return(ret);
-	}
-
-	public void addService(ESBService service) {
-		m_services.put(service.getCategory()+":"+service.getName(), service);
-	}
-	
-	public void removeService(ESBService service) {
-		m_services.remove(service.getCategory()+":"+service.getName());
-	}
-	
-	public ESBService getService(String category, String name) {
-		return(m_services.get(category+":"+name));
-	}
-
-	public Collection<ESBService> getServices() {
-		return(m_services.values());
-	}
-
-	public ESBService getGatewayService() {
-		return(m_gatewayService);
-	}
-	
-	public void setGatewayService(ESBService gw) {
-		m_gatewayService = gw;
-	}
-
-	public void validate(ModelListener l) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	public String getUniqueServiceName(String category, String name) {
-		return("serviceName__"+m_count++);
-	}
-
-	public Element getESBConfiguration() {
-		return(m_esbConfig);
-	}
-
-	public String getJMSDefinition(String jmsBusId) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public boolean isStateless() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	private java.util.Map<String,ESBService> m_services=new java.util.Hashtable<String,ESBService>();
-	private ESBService m_gatewayService=null;
-	private org.w3c.dom.Element m_esbConfig=null;
-	private int m_count=0;
-}

Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/TestESBService.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/TestESBService.java	2009-08-20 10:12:35 UTC (rev 783)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/TestESBService.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -1,228 +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.runtime.jbossesb.model;
-
-import java.util.List;
-
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.ConversionContext;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.ESBAction;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.ESBLanguageModel;
-import org.scribble.conversation.model.*;
-import org.scribble.model.*;
-import org.scribble.model.admin.ModelListener;
-import org.w3c.dom.Element;
-
-public class TestESBService extends ModelObject
-		implements org.jboss.tools.overlord.cdl.runtime.jbossesb.model.ESBService {
-
-	public TestESBService() {
-	}
-	
-	public TestESBService(String category, String name) {
-		m_category = category;
-		m_name = name;
-	}
-	
-	public void convert(List<Activity> activities, ConversionContext context) {
-		activities.addAll(m_contents);
-	}
-	
-	public Conversation convert(ConversionContext context) {
-		return(null);
-	}
-	
-	public List<Activity> getContents() {
-		return(m_contents);
-	}
-
-	public List<ESBAction> getActions() {
-		return(m_actions);
-	}
-
-	public void setCategory(String cat) {
-		m_category = cat;
-	}
-	
-	public String getCategory() {
-		return(m_category);
-	}
-
-	public void setConversationType(String type) {
-		m_conversationType = type;
-	}
-	
-	public String getConversationType() {
-		return(m_conversationType);
-	}
-
-	public void setName(String name) {
-		m_name = name;
-	}
-	
-	public String getName() {
-		return(m_name);
-	}
-	
-	public void setModel(ESBLanguageModel model) {
-		m_model = model;
-	}
-
-	public ESBLanguageModel getModel() {
-		return(m_model);
-	}
-	
-	public Element getService() {
-		return(m_service);
-	}
-	
-	public void setService(Element service) {
-		m_service = service;
-	}
-
-	public ClassLoader getServiceClassLoader() throws Exception {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public String getServiceDescriptionName() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public int getServicePosition() {
-		// TODO Auto-generated method stub
-		return 0;
-	}
-
-	public void setSessionClass(Class<?> cls) {
-		m_sessionClass = cls;
-	}
-	
-	public Class<?> getSessionClass() {
-		return(m_sessionClass);
-	}
-
-	public String getSessionName() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public void initializeLinks() {
-		// TODO Auto-generated method stub
-		
-	}
-
-	public void setLoop(boolean bool) {
-		m_loop = bool;
-	}
-
-	public boolean isLoop() {
-		return(m_loop);
-	}
-
-	public void setRoot(boolean bool) {
-		m_root = bool;
-	}
-	
-	public boolean isRoot() {
-		return(m_root);
-	}
-
-	public boolean isStateless() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-	
-	public void setCreateSession(boolean bool) {
-		m_createSession = bool;
-	}
-	
-	public boolean isSessionType() {
-		return(m_createSession);
-	}
-	
-	public void setSessionBased(boolean bool) {
-		m_sessionBased = bool;
-	}
-	
-	public boolean isSessionBased() {
-		return(m_sessionBased);
-	}
-
-	public ESBAction getFirstSessionBasedAction() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public boolean isGateway() {
-		return(m_gateway);
-	}
-
-	public void setGateway(boolean gw) {
-		m_gateway = gw;	
-	}
-	
-	public ESBAction getGatewayAction() {
-		return(m_gatewayAction);
-	}
-	
-	public void setGatewayAction(ESBAction act) {
-		m_gatewayAction = act;
-	}
-
-	public void validate(ModelListener l) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	public String getJMSBusIdRef() {
-		return(m_jmsBusIdRef);
-	}
-	
-	public void setJMSBusIdRef(String busId) {
-		m_jmsBusIdRef = busId;
-	}
-
-	public void addAction(ESBAction action, int pos) {
-		if (pos == -1) {
-			m_actions.add(action);
-		} else {
-			m_actions.add(pos, action);
-		}
-	}
-
-	public boolean removeAction(ESBAction action) {
-		return(m_actions.remove(action));
-	}
-
-	private String m_category=null;
-	private String m_name=null;
-	private ESBLanguageModel m_model=null;
-	private Element m_service;
-	private List<ESBAction> m_actions=new java.util.Vector<ESBAction>();
-	private boolean m_root=false;
-	private boolean m_gateway=false;
-	private ESBAction m_gatewayAction=null;
-	private boolean m_loop=false;
-	private boolean m_sessionBased=false;
-	private boolean m_createSession=false;
-	private Class<?> m_sessionClass=null;
-	private String m_conversationType=null;
-	private List<Activity> m_contents=new java.util.Vector<Activity>();
-	private String m_jmsBusIdRef=null;
-}

Deleted: cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/TestModelListener.java
===================================================================
--- cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/TestModelListener.java	2009-08-20 10:12:35 UTC (rev 783)
+++ cdl/trunk/tools/eclipse/plugins/org.jboss.savara.tools.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/TestModelListener.java	2009-08-20 13:22:27 UTC (rev 784)
@@ -1,83 +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.runtime.jbossesb.model;
-
-import org.scribble.model.ModelObject;
-import org.scribble.model.admin.ModelIssue;
-
-public class TestModelListener implements org.scribble.model.admin.ModelListener {
-
-	public void error(ModelIssue issue) {
-		reported(issue.getMessage());
-	}
-
-	public void warning(ModelIssue issue) {
-		reported(issue.getMessage());
-	}
-	
-	protected void reported(String mesg) {
-		if (mesg != null) {
-			
-			// Check if in the list of messages to be
-			// detected
-			if (m_errorsToDetect.contains(mesg)) {
-				m_errorsToDetect.remove(mesg);
-			} else {
-				m_unexpectedErrors.add(mesg);
-			}
-		}		
-	}
-
-	public void addExpectedError(String mesg) {
-		m_errorsToDetect.add(mesg);
-	}
-	
-	public boolean isValid() {
-		// If there are no more errors to detect, and no
-		// unexpected errors have been reported, then
-		// the expression has been validated as expected
-		return(m_errorsToDetect.size() == 0 &&
-				m_unexpectedErrors.size() == 0);
-	}
-	
-	public String invalidMessage() {
-		String ret="\r\n";
-		
-		if (m_errorsToDetect.size() > 0) {
-			ret += "Errors not detected:\r\n";
-			
-			for (int i=0; i < m_errorsToDetect.size(); i++) {
-				ret += m_errorsToDetect.get(i)+"\r\n";
-			}
-		}
-		
-		if (m_unexpectedErrors.size() > 0) {
-			ret += "Unexpected Errors:\r\n";
-			
-			for (int i=0; i < m_unexpectedErrors.size(); i++) {
-				ret += m_unexpectedErrors.get(i)+"\r\n";
-			}
-		}
-		
-		return(ret);
-	}
-
-	private java.util.List<String> m_errorsToDetect=new java.util.Vector<String>();
-	private java.util.List<String> m_unexpectedErrors=new java.util.Vector<String>();
-	private java.util.List<String> m_messages=new java.util.Vector<String>();
-}



More information about the overlord-commits mailing list