Author: scabanovich Date: 2009-11-26 11:52:57 -0500 (Thu, 26 Nov 2009) New Revision: 18862 Modified: trunk/esb/plugins/org.jboss.tools.esb.core/META-INF/MANIFEST.MF trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-attrs.properties trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-menu.properties trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/SpecificActionLoader.java trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ConverterConstants.java Log: https://jira.jboss.org/jira/browse/JBIDE-5199 Modified: trunk/esb/plugins/org.jboss.tools.esb.core/META-INF/MANIFEST.MF =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/META-INF/MANIFEST.MF 2009-11-26 16:42:46 UTC (rev 18861) +++ trunk/esb/plugins/org.jboss.tools.esb.core/META-INF/MANIFEST.MF 2009-11-26 16:52:57 UTC (rev 18862) @@ -8,6 +8,7 @@ Bundle-Localization: plugin Export-Package: org.jboss.tools.esb.core, org.jboss.tools.esb.core.model, + org.jboss.tools.esb.core.model.converters, org.jboss.tools.esb.core.model.handlers Require-Bundle: org.jboss.tools.jst.web;visibility:=reexport, org.eclipse.ui Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-attrs.properties =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-attrs.properties 2009-11-26 16:42:46 UTC (rev 18861) +++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-attrs.properties 2009-11-26 16:52:57 UTC (rev 18862) @@ -130,3 +130,29 @@ ESB.esb=esb ESB.stateful=Stateful ESB.entry_point=Entry Point +ESB.namespace_uri=Namespace URI +ESB.local_part=Local Part +ESB.field_name=Field Name +ESB.field_type=Field Type +ESB.item_type=Item Type +ESB.defined_in=Defined in +ESB.bpm=bpm +ESB.default=Default +ESB.template_file=Template File +ESB.fail_on_warning=Fail on Warning +ESB.uri_resolver=URI Resolver +ESB.fail_on_exception=Fail on Exception +ESB.suspend_transaction=Suspend Transaction +ESB.service_invoker_timeout=Service Invoker Timeout +ESB.support_message_based_scripting=Support Message Based Scripting +ESB.cache_script=Cache Script +ESB.endpoint_url=Endpoint URL +ESB.response_type=Response Type +ESB.method=Method +ESB.router=Router +ESB.send_to=Send to +ESB.subject=Subject +ESB.from=From +ESB.unwrap=Unwrap +ESB.auth=Auth +ESB.message_attachment_name=Message Attachment Name Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-menu.properties =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-menu.properties 2009-11-26 16:42:46 UTC (rev 18861) +++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-menu.properties 2009-11-26 16:52:57 UTC (rev 18862) @@ -49,3 +49,15 @@ ESB.AddSOAPClient.menu=SOAP Client... ESB.AddSystemPrintln.menu=System Println... ESB.CreateFileESBV.menu=JBoss ESB File... +ESB.AddSOAPProxy.menu=SOAP Proxy +ESB.AddSOAPWiseClient.menu=SOAP Wise Client +ESB.AddScripting.menu=Scripting +ESB.AddEJBProcessor.menu=EJB Processor +ESB.AddBPMProcessor.menu=BPM Processor +ESB.AddXSLTAction.menu=XSLT Action +ESB.AddJMSRouter.menu=JMS Router +ESB.AddEMailRouter.menu=EMail Router +ESB.AddEMailWiretap.menu=EMail Wiretap +ESB.AddHTTPRouter.menu=HTTP Router +ESB.AddSyncServiceInvoker.menu=Sync Service Invoker +ESB.AddBusinessRulesProcessor.menu=Business Rules Processor Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties 2009-11-26 16:42:46 UTC (rev 18861) +++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties 2009-11-26 16:52:57 UTC (rev 18862) @@ -15,6 +15,8 @@ FileESB110_Properties.Title=ESB File 1.1.0 FileESB120_Properties.Title=ESB File 1.2.0 +ESBGlobals120_Properties.Title=ESB Globals + #Providers List ESBProviders101_AddBusProvider_0.WindowTitle=Add Channel Provider @@ -412,10 +414,42 @@ ESBPreActionNotifier101_AddNotificationList.WindowTitle=Add Notification List ESBPreActionNotifier101_AddNotificationList.Title=ESB Notification List -ESBPreActionXStreamToObject101_AddAlias.WindowTitle=Add Alias -ESBPreActionXStreamToObject101_AddAlias.Title=ESB Alias +ESB.AddAlias.WindowTitle=Add Alias +ESB.AddAlias.Title=ESB Alias +ESB.AddNamespace.WindowTitle=Add Namespace +ESB.AddNamespace.Title=ESB Namespace + +ESB.AddFieldAlias.WindowTitle=Add Field Alias +ESB.AddFieldAlias.Title=ESB Field Alias + +ESB.AddAttributeAlias.WindowTitle=Add Attribute Alias +ESB.AddAttributeAlias.Title=ESB Attribute Alias + +ESB.AddImplicitCollection.WindowTitle=Add Implicit Collection +ESB.AddImplicitCollection.Title=ESB Implicit Collection + +ESB.AddConverter.WindowTitle=Add Converter +ESB.AddConverter.Title=ESB Converter + +ESB.AddBPMVar.WindowTitle=Add BPM Var +ESB.AddBPMVar.Title=ESB BPM Var + +ESB.AddHeader.WindowTitle=Add Header +ESB.AddHeader.Title=ESB Header + +ESB.AddClientProp.WindowTitle=Add HTTP Client Property +ESB.AddClientProp.Title=HTTP Client Property + ESBPreAlias_Properties.Title=ESB Alias +ESBPreAttributeAlias_Properties.Title=ESB Attribute Alias +ESBPreBPMVar_Properties.Title=ESB BPM Var +ESBPreClientProp_Properties.Title=ESB HTTP Client Property +ESBPreConverter_Properties.Title=ESB Converter +ESBPreFieldAlias_Properties.Title=ESB Field Alias +ESBPreHeader_Properties.Title=ESB Header +ESBPreImplicitCollection_Properties.Title=ESB Implicit Collection +ESBPreNamespace_Properties.Title=ESB Namespace ESBPreNotificationList_CreateTarget.WindowTitle=Add Target ESBPreNotificationList_CreateTarget.Title=ESB Target @@ -472,15 +506,6 @@ ESB.AddNotifier.WindowTitle=Add Notifier ESB.AddNotifier.Title=ESB Notifier -ESB.SOAPProcessor.WindowTitle=Add SOAP Processor -ESB.SOAPProcessor.Title=SOAP Processor - -ESB.SOAPClient.WindowTitle=Add SOAP Client -ESB.SOAPClient.Title=SOAP Client - -ESB.SOAPProxy.WindowTitle=Add SOAP Proxy -ESB.SOAPProxy.Title=SOAP Proxy - ESB.AddObjectInvoke.WindowTitle=Add Object Invoke ESB.AddObjectInvoke.Title=ESB Object Invoke @@ -499,13 +524,53 @@ ESB.AddSOAPClient.WindowTitle=Add SOAP Client ESB.AddSOAPClient.Title=ESB SOAP Client +ESB.AddSOAPProxy.WindowTitle=Add SOAP Proxy +ESB.AddSOAPProxy.Title=ESB SOAP Proxy + +ESB.AddSOAPWiseClient.WindowTitle=Add SOAP Wise Client +ESB.AddSOAPWiseClient.Title=ESB SOAP Wise Client + +ESB.AddScripting.WindowTitle=Add Scripting Action +ESB.AddScripting.Title=ESB Scripting Action + +ESB.AddEJBProcessor.WindowTitle=Add EJB Processor +ESB.AddEJBProcessor.Title=ESB EJB Processor + +ESB.AddBPMProcessor.WindowTitle=Add BPM Processor +ESB.AddBPMProcessor.Title=ESB BPM Processor + +ESB.AddXSLTAction.WindowTitle=Add XSLT Action +ESB.AddXSLTAction.Title=ESB XSLT Action + +ESB.AddJMSRouter.WindowTitle=Add JMS Router +ESB.AddJMSRouter.Title=ESB JMS Router + +ESB.AddEMailRouter.WindowTitle=Add EMail Router +ESB.AddEMailRouter.Title=ESB EMail Router + +ESB.AddEMailWiretap.WindowTitle=Add EMail Wiretap +ESB.AddEMailWiretap.Title=ESB EMail Wiretap + +ESB.AddHTTPRouter.WindowTitle=Add HTTP Wiretap +ESB.AddHTTPRouter.Title=ESB HTTP Wiretap + +ESB.AddSyncServiceInvoker.WindowTitle=Add Sync Service Invoker +ESB.AddSyncServiceInvoker.Title=ESB Sync Service Invoker + ESBPreActionAggregator101_Properties.Title=Aggregator +ESBPreActionBpmProcessor120_Properties.Title=BPM Processor ESBPreActionByteArrayToString101_Properties.Title=Byte Array to String ESBPreActionCommandInterpreter101_Properties.Title=Command Interpreter ESBPreActionContentBasedRouter101_Properties.Title=Content Based Router +ESBPreActionEJBProcessor120_Properties.Title=EJB Processor +ESBPreActionEMailRouter120_Properties.Title=EMail Router +ESBPreActionEMailWiretap120_Properties.Title=EMail Wiretap ESBPreActionGroovyProcessor101_Properties.Title=Groovy Processor +ESBPreActionHTTPRouter120_Properties.Title=HTTP Router +ESBPreActionJMSRouter120_Properties.Title=JMS Router ESBPreActionLongToDateConverter101_Properties.Title=Long to Date Converter ESBPreActionMessagePersister101_Properties.Title=Message Persister +ESBPreActionMessagePersister120_Properties.Title=Message Persister ESBPreActionNotifier101_Properties.Title=Notifier ESBPreActionObjectInvoke101_Properties.Title=Object Invoke ESBPreActionObjectToCSVString101_Properties.Title=Object to CSV String @@ -513,9 +578,14 @@ ESBPreActionSOAPClient101_Properties.Title=SOAP Client ESBPreActionSOAPProcessor101_Properties.Title=SOAP Processor ESBPreActionSOAPProxy120_Properties.Title=SOAP Proxy +ESBPreActionSOAPWiseClient120_Properties.Title=SOAP Wise Client +ESBPreActionSchemaValidator120_Properties.Title=Schema Validator +ESBPreActionScripting120_Properties.Title=Scripting ESBPreActionSmooksTransformer101_Properties.Title=Smooks Transformer ESBPreActionStaticRouter101_Properties.Title=Static Router ESBPreActionStaticWiretap101_Properties.Title=Static Wiretap +ESBPreActionSyncServiceInvoker120_Properties.Title=Sync Service Invoker ESBPreActionSystemPrintln101_Properties.Title=System Println +ESBPreActionXSLTAction120_Properties.Title=XSLT Action ESBPreActionXStreamToObject101_Properties.Title=XStream to Object ESBPreActionBusinessRulesProcessor101_Properties.Title=Business Rules Processor \ No newline at end of file Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2009-11-26 16:42:46 UTC (rev 18861) +++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2009-11-26 16:52:57 UTC (rev 18862) @@ -1131,6 +1131,11 @@ XMLSUBPATH="action" name="ESBPreActionObjectToXStream101"> <XChildrenEntities> <XChildEntity name="ESBProperty"/> + <XChildEntity name="ESBPreAlias"/> + <XChildEntity name="ESBPreNamespace"/> + <XChildEntity name="ESBPreFieldAlias"/> + <XChildEntity name="ESBPreImplicitCollection"/> + <XChildEntity name="ESBPreConverter"/> </XChildrenEntities> <XEntityRenderer> <ICONS> @@ -1160,6 +1165,16 @@ </Constraint> <Editor name="ListString"/> </XModelAttribute> + <XModelAttribute PROPERTIES="pre=true;category=advanced" + name="xstream mode" xmlname="xstream-mode"> + <Constraint loader="ListString"> + <value name="XPATH_RELATIVE_REFERENCS"/> + <value name="XPATH_ABSOLUTE_REFERENCS"/> + <value name="ID_REFERENCES"/> + <value name="NO_REFERENCES"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> <XModelAttribute PROPERTIES="category=general" name="process" xmlname="process"> <Editor name="Uneditable"/> </XModelAttribute> @@ -1168,7 +1183,52 @@ </XModelAttribute> </XModelAttributes> <XActionItem kind="list"> - <XActionItem kind="list" name="CreateActions"/> + <XActionItem kind="list" name="CreateActions"> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Add Alias..." kind="action" name="AddAlias"> + <EntityData EntityName="ESBPreAlias"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="class" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Add Namespace..." kind="action" name="AddNamespace"> + <EntityData EntityName="ESBPreNamespace"> + <AttributeData AttributeName="namespace uri"/> + <AttributeData AttributeName="local part" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Add Field Alias..." kind="action" name="AddFieldAlias"> + <EntityData EntityName="ESBPreFieldAlias"> + <AttributeData AttributeName="alias"/> + <AttributeData AttributeName="defined in"/> + <AttributeData AttributeName="field name"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Add Implicit Collection..." kind="action" name="AddImplicitCollection"> + <EntityData EntityName="ESBPreImplicitCollection"> + <AttributeData AttributeName="class"/> + <AttributeData AttributeName="field name"/> + <AttributeData AttributeName="field type" Mandatory="no"/> + <AttributeData AttributeName="item type" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Add Implicit Collection..." kind="action" name="AddConverter"> + <EntityData EntityName="ESBPreConverter"> + <AttributeData AttributeName="class"/> + <AttributeData AttributeName="field name"/> + <AttributeData AttributeName="field type" Mandatory="no"/> + </EntityData> + </XActionItem> + </XActionItem> <XActionItemReference entity="ESBProperty" name="CopyActions"/> <XActionItemReference entity="ESBProperty" name="DeleteActions"/> <XActionItemReference entity="ESBProperty" name="Properties"/> @@ -1351,7 +1411,24 @@ ICON="action.empty" PROPERTIES="actionpath=Open;attribute=wsdl transform" displayName="Open Transform" kind="action" name="OpenTransform"/> - <XActionItem kind="list" name="CreateActions"/> + <XActionItem kind="list" name="CreateActions"> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Add HTTP Client Property..." kind="action" name="AddClientProp"> + <EntityData EntityName="ESBPreClientProp"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="value" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Add Header..." kind="action" name="AddHeader"> + <EntityData EntityName="ESBPreHeader"> + <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"/> @@ -2019,6 +2096,10 @@ <XChildrenEntities> <XChildEntity name="ESBProperty"/> <XChildEntity name="ESBPreAlias"/> + <XChildEntity name="ESBPreAttributeAlias"/> + <XChildEntity name="ESBPreFieldAlias"/> + <XChildEntity name="ESBPreImplicitCollection"/> + <XChildEntity name="ESBPreConverter"/> </XChildrenEntities> <XEntityRenderer> <ICONS> @@ -2067,9 +2148,45 @@ displayName="Add Alias..." kind="action" name="AddAlias"> <EntityData EntityName="ESBPreAlias"> <AttributeData AttributeName="name"/> - <AttributeData AttributeName="value" Mandatory="no"/> + <AttributeData AttributeName="class" Mandatory="no"/> </EntityData> </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Add Attribute Alias..." kind="action" name="AddAttributeAlias"> + <EntityData EntityName="ESBPreAttributeAlias"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="class" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Add Field Alias..." kind="action" name="AddFieldAlias"> + <EntityData EntityName="ESBPreFieldAlias"> + <AttributeData AttributeName="alias"/> + <AttributeData AttributeName="defined in"/> + <AttributeData AttributeName="field name"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Add Implicit Collection..." kind="action" name="AddImplicitCollection"> + <EntityData EntityName="ESBPreImplicitCollection"> + <AttributeData AttributeName="class"/> + <AttributeData AttributeName="field name"/> + <AttributeData AttributeName="field type" Mandatory="no"/> + <AttributeData AttributeName="item type" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Add Converter..." kind="action" name="AddConverter"> + <EntityData EntityName="ESBPreConverter"> + <AttributeData AttributeName="class"/> + <AttributeData AttributeName="field name"/> + <AttributeData AttributeName="field type" Mandatory="no"/> + </EntityData> + </XActionItem> </XActionItem> <XActionItemReference entity="ESBProperty" name="CopyActions"/> <XActionItemReference entity="ESBProperty" name="DeleteActions"/> @@ -2093,13 +2210,16 @@ </XModelAttribute> <XModelAttribute PROPERTIES="category=general;id=true;save=always" name="name" xmlname="name"/> - <XModelAttribute PROPERTIES="category=general" name="value" xmlname="value"/> + <XModelAttribute PROPERTIES="category=general" name="class" xmlname="class"> + <Editor name="AccessibleJava"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" name="value" + visibility="false" xmlname="value"/> <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%" @@ -2122,6 +2242,37 @@ </XActionItem> <XDependencies/> </XModelEntity> + <XModelEntity ImplementingClass="%ESB%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;converter=attributealias" + XMLSUBPATH="attribute-alias" name="ESBPreAttributeAlias"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.property" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="attribute-alias" 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="class" xmlname="class"> + <Editor name="AccessibleJava"/> + </XModelAttribute> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <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="org.jboss.tools.esb.core.model.ESBRouteToImpl" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;converter=bpmVar" @@ -2145,6 +2296,100 @@ </XModelAttribute> </XModelAttributes> <XActionItem kind="list"> + <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="org.jboss.tools.esb.core.model.ESBRouteToImpl" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;converter=httpclient" + XMLSUBPATH="http-client-property" name="ESBPreClientProp"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.property" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="http client 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 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;converter=converter" + XMLSUBPATH="converter" name="ESBPreConverter"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.property" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="converter" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;id=true;save=always" + name="class" xmlname="class"> + <Editor name="AccessibleJava"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" name="field name" xmlname="fieldName"/> + <XModelAttribute PROPERTIES="category=general" name="field type" xmlname="fieldType"/> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <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;converter=fieldalias" + XMLSUBPATH="field-alias" name="ESBPreFieldAlias"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.property" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="field-alias" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;id=true;save=always" + name="alias" xmlname="alias"/> + <XModelAttribute PROPERTIES="category=general" name="defined in" xmlname="definedIn"> + <Editor name="AccessibleJava"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" name="field name" xmlname="fieldName"/> + <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"> @@ -2170,8 +2415,8 @@ </XModelEntity> <XModelEntity ImplementingClass="org.jboss.tools.esb.core.model.ESBRouteToImpl" - PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;converter=httpclient" - XMLSUBPATH="http-client-property" name="ESBPreClientProp"> + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;converter=header" + XMLSUBPATH="header" name="ESBPreHeader"> <XChildrenEntities/> <XEntityRenderer> <ICONS> @@ -2179,7 +2424,7 @@ </ICONS> </XEntityRenderer> <XModelAttributes> - <XModelAttribute default="http client property" loader="ElementType" name="element type"> + <XModelAttribute default="header" loader="ElementType" name="element type"> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="category=general;id=true;save=always" @@ -2213,10 +2458,9 @@ </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=header" - XMLSUBPATH="header" name="ESBPreHeader"> + <XModelEntity ImplementingClass="%ESB%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;converter=implicitcollection" + XMLSUBPATH="implicit-collection" name="ESBPreImplicitCollection"> <XChildrenEntities/> <XEntityRenderer> <ICONS> @@ -2224,12 +2468,16 @@ </ICONS> </XEntityRenderer> <XModelAttributes> - <XModelAttribute default="header" loader="ElementType" name="element type"> + <XModelAttribute default="implicit collection" 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"/> + name="class" xmlname="class"> + <Editor name="AccessibleJava"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" name="field name" xmlname="fieldName"/> + <XModelAttribute PROPERTIES="category=general" name="field type" xmlname="fieldType"/> + <XModelAttribute PROPERTIES="category=general" name="item type" xmlname="itemType"/> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> <Editor name="Note"/> </XModelAttribute> @@ -2259,6 +2507,51 @@ <XDependencies/> </XModelEntity> <XModelEntity ImplementingClass="%ESB%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;converter=namespace" + XMLSUBPATH="namespace" name="ESBPreNamespace"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.property" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="namespace" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;id=true;save=always" + name="namespace uri" xmlname="namespace-uri"/> + <XModelAttribute PROPERTIES="category=general" name="local part" + visibility="false" xmlname="local-part"/> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"/> + <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/> + <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> + <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" + ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> + <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" + ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> + </XActionItem> + <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> + <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%" + ICON="action.delete" displayName="Delete" kind="action" name="Delete"/> + </XActionItem> + <XActionItem ICON="action.empty" kind="list" name="Properties"> + <XActionItem HandlerClassName="%Properties%" ICON="action.empty" + displayName="Properties..." kind="action" name="Properties"/> + </XActionItem> + <XActionItem displayName="move" kind="list" name="MoveActions"> + <XActionItem HIDE="always" HandlerClassName="%Move%" + ICON="action.move" displayName="Move" kind="action" name="Move"/> + </XActionItem> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%ESB%" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;converter=notification" XMLSUBPATH="NotificationList" name="ESBPreNotificationList"> <XChildrenEntities> Modified: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/SpecificActionLoader.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/SpecificActionLoader.java 2009-11-26 16:42:46 UTC (rev 18861) +++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/SpecificActionLoader.java 2009-11-26 16:52:57 UTC (rev 18862) @@ -37,6 +37,8 @@ public static final SpecificActionLoader instance = new SpecificActionLoader(); + Map<String, IPropertyConverter> propertyConverters = new HashMap<String, IPropertyConverter>(); + SpecificActionLoader() { if(classToEntity.isEmpty()) { XMapping m = PreferenceModelUtilities.getPreferenceModel().getMetaData().getMapping("ESBSpecificActions"); @@ -48,6 +50,18 @@ } } } + propertyConverters.put("alias", ConverterConstants.ALIAS_CONVERTER); + propertyConverters.put("route", ConverterConstants.ROUTE_CONVERTER); + propertyConverters.put("path", ConverterConstants.OBJECT_PATHS_CONVERTER); + propertyConverters.put("notification", ConverterConstants.NOTIFICATION_CONVERTER); + propertyConverters.put("bpmVar", ConverterConstants.BPM_VAR_CONVERTER); + propertyConverters.put("httpclient", ConverterConstants.ENDPOINT_CONVERTER); + propertyConverters.put("header", ConverterConstants.HEADER_CONVERTER); + propertyConverters.put("namespace", ConverterConstants.NAMESPACES_CONVERTER); + propertyConverters.put("fieldalias", ConverterConstants.FIELD_ALIAS_CONVERTER); + propertyConverters.put("implicitcollection", ConverterConstants.IMPLICIT_COLLECTION_CONVERTER); + propertyConverters.put("attributealias", ConverterConstants.ATTRIBUTE_ALIAS_CONVERTER); + propertyConverters.put("converter", ConverterConstants.CONVERTER_CONVERTER); } public boolean isPreActionEntity(XModelObject object) { @@ -200,14 +214,6 @@ IPropertyConverter getPropertyConverter(XModelEntity childEntity) { String converter = childEntity.getProperty("converter"); - if("alias".equals(converter)) return ConverterConstants.ALIAS_CONVERTER; - if("route".equals(converter)) return ConverterConstants.ROUTE_CONVERTER; - if("path".equals(converter)) return ConverterConstants.OBJECT_PATHS_CONVERTER; - if("notification".equals(converter)) return ConverterConstants.NOTIFICATION_CONVERTER; - if("bpmVar".equals(converter)) return ConverterConstants.BPM_VAR_CONVERTER; - if("httpclient".equals(converter)) return ConverterConstants.ENDPOINT_CONVERTER; - if("header".equals(converter)) return ConverterConstants.HEADER_CONVERTER; - - return null; + return (converter == null) ? null : propertyConverters.get(converter); } } Modified: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ConverterConstants.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ConverterConstants.java 2009-11-26 16:42:46 UTC (rev 18861) +++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ConverterConstants.java 2009-11-26 16:52:57 UTC (rev 18862) @@ -41,4 +41,24 @@ String HEADERS = "headers"; IPropertyConverter HEADER_CONVERTER = new BasicListConverter(HEADERS, HEADER_ENTITY); + String NAMESPACE_ENTITY = "ESBPreNamespace"; + String NAMESPACES = "namespaces"; + IPropertyConverter NAMESPACES_CONVERTER = new BasicListConverter(NAMESPACES, NAMESPACE_ENTITY); + + String FIELD_ALIAS_ENTITY = "ESBPreFieldAlias"; + String FIELD_ALIASES = "fieldAliases"; + IPropertyConverter FIELD_ALIAS_CONVERTER = new BasicListConverter(FIELD_ALIASES, FIELD_ALIAS_ENTITY); + + String IMPLICIT_COLLECTION_ENTITY = "ESBPreImplicitCollection"; + String IMPLICIT_COLLECTIONS = "implicit-collections"; + IPropertyConverter IMPLICIT_COLLECTION_CONVERTER = new BasicListConverter(IMPLICIT_COLLECTIONS, IMPLICIT_COLLECTION_ENTITY); + + String CONVERTER_ENTITY = "ESBPreConverter"; + String CONVERTERS = "converters"; + IPropertyConverter CONVERTER_CONVERTER = new BasicListConverter(CONVERTERS, CONVERTER_ENTITY); + + String ATTRIBUTE_ALIAS_ENTITY = "ESBPreAttributeAlias"; + String ATTRIBUTE_ALIASES = "attribute-aliases"; + IPropertyConverter ATTRIBUTE_ALIAS_CONVERTER = new BasicListConverter(ATTRIBUTE_ALIASES, ATTRIBUTE_ALIAS_ENTITY); + }