Author: scabanovich Date: 2008-06-10 09:54:56 -0400 (Tue, 10 Jun 2008) New Revision: 8679 Added: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBRouteToImpl.java trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ListConverter.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/RouteToConverter.java Modified: trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta 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/converters/AliasConverter.java trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/IPropertyConverter.java Log: JBIDE-2022 Modified: trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml 2008-06-10 13:26:05 UTC (rev 8678) +++ trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml 2008-06-10 13:54:56 UTC (rev 8679) @@ -29,6 +29,8 @@ class="org.jboss.tools.esb.core.model.ESBAnyElementPresentation"/> <xclass id="org.jboss.tools.esb.core.model.ESBCustomizedObjectImpl" class="org.jboss.tools.esb.core.model.ESBCustomizedObjectImpl"/> + <xclass id="org.jboss.tools.esb.core.model.ESBRouteToImpl" + class="org.jboss.tools.esb.core.model.ESBRouteToImpl"/> <xclass id="org.jboss.tools.esb.core.model.handlers.AddProviderSupport" class="org.jboss.tools.esb.core.model.handlers.AddProviderSupport"/> 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 2008-06-10 13:26:05 UTC (rev 8678) +++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2008-06-10 13:54:56 UTC (rev 8679) @@ -49,6 +49,44 @@ </ICONS> <GlobalActions kind="list"/> <XModelEntity ImplementingClass="%ESB%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" name="ESBPreActionAggregator101"> + <XChildrenEntities> + <XChildEntity name="ESBProperty"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.action" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="pre-packed 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.Aggregator" name="class" xmlname="class"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="pre=true;category=general" + name="timeout in millies" xmlname="timeoutInMillies"/> + <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" name="ESBPreActionByteArrayToString101"> <XChildrenEntities> <XChildEntity name="ESBProperty"/> @@ -88,6 +126,145 @@ <XDependencies/> </XModelEntity> <XModelEntity ImplementingClass="%ESB%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" name="ESBPreActionCommandInterpreter101"> + <XChildrenEntities> + <XChildEntity name="ESBProperty"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.action" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="pre-packed 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.jbpm.CommandInterpreter" + name="class" xmlname="class"> + <Editor name="Uneditable"/> + </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%" name="ESBPreActionContentBasedRouter101"> + <XChildrenEntities> + <XChildEntity name="ESBProperty"/> + <XChildEntity name="ESBPreRouteTo"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.action" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="pre-packed 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.ContentBasedRouter" name="class" xmlname="class"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="pre=true;category=general" + name="rule set" xmlname="ruleSet"/> + <XModelAttribute PROPERTIES="category=general;pre=true;save=always" + name="rule language" xmlname="ruleLanguage"/> + <XModelAttribute PROPERTIES="pre=true;category=general" + default="Default(false)" name="rule reload" xmlname="ruleReload"> + <Constraint loader="ListString"> + <value name="Default(false)"/> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <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 Route To..." kind="action" name="AddRouteTo"> + <EntityData EntityName="ESBPreRouteTo"> + <AttributeData AttributeName="destination name"/> + <AttributeData AttributeName="service category" Mandatory="no"/> + <AttributeData AttributeName="service name" 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" name="ESBPreActionGroovyProcessor101"> + <XChildrenEntities> + <XChildEntity name="ESBProperty"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.action" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="pre-packed 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.scripting.GroovyActionProcessor" + name="class" xmlname="class"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="pre=true;category=general" name="script" xmlname="script"/> + <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" name="ESBPreActionLongToDateConverter101"> <XChildrenEntities> <XChildEntity name="ESBProperty"/> @@ -167,6 +344,51 @@ <XDependencies/> </XModelEntity> <XModelEntity ImplementingClass="%ESB%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%EntityOrdered%" name="ESBPreActionNotifier101"> + <XChildrenEntities> + <XChildEntity name="ESBProperty"/> + <XChildEntity name="ESBPreNotificationList"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.action" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="pre-packed 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.Notifier" name="class" xmlname="class"> + <Editor name="Uneditable"/> + </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"> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Add Notification List..." kind="action" name="AddNotificationList"> + <EntityData EntityName="ESBPreNotificationList"> + <AttributeData AttributeName="type"/> + </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" name="ESBPreActionObjectInvoke101"> <XChildrenEntities> <XChildEntity name="ESBProperty"/> @@ -306,6 +528,92 @@ <XDependencies/> </XModelEntity> <XModelEntity ImplementingClass="%ESB%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" name="ESBPreActionSOAPClient101"> + <XChildrenEntities> + <XChildEntity name="ESBProperty"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.action" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="pre-packed 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.soap.SOAPClient" name="class" xmlname="class"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="pre=true;category=general" name="wsdl" xmlname="wsdl"/> + <XModelAttribute PROPERTIES="pre=true;category=general" + name="operation" xmlname="operation"/> + <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"> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Add Property..." kind="action" name="AddProperty"> + <EntityData EntityName="ESBProperty"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="value" 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" name="ESBPreActionSOAPProcessor101"> + <XChildrenEntities> + <XChildEntity name="ESBProperty"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.action" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="pre-packed 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.soap.SOAPProcessor" name="class" xmlname="class"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="pre=true;category=general" + name="jbossws endpoint" xmlname="jbossws-endpoint"/> + <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" name="ESBPreActionSmooksTransformer101"> <XChildrenEntities> <XChildEntity name="ESBProperty"/> @@ -351,6 +659,164 @@ <XDependencies/> </XModelEntity> <XModelEntity ImplementingClass="%ESB%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%EntityOrdered%" name="ESBPreActionStaticRouter101"> + <XChildrenEntities> + <XChildEntity name="ESBProperty"/> + <XChildEntity name="ESBPreRouteTo"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.action" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="pre-packed 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.StaticRouter" name="class" xmlname="class"> + <Editor name="Uneditable"/> + </XModelAttribute> + <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 Route To..." kind="action" name="AddRouteTo"> + <EntityData EntityName="ESBPreRouteTo"> + <AttributeData AttributeName="destination name"/> + <AttributeData AttributeName="service category" Mandatory="no"/> + <AttributeData AttributeName="service name"/> + </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%" name="ESBPreActionStaticWiretap101"> + <XChildrenEntities> + <XChildEntity name="ESBProperty"/> + <XChildEntity name="ESBPreRouteTo"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.action" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="pre-packed 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.StaticWiretap" name="class" xmlname="class"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" name="process" xmlname="process"> + <Constraint loader="ListString"> + <value name="process"/> + </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 Route To..." kind="action" name="AddRouteTo"> + <EntityData EntityName="ESBPreRouteTo"> + <AttributeData AttributeName="destination name"/> + <AttributeData AttributeName="service category" Mandatory="no"/> + <AttributeData AttributeName="service name"/> + </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" name="ESBPreActionSystemPrintln101"> + <XChildrenEntities> + <XChildEntity name="ESBProperty"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.action" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="pre-packed 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.SystemPrintln" name="class" xmlname="class"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute + PROPERTIES="pre=true;category=general;id=true;save=always" + name="message" xmlname="message"/> + <XModelAttribute PROPERTIES="pre=true;category=general" + default="Default(false)" name="print full" xmlname="printfull"> + <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(false)" name="output stream" xmlname="outputstream"> + <Constraint loader="ListString"> + <value name="Default(false)"/> + <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%" name="ESBPreActionXStreamToObject101"> <XChildrenEntities> <XChildEntity name="ESBProperty"/> @@ -457,6 +923,107 @@ </XActionItem> <XDependencies/> </XModelEntity> + <XModelEntity ImplementingClass="%ESB%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;converter=notification" + XMLSUBPATH="NotificationList" name="ESBPreNotificationList"> + <XChildrenEntities> + <XChildEntity name="AnyElement"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.property" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="notification list" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;id=true;save=always" + name="type" xmlname="type"/> + <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="entity=AnyElement" WizardClassName="%Default%" + displayName="Add Tag..." kind="action" name="CreateTag"> + <EntityData EntityName="AnyElementNew"> + <AttributeData AttributeName="tag"/> + </EntityData> + </XActionItem> + </XActionItem> + <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="org.jboss.tools.esb.core.model.ESBRouteToImpl" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;converter=route" + XMLSUBPATH="route-to" name="ESBPreRouteTo"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.property" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="route to" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" + name="destination name" xmlname="destination-name"/> + <XModelAttribute PROPERTIES="category=general" + name="service category" xmlname="service-category"/> + <XModelAttribute PROPERTIES="category=general;id=true;save=always" + name="service name" xmlname="service-name"/> + <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> <XEntityExtension name="ESBActions101"> <XChildrenEntities> <XChildEntity name="ESBPreActionByteArrayToString101"/> @@ -467,6 +1034,16 @@ <XChildEntity name="ESBPreActionSmooksTransformer101"/> <XChildEntity name="ESBPreActionMessagePersister101"/> <XChildEntity name="ESBPreActionXStreamToObject101"/> + <XChildEntity name="ESBPreActionCommandInterpreter101"/> + <XChildEntity name="ESBPreActionGroovyProcessor101"/> + <XChildEntity name="ESBPreActionAggregator101"/> + <XChildEntity name="ESBPreActionContentBasedRouter101"/> + <XChildEntity name="ESBPreActionStaticRouter101"/> + <XChildEntity name="ESBPreActionStaticWiretap101"/> + <XChildEntity name="ESBPreActionSOAPProcessor101"/> + <XChildEntity name="ESBPreActionSOAPClient101"/> + <XChildEntity name="ESBPreActionSystemPrintln101"/> + <XChildEntity name="ESBPreActionNotifier101"/> </XChildrenEntities> <XActionItem kind="list"> <XActionItem ICON="action.empty" displayName="New" group="1" @@ -474,21 +1051,6 @@ <XActionItem displayName="Pre-packed Action" group="1" kind="list" name="PrePackedAction"> <XActionItem HandlerClassName="%Create%" ICON="action.empty" PROPERTIES="validator.add=true" WizardClassName="%Default%" - displayName="Byte Array To String..." kind="action" name="AddByteArrayToString"> - <EntityData EntityName="ESBPreActionByteArrayToString101"> - <AttributeData AttributeName="name"/> - <AttributeData AttributeName="encoding" Mandatory="no"/> - </EntityData> - </XActionItem> - <XActionItem HandlerClassName="%Create%" ICON="action.empty" - PROPERTIES="validator.add=true" WizardClassName="%Default%" - displayName="Long To Date..." kind="action" name="AddLongToDate"> - <EntityData EntityName="ESBPreActionLongToDateConverter101"> - <AttributeData AttributeName="name"/> - </EntityData> - </XActionItem> - <XActionItem HandlerClassName="%Create%" ICON="action.empty" - PROPERTIES="validator.add=true" WizardClassName="%Default%" displayName="Object Invoke..." kind="action" name="AddObjectInvoke"> <EntityData EntityName="ESBPreActionObjectInvoke101"> <AttributeData AttributeName="name"/> @@ -496,53 +1058,155 @@ <AttributeData AttributeName="class method"/> </EntityData> </XActionItem> - <XActionItem HandlerClassName="%Create%" ICON="action.empty" - PROPERTIES="validator.add=true" WizardClassName="%Default%" - displayName="Object To CSV String..." kind="action" name="AddObjectToCSVString"> - <EntityData EntityName="ESBPreActionObjectToCSVString101"> - <AttributeData AttributeName="name"/> - <AttributeData AttributeName="bean properties"/> - <AttributeData AttributeName="fail on missing property" Mandatory="no"/> - </EntityData> + <XActionItem displayName="Converters" group="1" kind="list" name="Converters"> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Byte Array To String..." kind="action" name="AddByteArrayToString"> + <EntityData EntityName="ESBPreActionByteArrayToString101"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="encoding" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Long To Date..." kind="action" name="AddLongToDate"> + <EntityData EntityName="ESBPreActionLongToDateConverter101"> + <AttributeData AttributeName="name"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Object To CSV String..." kind="action" name="AddObjectToCSVString"> + <EntityData EntityName="ESBPreActionObjectToCSVString101"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="bean properties"/> + <AttributeData AttributeName="fail on missing property" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Object To XStream..." kind="action" name="AddObjectToXStream"> + <EntityData EntityName="ESBPreActionObjectToXStream101"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="class alias" Mandatory="no"/> + <AttributeData AttributeName="exclude package" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Smooks Transformer..." kind="action" name="AddSmooksTransformer"> + <EntityData EntityName="ESBPreActionSmooksTransformer101"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="resource config"/> + <AttributeData AttributeName="from" Mandatory="no"/> + <AttributeData AttributeName="from type" Mandatory="no"/> + <AttributeData AttributeName="to" Mandatory="no"/> + <AttributeData AttributeName="to type" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Message Persister..." kind="action" name="AddMessagePersister"> + <EntityData EntityName="ESBPreActionMessagePersister101"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="classification" Mandatory="no"/> + <AttributeData AttributeName="message store class" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="XStream To Object..." kind="action" name="AddXStreamToObject"> + <EntityData EntityName="ESBPreActionXStreamToObject101"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="class alias" Mandatory="no"/> + <AttributeData AttributeName="exclude package" Mandatory="no"/> + <AttributeData AttributeName="incoming type"/> + </EntityData> + </XActionItem> </XActionItem> <XActionItem HandlerClassName="%Create%" ICON="action.empty" PROPERTIES="validator.add=true" WizardClassName="%Default%" - displayName="Object To XStream..." kind="action" name="AddObjectToXStream"> - <EntityData EntityName="ESBPreActionObjectToXStream101"> + displayName="Command Interpreter..." kind="action" name="AddCommandInterpreter"> + <EntityData EntityName="ESBPreActionCommandInterpreter101"> <AttributeData AttributeName="name"/> - <AttributeData AttributeName="class alias" Mandatory="no"/> - <AttributeData AttributeName="exclude package" Mandatory="no"/> </EntityData> </XActionItem> <XActionItem HandlerClassName="%Create%" ICON="action.empty" PROPERTIES="validator.add=true" WizardClassName="%Default%" - displayName="Smooks Transformer..." kind="action" name="AddSmooksTransformer"> - <EntityData EntityName="ESBPreActionSmooksTransformer101"> + displayName="Groovy Action Processor..." kind="action" name="AddGroovyProcessor"> + <EntityData EntityName="ESBPreActionGroovyProcessor101"> <AttributeData AttributeName="name"/> - <AttributeData AttributeName="resource config"/> - <AttributeData AttributeName="from" Mandatory="no"/> - <AttributeData AttributeName="from type" Mandatory="no"/> - <AttributeData AttributeName="to" Mandatory="no"/> - <AttributeData AttributeName="to type" Mandatory="no"/> + <AttributeData AttributeName="script"/> </EntityData> </XActionItem> - <XActionItem HandlerClassName="%Create%" ICON="action.empty" - PROPERTIES="validator.add=true" WizardClassName="%Default%" - displayName="Message Persister..." kind="action" name="AddMessagePersister"> - <EntityData EntityName="ESBPreActionMessagePersister101"> - <AttributeData AttributeName="name"/> - <AttributeData AttributeName="classification" Mandatory="no"/> - <AttributeData AttributeName="message store class" Mandatory="no"/> - </EntityData> + <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> + <XActionItem displayName="SOAP" group="1" kind="list" name="SOAP"> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="SOAP Processor..." kind="action" name="SOAPProcessor"> + <EntityData EntityName="ESBPreActionSOAPProcessor101"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="jbossws endpoint"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="SOAP Client..." kind="action" name="SOAPClient"> + <EntityData EntityName="ESBPreActionSOAPClient101"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="wsdl"/> + <AttributeData AttributeName="operation"/> + </EntityData> + </XActionItem> + </XActionItem> <XActionItem HandlerClassName="%Create%" ICON="action.empty" PROPERTIES="validator.add=true" WizardClassName="%Default%" - displayName="XStream To Object..." kind="action" name="AddXStreamToObject"> - <EntityData EntityName="ESBPreActionXStreamToObject101"> + displayName="System Println..." kind="action" name="AddSystemPrintln"> + <EntityData EntityName="ESBPreActionSystemPrintln101"> <AttributeData AttributeName="name"/> - <AttributeData AttributeName="class alias" Mandatory="no"/> - <AttributeData AttributeName="exclude package" Mandatory="no"/> - <AttributeData AttributeName="incoming type"/> + <AttributeData AttributeName="message"/> </EntityData> </XActionItem> </XActionItem> Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta 2008-06-10 13:26:05 UTC (rev 8678) +++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta 2008-06-10 13:54:56 UTC (rev 8679) @@ -49,7 +49,7 @@ </ICONS> <GlobalActions kind="list"/> <XModelEntity ImplementingClass="%ESB%" - PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%Ordered%" XMLSUBPATH="action" name="ESBAction101"> <XChildrenEntities> <XChildEntity name="ESBProperty"/> Added: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBRouteToImpl.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBRouteToImpl.java (rev 0) +++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBRouteToImpl.java 2008-06-10 13:54:56 UTC (rev 8679) @@ -0,0 +1,27 @@ +/******************************************************************************* + * 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; + +/** + * @author Viacheslav Kabanovich + */ +public class ESBRouteToImpl extends ESBCustomizedObjectImpl { + private static final long serialVersionUID = 1L; + + public ESBRouteToImpl() {} + + public String getPresentationString() { + String dn = getAttributeValue("destination name"); + if(dn != null && dn.length() > 0) return dn; + return super.getPresentationString(); + } + +} 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 2008-06-10 13:26:05 UTC (rev 8678) +++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/SpecificActionLoader.java 2008-06-10 13:54:56 UTC (rev 8679) @@ -1,3 +1,13 @@ +/******************************************************************************* + * 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; import java.util.HashMap; @@ -12,17 +22,21 @@ 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.RouteToConverter; +/** + * @author Viacheslav Kabanovich + */ public class SpecificActionLoader implements ESBConstants { - public static SpecificActionLoader instance = new SpecificActionLoader(); - static String ACTION_ENTITY = "ESBAction"; - static String ACTIONS_FOLDER_ENTITY = "ESBActions"; + static final String ACTION_ENTITY = "ESBAction"; + static final String ACTIONS_FOLDER_ENTITY = "ESBActions"; /** * Version suffix should be added to entity name */ - String[][] SPECIFIC_ACTIONS = { + static final String[][] SPECIFIC_ACTIONS = { {"org.jboss.soa.esb.actions.converters.ByteArrayToString", "ESBPreActionByteArrayToString"}, //encoding {"org.jboss.soa.esb.actions.converters.LongToDateConverter", "ESBPreActionLongToDateConverter"}, @@ -41,7 +55,7 @@ //class-alias, exclude-package, incoming-type, root-node, aliases {"org.jboss.soa.esb.actions.jbpm.CommandInterpreter", "ESBPreActionCommandInterpreter"}, // - {"org.jboss.soa.esb.actions.scripting.GroovyActionProcessor", "ESBPreActionGroovyActionProcessor"}, + {"org.jboss.soa.esb.actions.scripting.GroovyActionProcessor", "ESBPreActionGroovyProcessor"}, //script {"org.jboss.soa.esb.actions.Aggregator", "ESBPreActionAggregator"}, //timeoutInMillies @@ -61,6 +75,8 @@ //message, printfull, outputstream }; + public static final SpecificActionLoader instance = new SpecificActionLoader(); + Map<String,String> classToEntity = new HashMap<String, String>(); Map<String,String> entityToClass = new HashMap<String, String>(); @@ -145,8 +161,11 @@ 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("notification".equals(converter)) { + new NotificationConverter().toSpecific(basic, action); } - //TODO } XModelObject[] cs = basic.getChildren(ESBConstants.ENT_ESB_PROPERTY); @@ -177,8 +196,8 @@ if(pre == null || pre.length() == 0) continue; if("true".equals(pre)) { String value = action.getAttributeValue(as[i].getName()); - if(value == null || (value.length() == 0 && !"always".equals(as[i].getProperty("save")))) { - continue; + if(value == null || value.length() == 0 || value.equals(as[i].getDefaultValue())) { + if(!"always".equals(as[i].getProperty("save"))) continue; } XModelObject p = action.getModel().createModelObject(ESBConstants.ENT_ESB_PROPERTY, null); p.setAttributeValue("name", as[i].getXMLName()); @@ -199,8 +218,11 @@ 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("notification".equals(converter)) { + new NotificationConverter().toBasic(result, action); } - //TODO } XModelObject[] cs = action.getChildren(ESBConstants.ENT_ESB_PROPERTY); Modified: 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 2008-06-10 13:26:05 UTC (rev 8678) +++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/AliasConverter.java 2008-06-10 13:54:56 UTC (rev 8679) @@ -1,62 +1,28 @@ +/******************************************************************************* + * 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; -import java.util.HashMap; -import java.util.Map; +/** + * @author Viacheslav Kabanovich + */ +public class AliasConverter extends ListConverter { + static final String ALIAS_ENTITY = "ESBPreAlias"; + static final String ALIASES = "aliases"; -import org.jboss.tools.common.model.XModelObject; -import org.jboss.tools.common.model.impl.AnyElementObjectImpl; -import org.jboss.tools.common.model.util.XModelObjectLoaderUtil; -import org.jboss.tools.esb.core.model.ESBConstants; - -public class AliasConverter implements IPropertyConverter { - static String ALIAS_ENTITY = "ESBPreAlias"; - - public void toSpecific(XModelObject basicAction, XModelObject specificAction) { - XModelObject p = basicAction.getChildByPath("aliases"); - if(p == null) return; - XModelObject[] as = p.getChildren(); - for (int i = 0; i < as.length; i++) { - if(as[i] instanceof AnyElementObjectImpl) { - Map<String, String> attr = toMap(((AnyElementObjectImpl)as[i]).getAttributes()); - String n = attr.get(ESBConstants.ATTR_NAME); - String v = attr.get(ESBConstants.ATTR_VALUE); - if(n == null || v == null) { - continue; - } - XModelObject a = specificAction.getModel().createModelObject(ALIAS_ENTITY, null); - a.setAttributeValue(ESBConstants.ATTR_NAME, n); - a.setAttributeValue(ESBConstants.ATTR_VALUE, v); - specificAction.addChild(a); - } - } - p.removeFromParent(); + protected String getPropertyName() { + return ALIASES; } - public void toBasic(XModelObject basicAction, XModelObject specificAction) { - XModelObject[] as = specificAction.getChildren(ALIAS_ENTITY); - if(as.length == 0) return; - XModelObject p = basicAction.getModel().createModelObject(ESBConstants.ENT_ESB_PROPERTY, null); - p.setAttributeValue(ESBConstants.ATTR_NAME, "aliases"); - basicAction.addChild(p); - for (int i = 0; i < as.length; i++) { - XModelObject t = basicAction.getModel().createModelObject("AnyElement", null); - t.setAttributeValue("tag", "alias"); - String attrs = ESBConstants.ATTR_NAME + "=" - + as[i].getAttributeValue(ESBConstants.ATTR_NAME) - + ";" + ESBConstants.ATTR_VALUE + "=" - + as[i].getAttributeValue(ESBConstants.ATTR_VALUE); - t.setAttributeValue("attributes", attrs); - t.setAttributeValue(XModelObjectLoaderUtil.ATTR_ID_NAME, "" + (i + 1)); - p.addChild(t); - } + protected String getItemEntityName() { + return ALIAS_ENTITY; } - static Map<String, String> toMap(String[][] attributes) { - Map<String,String> map = new HashMap<String, String>(); - for (int i = 0; i < attributes.length; i++) { - map.put(attributes[i][0], attributes[i][1]); - } - return map; - } - } Modified: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/IPropertyConverter.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/IPropertyConverter.java 2008-06-10 13:26:05 UTC (rev 8678) +++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/IPropertyConverter.java 2008-06-10 13:54:56 UTC (rev 8679) @@ -1,3 +1,13 @@ +/******************************************************************************* + * 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; import org.jboss.tools.common.model.XModelObject; @@ -2,2 +12,5 @@ +/** + * @author Viacheslav Kabanovich + */ public interface IPropertyConverter { Added: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ListConverter.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ListConverter.java (rev 0) +++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ListConverter.java 2008-06-10 13:54:56 UTC (rev 8679) @@ -0,0 +1,120 @@ +/******************************************************************************* + * 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; + +import java.util.HashMap; +import java.util.Map; + +import org.jboss.tools.common.meta.XAttribute; +import org.jboss.tools.common.meta.XModelEntity; +import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.impl.AnyElementObjectImpl; +import org.jboss.tools.common.model.util.XModelObjectLoaderUtil; +import org.jboss.tools.esb.core.model.ESBConstants; + +/** + * @author Viacheslav Kabanovich + */ +public abstract class ListConverter implements IPropertyConverter { + + public ListConverter() {} + + protected abstract String getPropertyName(); + + protected abstract String getItemEntityName(); + + public void toSpecific(XModelObject basicAction, XModelObject specificAction) { + XModelObject p = basicAction.getChildByPath(getPropertyName()); + if(p == null) return; + XModelObject[] as = p.getChildren(); + for (int i = 0; i < as.length; i++) { + if(as[i] instanceof AnyElementObjectImpl) { + String tag = as[i].getAttributeValue("tag"); + Map<String, String> attr = toMap(((AnyElementObjectImpl)as[i]).getAttributes()); + + XModelObject a = specificAction.getModel().createModelObject(getItemEntityName(), null); + if(a == null || tag == null || !tag.equals(a.getModelEntity().getXMLSubPath())) { + continue; + } + + XModelEntity entity = a.getModelEntity(); + XAttribute[] attrs = entity.getAttributes(); + for (int j = 0; j < attrs.length; j++) { + String name = attrs[j].getName(); + String xml = attrs[j].getXMLName(); + if(xml == null || xml.length() == 0) continue; + String value = attr.get(xml); + if(value == null || value.length() == 0) { + value = attrs[j].getDefaultValue(); + } + if(value != null) { + a.setAttributeValue(name, value); + } + } + if(a.getModelEntity().getChild("AnyElement") != null) { + XModelObject[] cs = as[i].getChildren(); + for (int j = 0; j < cs.length; j++) { + a.addChild(cs[j].copy()); + } + } + specificAction.addChild(a); + } + } + p.removeFromParent(); + } + + public void toBasic(XModelObject basicAction, XModelObject specificAction) { + XModelObject[] as = specificAction.getChildren(getItemEntityName()); + if(as.length == 0) return; + XModelObject p = basicAction.getModel().createModelObject(ESBConstants.ENT_ESB_PROPERTY, null); + p.setAttributeValue(ESBConstants.ATTR_NAME, getPropertyName()); + for (int i = 0; i < as.length; i++) { + XModelObject t = basicAction.getModel().createModelObject("AnyElement", null); + t.setAttributeValue("tag", as[i].getModelEntity().getXMLSubPath()); + StringBuffer sb = new StringBuffer(); + XModelEntity entity = as[i].getModelEntity(); + XAttribute[] attrs = entity.getAttributes(); + for (int j = 0; j < attrs.length; j++) { + String name = attrs[j].getName(); + String xml = attrs[j].getXMLName(); + if(xml == null || xml.length() == 0) continue; + String value = as[i].getAttributeValue(name); + if(value == null || value.length() == 0 || value.equals(attrs[j].getDefaultValue())) { + if(!"always".equals(attrs[j].getProperty("save"))) continue; + } + if(sb.length() > 0) { + sb.append(';'); + } + sb.append(xml).append('=').append(value); + } + String attributes = sb.toString(); + t.setAttributeValue("attributes", attributes); + t.setAttributeValue(XModelObjectLoaderUtil.ATTR_ID_NAME, "" + (i + 1)); + if(as[i].getModelEntity().getChild("AnyElement") != null) { + XModelObject[] cs = as[i].getChildren(); + for (int j = 0; j < cs.length; j++) { + t.addChild(cs[j].copy()); + } + } + p.addChild(t); + } + basicAction.addChild(p); + } + + static Map<String, String> toMap(String[][] attributes) { + Map<String,String> map = new HashMap<String, String>(); + for (int i = 0; i < attributes.length; i++) { + map.put(attributes[i][0], attributes[i][1]); + } + return map; + } + +} Added: 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 (rev 0) +++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/NotificationConverter.java 2008-06-10 13:54:56 UTC (rev 8679) @@ -0,0 +1,28 @@ +/******************************************************************************* + * 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; + } + +} Added: 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 (rev 0) +++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/RouteToConverter.java 2008-06-10 13:54:56 UTC (rev 8679) @@ -0,0 +1,28 @@ +/******************************************************************************* + * 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; + } + +}