Author: scabanovich Date: 2008-06-11 05:59:16 -0400 (Wed, 11 Jun 2008) New Revision: 8708 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.meta trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBConstants.java trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBLoaderUtil.java trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ListConverter.java Log: JBIDE-2022 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-11 09:47:24 UTC (rev 8707) +++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2008-06-11 09:59:16 UTC (rev 8708) @@ -49,7 +49,8 @@ </ICONS> <GlobalActions kind="list"/> <XModelEntity ImplementingClass="%ESB%" - PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" name="ESBPreActionAggregator101"> + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" + XMLSUBPATH="action" name="ESBPreActionAggregator101"> <XChildrenEntities> <XChildEntity name="ESBProperty"/> </XChildrenEntities> @@ -59,7 +60,7 @@ </ICONS> </XEntityRenderer> <XModelAttributes> - <XModelAttribute default="pre-packed action" loader="ElementType" name="element type"> + <XModelAttribute default="aggregator action" loader="ElementType" name="element type"> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="category=general;id=true;save=always" @@ -87,7 +88,8 @@ <XDependencies/> </XModelEntity> <XModelEntity ImplementingClass="%ESB%" - PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" name="ESBPreActionByteArrayToString101"> + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" + XMLSUBPATH="action" name="ESBPreActionByteArrayToString101"> <XChildrenEntities> <XChildEntity name="ESBProperty"/> </XChildrenEntities> @@ -97,7 +99,8 @@ </ICONS> </XEntityRenderer> <XModelAttributes> - <XModelAttribute default="pre-packed action" loader="ElementType" name="element type"> + <XModelAttribute default="byte array to string converter action" + loader="ElementType" name="element type"> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="category=general;id=true;save=always" @@ -126,7 +129,8 @@ <XDependencies/> </XModelEntity> <XModelEntity ImplementingClass="%ESB%" - PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" name="ESBPreActionCommandInterpreter101"> + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" + XMLSUBPATH="action" name="ESBPreActionCommandInterpreter101"> <XChildrenEntities> <XChildEntity name="ESBProperty"/> </XChildrenEntities> @@ -136,7 +140,8 @@ </ICONS> </XEntityRenderer> <XModelAttributes> - <XModelAttribute default="pre-packed action" loader="ElementType" name="element type"> + <XModelAttribute default="command interpreter action" + loader="ElementType" name="element type"> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="category=general;id=true;save=always" @@ -163,7 +168,8 @@ <XDependencies/> </XModelEntity> <XModelEntity ImplementingClass="%ESB%" - PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%EntityOrdered%" name="ESBPreActionContentBasedRouter101"> + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%EntityOrdered%" + XMLSUBPATH="action" name="ESBPreActionContentBasedRouter101"> <XChildrenEntities> <XChildEntity name="ESBProperty"/> <XChildEntity name="ESBPreRouteTo"/> @@ -174,7 +180,8 @@ </ICONS> </XEntityRenderer> <XModelAttributes> - <XModelAttribute default="pre-packed action" loader="ElementType" name="element type"> + <XModelAttribute default="content based router action" + loader="ElementType" name="element type"> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="category=general;id=true;save=always" @@ -227,7 +234,8 @@ <XDependencies/> </XModelEntity> <XModelEntity ImplementingClass="%ESB%" - PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" name="ESBPreActionGroovyProcessor101"> + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" + XMLSUBPATH="action" name="ESBPreActionGroovyProcessor101"> <XChildrenEntities> <XChildEntity name="ESBProperty"/> </XChildrenEntities> @@ -237,7 +245,8 @@ </ICONS> </XEntityRenderer> <XModelAttributes> - <XModelAttribute default="pre-packed action" loader="ElementType" name="element type"> + <XModelAttribute default="groovy processor action" + loader="ElementType" name="element type"> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="category=general;id=true;save=always" @@ -265,7 +274,8 @@ <XDependencies/> </XModelEntity> <XModelEntity ImplementingClass="%ESB%" - PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" name="ESBPreActionLongToDateConverter101"> + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" + XMLSUBPATH="action" name="ESBPreActionLongToDateConverter101"> <XChildrenEntities> <XChildEntity name="ESBProperty"/> </XChildrenEntities> @@ -275,7 +285,8 @@ </ICONS> </XEntityRenderer> <XModelAttributes> - <XModelAttribute default="pre-packed action" loader="ElementType" name="element type"> + <XModelAttribute default="long to date converter action" + loader="ElementType" name="element type"> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="category=general;id=true;save=always" @@ -302,7 +313,8 @@ <XDependencies/> </XModelEntity> <XModelEntity ImplementingClass="%ESB%" - PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" name="ESBPreActionMessagePersister101"> + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" + XMLSUBPATH="action" name="ESBPreActionMessagePersister101"> <XChildrenEntities> <XChildEntity name="ESBProperty"/> </XChildrenEntities> @@ -312,7 +324,7 @@ </ICONS> </XEntityRenderer> <XModelAttributes> - <XModelAttribute default="pre-packed action" loader="ElementType" name="element type"> + <XModelAttribute default="persist action" loader="ElementType" name="element type"> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="category=general;id=true;save=always" @@ -344,7 +356,8 @@ <XDependencies/> </XModelEntity> <XModelEntity ImplementingClass="%ESB%" - PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%EntityOrdered%" name="ESBPreActionNotifier101"> + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%EntityOrdered%" + XMLSUBPATH="action" name="ESBPreActionNotifier101"> <XChildrenEntities> <XChildEntity name="ESBProperty"/> <XChildEntity name="ESBPreNotificationList"/> @@ -355,7 +368,7 @@ </ICONS> </XEntityRenderer> <XModelAttributes> - <XModelAttribute default="pre-packed action" loader="ElementType" name="element type"> + <XModelAttribute default="notifier action" loader="ElementType" name="element type"> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="category=general;id=true;save=always" @@ -389,7 +402,8 @@ <XDependencies/> </XModelEntity> <XModelEntity ImplementingClass="%ESB%" - PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" name="ESBPreActionObjectInvoke101"> + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" + XMLSUBPATH="action" name="ESBPreActionObjectInvoke101"> <XChildrenEntities> <XChildEntity name="ESBProperty"/> </XChildrenEntities> @@ -399,7 +413,7 @@ </ICONS> </XEntityRenderer> <XModelAttributes> - <XModelAttribute default="pre-packed action" loader="ElementType" name="element type"> + <XModelAttribute default="object invoke action" loader="ElementType" name="element type"> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="category=general;id=true;save=always" @@ -432,7 +446,8 @@ <XDependencies/> </XModelEntity> <XModelEntity ImplementingClass="%ESB%" - PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" name="ESBPreActionObjectToCSVString101"> + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" + XMLSUBPATH="action" name="ESBPreActionObjectToCSVString101"> <XChildrenEntities> <XChildEntity name="ESBProperty"/> </XChildrenEntities> @@ -442,7 +457,8 @@ </ICONS> </XEntityRenderer> <XModelAttributes> - <XModelAttribute default="pre-packed action" loader="ElementType" name="element type"> + <XModelAttribute default="object to cvs string converter action" + loader="ElementType" name="element type"> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="category=general;id=true;save=always" @@ -480,7 +496,8 @@ <XDependencies/> </XModelEntity> <XModelEntity ImplementingClass="%ESB%" - PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" name="ESBPreActionObjectToXStream101"> + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" + XMLSUBPATH="action" name="ESBPreActionObjectToXStream101"> <XChildrenEntities> <XChildEntity name="ESBProperty"/> </XChildrenEntities> @@ -490,7 +507,8 @@ </ICONS> </XEntityRenderer> <XModelAttributes> - <XModelAttribute default="pre-packed action" loader="ElementType" name="element type"> + <XModelAttribute default="object to XStream converter action" + loader="ElementType" name="element type"> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="category=general;id=true;save=always" @@ -528,7 +546,8 @@ <XDependencies/> </XModelEntity> <XModelEntity ImplementingClass="%ESB%" - PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" name="ESBPreActionSOAPClient101"> + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" + XMLSUBPATH="action" name="ESBPreActionSOAPClient101"> <XChildrenEntities> <XChildEntity name="ESBProperty"/> </XChildrenEntities> @@ -538,7 +557,7 @@ </ICONS> </XEntityRenderer> <XModelAttributes> - <XModelAttribute default="pre-packed action" loader="ElementType" name="element type"> + <XModelAttribute default="SOAP client action" loader="ElementType" name="element type"> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="category=general;id=true;save=always" @@ -576,7 +595,8 @@ <XDependencies/> </XModelEntity> <XModelEntity ImplementingClass="%ESB%" - PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" name="ESBPreActionSOAPProcessor101"> + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" + XMLSUBPATH="action" name="ESBPreActionSOAPProcessor101"> <XChildrenEntities> <XChildEntity name="ESBProperty"/> </XChildrenEntities> @@ -586,7 +606,7 @@ </ICONS> </XEntityRenderer> <XModelAttributes> - <XModelAttribute default="pre-packed action" loader="ElementType" name="element type"> + <XModelAttribute default="SOAP processor action" loader="ElementType" name="element type"> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="category=general;id=true;save=always" @@ -614,7 +634,8 @@ <XDependencies/> </XModelEntity> <XModelEntity ImplementingClass="%ESB%" - PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" name="ESBPreActionSmooksTransformer101"> + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" + XMLSUBPATH="action" name="ESBPreActionSmooksTransformer101"> <XChildrenEntities> <XChildEntity name="ESBProperty"/> </XChildrenEntities> @@ -624,7 +645,8 @@ </ICONS> </XEntityRenderer> <XModelAttributes> - <XModelAttribute default="pre-packed action" loader="ElementType" name="element type"> + <XModelAttribute default="smooks transformer action" + loader="ElementType" name="element type"> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="category=general;id=true;save=always" @@ -659,7 +681,8 @@ <XDependencies/> </XModelEntity> <XModelEntity ImplementingClass="%ESB%" - PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%EntityOrdered%" name="ESBPreActionStaticRouter101"> + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%EntityOrdered%" + XMLSUBPATH="action" name="ESBPreActionStaticRouter101"> <XChildrenEntities> <XChildEntity name="ESBProperty"/> <XChildEntity name="ESBPreRouteTo"/> @@ -670,7 +693,7 @@ </ICONS> </XEntityRenderer> <XModelAttributes> - <XModelAttribute default="pre-packed action" loader="ElementType" name="element type"> + <XModelAttribute default="static router action" loader="ElementType" name="element type"> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="category=general;id=true;save=always" @@ -710,7 +733,8 @@ <XDependencies/> </XModelEntity> <XModelEntity ImplementingClass="%ESB%" - PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%EntityOrdered%" name="ESBPreActionStaticWiretap101"> + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%EntityOrdered%" + XMLSUBPATH="action" name="ESBPreActionStaticWiretap101"> <XChildrenEntities> <XChildEntity name="ESBProperty"/> <XChildEntity name="ESBPreRouteTo"/> @@ -721,7 +745,7 @@ </ICONS> </XEntityRenderer> <XModelAttributes> - <XModelAttribute default="pre-packed action" loader="ElementType" name="element type"> + <XModelAttribute default="static wiretap action" loader="ElementType" name="element type"> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="category=general;id=true;save=always" @@ -760,7 +784,8 @@ <XDependencies/> </XModelEntity> <XModelEntity ImplementingClass="%ESB%" - PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" name="ESBPreActionSystemPrintln101"> + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" + XMLSUBPATH="action" name="ESBPreActionSystemPrintln101"> <XChildrenEntities> <XChildEntity name="ESBProperty"/> </XChildrenEntities> @@ -770,7 +795,7 @@ </ICONS> </XEntityRenderer> <XModelAttributes> - <XModelAttribute default="pre-packed action" loader="ElementType" name="element type"> + <XModelAttribute default="system println action" loader="ElementType" name="element type"> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="category=general;id=true;save=always" @@ -817,7 +842,8 @@ <XDependencies/> </XModelEntity> <XModelEntity ImplementingClass="%ESB%" - PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%EntityOrdered%" name="ESBPreActionXStreamToObject101"> + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%EntityOrdered%" + XMLSUBPATH="action" name="ESBPreActionXStreamToObject101"> <XChildrenEntities> <XChildEntity name="ESBProperty"/> <XChildEntity name="ESBPreAlias"/> @@ -828,7 +854,8 @@ </ICONS> </XEntityRenderer> <XModelAttributes> - <XModelAttribute default="pre-packed action" loader="ElementType" name="element type"> + <XModelAttribute default="XStream to object converter action" + loader="ElementType" name="element type"> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="category=general;id=true;save=always" @@ -927,7 +954,7 @@ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;converter=notification" XMLSUBPATH="NotificationList" name="ESBPreNotificationList"> <XChildrenEntities> - <XChildEntity name="AnyElement"/> + <XChildEntity name="ESBPreTarget"/> </XChildrenEntities> <XEntityRenderer> <ICONS> @@ -948,9 +975,9 @@ <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"/> + displayName="Add Target..." kind="action" name="CreateTarget"> + <EntityData EntityName="ESBPreTarget"> + <AttributeData AttributeName="class"/> </EntityData> </XActionItem> </XActionItem> @@ -1024,6 +1051,59 @@ </XActionItem> <XDependencies/> </XModelEntity> + <XModelEntity ImplementingClass="%ESB%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" + XMLSUBPATH="target" name="ESBPreTarget"> + <XChildrenEntities> + <XChildEntity name="AnyElement"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.property" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="target" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;id=true;save=always" + name="class" xmlname="class"/> + <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> <XEntityExtension name="ESBActions101"> <XChildrenEntities> <XChildEntity name="ESBPreActionByteArrayToString101"/> @@ -1048,7 +1128,8 @@ <XActionItem kind="list"> <XActionItem ICON="action.empty" displayName="New" group="1" kind="list" name="CreateActions"> - <XActionItem displayName="Pre-packed Action" group="1" kind="list" name="PrePackedAction"> + <XActionItem displayName="Add Pre-Packed Action" group="1" + kind="list" name="PrePackedAction"> <XActionItem HandlerClassName="%Create%" ICON="action.empty" PROPERTIES="validator.add=true" WizardClassName="%Default%" displayName="Object Invoke..." kind="action" name="AddObjectInvoke"> @@ -1058,7 +1139,7 @@ <AttributeData AttributeName="class method"/> </EntityData> </XActionItem> - <XActionItem displayName="Converters" group="1" kind="list" name="Converters"> + <XActionItem displayName="Converters" 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"> @@ -1139,7 +1220,7 @@ <AttributeData AttributeName="script"/> </EntityData> </XActionItem> - <XActionItem displayName="Routers" group="1" kind="list" name="Routers"> + <XActionItem displayName="Routers" kind="list" name="Routers"> <XActionItem HandlerClassName="%Create%" ICON="action.empty" PROPERTIES="validator.add=true" WizardClassName="%Default%" displayName="Aggregator..." kind="action" name="AddAggregator"> @@ -1182,7 +1263,7 @@ </EntityData> </XActionItem> </XActionItem> - <XActionItem displayName="SOAP" group="1" kind="list" name="SOAP"> + <XActionItem displayName="SOAP" kind="list" name="SOAP"> <XActionItem HandlerClassName="%Create%" ICON="action.empty" PROPERTIES="validator.add=true" WizardClassName="%Default%" displayName="SOAP Processor..." kind="action" name="SOAPProcessor"> 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-11 09:47:24 UTC (rev 8707) +++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta 2008-06-11 09:59:16 UTC (rev 8708) @@ -127,13 +127,17 @@ <XActionItem displayName="New" group="1" kind="list" name="CreateActions"> <XActionItem HandlerClassName="%Create%" ICON="action.empty" PROPERTIES="validator.add=true" WizardClassName="%Default%" - displayName="Add Action..." kind="action" name="AddAction"> + displayName="Add Generic Action..." kind="action" name="AddAction"> <EntityData EntityName="ESBAction101"> <AttributeData AttributeName="name"/> <AttributeData AttributeName="class"/> <AttributeData AttributeName="process" Mandatory="no"/> </EntityData> </XActionItem> + <XActionItem HIDE="always" + HandlerClassName="org.jboss.tools.common.meta.action.impl.handlers.ShowMenuHandler" + PROPERTIES="actionList=CreateActions" displayName="Action..." + kind="action" name="AddAnyAction"/> </XActionItem> <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/> <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> Modified: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBConstants.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBConstants.java 2008-06-11 09:47:24 UTC (rev 8707) +++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBConstants.java 2008-06-11 09:59:16 UTC (rev 8708) @@ -102,8 +102,9 @@ public String ENT_ESB_SIMPLE_SCHEDULE = "ESBSimpleSchedule101"; //$NON-NLS-1$ public String ENT_ESB_CRON_SCHEDULE = "ESBCronSchedule101"; //$NON-NLS-1$ - + public String ENT_ESB_ROUTE_TO = "ESBPreRouteTo"; //$NON-NLS-1$ + public String ATTR_NAME = "name"; //$NON-NLS-1$ public String ATTR_VALUE = "value"; //$NON-NLS-1$ public String ATTR_PROPERTY_VALUE_PRESENTATION = "value presentation"; Modified: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBLoaderUtil.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBLoaderUtil.java 2008-06-11 09:47:24 UTC (rev 8707) +++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBLoaderUtil.java 2008-06-11 09:59:16 UTC (rev 8708) @@ -23,6 +23,17 @@ public ESBLoaderUtil() {} + protected String getChildEntity(XModelEntity entity, Element e) { + String result = super.getChildEntity(entity, e); + if(result != null && result.startsWith(ESBConstants.PREACTION_PREFIX)) { + if(entity.getChild(ESBConstants.ENT_ESB_ACTION) != null) { + return ESBConstants.ENT_ESB_ACTION; + } + //TODO when different versions appear, support them! + } + return result; + } + protected boolean isSaveable(XModelEntity entity, String n, String v, String dv) { if(v == null) return false; if(v.length() == 0 || v.equals(dv)) { 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 2008-06-11 09:47:24 UTC (rev 8707) +++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ListConverter.java 2008-06-11 09:59:16 UTC (rev 8708) @@ -37,35 +37,10 @@ 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; + XModelObject a = fromAnyElement(as[i], getItemEntityName()); + if(a != null) { + specificAction.addChild(a); } - - 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(); @@ -77,36 +52,94 @@ 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; + XModelObject t = toAnyElement(as[i], i); + p.addChild(t); + } + basicAction.addChild(p); + } + + protected XModelObject fromAnyElement(XModelObject any, String toEntity) { + String tag = any.getAttributeValue("tag"); + Map<String, String> attr = toMap(((AnyElementObjectImpl)any).getAttributes()); + + XModelObject a = any.getModel().createModelObject(toEntity, null); + if(a == null || tag == null || !tag.equals(a.getModelEntity().getXMLSubPath())) { + return null; + } + + 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); + } + } + XModelObject[] cs = any.getChildren(); + if(cs.length > 0 && a.getModelEntity().getChildren().length > 0) { + //TODO consider case of several child entities, possibly including AnyElement + if (a.getModelEntity().getChild("AnyElement") != null) { + for (int j = 0; j < cs.length; j++) { + a.addChild(cs[j].copy()); } - if(sb.length() > 0) { - sb.append(';'); - } - sb.append(xml).append('=').append(value); + } else { + String toChildEntity = a.getModelEntity().getChildren()[0].getName(); + for (int j = 0; j < cs.length; j++) { + XModelObject c = fromAnyElement(cs[j], toChildEntity); + if(c != null) { + a.addChild(c); + } + } } - 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(); + } + return a; + } + + protected XModelObject toAnyElement(XModelObject specific, int index) { + XModelObject t = specific.getModel().createModelObject("AnyElement", null); + t.setAttributeValue("tag", specific.getModelEntity().getXMLSubPath()); + StringBuffer sb = new StringBuffer(); + XModelEntity entity = specific.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 = specific.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, "" + (index + 1)); + XModelObject[] cs = specific.getChildren(); + if (cs.length > 0) { for (int j = 0; j < cs.length; j++) { - t.addChild(cs[j].copy()); + XModelObject c = null; + if (cs[j].getModelEntity().getName().equals("AnyElement")) { + c = cs[j].copy(); + c.setAttributeValue(XModelObjectLoaderUtil.ATTR_ID_NAME, "" + + (j + 1)); + } else { + c = toAnyElement(cs[j], j); } + if (c != null) { + t.addChild(c); + } } - p.addChild(t); } - basicAction.addChild(p); + return t; } static Map<String, String> toMap(String[][] attributes) {