Author: objectiser Date: 2009-02-16 15:23:20 -0500 (Mon, 16 Feb 2009) New Revision: 502 Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/export/BPELLanguageModelStreamExportRule.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/Generator.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/BPELLanguageModel.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/BPELNotation.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/DefaultBPELLanguageModel.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/ConversationInteractionModelChangeRule.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/ConversationModelChangeRule.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/IfModelChangeRule.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/LanguageToConversationModelChangeRule.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/RunModelChangeRule.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/SpawnModelChangeRule.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/WhenModelChangeRule.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/WhileModelChangeRule.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/parser/BPELParser.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/test/org/jboss/tools/overlord/cdl/bpel/generator/GeneratorTest.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/editor/JBossESBConfigEditorManager.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/export/ESBLanguageModelStreamExportRule.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Generator.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBLanguageModel.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBService.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBLanguageModel.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/JBossESBNotation.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/ConversationInteractionModelChangeRule.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/ConversationModelChangeRule.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/IfModelChangeRule.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/LanguageToConversationModelChangeRule.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/MessageSignatureModelChangeRule.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/ParallelModelChangeRule.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/RunModelChangeRule.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/SpawnModelChangeRule.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/TypeReferenceModelChangeRule.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/WhenModelChangeRule.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/WhileModelChangeRule.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateless/ConversationInteractionModelChangeRule.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateless/ConversationModelChangeRule.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateless/IfModelChangeRule.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateless/LanguageToConversationModelChangeRule.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateless/TypeReferenceModelChangeRule.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/parser/JBossESBParser.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/validation/ESBLanguageModelValidationRule.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBLanguageModelTest.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/TestESBLanguageModel.java Log: Refactored to standardise the way notations are managed, and ensure rules are correctly associated with the appropriate notations - and derived from any rules that they need to override. Some interfaces (exporter/projector) have been updated to supply the model reference, rather than using the notation information associated with the model itself - to decouple the model from the concrete notation. Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/export/BPELLanguageModelStreamExportRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/export/BPELLanguageModelStreamExportRule.java 2009-02-16 13:05:59 UTC (rev 501) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/export/BPELLanguageModelStreamExportRule.java 2009-02-16 20:23:20 UTC (rev 502) @@ -33,7 +33,7 @@ * This class implements the stream based export rule for the * BPELLanguageModel entity. */ -(a)RegistryInfo(extension=ExportRule.class,notation=BPELLanguageModel.BPEL_NOTATION) +(a)RegistryInfo(extension=ExportRule.class,notation=BPELNotation.NOTATION_CODE) public class BPELLanguageModelStreamExportRule extends DefaultModelStreamExportRule { /** Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/Generator.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/Generator.java 2009-02-16 13:05:59 UTC (rev 501) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/Generator.java 2009-02-16 20:23:20 UTC (rev 502) @@ -28,13 +28,12 @@ import org.eclipse.core.resources.IFile; import org.jboss.tools.overlord.cdl.bpel.generator.BuildSystem; import org.jboss.tools.overlord.cdl.bpel.model.*; -import org.scribble.conversation.model.ConversationModel; +import org.scribble.conversation.model.*; import org.scribble.extensions.RegistryFactory; import org.scribble.model.*; import org.scribble.model.admin.DefaultModelListener; import org.scribble.model.admin.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.*; @@ -128,7 +127,10 @@ org.scribble.projector.Projector.class, null); if (projector != null) { - Model localModel=projector.project(m_conversationModel, + ModelReference srcRef= + new ModelReference(ConversationNotation.NOTATION_CODE); + + Model localModel=projector.project(srcRef, m_conversationModel, role, new DefaultModelListener()); if (localModel instanceof ConversationModel && @@ -136,7 +138,7 @@ ConversationModel lcm=(ConversationModel)localModel; ModelReference targetRef= - new ModelReference(BPELLanguageModel.BPEL_NOTATION); + new ModelReference(BPELNotation.NOTATION_CODE); DefaultBPELLanguageModel target= new DefaultBPELLanguageModel(targetRef); Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/BPELLanguageModel.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/BPELLanguageModel.java 2009-02-16 13:05:59 UTC (rev 501) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/BPELLanguageModel.java 2009-02-16 20:23:20 UTC (rev 502) @@ -27,8 +27,6 @@ */ public interface BPELLanguageModel { - public static final String BPEL_NOTATION = "bpel"; - /** * This method validates the ESB model and reports warnings or * errors to the supplied model listener. Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/BPELNotation.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/BPELNotation.java 2009-02-16 13:05:59 UTC (rev 501) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/BPELNotation.java 2009-02-16 20:23:20 UTC (rev 502) @@ -27,11 +27,13 @@ @RegistryInfo(extension=org.scribble.model.Notation.class) public class BPELNotation extends org.scribble.model.AbstractNotation { + public static final String NOTATION_CODE = "bpel"; + /** * This is the default constructor for the BPEL notation. */ public BPELNotation() { - super(BPELLanguageModel.BPEL_NOTATION, "BPEL", false); + super(NOTATION_CODE, "BPEL", false); } /** Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/DefaultBPELLanguageModel.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/DefaultBPELLanguageModel.java 2009-02-16 13:05:59 UTC (rev 501) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/DefaultBPELLanguageModel.java 2009-02-16 20:23:20 UTC (rev 502) @@ -94,11 +94,6 @@ // Needs to establish dependency to conversation } - @Override - public String getNotation() { - return(BPEL_NOTATION); - } - /** * This method returns the source model reference. * Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/ConversationInteractionModelChangeRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/ConversationInteractionModelChangeRule.java 2009-02-16 13:05:59 UTC (rev 501) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/ConversationInteractionModelChangeRule.java 2009-02-16 20:23:20 UTC (rev 502) @@ -28,7 +28,7 @@ /** * This is the model change rule for the Conversation Interaction. */ -(a)RegistryInfo(extension=ModelChangeRule.class,notation=BPELLanguageModel.BPEL_NOTATION) +(a)RegistryInfo(extension=ModelChangeRule.class,notation=BPELNotation.NOTATION_CODE) public class ConversationInteractionModelChangeRule extends AbstractBPELModelChangeRule { /** Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/ConversationModelChangeRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/ConversationModelChangeRule.java 2009-02-16 13:05:59 UTC (rev 501) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/ConversationModelChangeRule.java 2009-02-16 20:23:20 UTC (rev 502) @@ -27,7 +27,7 @@ /** * This is the model change rule for the Conversation. */ -(a)RegistryInfo(extension=ModelChangeRule.class,notation=BPELLanguageModel.BPEL_NOTATION) +(a)RegistryInfo(extension=ModelChangeRule.class,notation=BPELNotation.NOTATION_CODE) public class ConversationModelChangeRule extends AbstractModelChangeRule { private static final String NAME_SUFFIX = "_main"; Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/IfModelChangeRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/IfModelChangeRule.java 2009-02-16 13:05:59 UTC (rev 501) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/IfModelChangeRule.java 2009-02-16 20:23:20 UTC (rev 502) @@ -27,7 +27,7 @@ /** * This is the model change rule for the If. */ -(a)RegistryInfo(extension=ModelChangeRule.class,notation=BPELLanguageModel.BPEL_NOTATION) +(a)RegistryInfo(extension=ModelChangeRule.class,notation=BPELNotation.NOTATION_CODE) public class IfModelChangeRule extends AbstractModelChangeRule { /** Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/LanguageToConversationModelChangeRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/LanguageToConversationModelChangeRule.java 2009-02-16 13:05:59 UTC (rev 501) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/LanguageToConversationModelChangeRule.java 2009-02-16 20:23:20 UTC (rev 502) @@ -27,7 +27,7 @@ * This is the model change rule for the Language Model to * Conversation Model. */ -(a)RegistryInfo(extension=ModelChangeRule.class,notation=BPELLanguageModel.BPEL_NOTATION) +(a)RegistryInfo(extension=ModelChangeRule.class,notation=BPELNotation.NOTATION_CODE) public class LanguageToConversationModelChangeRule extends AbstractModelChangeRule { /** Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/RunModelChangeRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/RunModelChangeRule.java 2009-02-16 13:05:59 UTC (rev 501) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/RunModelChangeRule.java 2009-02-16 20:23:20 UTC (rev 502) @@ -27,7 +27,7 @@ /** * This is the model change rule for the Run. */ -(a)RegistryInfo(extension=ModelChangeRule.class,notation=BPELLanguageModel.BPEL_NOTATION) +(a)RegistryInfo(extension=ModelChangeRule.class,notation=BPELNotation.NOTATION_CODE) public class RunModelChangeRule extends AbstractModelChangeRule { /** Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/SpawnModelChangeRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/SpawnModelChangeRule.java 2009-02-16 13:05:59 UTC (rev 501) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/SpawnModelChangeRule.java 2009-02-16 20:23:20 UTC (rev 502) @@ -27,7 +27,7 @@ /** * This is the model change rule for the Run. */ -(a)RegistryInfo(extension=ModelChangeRule.class,notation=BPELLanguageModel.BPEL_NOTATION) +(a)RegistryInfo(extension=ModelChangeRule.class,notation=BPELNotation.NOTATION_CODE) public class SpawnModelChangeRule extends AbstractModelChangeRule { /** Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/WhenModelChangeRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/WhenModelChangeRule.java 2009-02-16 13:05:59 UTC (rev 501) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/WhenModelChangeRule.java 2009-02-16 20:23:20 UTC (rev 502) @@ -27,7 +27,7 @@ /** * This is the model change rule for the When. */ -(a)RegistryInfo(extension=ModelChangeRule.class,notation=BPELLanguageModel.BPEL_NOTATION) +(a)RegistryInfo(extension=ModelChangeRule.class,notation=BPELNotation.NOTATION_CODE) public class WhenModelChangeRule extends AbstractModelChangeRule { /** Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/WhileModelChangeRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/WhileModelChangeRule.java 2009-02-16 13:05:59 UTC (rev 501) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/WhileModelChangeRule.java 2009-02-16 20:23:20 UTC (rev 502) @@ -27,7 +27,7 @@ /** * This is the model change rule for the While. */ -(a)RegistryInfo(extension=ModelChangeRule.class,notation=BPELLanguageModel.BPEL_NOTATION) +(a)RegistryInfo(extension=ModelChangeRule.class,notation=BPELNotation.NOTATION_CODE) public class WhileModelChangeRule extends AbstractModelChangeRule { /** Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/parser/BPELParser.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/parser/BPELParser.java 2009-02-16 13:05:59 UTC (rev 501) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/parser/BPELParser.java 2009-02-16 20:23:20 UTC (rev 502) @@ -35,7 +35,7 @@ * * @author gary */ -(a)RegistryInfo(extension=Parser.class,notation=BPELLanguageModel.BPEL_NOTATION) +(a)RegistryInfo(extension=Parser.class,notation=BPELNotation.NOTATION_CODE) public class BPELParser extends org.scribble.conversation.parser.ConversationParser { /** Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/test/org/jboss/tools/overlord/cdl/bpel/generator/GeneratorTest.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/test/org/jboss/tools/overlord/cdl/bpel/generator/GeneratorTest.java 2009-02-16 13:05:59 UTC (rev 501) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/test/org/jboss/tools/overlord/cdl/bpel/generator/GeneratorTest.java 2009-02-16 20:23:20 UTC (rev 502) @@ -17,8 +17,7 @@ */ package org.jboss.tools.overlord.cdl.bpel.generator; -import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; -import org.jboss.tools.overlord.cdl.bpel.model.DefaultBPELLanguageModel; +import org.jboss.tools.overlord.cdl.bpel.model.*; import org.scribble.extensions.RegistryFactory; import org.scribble.model.*; import org.scribble.model.change.ModelGenerator; @@ -103,7 +102,7 @@ } ModelReference targetRef= - new ModelReference(BPELLanguageModel.BPEL_NOTATION); + new ModelReference(BPELNotation.NOTATION_CODE); System.out.println("REG="+RegistryFactory.getRegistry()); Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/editor/JBossESBConfigEditorManager.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/editor/JBossESBConfigEditorManager.java 2009-02-16 13:05:59 UTC (rev 501) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/editor/JBossESBConfigEditorManager.java 2009-02-16 20:23:20 UTC (rev 502) @@ -30,7 +30,7 @@ * This is the JBossESB config implementation of the EditorManager * interface. */ -(a)RegistryInfo(extension=EditorManager.class,preference=10,notation=ESBLanguageModel.JBOSSESB_NOTATION) +(a)RegistryInfo(extension=EditorManager.class,notation=JBossESBNotation.NOTATION_CODE) //preference=10, public class JBossESBConfigEditorManager extends AbstractEditorManager { /** Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/export/ESBLanguageModelStreamExportRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/export/ESBLanguageModelStreamExportRule.java 2009-02-16 13:05:59 UTC (rev 501) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/export/ESBLanguageModelStreamExportRule.java 2009-02-16 20:23:20 UTC (rev 502) @@ -22,7 +22,7 @@ import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; -import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.ESBLanguageModel; +import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*; import org.scribble.export.*; import org.scribble.export.stream.*; import org.scribble.extensions.RegistryInfo; @@ -33,7 +33,7 @@ * This class implements the stream based export rule for the * ESBLanguageModel entity. */ -(a)RegistryInfo(extension=ExportRule.class,notation=ESBLanguageModel.JBOSSESB_NOTATION) +(a)RegistryInfo(extension=ExportRule.class,notation=JBossESBNotation.NOTATION_CODE) public class ESBLanguageModelStreamExportRule extends DefaultModelStreamExportRule { /** Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Generator.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Generator.java 2009-02-16 13:05:59 UTC (rev 501) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Generator.java 2009-02-16 20:23:20 UTC (rev 502) @@ -140,7 +140,10 @@ org.scribble.projector.Projector.class, null); if (projector != null) { - Model localModel=projector.project(m_conversationModel, + ModelReference ref=new ModelReference(ConversationNotation.NOTATION_CODE); + + Model localModel=projector.project(ref, + m_conversationModel, role, new DefaultModelListener()); if (localModel instanceof ConversationModel && @@ -157,7 +160,7 @@ if (transformer != null) { Conversation statelessConversation=(Conversation) transformer.transform(lcm.getConversation(), - new ModelReference(ESBLanguageModel.JBOSSESB_NOTATION)); + new ModelReference(JBossESBNotation.NOTATION_CODE)); if (statelessConversation != null) { @@ -176,9 +179,8 @@ formatter.setOutputStream(os); - exporter.export(statelessConversation, - new ModelReference(ESBLanguageModel.JBOSSESB_NOTATION), - formatter); + exporter.export(new ModelReference(JBossESBNotation.NOTATION_CODE), + statelessConversation, formatter); String str=new String(os.toByteArray()); @@ -198,7 +200,7 @@ } ModelReference targetRef= - new ModelReference(ESBLanguageModel.JBOSSESB_NOTATION); + new ModelReference(JBossESBNotation.NOTATION_CODE); DefaultESBLanguageModel target= new DefaultESBLanguageModel(targetRef, stateless); Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBLanguageModel.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBLanguageModel.java 2009-02-16 13:05:59 UTC (rev 501) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBLanguageModel.java 2009-02-16 20:23:20 UTC (rev 502) @@ -307,7 +307,8 @@ formatter.setOutputStream(os); - exporter.export(model, formatter); + exporter.export(getModelReference(), + model, formatter); String str=new String(os.toByteArray()); @@ -323,11 +324,6 @@ } } - @Override - public String getNotation() { - return(JBOSSESB_NOTATION); - } - /** * This method returns the source model reference. * Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBService.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBService.java 2009-02-16 13:05:59 UTC (rev 501) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBService.java 2009-02-16 20:23:20 UTC (rev 502) @@ -719,7 +719,7 @@ // Java Lang Model parser and also Lang Model conformance // rule. ImplementsReference iref= - new ImplementsReference(ConversationModel.CONVERSATION); + new ImplementsReference(ConversationNotation.NOTATION_CODE); role = convType.substring(index+1); Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBLanguageModel.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBLanguageModel.java 2009-02-16 13:05:59 UTC (rev 501) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBLanguageModel.java 2009-02-16 20:23:20 UTC (rev 502) @@ -27,8 +27,6 @@ */ public interface ESBLanguageModel { - public static final String JBOSSESB_NOTATION = "jboss-esb.xml"; - /** * This method validates the ESB model and reports warnings or * errors to the supplied model listener. Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/JBossESBNotation.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/JBossESBNotation.java 2009-02-16 13:05:59 UTC (rev 501) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/JBossESBNotation.java 2009-02-16 20:23:20 UTC (rev 502) @@ -27,11 +27,13 @@ @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(ESBLanguageModel.JBOSSESB_NOTATION, "JBossESB", false); + super(NOTATION_CODE, "JBossESB", false); } /** Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/ConversationInteractionModelChangeRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/ConversationInteractionModelChangeRule.java 2009-02-16 13:05:59 UTC (rev 501) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/ConversationInteractionModelChangeRule.java 2009-02-16 20:23:20 UTC (rev 502) @@ -30,7 +30,7 @@ /** * This is the model change rule for the Conversation Interaction. */ -(a)RegistryInfo(extension=ModelChangeRule.class,notation=ESBLanguageModel.JBOSSESB_NOTATION) +(a)RegistryInfo(extension=ModelChangeRule.class,notation=JBossESBNotation.NOTATION_CODE) public class ConversationInteractionModelChangeRule extends AbstractStatefulESBModelChangeRule { /** Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/ConversationModelChangeRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/ConversationModelChangeRule.java 2009-02-16 13:05:59 UTC (rev 501) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/ConversationModelChangeRule.java 2009-02-16 20:23:20 UTC (rev 502) @@ -28,7 +28,7 @@ /** * This is the model change rule for the Conversation. */ -(a)RegistryInfo(extension=ModelChangeRule.class,notation=ESBLanguageModel.JBOSSESB_NOTATION) +(a)RegistryInfo(extension=ModelChangeRule.class,notation=JBossESBNotation.NOTATION_CODE) public class ConversationModelChangeRule extends AbstractModelChangeRule { private static final String NAME_SUFFIX = "_main"; Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/IfModelChangeRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/IfModelChangeRule.java 2009-02-16 13:05:59 UTC (rev 501) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/IfModelChangeRule.java 2009-02-16 20:23:20 UTC (rev 502) @@ -32,7 +32,7 @@ /** * This is the model change rule for the If grouping construct. */ -(a)RegistryInfo(extension=ModelChangeRule.class,notation=ESBLanguageModel.JBOSSESB_NOTATION) +(a)RegistryInfo(extension=ModelChangeRule.class,notation=JBossESBNotation.NOTATION_CODE) public class IfModelChangeRule extends AbstractStatefulESBModelChangeRule { /** Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/LanguageToConversationModelChangeRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/LanguageToConversationModelChangeRule.java 2009-02-16 13:05:59 UTC (rev 501) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/LanguageToConversationModelChangeRule.java 2009-02-16 20:23:20 UTC (rev 502) @@ -28,7 +28,7 @@ * This is the model change rule for the Language Model to * Conversation Model. */ -(a)RegistryInfo(extension=ModelChangeRule.class,notation=ESBLanguageModel.JBOSSESB_NOTATION) +(a)RegistryInfo(extension=ModelChangeRule.class,notation=JBossESBNotation.NOTATION_CODE) public class LanguageToConversationModelChangeRule extends AbstractModelChangeRule { /** Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/MessageSignatureModelChangeRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/MessageSignatureModelChangeRule.java 2009-02-16 13:05:59 UTC (rev 501) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/MessageSignatureModelChangeRule.java 2009-02-16 20:23:20 UTC (rev 502) @@ -28,7 +28,7 @@ /** * This is the model change rule for the MessageSignature. */ -(a)RegistryInfo(extension=ModelChangeRule.class,notation=ESBLanguageModel.JBOSSESB_NOTATION) +(a)RegistryInfo(extension=ModelChangeRule.class,notation=JBossESBNotation.NOTATION_CODE) public class MessageSignatureModelChangeRule extends AbstractModelChangeRule { /** Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/ParallelModelChangeRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/ParallelModelChangeRule.java 2009-02-16 13:05:59 UTC (rev 501) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/ParallelModelChangeRule.java 2009-02-16 20:23:20 UTC (rev 502) @@ -31,7 +31,7 @@ /** * This is the model change rule for the Parallel grouping construct. */ -(a)RegistryInfo(extension=ModelChangeRule.class,notation=ESBLanguageModel.JBOSSESB_NOTATION) +(a)RegistryInfo(extension=ModelChangeRule.class,notation=JBossESBNotation.NOTATION_CODE) public class ParallelModelChangeRule extends AbstractStatefulESBModelChangeRule { /** Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/RunModelChangeRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/RunModelChangeRule.java 2009-02-16 13:05:59 UTC (rev 501) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/RunModelChangeRule.java 2009-02-16 20:23:20 UTC (rev 502) @@ -31,7 +31,7 @@ /** * This is the model change rule for the Run composition construct. */ -(a)RegistryInfo(extension=ModelChangeRule.class,notation=ESBLanguageModel.JBOSSESB_NOTATION) +(a)RegistryInfo(extension=ModelChangeRule.class,notation=JBossESBNotation.NOTATION_CODE) public class RunModelChangeRule extends AbstractStatefulESBModelChangeRule { /** Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/SpawnModelChangeRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/SpawnModelChangeRule.java 2009-02-16 13:05:59 UTC (rev 501) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/SpawnModelChangeRule.java 2009-02-16 20:23:20 UTC (rev 502) @@ -30,7 +30,7 @@ /** * This is the model change rule for the Spawn composition construct. */ -(a)RegistryInfo(extension=ModelChangeRule.class,notation=ESBLanguageModel.JBOSSESB_NOTATION) +(a)RegistryInfo(extension=ModelChangeRule.class,notation=JBossESBNotation.NOTATION_CODE) public class SpawnModelChangeRule extends AbstractStatefulESBModelChangeRule { /** Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/TypeReferenceModelChangeRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/TypeReferenceModelChangeRule.java 2009-02-16 13:05:59 UTC (rev 501) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/TypeReferenceModelChangeRule.java 2009-02-16 20:23:20 UTC (rev 502) @@ -28,7 +28,7 @@ /** * This is the model change rule for the Type Reference. */ -(a)RegistryInfo(extension=ModelChangeRule.class,notation=ESBLanguageModel.JBOSSESB_NOTATION) +(a)RegistryInfo(extension=ModelChangeRule.class,notation=JBossESBNotation.NOTATION_CODE) public class TypeReferenceModelChangeRule extends AbstractModelChangeRule { /** Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/WhenModelChangeRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/WhenModelChangeRule.java 2009-02-16 13:05:59 UTC (rev 501) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/WhenModelChangeRule.java 2009-02-16 20:23:20 UTC (rev 502) @@ -31,7 +31,7 @@ /** * This is the model change rule for the When grouping construct. */ -(a)RegistryInfo(extension=ModelChangeRule.class,notation=ESBLanguageModel.JBOSSESB_NOTATION) +(a)RegistryInfo(extension=ModelChangeRule.class,notation=JBossESBNotation.NOTATION_CODE) public class WhenModelChangeRule extends AbstractStatefulESBModelChangeRule { /** Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/WhileModelChangeRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/WhileModelChangeRule.java 2009-02-16 13:05:59 UTC (rev 501) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/WhileModelChangeRule.java 2009-02-16 20:23:20 UTC (rev 502) @@ -31,7 +31,7 @@ /** * This is the model change rule for the While repetition construct. */ -(a)RegistryInfo(extension=ModelChangeRule.class,notation=ESBLanguageModel.JBOSSESB_NOTATION) +(a)RegistryInfo(extension=ModelChangeRule.class,notation=JBossESBNotation.NOTATION_CODE) public class WhileModelChangeRule extends AbstractStatefulESBModelChangeRule { /** Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateless/ConversationInteractionModelChangeRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateless/ConversationInteractionModelChangeRule.java 2009-02-16 13:05:59 UTC (rev 501) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateless/ConversationInteractionModelChangeRule.java 2009-02-16 20:23:20 UTC (rev 502) @@ -29,7 +29,7 @@ /** * This is the model change rule for the Conversation Interaction. */ -(a)RegistryInfo(extension=ModelChangeRule.class,notation=ESBLanguageModel.JBOSSESB_NOTATION) +(a)RegistryInfo(extension=ModelChangeRule.class,notation=JBossESBNotation.NOTATION_CODE) public class ConversationInteractionModelChangeRule extends AbstractStatelessESBModelChangeRule { /** Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateless/ConversationModelChangeRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateless/ConversationModelChangeRule.java 2009-02-16 13:05:59 UTC (rev 501) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateless/ConversationModelChangeRule.java 2009-02-16 20:23:20 UTC (rev 502) @@ -28,7 +28,7 @@ /** * This is the model change rule for the Conversation. */ -(a)RegistryInfo(extension=ModelChangeRule.class,notation=ESBLanguageModel.JBOSSESB_NOTATION) +(a)RegistryInfo(extension=ModelChangeRule.class,notation=JBossESBNotation.NOTATION_CODE) public class ConversationModelChangeRule extends AbstractModelChangeRule { private static final String NAME_SUFFIX = "_main"; Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateless/IfModelChangeRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateless/IfModelChangeRule.java 2009-02-16 13:05:59 UTC (rev 501) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateless/IfModelChangeRule.java 2009-02-16 20:23:20 UTC (rev 502) @@ -32,7 +32,7 @@ /** * This is the model change rule for the If grouping construct. */ -(a)RegistryInfo(extension=ModelChangeRule.class,notation=ESBLanguageModel.JBOSSESB_NOTATION) +(a)RegistryInfo(extension=ModelChangeRule.class,notation=JBossESBNotation.NOTATION_CODE) public class IfModelChangeRule extends AbstractStatelessESBModelChangeRule { private static final String NAME_SUFFIX = "_main"; Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateless/LanguageToConversationModelChangeRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateless/LanguageToConversationModelChangeRule.java 2009-02-16 13:05:59 UTC (rev 501) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateless/LanguageToConversationModelChangeRule.java 2009-02-16 20:23:20 UTC (rev 502) @@ -28,7 +28,7 @@ * This is the model change rule for the Language Model to * Conversation Model. */ -(a)RegistryInfo(extension=ModelChangeRule.class,notation=ESBLanguageModel.JBOSSESB_NOTATION) +(a)RegistryInfo(extension=ModelChangeRule.class,notation=JBossESBNotation.NOTATION_CODE) public class LanguageToConversationModelChangeRule extends AbstractModelChangeRule { /** Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateless/TypeReferenceModelChangeRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateless/TypeReferenceModelChangeRule.java 2009-02-16 13:05:59 UTC (rev 501) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateless/TypeReferenceModelChangeRule.java 2009-02-16 20:23:20 UTC (rev 502) @@ -28,7 +28,7 @@ /** * This is the model change rule for the Type Reference. */ -(a)RegistryInfo(extension=ModelChangeRule.class,notation=ESBLanguageModel.JBOSSESB_NOTATION) +(a)RegistryInfo(extension=ModelChangeRule.class,notation=JBossESBNotation.NOTATION_CODE) public class TypeReferenceModelChangeRule extends AbstractModelChangeRule { /** Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/parser/JBossESBParser.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/parser/JBossESBParser.java 2009-02-16 13:05:59 UTC (rev 501) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/parser/JBossESBParser.java 2009-02-16 20:23:20 UTC (rev 502) @@ -35,7 +35,7 @@ * * @author gary */ -(a)RegistryInfo(extension=Parser.class,notation=ESBLanguageModel.JBOSSESB_NOTATION) +(a)RegistryInfo(extension=Parser.class,notation=JBossESBNotation.NOTATION_CODE) public class JBossESBParser extends org.scribble.conversation.parser.ConversationParser { /** Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/validation/ESBLanguageModelValidationRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/validation/ESBLanguageModelValidationRule.java 2009-02-16 13:05:59 UTC (rev 501) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/validation/ESBLanguageModelValidationRule.java 2009-02-16 20:23:20 UTC (rev 502) @@ -29,7 +29,7 @@ * * @author gary */ -(a)RegistryInfo(extension=ValidationRule.class,notation=ESBLanguageModel.JBOSSESB_NOTATION) +(a)RegistryInfo(extension=ValidationRule.class,notation=JBossESBNotation.NOTATION_CODE) public class ESBLanguageModelValidationRule extends AbstractValidationRule { /** Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBLanguageModelTest.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBLanguageModelTest.java 2009-02-16 13:05:59 UTC (rev 501) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBLanguageModelTest.java 2009-02-16 20:23:20 UTC (rev 502) @@ -27,7 +27,7 @@ public void testBaseConfiguration() { - ModelReference ref=new ModelReference(ESBLanguageModel.JBOSSESB_NOTATION); + ModelReference ref=new ModelReference(JBossESBNotation.NOTATION_CODE); DefaultESBLanguageModel model=new DefaultESBLanguageModel(ref, false); @@ -111,7 +111,7 @@ String category="category.one"; String name="serviceName"; - ModelReference ref=new ModelReference(ESBLanguageModel.JBOSSESB_NOTATION); + ModelReference ref=new ModelReference(JBossESBNotation.NOTATION_CODE); DefaultESBLanguageModel model=new DefaultESBLanguageModel(ref, false); @@ -173,7 +173,7 @@ String category="category.two"; String name="serviceName"; - ModelReference ref=new ModelReference(ESBLanguageModel.JBOSSESB_NOTATION); + ModelReference ref=new ModelReference(JBossESBNotation.NOTATION_CODE); DefaultESBLanguageModel model=new DefaultESBLanguageModel(ref, false); @@ -219,7 +219,7 @@ String category="category.one"; String name="serviceName"; - ModelReference ref=new ModelReference(ESBLanguageModel.JBOSSESB_NOTATION); + ModelReference ref=new ModelReference(JBossESBNotation.NOTATION_CODE); DefaultESBLanguageModel model=new DefaultESBLanguageModel(ref, false); @@ -239,7 +239,7 @@ String name1="serviceName1"; String name2="serviceName2"; - ModelReference ref=new ModelReference(ESBLanguageModel.JBOSSESB_NOTATION); + ModelReference ref=new ModelReference(JBossESBNotation.NOTATION_CODE); DefaultESBLanguageModel model=new DefaultESBLanguageModel(ref, false); Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/TestESBLanguageModel.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/TestESBLanguageModel.java 2009-02-16 13:05:59 UTC (rev 501) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/TestESBLanguageModel.java 2009-02-16 20:23:20 UTC (rev 502) @@ -102,12 +102,6 @@ return(m_esbConfig); } - @Override - public String getNotation() { - // TODO Auto-generated method stub - return null; - } - public String getJMSDefinition(String jmsBusId) { // TODO Auto-generated method stub return null;