Author: scabanovich Date: 2010-01-11 09:39:50 -0500 (Mon, 11 Jan 2010) New Revision: 19692 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-notifiers.meta 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/NotificationListConverter.java Log: https://jira.jboss.org/jira/browse/JBIDE-5554 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 2010-01-11 14:29:29 UTC (rev 19691) +++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2010-01-11 14:39:50 UTC (rev 19692) @@ -2744,6 +2744,8 @@ ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> + <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%" + ICON="action.paste" displayName="Paste" kind="action" name="Paste"/> </XActionItem> <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%" @@ -2797,25 +2799,10 @@ PROPERTIES="actionList=CreateActions" displayName="Target..." kind="action" name="AddAnyTarget"/> </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> + <XActionItemReference entity="ESBPreNotificationList" name="CopyActions"/> + <XActionItemReference entity="ESBPreNotificationList" name="DeleteActions"/> + <XActionItemReference entity="ESBPreNotificationList" name="Properties"/> + <XActionItemReference entity="ESBPreNotificationList" name="MoveActions"/> </XActionItem> <XDependencies/> </XModelEntity> Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-notifiers.meta =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-notifiers.meta 2010-01-11 14:29:29 UTC (rev 19691) +++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-notifiers.meta 2010-01-11 14:39:50 UTC (rev 19692) @@ -17,6 +17,44 @@ <GlobalActions kind="list"/> <XModelEntity ImplementingClass="%ESB%" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" + XMLSUBPATH="attachment" name="ESBPreNotifyAttachment"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.property" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="attachment" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;id=true;save=always" + name="file" xmlname="#text"> + <Constraint loader="Tree"> + <value name="ESBResourceTree"/> + <value name="linkAction=OpenFile"/> + </Constraint> + <Editor name="TreeChooser"/> + </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=file" + displayName="Open File" kind="action" name="OpenFile"/> + <XActionItem kind="list" name="CreateActions"/> + <XActionItemReference entity="ESBPreAlias" name="CopyActions"/> + <XActionItemReference entity="ESBPreAlias" name="DeleteActions"/> + <XActionItemReference entity="ESBPreAlias" name="Properties"/> + <XActionItemReference entity="ESBPreAlias" name="MoveActions"/> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%ESB%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" XMLSUBPATH="column" name="ESBPreNotifyColumn"> <XChildrenEntities/> <XEntityRenderer> @@ -30,8 +68,7 @@ </XModelAttribute> <XModelAttribute PROPERTIES="category=general;id=true;save=always" name="name" xmlname="name"/> - <XModelAttribute PROPERTIES="category=general" name="value" - visibility="false" xmlname="value"/> + <XModelAttribute PROPERTIES="category=general" name="value" xmlname="value"/> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> <Editor name="Note"/> </XModelAttribute> @@ -87,6 +124,62 @@ </XModelEntity> <XModelEntity ImplementingClass="%ESB%" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" + XMLSUBPATH="ftp" name="ESBPreNotifyFTPList"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.property" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="ftp list" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;id=true;save=always" + name="url" xmlname="URL"/> + <XModelAttribute PROPERTIES="category=general" name="file name" xmlname="filename"> + <Constraint loader="Tree"> + <value name="ESBResourceTree"/> + <value name="linkAction=OpenFile"/> + </Constraint> + <Editor name="TreeChooser"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" name="list files" xmlname="listFiles"> + <Constraint loader="ListString"> + <value/> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" + name="delete list file" xmlname="deletelistFile"> + <Constraint loader="ListString"> + <value/> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="ListString"/> + </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=file name" + displayName="Open File" kind="action" name="OpenFile"/> + <XActionItem kind="list" name="CreateActions"/> + <XActionItemReference entity="ESBPreAlias" name="CopyActions"/> + <XActionItemReference entity="ESBPreAlias" name="DeleteActions"/> + <XActionItemReference entity="ESBPreAlias" name="Properties"/> + <XActionItemReference entity="ESBPreAlias" name="MoveActions"/> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%ESB%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" XMLSUBPATH="file" name="ESBPreNotifyFile"> <XChildrenEntities/> <XEntityRenderer> @@ -100,8 +193,7 @@ </XModelAttribute> <XModelAttribute PROPERTIES="category=general;id=true;save=always" name="uri" xmlname="URI"/> - <XModelAttribute PROPERTIES="category=general" name="append" - visibility="false" xmlname="append"> + <XModelAttribute PROPERTIES="category=general" name="append" xmlname="append"> <Constraint loader="ListString"> <value/> <value name="true"/> @@ -125,6 +217,135 @@ </XModelEntity> <XModelEntity ImplementingClass="%ESB%" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" + XMLSUBPATH="messageProp" name="ESBPreNotifyProp"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.property" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="message property" 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" name="value" xmlname="value"/> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"/> + <XActionItemReference entity="ESBPreAlias" name="CopyActions"/> + <XActionItemReference entity="ESBPreAlias" name="DeleteActions"/> + <XActionItemReference entity="ESBPreAlias" name="Properties"/> + <XActionItemReference entity="ESBPreAlias" name="MoveActions"/> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%ESB%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" + XMLSUBPATH="queue" name="ESBPreNotifyQueue"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.property" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="queue" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;id=true;save=always" + name="jndi name" xmlname="jndiName"/> + <XModelAttribute PROPERTIES="category=general" name="jndi url" xmlname="jndi-URL"/> + <XModelAttribute PROPERTIES="category=general" + name="jndi context factory" xmlname="jndi-context-factory"/> + <XModelAttribute PROPERTIES="category=general" name="jndi pkg prefix" xmlname="jndi-pkg-prefix"/> + <XModelAttribute PROPERTIES="category=general" + name="connection factory" xmlname="connection-factory"/> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"/> + <XActionItemReference entity="ESBPreAlias" name="CopyActions"/> + <XActionItemReference entity="ESBPreAlias" name="DeleteActions"/> + <XActionItemReference entity="ESBPreAlias" name="Properties"/> + <XActionItemReference entity="ESBPreAlias" name="MoveActions"/> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%ESB%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" + XMLSUBPATH="destination" name="ESBPreNotifyTCP"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.property" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="destination" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;id=true;save=always" + name="uri" xmlname="URI"/> + <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=file name" + displayName="Open File" kind="action" name="OpenFile"/> + <XActionItem kind="list" name="CreateActions"/> + <XActionItemReference entity="ESBPreAlias" name="CopyActions"/> + <XActionItemReference entity="ESBPreAlias" name="DeleteActions"/> + <XActionItemReference entity="ESBPreAlias" name="Properties"/> + <XActionItemReference entity="ESBPreAlias" name="MoveActions"/> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%ESB%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" + XMLSUBPATH="topic" name="ESBPreNotifyTopic"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.property" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="topic" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;id=true;save=always" + name="jndi name" xmlname="jndiName"/> + <XModelAttribute PROPERTIES="category=general" name="jndi url" xmlname="jndi-URL"/> + <XModelAttribute PROPERTIES="category=general" + name="jndi context factory" xmlname="jndi-context-factory"/> + <XModelAttribute PROPERTIES="category=general" name="jndi pkg prefix" xmlname="jndi-pkg-prefix"/> + <XModelAttribute PROPERTIES="category=general" + name="connection factory" xmlname="connection-factory"/> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"/> + <XActionItemReference entity="ESBPreAlias" name="CopyActions"/> + <XActionItemReference entity="ESBPreAlias" name="DeleteActions"/> + <XActionItemReference entity="ESBPreAlias" name="Properties"/> + <XActionItemReference entity="ESBPreAlias" name="MoveActions"/> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%ESB%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" XMLSUBPATH="target" name="ESBPreTargetNotifyConsole"> <XChildrenEntities/> <XEntityRenderer> @@ -156,6 +377,54 @@ </XModelEntity> <XModelEntity ImplementingClass="%ESB%" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" + XMLSUBPATH="target" name="ESBPreTargetNotifyEmail"> + <XChildrenEntities> + <XChildEntity name="ESBPreNotifyAttachment"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.property" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="target notify email" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;id=true;save=always" + default="NotifyEmail" name="class" xmlname="class"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" name="from" xmlname="from"/> + <XModelAttribute PROPERTIES="category=general" name="send to" xmlname="sendTo"/> + <XModelAttribute PROPERTIES="category=advanced" name="copy to" xmlname="ccTo"/> + <XModelAttribute PROPERTIES="category=general" name="subject" xmlname="subject"/> + <XModelAttribute PROPERTIES="category=advanced" name="message" xmlname="message"/> + <XModelAttribute PROPERTIES="category=advanced" + name="attachment name" xmlname="msgAttachmentName"/> + <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 Attachment..." kind="action" name="CreateAttachment"> + <EntityData EntityName="ESBPreNotifyAttachment"> + <AttributeData AttributeName="file"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/> + <XActionItemReference entity="ESBPreAlias" name="CopyActions"/> + <XActionItemReference entity="ESBPreAlias" name="DeleteActions"/> + <XActionItemReference entity="ESBPreAlias" name="Properties"/> + <XActionItemReference entity="ESBPreAlias" name="MoveActions"/> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%ESB%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" XMLSUBPATH="target" name="ESBPreTargetNotifyFTP"> <XChildrenEntities> <XChildEntity name="ESBPreNotifyFTP"/> @@ -197,6 +466,51 @@ </XModelEntity> <XModelEntity ImplementingClass="%ESB%" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" + XMLSUBPATH="target" name="ESBPreTargetNotifyFTPList"> + <XChildrenEntities> + <XChildEntity name="ESBPreNotifyFTPList"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.property" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="target notify FTP list" + loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;id=true;save=always" + default="NotifyFTPList" name="class" xmlname="class"> + <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" + WizardClassName="%Default%" displayName="Add FTP List..." + kind="action" name="CreateFTPList"> + <EntityData EntityName="ESBPreNotifyFTPList"> + <AttributeData AttributeName="url"/> + <AttributeData AttributeName="file name" Mandatory="no"/> + <AttributeData AttributeName="list files" Mandatory="no"/> + <AttributeData AttributeName="delete list file" Mandatory="no"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/> + <XActionItemReference entity="ESBPreAlias" name="CopyActions"/> + <XActionItemReference entity="ESBPreAlias" name="DeleteActions"/> + <XActionItemReference entity="ESBPreAlias" name="Properties"/> + <XActionItemReference entity="ESBPreAlias" name="MoveActions"/> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%ESB%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" XMLSUBPATH="target" name="ESBPreTargetNotifyFiles"> <XChildrenEntities> <XChildEntity name="ESBPreNotifyFile"/> @@ -238,6 +552,57 @@ </XModelEntity> <XModelEntity ImplementingClass="%ESB%" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" + XMLSUBPATH="target" name="ESBPreTargetNotifyQueues"> + <XChildrenEntities> + <XChildEntity name="ESBPreNotifyProp"/> + <XChildEntity name="ESBPreNotifyQueue"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.property" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="target notify queues" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;id=true;save=always" + default="NotifyQueues" name="class" xmlname="class"> + <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" + WizardClassName="%Default%" displayName="Add Message Property..." + kind="action" name="CreateProp"> + <EntityData EntityName="ESBPreNotifyProp"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="value" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + WizardClassName="%Default%" displayName="Add Queue..." + kind="action" name="CreateQueue"> + <EntityData EntityName="ESBPreNotifyQueue"> + <AttributeData AttributeName="jndi name"/> + <AttributeData AttributeName="jndi url" Mandatory="no"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/> + <XActionItemReference entity="ESBPreAlias" name="CopyActions"/> + <XActionItemReference entity="ESBPreAlias" name="DeleteActions"/> + <XActionItemReference entity="ESBPreAlias" name="Properties"/> + <XActionItemReference entity="ESBPreAlias" name="MoveActions"/> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%ESB%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" XMLSUBPATH="target" name="ESBPreTargetNotifySQLTable"> <XChildrenEntities> <XChildEntity name="ESBPreNotifyColumn"/> @@ -287,12 +652,108 @@ </XActionItem> <XDependencies/> </XModelEntity> + <XModelEntity ImplementingClass="%ESB%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" + XMLSUBPATH="target" name="ESBPreTargetNotifyTCP"> + <XChildrenEntities> + <XChildEntity name="ESBPreNotifyTCP"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.property" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="target notify TCP" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;id=true;save=always" + default="NotifyTCP" name="class" xmlname="class"> + <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" + WizardClassName="%Default%" displayName="Add TCP..." kind="action" name="CreateTCP"> + <EntityData EntityName="ESBPreNotifyTCP"> + <AttributeData AttributeName="uri"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/> + <XActionItemReference entity="ESBPreAlias" name="CopyActions"/> + <XActionItemReference entity="ESBPreAlias" name="DeleteActions"/> + <XActionItemReference entity="ESBPreAlias" name="Properties"/> + <XActionItemReference entity="ESBPreAlias" name="MoveActions"/> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%ESB%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" + XMLSUBPATH="target" name="ESBPreTargetNotifyTopics"> + <XChildrenEntities> + <XChildEntity name="ESBPreNotifyProp"/> + <XChildEntity name="ESBPreNotifyTopic"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.property" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="target notify topics" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;id=true;save=always" + default="NotifyTopics" name="class" xmlname="class"> + <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" + WizardClassName="%Default%" displayName="Add Message Property..." + kind="action" name="CreateProp"> + <EntityData EntityName="ESBPreNotifyProp"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="value" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + WizardClassName="%Default%" displayName="Add Topic..." + kind="action" name="CreateTopic"> + <EntityData EntityName="ESBPreNotifyTopic"> + <AttributeData AttributeName="jndi name"/> + <AttributeData AttributeName="jndi url" Mandatory="no"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/> + <XActionItemReference entity="ESBPreAlias" name="CopyActions"/> + <XActionItemReference entity="ESBPreAlias" name="DeleteActions"/> + <XActionItemReference entity="ESBPreAlias" name="Properties"/> + <XActionItemReference entity="ESBPreAlias" name="MoveActions"/> + </XActionItem> + <XDependencies/> + </XModelEntity> <XEntityExtension name="ESBPreNotificationList120"> <XChildrenEntities> <XChildEntity maxCount="1" name="ESBPreTargetNotifyConsole"/> + <XChildEntity name="ESBPreTargetNotifyEmail"/> <XChildEntity maxCount="1" name="ESBPreTargetNotifyFiles"/> <XChildEntity maxCount="1" name="ESBPreTargetNotifySQLTable"/> <XChildEntity maxCount="1" name="ESBPreTargetNotifyFTP"/> + <XChildEntity maxCount="1" name="ESBPreTargetNotifyFTPList"/> + <XChildEntity name="ESBPreTargetNotifyQueues"/> + <XChildEntity name="ESBPreTargetNotifyTCP"/> + <XChildEntity name="ESBPreTargetNotifyTopics"/> </XChildrenEntities> <XActionItem kind="list"> <XActionItem displayName="New" group="1" kind="list" name="CreateActions"> @@ -307,6 +768,16 @@ </XActionItem> <XActionItem HandlerClassName="%DefaultReplaceUnique%" ICON="action.empty" + PROPERTIES="child=NotifyEmail;significanceMessageClass=%Replace%" + displayName="Notify Email..." kind="action" name="CreateTargetNotifyEmail"> + <EntityData EntityName="ESBPreTargetNotifyEmail"> + <AttributeData AttributeName="from"/> + <AttributeData AttributeName="send to"/> + <AttributeData AttributeName="subject"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%DefaultReplaceUnique%" + ICON="action.empty" PROPERTIES="child=NotifyFiles;significanceMessageClass=%Replace%" displayName="Notify Files..." kind="action" name="CreateTargetNotifyFiles"> <EntityData EntityName="ESBPreTargetNotifyFiles"> @@ -323,6 +794,22 @@ </XActionItem> <XActionItem HandlerClassName="%DefaultReplaceUnique%" ICON="action.empty" + PROPERTIES="child=NotifyFTPList;significanceMessageClass=%Replace%" + displayName="Notify FTP List..." kind="action" name="CreateTargetNotifyFTPList"> + <EntityData EntityName="ESBPreTargetNotifyFTPList"> + <AttributeData AttributeName="class"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%DefaultReplaceUnique%" + ICON="action.empty" + PROPERTIES="child=NotifyQueues;significanceMessageClass=%Replace%" + displayName="Notify Queues..." kind="action" name="CreateTargetNotifyQueues"> + <EntityData EntityName="ESBPreTargetNotifyQueues"> + <AttributeData AttributeName="class"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%DefaultReplaceUnique%" + ICON="action.empty" PROPERTIES="child=NotifySQLTable;significanceMessageClass=%Replace%" WizardClassName="%Default%" displayName="Notify SQL Table..." kind="action" name="CreateTargetNotifySQLTable"> @@ -336,6 +823,22 @@ <AttributeData AttributeName="data column" Mandatory="no"/> </EntityData> </XActionItem> + <XActionItem HandlerClassName="%DefaultReplaceUnique%" + ICON="action.empty" + PROPERTIES="child=NotifyTCP;significanceMessageClass=%Replace%" + displayName="Notify TCP..." kind="action" name="CreateTargetNotifyTCP"> + <EntityData EntityName="ESBPreTargetNotifyTCP"> + <AttributeData AttributeName="class"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%DefaultReplaceUnique%" + ICON="action.empty" + PROPERTIES="child=NotifyTopics;significanceMessageClass=%Replace%" + displayName="Notify Topics..." kind="action" name="CreateTargetNotifyTopics"> + <EntityData EntityName="ESBPreTargetNotifyTopics"> + <AttributeData AttributeName="class"/> + </EntityData> + </XActionItem> </XActionItem> </XActionItem> </XActionItem> Modified: 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 2010-01-11 14:29:29 UTC (rev 19691) +++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ListConverter.java 2010-01-11 14:39:50 UTC (rev 19692) @@ -34,7 +34,7 @@ protected abstract String getItemEntityName(); public void toSpecific(XModelObject basicAction, XModelObject specificAction) { - XModelObject p = basicAction.getChildByPath(getPropertyName()); + XModelObject p = getBasicProperty(basicAction); if(p == null) return; XModelObject[] as = p.getChildren(); for (int i = 0; i < as.length; i++) { @@ -48,6 +48,10 @@ p.removeFromParent(); } + protected XModelObject getBasicProperty(XModelObject basicAction) { + return basicAction.getChildByPath(getPropertyName()); + } + public void toBasic(XModelObject basicAction, XModelObject specificAction) { XModelObject[] as = specificAction.getChildren(getItemEntityName()); if(as.length == 0) return; @@ -63,6 +67,7 @@ public XModelObject fromAnyElement(XModelObject any, String toEntity) { String tag = any.getAttributeValue("tag"); Map<String, String> attr = toMap(((AnyElementObjectImpl)any).getAttributes()); + attr.put("#text", "" + any.getAttributeValue("text")); XModelObject a = any.getModel().createModelObject(toEntity, null); if(!isRelevantTag(tag, a)) { @@ -125,10 +130,14 @@ 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(';'); + if("#text".equals(xml)) { + t.setAttributeValue("text", value); + } else { + if(sb.length() > 0) { + sb.append(';'); + } + sb.append(xml).append('=').append(value); } - sb.append(xml).append('=').append(value); } String attributes = sb.toString(); t.setAttributeValue("attributes", attributes); Modified: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/NotificationListConverter.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/NotificationListConverter.java 2010-01-11 14:29:29 UTC (rev 19691) +++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/NotificationListConverter.java 2010-01-11 14:39:50 UTC (rev 19692) @@ -29,6 +29,20 @@ super(propertyName, itemEntityName); } + protected XModelObject getBasicProperty(XModelObject basicAction) { + XModelObject result = super.getBasicProperty(basicAction); + if(result != null) return result; + XModelObject[] ps = basicAction.getChildren(); + for (XModelObject p: ps) { + XModelObject[] as = p.getChildren(); + if(as.length > 0) { + String tag = as[0].getAttributeValue("tag"); + if("NotificationList".equals(tag)) return p; + } + } + return null; + } + protected String getToChildEntity(XModelObject any, XModelEntity parent) { if(ENT_ESB_NOTIFICATION_120.equals(parent.getName())) { String tag = any.getAttributeValue("tag");