Author: scabanovich Date: 2009-11-24 09:49:42 -0500 (Tue, 24 Nov 2009) New Revision: 18800 Added: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/BasicListConverter.java trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ConverterConstants.java Removed: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/AliasConverter.java trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/NotificationConverter.java trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ObjectPathConverter.java trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/RouteToConverter.java Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/SpecificActionLoader.java Log: https://jira.jboss.org/jira/browse/JBIDE-5199 Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2009-11-24 14:38:47 UTC (rev 18799) +++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2009-11-24 14:49:42 UTC (rev 18800) @@ -24,12 +24,18 @@ <PAIR name="org.jboss.soa.esb.actions.converters.SmooksTransformer" value="ESBPreActionSmooksTransformer"/> <PAIR name="org.jboss.soa.esb.actions.converters.XStreamToObject" value="ESBPreActionXStreamToObject"/> <PAIR name="org.jboss.soa.esb.actions.jbpm.CommandInterpreter" value="ESBPreActionCommandInterpreter"/> + <PAIR name="org.jboss.soa.esb.actions.routing.JMSRouter" value="ESBPreActionJMSRouter"/> + <PAIR name="org.jboss.soa.esb.actions.routing.email.EmailRouter" value="ESBPreActionEMailRouter"/> + <PAIR name="org.jboss.soa.esb.actions.routing.email.EmailWiretap" value="ESBPreActionEMailWiretap"/> <PAIR name="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor" value="ESBPreActionGroovyProcessor"/> <PAIR name="org.jboss.soa.esb.actions.soap.SOAPClient" value="ESBPreActionSOAPClient"/> <PAIR name="org.jboss.soa.esb.actions.soap.SOAPProcessor" value="ESBPreActionSOAPProcessor"/> <PAIR name="org.jboss.soa.esb.actions.soap.proxy.SOAPProxy" value="ESBPreActionSOAPProxy"/> <PAIR name="org.jboss.soa.esb.actions.transformation.xslt.XslAction" value="ESBPreActionXSLTAction"/> + <PAIR + name="org.jboss.soa.esb.actions.validation.SchemaValidationAction" value="ESBPreActionSchemaValidator"/> + <PAIR name="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor" value="ESBPreActionBpmProcessor"/> <PAIR name="org.jboss.soa.esb.smooks.SmooksAction" value="ESBPreActionSmooksAction"/> </MAPPING> <MAPPING name="FileVersions"> @@ -116,6 +122,69 @@ </XModelEntity> <XModelEntity ImplementingClass="%ESB%" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%EntityOrdered%" + XMLSUBPATH="action" name="ESBPreActionBpmProcessor120"> + <XChildrenEntities> + <XChildEntity name="ESBProperty"/> + <XChildEntity name="ESBPreBPMVar"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.action" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="bpm processor action" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;id=true;save=always" + name="name" xmlname="name"/> + <XModelAttribute PROPERTIES="category=general;save=always" + default="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor" + name="class" xmlname="class"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="pre=true;category=general;save=always" + name="command" xmlname="command"/> + <XModelAttribute PROPERTIES="pre=true;category=general" + name="process definition name" xmlname="processdefinition"/> + <XModelAttribute PROPERTIES="pre=true;category=general" + name="process definition id" xmlname="process-definition-id"/> + <XModelAttribute PROPERTIES="pre=true;category=general" name="actor" xmlname="actor"/> + <XModelAttribute PROPERTIES="pre=true;category=general" name="key" xmlname="key"/> + <XModelAttribute PROPERTIES="pre=true;category=general" + name="transition name" xmlname="transition-name"/> + <XModelAttribute PROPERTIES="category=general" name="process" xmlname="process"> + <Constraint loader="ListString"> + <value name="process"/> + <value name="split"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Add BPM Var..." kind="action" name="AddBPMVar"> + <EntityData EntityName="ESBPreBPMVar"> + <AttributeData AttributeName="esb"/> + <AttributeData AttributeName="bpm" Mandatory="no"/> + <AttributeData AttributeName="default" Mandatory="no"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItemReference entity="ESBProperty" name="CopyActions"/> + <XActionItemReference entity="ESBProperty" name="DeleteActions"/> + <XActionItemReference entity="ESBProperty" name="Properties"/> + <XActionItemReference entity="ESBProperty" name="MoveActions"/> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%ESB%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%EntityOrdered%" XMLSUBPATH="action" name="ESBPreActionBusinessRulesProcessor101"> <XChildrenEntities> <XChildEntity name="ESBProperty"/> @@ -357,6 +426,128 @@ <XDependencies/> </XModelEntity> <XModelEntity ImplementingClass="%ESB%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%EntityOrdered%" + XMLSUBPATH="action" name="ESBPreActionEMailRouter120"> + <XChildrenEntities> + <XChildEntity name="ESBProperty"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.action" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="email router action" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;id=true;save=always" + name="name" xmlname="name"/> + <XModelAttribute PROPERTIES="category=general;save=always" + default="org.jboss.soa.esb.actions.routing.email.EmailRouter" + name="class" xmlname="class"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="pre=true;category=general" name="from" xmlname="from"/> + <XModelAttribute PROPERTIES="pre=true;category=general" + name="send to" xmlname="sendTo"/> + <XModelAttribute PROPERTIES="pre=true;category=general" + name="subject" xmlname="subject"/> + <XModelAttribute PROPERTIES="pre=true;category=general" name="host" xmlname="host"> + <Editor name="AccessibleJava"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="pre=true;category=general" name="port" xmlname="port"/> + <XModelAttribute PROPERTIES="pre=true;category=general" + name="username" xmlname="username"/> + <XModelAttribute PROPERTIES="pre=true;category=general" + name="password" xmlname="password"/> + <XModelAttribute PROPERTIES="category=general;pre=true" + default="default(false)" name="unwrap" xmlname="unwrap"> + <Constraint loader="ListString"> + <value name="default(false)"/> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;pre=true" name="auth" xmlname="auth"> + <Constraint loader="ListString"> + <value/> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="pre=true;category=advanced" + name="message attachment name" xmlname="messageAttachmentName"/> + <XModelAttribute PROPERTIES="pre=true;category=advanced" + name="message" xmlname="message"/> + <XModelAttribute PROPERTIES="pre=true;category=advanced" name="cc to" xmlname="ccTo"/> + <XModelAttribute PROPERTIES="category=general" name="process" xmlname="process"> + <Constraint loader="ListString"> + <value name="process"/> + <value name="split"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"/> + <XActionItemReference entity="ESBProperty" name="CopyActions"/> + <XActionItemReference entity="ESBProperty" name="DeleteActions"/> + <XActionItemReference entity="ESBProperty" name="Properties"/> + <XActionItemReference entity="ESBProperty" name="MoveActions"/> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%ESB%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%EntityOrdered%" + XMLSUBPATH="action" name="ESBPreActionEMailWiretap120"> + <XChildrenEntities> + <XChildEntity name="ESBProperty"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.action" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="email wiretap action" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;id=true;save=always" + name="name" xmlname="name"/> + <XModelAttribute PROPERTIES="category=general;save=always" + default="org.jboss.soa.esb.actions.routing.email.EmailWiretap" + name="class" xmlname="class"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttributeReference + attributes="from,send to,subject,host,port,username,password,auth,message attachment name,message,cc to" + entity="ESBPreActionEMailRouter120" name="router"/> + <XModelAttribute PROPERTIES="category=general" name="process" xmlname="process"> + <Constraint loader="ListString"> + <value name="process"/> + <value name="split"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"/> + <XActionItemReference entity="ESBProperty" name="CopyActions"/> + <XActionItemReference entity="ESBProperty" name="DeleteActions"/> + <XActionItemReference entity="ESBProperty" name="Properties"/> + <XActionItemReference entity="ESBProperty" name="MoveActions"/> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%ESB%" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" XMLSUBPATH="action" name="ESBPreActionGroovyProcessor101"> <XChildrenEntities> @@ -387,6 +578,24 @@ </Constraint> <Editor name="TreeChooser"/> </XModelAttribute> + <XModelAttribute PROPERTIES="pre=true;category=general" + default="Default(false)" name="support message based scripting" xmlname="supportMessageBasedScripting"> + <Constraint loader="ListString"> + <value name="Default(false)"/> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="pre=true;category=general" + default="Default(true)" name="cache script" xmlname="cacheScript"> + <Constraint loader="ListString"> + <value name="Default(true)"/> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> <XModelAttribute PROPERTIES="category=general" name="process" xmlname="process"> <Editor name="Uneditable"/> </XModelAttribute> @@ -408,6 +617,89 @@ <XDependencies/> </XModelEntity> <XModelEntity ImplementingClass="%ESB%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%EntityOrdered%" + XMLSUBPATH="action" name="ESBPreActionJMSRouter120"> + <XChildrenEntities> + <XChildEntity name="ESBProperty"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.action" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="jms router action" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;id=true;save=always" + name="name" xmlname="name"/> + <XModelAttribute PROPERTIES="category=general;save=always" + default="org.jboss.soa.esb.actions.routing.JMSRouter" name="class" xmlname="class"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="pre=true;category=general" + name="jndi context factory" xmlname="jndi-context-factory"> + <Editor name="AccessibleJava"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="pre=true;category=general" + name="jndi url" xmlname="jndi-URL"/> + <XModelAttribute PROPERTIES="pre=true;category=general" + name="jndi pkg prefix" xmlname="jndi-pkg-prefix"/> + <XModelAttribute PROPERTIES="pre=true;category=general" + name="connection factory" xmlname="connection-factory"/> + <XModelAttribute PROPERTIES="pre=true;category=general" + name="priority" xmlname="priority"/> + <XModelAttribute PROPERTIES="category=general;pre=true" + default="default(false)" name="unwrap" xmlname="unwrap"> + <Constraint loader="ListString"> + <value name="default(false)"/> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;pre=true" + default="default(true)" name="persistent" xmlname="persistent"> + <Constraint loader="ListString"> + <value name="default(true)"/> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="pre=true;category=advanced" + name="time to live" xmlname="time-to-live"/> + <XModelAttribute PROPERTIES="pre=true;category=advanced" + name="security principal" xmlname="security-principal"/> + <XModelAttribute PROPERTIES="pre=true;category=advanced" + name="security credentials" xmlname="security-credentials"/> + <XModelAttribute PROPERTIES="pre=true;category=advanced" + name="property strategy" xmlname="property-strategy"/> + <XModelAttribute PROPERTIES="pre=true;category=advanced" + name="message prop" xmlname="message-prop"/> + <XModelAttribute PROPERTIES="pre=true;category=advanced" + name="jndi prefixes" xmlname="jndi-prefixes"/> + <XModelAttribute PROPERTIES="category=general" name="process" xmlname="process"> + <Constraint loader="ListString"> + <value name="process"/> + <value name="split"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"/> + <XActionItemReference entity="ESBProperty" name="CopyActions"/> + <XActionItemReference entity="ESBProperty" name="DeleteActions"/> + <XActionItemReference entity="ESBProperty" name="Properties"/> + <XActionItemReference entity="ESBProperty" name="MoveActions"/> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%ESB%" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" XMLSUBPATH="action" name="ESBPreActionLongToDateConverter101"> <XChildrenEntities> @@ -490,6 +782,58 @@ <XDependencies/> </XModelEntity> <XModelEntity ImplementingClass="%ESB%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" + XMLSUBPATH="action" name="ESBPreActionMessagePersister120"> + <XChildrenEntities> + <XChildEntity name="ESBProperty"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.action" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="persist action" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;id=true;save=always" + name="name" xmlname="name"/> + <XModelAttribute PROPERTIES="category=general;save=always" + default="org.jboss.soa.esb.actions.MessagePersister" name="class" xmlname="class"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;save=always;pre=true" + name="message store class" xmlname="message-store-class"> + <Editor name="AccessibleJava"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;pre=true" + name="classification" xmlname="classification"/> + <XModelAttribute PROPERTIES="category=general;pre=true" + default="default(true)" name="terminal" xmlname="terminal"> + <Constraint loader="ListString"> + <value name="default(true)"/> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" name="process" xmlname="process"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"/> + <XActionItemReference entity="ESBProperty" name="CopyActions"/> + <XActionItemReference entity="ESBProperty" name="DeleteActions"/> + <XActionItemReference entity="ESBProperty" name="Properties"/> + <XActionItemReference entity="ESBProperty" name="MoveActions"/> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%ESB%" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%EntityOrdered%" XMLSUBPATH="action" name="ESBPreActionNotifier101"> <XChildrenEntities> @@ -823,6 +1167,60 @@ </XModelEntity> <XModelEntity ImplementingClass="%ESB%" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" + XMLSUBPATH="action" name="ESBPreActionSchemaValidator120"> + <XChildrenEntities> + <XChildEntity name="ESBProperty"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.action" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="schema validation action" + loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;id=true;save=always" + name="name" xmlname="name"/> + <XModelAttribute PROPERTIES="category=general;save=always" + default="org.jboss.soa.esb.actions.validation.SchemaValidationAction" + name="class" xmlname="class"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;save=always;pre=true" + name="schema" xmlname="schema"> + <Constraint loader="Tree"> + <value name="ESBResourceTree"/> + <value name="extensions=xsd"/> + <value name="linkAction=OpenSchema"/> + </Constraint> + <Editor name="TreeChooser"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;pre=true" + name="schema language" xmlname="schemaLanguage"/> + <XModelAttribute PROPERTIES="category=general" name="process" xmlname="process"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem + HandlerClassName="org.jboss.tools.esb.core.model.handlers.OpenESBResourceHandler" + ICON="action.empty" PROPERTIES="actionpath=Open;attribute=schema" + displayName="Open Schema" kind="action" name="OpenSchema"/> + <XActionItem kind="list" name="CreateActions"/> + <XActionItemReference entity="ESBProperty" name="CopyActions"/> + <XActionItemReference entity="ESBProperty" name="DeleteActions"/> + <XActionItemReference entity="ESBProperty" name="Properties"/> + <XActionItemReference entity="ESBProperty" name="MoveActions"/> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%ESB%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" XMLSUBPATH="action" name="ESBPreActionSmooksAction101"> <XChildrenEntities> <XChildEntity name="ESBProperty"/> @@ -856,6 +1254,8 @@ <XModelAttribute PROPERTIES="category=advanced;pre=true" name="set payload location" xmlname="set-payload-location"/> <XModelAttribute PROPERTIES="category=advanced;pre=true" + name="mapped context objects" xmlname="mappedContextObjects"/> + <XModelAttribute PROPERTIES="category=advanced;pre=true" name="exclude non-serializables" xmlname="excludeNonSerializables"> <Constraint loader="ListString"> <value/> @@ -1299,6 +1699,52 @@ </XActionItem> <XDependencies/> </XModelEntity> + <XModelEntity + ImplementingClass="org.jboss.tools.esb.core.model.ESBRouteToImpl" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;converter=bpmVar" + XMLSUBPATH="mapping" name="ESBPreBPMVar"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.property" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="bpm var" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;id=true;save=always" + name="esb" xmlname="esb"/> + <XModelAttribute PROPERTIES="category=general" name="bpm" xmlname="bpm"/> + <XModelAttribute PROPERTIES="category=general" name="default" xmlname="default"/> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"/> + <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/> + <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> + <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" + ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> + <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" + ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> + </XActionItem> + <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> + <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%" + ICON="action.delete" displayName="Delete" kind="action" name="Delete"/> + </XActionItem> + <XActionItem ICON="action.empty" kind="list" name="Properties"> + <XActionItem HandlerClassName="%Properties%" ICON="action.empty" + displayName="Properties..." kind="action" name="Properties"/> + </XActionItem> + <XActionItem displayName="move" kind="list" name="MoveActions"> + <XActionItem HIDE="always" HandlerClassName="%Move%" + ICON="action.move" displayName="Move" kind="action" name="Move"/> + </XActionItem> + </XActionItem> + <XDependencies/> + </XModelEntity> <XModelEntity ImplementingClass="%ESB%" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;converter=notification" XMLSUBPATH="NotificationList" name="ESBPreNotificationList"> @@ -1757,14 +2203,18 @@ <XChildEntity name="ESBPreActionObjectToXStream101"/> <XChildEntity name="ESBPreActionSmooksAction101"/> <XChildEntity name="ESBPreActionSmooksTransformer101"/> - <XChildEntity name="ESBPreActionMessagePersister101"/> + <XChildEntity name="ESBPreActionMessagePersister120"/> <XChildEntity name="ESBPreActionXStreamToObject101"/> <XChildEntity name="ESBPreActionCommandInterpreter101"/> + <XChildEntity name="ESBPreActionBpmProcessor120"/> <XChildEntity name="ESBPreActionGroovyProcessor101"/> <XChildEntity name="ESBPreActionAggregator101"/> <XChildEntity name="ESBPreActionContentBasedRouter101"/> <XChildEntity name="ESBPreActionStaticRouter101"/> <XChildEntity name="ESBPreActionStaticWiretap101"/> + <XChildEntity name="ESBPreActionJMSRouter120"/> + <XChildEntity name="ESBPreActionEMailRouter120"/> + <XChildEntity name="ESBPreActionEMailWiretap120"/> <XChildEntity name="ESBPreActionSOAPProcessor101"/> <XChildEntity name="ESBPreActionSOAPClient101"/> <XChildEntity name="ESBPreActionSOAPProxy120"/> @@ -1772,6 +2222,7 @@ <XChildEntity name="ESBPreActionNotifier101"/> <XChildEntity name="ESBPreActionBusinessRulesProcessor101"/> <XChildEntity name="ESBPreActionXSLTAction120"/> + <XChildEntity name="ESBPreActionSchemaValidator120"/> </XChildrenEntities> <XActionItem kind="list"> <XActionItem ICON="action.empty" displayName="New" group="1" @@ -1785,7 +2236,16 @@ <XActionItemReference entity="ESBActions101" name="AddObjectToXStream"/> <XActionItemReference entity="ESBActions101" name="AddSmooksAction"/> <XActionItemReference entity="ESBActions101" name="AddSmooksTransformer"/> - <XActionItemReference entity="ESBActions101" name="AddMessagePersister"/> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Message Persister..." kind="action" name="AddMessagePersister"> + <EntityData EntityName="ESBPreActionMessagePersister120"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="message store class"/> + <AttributeData AttributeName="classification" Mandatory="no"/> + <AttributeData AttributeName="terminal" Mandatory="no"/> + </EntityData> + </XActionItem> <XActionItemReference entity="ESBActions101" name="AddXStreamToObject"/> <XActionItem HandlerClassName="%Create%" ICON="action.empty" PROPERTIES="validator.add=true" WizardClassName="%Default%" @@ -1800,8 +2260,87 @@ </XActionItem> </XActionItem> <XActionItemReference entity="ESBActions101" name="AddCommandInterpreter"/> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="BPM Processor..." kind="action" name="AddBPMProcessor"> + <EntityData EntityName="ESBPreActionBpmProcessor120"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="command"/> + <AttributeData AttributeName="process definition name" Mandatory="no"/> + <AttributeData AttributeName="process definition id" Mandatory="no"/> + </EntityData> + </XActionItem> <XActionItemReference entity="ESBActions101" name="AddGroovyProcessor"/> - <XActionItemReference entity="ESBActions101" name="Routers"/> + <XActionItem displayName="Routers" group="1" kind="list" name="Routers"> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Aggregator..." kind="action" name="AddAggregator"> + <EntityData EntityName="ESBPreActionAggregator101"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="timeout in millies" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Content Based Router..." kind="action" name="AddContentBasedRouter"> + <EntityData EntityName="ESBPreActionContentBasedRouter101"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="process" Mandatory="no"/> + <AttributeData AttributeName="rule set"/> + <AttributeData AttributeName="rule language" Mandatory="no"/> + <AttributeData AttributeName="rule reload" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Static Router..." kind="action" name="AddStaticRouter"> + <EntityData EntityName="ESBPreActionStaticRouter101"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="process" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Static Wiretap..." kind="action" name="AddStaticWiretap"> + <EntityData EntityName="ESBPreActionStaticWiretap101"> + <AttributeData AttributeName="name"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Notifier..." kind="action" name="AddNotifier"> + <EntityData EntityName="ESBPreActionNotifier101"> + <AttributeData AttributeName="name"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="JMS Router..." kind="action" name="AddJMSRouter"> + <EntityData EntityName="ESBPreActionJMSRouter120"> + <AttributeData AttributeName="name"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="EMail Router..." kind="action" name="AddEMailRouter"> + <EntityData EntityName="ESBPreActionEMailRouter120"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="from" Mandatory="no"/> + <AttributeData AttributeName="send to" Mandatory="no"/> + <AttributeData AttributeName="subject" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="EMail Wiretap..." kind="action" name="AddEMailWiretap"> + <EntityData EntityName="ESBPreActionEMailWiretap120"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="from" Mandatory="no"/> + <AttributeData AttributeName="send to" Mandatory="no"/> + <AttributeData AttributeName="subject" Mandatory="no"/> + </EntityData> + </XActionItem> + </XActionItem> <XActionItem displayName="SOAP" kind="list" name="SOAP"> <XActionItem HandlerClassName="%Create%" ICON="action.empty" PROPERTIES="validator.add=true" WizardClassName="%Default%" @@ -1833,6 +2372,14 @@ </XActionItem> <XActionItemReference entity="ESBActions101" name="AddSystemPrintln"/> <XActionItemReference entity="ESBActions101" name="AddBusinessRulesProcessor"/> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Schema Validation..." kind="action" name="AddSchemaValidation"> + <EntityData EntityName="ESBPreActionSchemaValidator120"> + <AttributeData AttributeName="schema"/> + <AttributeData AttributeName="schema language" Mandatory="no"/> + </EntityData> + </XActionItem> </XActionItem> </XActionItem> </XActionItem> Modified: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/SpecificActionLoader.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/SpecificActionLoader.java 2009-11-24 14:38:47 UTC (rev 18799) +++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/SpecificActionLoader.java 2009-11-24 14:49:42 UTC (rev 18800) @@ -23,10 +23,8 @@ import org.jboss.tools.common.model.options.PreferenceModelUtilities; import org.jboss.tools.common.model.util.XModelObjectLoaderUtil; import org.jboss.tools.esb.core.ESBCorePlugin; -import org.jboss.tools.esb.core.model.converters.AliasConverter; -import org.jboss.tools.esb.core.model.converters.NotificationConverter; -import org.jboss.tools.esb.core.model.converters.ObjectPathConverter; -import org.jboss.tools.esb.core.model.converters.RouteToConverter; +import org.jboss.tools.esb.core.model.converters.ConverterConstants; +import org.jboss.tools.esb.core.model.converters.IPropertyConverter; /** * @author Viacheslav Kabanovich @@ -134,15 +132,9 @@ if(ESBConstants.ENT_ESB_PROPERTY.equals(childEntityName)) continue; XModelEntity childEntity = action.getModelEntity().getMetaModel().getEntity(childEntityName); if(childEntity == null) continue; - String converter = childEntity.getProperty("converter"); - if("alias".equals(converter)) { - new AliasConverter().toSpecific(basic, action); - } else if("route".equals(converter)) { - new RouteToConverter().toSpecific(basic, action); - } else if("path".equals(converter)) { - new ObjectPathConverter().toSpecific(basic, action); - } else if("notification".equals(converter)) { - new NotificationConverter().toSpecific(basic, action); + IPropertyConverter converter = getPropertyConverter(childEntity); + if(converter != null) { + converter.toSpecific(basic, action); } } @@ -193,15 +185,9 @@ if(ESBConstants.ENT_ESB_PROPERTY.equals(childEntityName)) continue; XModelEntity childEntity = entity.getMetaModel().getEntity(childEntityName); if(childEntity == null) continue; - String converter = childEntity.getProperty("converter"); - if("alias".equals(converter)) { - new AliasConverter().toBasic(result, action); - } else if("route".equals(converter)) { - new RouteToConverter().toBasic(result, action); - } else if("path".equals(converter)) { - new ObjectPathConverter().toBasic(result, action); - } else if("notification".equals(converter)) { - new NotificationConverter().toBasic(result, action); + IPropertyConverter converter = getPropertyConverter(childEntity); + if(converter != null) { + converter.toBasic(result, action); } } @@ -211,4 +197,15 @@ } return result; } + + IPropertyConverter getPropertyConverter(XModelEntity childEntity) { + String converter = childEntity.getProperty("converter"); + if("alias".equals(converter)) return ConverterConstants.ALIAS_CONVERTER; + if("route".equals(converter)) return ConverterConstants.ROUTE_CONVERTER; + if("path".equals(converter)) return ConverterConstants.OBJECT_PATHS_CONVERTER; + if("notification".equals(converter)) return ConverterConstants.NOTIFICATION_CONVERTER; + if("bpmVar".equals(converter)) return ConverterConstants.BPM_VAR_CONVERTER; + + return null; + } } Deleted: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/AliasConverter.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/AliasConverter.java 2009-11-24 14:38:47 UTC (rev 18799) +++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/AliasConverter.java 2009-11-24 14:49:42 UTC (rev 18800) @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.esb.core.model.converters; - -/** - * @author Viacheslav Kabanovich - */ -public class AliasConverter extends ListConverter { - static final String ALIAS_ENTITY = "ESBPreAlias"; - static final String ALIASES = "aliases"; - - protected String getPropertyName() { - return ALIASES; - } - - protected String getItemEntityName() { - return ALIAS_ENTITY; - } - -} Added: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/BasicListConverter.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/BasicListConverter.java (rev 0) +++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/BasicListConverter.java 2009-11-24 14:49:42 UTC (rev 18800) @@ -0,0 +1,33 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.esb.core.model.converters; + +/** + * @author Viacheslav Kabanovich + */ +public class BasicListConverter extends ListConverter { + String propertyName; + String itemEntityName; + + public BasicListConverter(String propertyName, String itemEntityName) { + this.propertyName = propertyName; + this.itemEntityName = itemEntityName; + } + + protected String getPropertyName() { + return propertyName; + } + + protected String getItemEntityName() { + return itemEntityName; + } + +} Property changes on: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/BasicListConverter.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ConverterConstants.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ConverterConstants.java (rev 0) +++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ConverterConstants.java 2009-11-24 14:49:42 UTC (rev 18800) @@ -0,0 +1,36 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.esb.core.model.converters; + +/** + * @author Viacheslav Kabanovich + */ +public interface ConverterConstants { + String ALIAS_ENTITY = "ESBPreAlias"; + String ALIASES = "aliases"; + IPropertyConverter ALIAS_CONVERTER = new BasicListConverter(ALIASES, ALIAS_ENTITY); + + String ROUTE_TO_ENTITY = "ESBPreRouteTo"; + String DESTINATIONS = "destinations"; + IPropertyConverter ROUTE_CONVERTER = new BasicListConverter(DESTINATIONS, ROUTE_TO_ENTITY); + + String OBJECT_PATH_ENTITY = "ESBPreObjectPath"; + String OBJECT_PATHS = "object-paths"; + IPropertyConverter OBJECT_PATHS_CONVERTER = new BasicListConverter(OBJECT_PATHS, OBJECT_PATH_ENTITY); + + String NOTIFICATION_ENTITY = "ESBPreNotificationList"; + IPropertyConverter NOTIFICATION_CONVERTER = new BasicListConverter(DESTINATIONS, NOTIFICATION_ENTITY); + + String BPM_VAR_ENTITY = "ESBPreBPMVar"; + String BPM_VARS = "esbToBpmVars"; + IPropertyConverter BPM_VAR_CONVERTER = new BasicListConverter(BPM_VARS, BPM_VAR_ENTITY); + +} Property changes on: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ConverterConstants.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/NotificationConverter.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/NotificationConverter.java 2009-11-24 14:38:47 UTC (rev 18799) +++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/NotificationConverter.java 2009-11-24 14:49:42 UTC (rev 18800) @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.esb.core.model.converters; - -/** - * @author Viacheslav Kabanovich - */ -public class NotificationConverter extends ListConverter { - static final String NOTIFICATION_ENTITY = "ESBPreNotificationList"; - static final String DESTINATIONS = "destinations"; - - protected String getPropertyName() { - return DESTINATIONS; - } - - protected String getItemEntityName() { - return NOTIFICATION_ENTITY; - } - -} Deleted: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ObjectPathConverter.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ObjectPathConverter.java 2009-11-24 14:38:47 UTC (rev 18799) +++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ObjectPathConverter.java 2009-11-24 14:49:42 UTC (rev 18800) @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.esb.core.model.converters; - -/** - * @author Viacheslav Kabanovich - */ -public class ObjectPathConverter extends ListConverter { - static final String OBJECT_PATH_ENTITY = "ESBPreObjectPath"; - static final String OBJECT_PATHS = "object-paths"; - - protected String getPropertyName() { - return OBJECT_PATHS; - } - - protected String getItemEntityName() { - return OBJECT_PATH_ENTITY; - } - -} Deleted: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/RouteToConverter.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/RouteToConverter.java 2009-11-24 14:38:47 UTC (rev 18799) +++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/RouteToConverter.java 2009-11-24 14:49:42 UTC (rev 18800) @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.esb.core.model.converters; - -/** - * @author Viacheslav Kabanovich - */ -public class RouteToConverter extends ListConverter { - static final String ROUTE_TO_ENTITY = "ESBPreRouteTo"; - static final String DESTINATIONS = "destinations"; - - protected String getPropertyName() { - return DESTINATIONS; - } - - protected String getItemEntityName() { - return ROUTE_TO_ENTITY; - } - -}