[jbosstools-commits] JBoss Tools SVN: r18742 - in trunk/esb/plugins/org.jboss.tools.esb.core: resources/meta and 2 other directories.

Author: scabanovich Date: 2009-11-19 08:52:04 -0500 (Thu, 19 Nov 2009) New Revision: 18742 Modified: 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/handlers/AddGenericActionSupport.java Log: https://jira.jboss.org/jira/browse/JBIDE-5191 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-19 12:45:37 UTC (rev 18741) +++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties 2009-11-19 13:52:04 UTC (rev 18742) @@ -13,6 +13,7 @@ FileESB101_Properties.Title=ESB File 1.0.1 FileESB110_Properties.Title=ESB File 1.1.0 +FileESB120_Properties.Title=ESB File 1.2.0 #Providers List @@ -117,19 +118,12 @@ #Services List -ESBServices101_AddService.WindowTitle=Add Service -ESBServices101_AddService.Title=ESB Service -ESBServices101_AddService_0.WindowTitle=Add Service -ESBServices101_AddService_0.Title=ESB Service +ESB.AddService.WindowTitle=Add Service +ESB.AddService.Title=ESB Service ESBServices101_Properties.Title=Services List - -ESBServices110_AddService.WindowTitle=Add Service -ESBServices110_AddService.Title=ESB Service -ESBServices110_AddService_0.WindowTitle=Add Service -ESBServices110_AddService_0.Title=ESB Service - ESBServices110_Properties.Title=Services List +ESBServices120_Properties.Title=Services List ESB.AddProperty.WindowTitle=Add Property ESB.AddProperty.Title=ESB Property @@ -207,6 +201,11 @@ ESBHTTPProvider110_Properties.Title=ESB HTTP Provider +ESBHTTPProvider120_AddBus.WindowTitle=Add HTTP Channel +ESBHTTPProvider120_AddBus.Title=ESB HTTP Channel + +ESBHTTPProvider120_Properties.Title=ESB HTTP Provider + #Bus ESBBus_Properties.Title=ESB Channel @@ -269,6 +268,7 @@ #HTTP Bus ESBHTTPBus110_Properties.Title=ESB HTTP Channel +ESBHTTPBus120_Properties.Title=ESB HTTP Channel #FS Message Filter @@ -282,81 +282,55 @@ #Service ESBService101_Properties.Title=ESB Service - ESBService110_Properties.Title=ESB Service #Listeners List -ESBListeners101_AddListener.WindowTitle=Add Listener -ESBListeners101_AddListener.Title=ESB Listener +ESB.AddListener.WindowTitle=Add Listener +ESB.AddListener.Title=ESB Listener -ESBListeners101_AddScheduledListener.WindowTitle=Add Scheduled Listener -ESBListeners101_AddScheduledListener.Title=ESB Scheduled Listener +ESB.AddScheduledListener.WindowTitle=Add Scheduled Listener +ESB.AddScheduledListener.Title=ESB Scheduled Listener -ESBListeners101_AddJCAGateway.WindowTitle=Add JCA Gateway -ESBListeners101_AddJCAGateway.Title=ESB JCA Gateway +ESB.AddJCAGateway.WindowTitle=Add JCA Gateway +ESB.AddJCAGateway.Title=ESB JCA Gateway -ESBListeners101_AddJMSListener.WindowTitle=Add JMS Listener -ESBListeners101_AddJMSListener.Title=ESB JMS Listener +ESB.AddJMSListener.WindowTitle=Add JMS Listener +ESB.AddJMSListener.Title=ESB JMS Listener -ESBListeners101_AddFSListener.WindowTitle=Add FS Listener -ESBListeners101_AddFSListener.Title=ESB FS Listener +ESB.AddFSListener.WindowTitle=Add FS Listener +ESB.AddFSListener.Title=ESB FS Listener -ESBListeners101_AddFTPListener.WindowTitle=Add FTP Listener -ESBListeners101_AddFTPListener.Title=ESB FTP Listener +ESB.AddFTPListener.WindowTitle=Add FTP Listener +ESB.AddFTPListener.Title=ESB FTP Listener -ESBListeners101_AddSQLListener.WindowTitle=Add SQL Listener -ESBListeners101_AddSQLListener.Title=ESB SQL Listener +ESB.AddSQLListener.WindowTitle=Add SQL Listener +ESB.AddSQLListener.Title=ESB SQL Listener -ESBListeners101_AddJBRListener.WindowTitle=Add JBR Listener -ESBListeners101_AddJBRListener.Title=ESB JBR Listener +ESB.AddJBRListener.WindowTitle=Add JBR Listener +ESB.AddJBRListener.Title=ESB JBR Listener -ESBListeners101_AddHibernateListener.WindowTitle=Add Hibernate Listener -ESBListeners101_AddHibernateListener.Title=ESB Hibernate Listener +ESB.AddHibernateListener.WindowTitle=Add Hibernate Listener +ESB.AddHibernateListener.Title=ESB Hibernate Listener -ESBListeners101_AddGroovyListener.WindowTitle=Add Groovy Listener -ESBListeners101_AddGroovyListener.Title=ESB Groovy Listener +ESB.AddGroovyListener.WindowTitle=Add Groovy Listener +ESB.AddGroovyListener.Title=ESB Groovy Listener ESBListeners101_Properties.Title=ESB Listeners List -ESBListeners110_AddListener.WindowTitle=Add Listener -ESBListeners110_AddListener.Title=ESB Listener +ESB.AddHTTPListener.WindowTitle=Add HTTP Listener +ESB.AddHTTPListener.Title=ESB HTTP Listener -ESBListeners110_AddScheduledListener.WindowTitle=Add Scheduled Listener -ESBListeners110_AddScheduledListener.Title=ESB Scheduled Listener +ESB.AddUDPListener.WindowTitle=Add UDP Listener +ESB.AddUDPListener.Title=ESB UDP Listener -ESBListeners110_AddJCAGateway.WindowTitle=Add JCA Gateway -ESBListeners110_AddJCAGateway.Title=ESB JCA Gateway +ESBListeners110_Properties.Title=ESB Listeners List -ESBListeners110_AddJMSListener.WindowTitle=Add JMS Listener -ESBListeners110_AddJMSListener.Title=ESB JMS Listener +ESB.AddHTTPGateway.WindowTitle=Add HTTP Gateway +ESB.AddHTTPGateway.Title=ESB HTTP Gateway -ESBListeners110_AddFSListener.WindowTitle=Add FS Listener -ESBListeners110_AddFSListener.Title=ESB FS Listener +ESBListeners120_Properties.Title=ESB Listeners List -ESBListeners110_AddFTPListener.WindowTitle=Add FTP Listener -ESBListeners110_AddFTPListener.Title=ESB FTP Listener - -ESBListeners110_AddSQLListener.WindowTitle=Add SQL Listener -ESBListeners110_AddSQLListener.Title=ESB SQL Listener - -ESBListeners110_AddJBRListener.WindowTitle=Add JBR Listener -ESBListeners110_AddJBRListener.Title=ESB JBR Listener - -ESBListeners110_AddHibernateListener.WindowTitle=Add Hibernate Listener -ESBListeners110_AddHibernateListener.Title=ESB Hibernate Listener - -ESBListeners110_AddGroovyListener.WindowTitle=Add Groovy Listener -ESBListeners110_AddGroovyListener.Title=ESB Groovy Listener - -ESBListeners110_AddHTTPListener.WindowTitle=Add HTTP Listener -ESBListeners110_AddHTTPListener.Title=ESB HTTP Listener - -ESBListeners110_AddUDPListener.WindowTitle=Add UDP Listener -ESBListeners110_AddUDPListener.Title=ESB UDP Listener - -ESBListeners110_Properties.Title=ESB Listeners List - # ESB Listener ESBListener101_Properties.Title=ESB Listener @@ -403,6 +377,7 @@ # HTTP Listener ESBHTTPListener110_Properties.Title=ESB HTTP Listener +ESBHTTPGateway120_Properties.Title=ESB HTTP Gateway # UDP Listener @@ -410,19 +385,17 @@ # Actions List -ESBActions101_AddAction.WindowTitle=Add Action -ESBActions101_AddAction.Title=ESB Action +ESB.AddAction.WindowTitle=Add Action +ESB.AddAction.Title=ESB Action ESBActions101_Properties.Title=ESB Actions List - -ESBActions110_AddAction.WindowTitle=Add Action -ESBActions110_AddAction.Title=ESB Action - ESBActions110_Properties.Title=ESB Actions List +ESBActions120_Properties.Title=ESB Actions List # Action ESBAction101_Properties.Title=ESB Action +ESBAction120_Properties.Title=ESB Action # Activation Config @@ -460,129 +433,72 @@ #Adding specific actions -ESBActions101_AddByteArrayToString.WindowTitle=Add Byte Array To String -ESBActions101_AddByteArrayToString.Title=ESB Byte Array To String Converter +ESB.AddByteArrayToString.WindowTitle=Add Byte Array To String +ESB.AddByteArrayToString.Title=ESB Byte Array To String Converter -ESBActions101_AddLongToDate.WindowTitle=Add Long To Date -ESBActions101_AddLongToDate.Title=ESB Long To Date Converter +ESB.AddLongToDate.WindowTitle=Add Long To Date +ESB.AddLongToDate.Title=ESB Long To Date Converter -ESBActions101_AddObjectToCSVString.WindowTitle=Add Object To CSV String -ESBActions101_AddObjectToCSVString.Title=ESB Action Object To CSVString Converter +ESB.AddObjectToCSVString.WindowTitle=Add Object To CSV String +ESB.AddObjectToCSVString.Title=ESB Action Object To CSVString Converter -ESBActions101_AddObjectToXStream.WindowTitle=Add Object To XStream -ESBActions101_AddObjectToXStream.Title=ESB Object To XStream Converter +ESB.AddObjectToXStream.WindowTitle=Add Object To XStream +ESB.AddObjectToXStream.Title=ESB Object To XStream Converter -ESBActions101_AddSmooksAction.WindowTitle=Add Smooks Action -ESBActions101_AddSmooksAction.Title=ESB Smooks Action +ESB.AddSmooksAction.WindowTitle=Add Smooks Action +ESB.AddSmooksAction.Title=ESB Smooks Action -ESBActions101_AddSmooksTransformer.WindowTitle=Add Smooks Transformer -ESBActions101_AddSmooksTransformer.Title=ESB Smooks Transformer +ESB.AddSmooksTransformer.WindowTitle=Add Smooks Transformer +ESB.AddSmooksTransformer.Title=ESB Smooks Transformer -ESBActions101_AddMessagePersister.WindowTitle=Add Message Persister -ESBActions101_AddMessagePersister.Title=ESB Message Persister +ESB.AddMessagePersister.WindowTitle=Add Message Persister +ESB.AddMessagePersister.Title=ESB Message Persister -ESBActions101_AddXStreamToObject.WindowTitle=Add XStream To Object -ESBActions101_AddXStreamToObject.Title=ESB XStream To Object Converter +ESB.AddXStreamToObject.WindowTitle=Add XStream To Object +ESB.AddXStreamToObject.Title=ESB XStream To Object Converter -ESBActions101_AddAggregator.WindowTitle=Add Aggregator -ESBActions101_AddAggregator.Title=ESB Aggregator +ESB.AddAggregator.WindowTitle=Add Aggregator +ESB.AddAggregator.Title=ESB Aggregator -ESBActions101_AddContentBasedRouter.WindowTitle=Add Content Based Router -ESBActions101_AddContentBasedRouter.Title=ESB Content Based Router +ESB.AddContentBasedRouter.WindowTitle=Add Content Based Router +ESB.AddContentBasedRouter.Title=ESB Content Based Router -ESBActions101_AddStaticRouter.WindowTitle=Add Static Router -ESBActions101_AddStaticRouter.Title=ESB Static Router +ESB.AddStaticRouter.WindowTitle=Add Static Router +ESB.AddStaticRouter.Title=ESB Static Router -ESBActions101_AddStaticWiretap.WindowTitle=Add Static Wiretap -ESBActions101_AddStaticWiretap.Title=ESB Static Wiretap +ESB.AddStaticWiretap.WindowTitle=Add Static Wiretap +ESB.AddStaticWiretap.Title=ESB Static Wiretap -ESBActions101_AddNotifier.WindowTitle=Add Notifier -ESBActions101_AddNotifier.Title=ESB Notifier +ESB.AddNotifier.WindowTitle=Add Notifier +ESB.AddNotifier.Title=ESB Notifier -ESBActions101_SOAPProcessor.WindowTitle=Add SOAP Processor -ESBActions101_SOAPProcessor.Title=SOAP Processor +ESB.SOAPProcessor.WindowTitle=Add SOAP Processor +ESB.SOAPProcessor.Title=SOAP Processor -ESBActions101_SOAPClient.WindowTitle=Add SOAP Client -ESBActions101_SOAPClient.Title=SOAP Client +ESB.SOAPClient.WindowTitle=Add SOAP Client +ESB.SOAPClient.Title=SOAP Client -ESBActions101_AddObjectInvoke.WindowTitle=Add Object Invoke -ESBActions101_AddObjectInvoke.Title=ESB Object Invoke +ESB.SOAPProxy.WindowTitle=Add SOAP Proxy +ESB.SOAPProxy.Title=SOAP Proxy -ESBActions101_AddCommandInterpreter.WindowTitle=Add Command Interpreter -ESBActions101_AddCommandInterpreter.Title=ESB Command Interpreter +ESB.AddObjectInvoke.WindowTitle=Add Object Invoke +ESB.AddObjectInvoke.Title=ESB Object Invoke -ESBActions101_AddGroovyProcessor.WindowTitle=Add Groovy Action Processor -ESBActions101_AddGroovyProcessor.Title=ESB Groovy Action Processor +ESB.AddCommandInterpreter.WindowTitle=Add Command Interpreter +ESB.AddCommandInterpreter.Title=ESB Command Interpreter -ESBActions101_AddSystemPrintln.WindowTitle=Add System Println -ESBActions101_AddSystemPrintln.Title=ESB System Println +ESB.AddGroovyProcessor.WindowTitle=Add Groovy Action Processor +ESB.AddGroovyProcessor.Title=ESB Groovy Action Processor -ESBActions101_AddSOAPProcessor.WindowTitle=Add SOAP Processor -ESBActions101_AddSOAPProcessor.Title=ESB SOAP Processor +ESB.AddSystemPrintln.WindowTitle=Add System Println +ESB.AddSystemPrintln.Title=ESB System Println -ESBActions101_AddSOAPClient.WindowTitle=Add SOAP Client -ESBActions101_AddSOAPClient.Title=ESB SOAP Client +ESB.AddSOAPProcessor.WindowTitle=Add SOAP Processor +ESB.AddSOAPProcessor.Title=ESB SOAP Processor -ESBActions110_AddByteArrayToString.WindowTitle=Add Byte Array To String -ESBActions110_AddByteArrayToString.Title=ESB Byte Array To String Converter +ESB.AddSOAPClient.WindowTitle=Add SOAP Client +ESB.AddSOAPClient.Title=ESB SOAP Client -ESBActions110_AddLongToDate.WindowTitle=Add Long To Date -ESBActions110_AddLongToDate.Title=ESB Long To Date Converter - -ESBActions110_AddObjectToCSVString.WindowTitle=Add Object To CSV String -ESBActions110_AddObjectToCSVString.Title=ESB Action Object To CSVString Converter - -ESBActions110_AddObjectToXStream.WindowTitle=Add Object To XStream -ESBActions110_AddObjectToXStream.Title=ESB Object To XStream Converter - -ESBActions110_AddSmooksTransformer.WindowTitle=Add Smooks Transformer -ESBActions110_AddSmooksTransformer.Title=ESB Smooks Transformer - -ESBActions110_AddMessagePersister.WindowTitle=Add Message Persister -ESBActions110_AddMessagePersister.Title=ESB Message Persister - -ESBActions110_AddXStreamToObject.WindowTitle=Add XStream To Object -ESBActions110_AddXStreamToObject.Title=ESB XStream To Object Converter - -ESBActions110_AddAggregator.WindowTitle=Add Aggregator -ESBActions110_AddAggregator.Title=ESB Aggregator - -ESBActions110_AddContentBasedRouter.WindowTitle=Add Content Based Router -ESBActions110_AddContentBasedRouter.Title=ESB Content Based Router - -ESBActions110_AddStaticRouter.WindowTitle=Add Static Router -ESBActions110_AddStaticRouter.Title=ESB Static Router - -ESBActions110_AddStaticWiretap.WindowTitle=Add Static Wiretap -ESBActions110_AddStaticWiretap.Title=ESB Static Wiretap - -ESBActions110_AddNotifier.WindowTitle=Add Notifier -ESBActions110_AddNotifier.Title=ESB Notifier - -ESBActions110_SOAPProcessor.WindowTitle=Add SOAP Processor -ESBActions110_SOAPProcessor.Title=SOAP Processor - -ESBActions110_SOAPClient.WindowTitle=Add SOAP Client -ESBActions110_SOAPClient.Title=SOAP Client - -ESBActions110_AddObjectInvoke.WindowTitle=Add Object Invoke -ESBActions110_AddObjectInvoke.Title=ESB Object Invoke - -ESBActions110_AddCommandInterpreter.WindowTitle=Add Command Interpreter -ESBActions110_AddCommandInterpreter.Title=ESB Command Interpreter - -ESBActions110_AddGroovyProcessor.WindowTitle=Add Groovy Action Processor -ESBActions110_AddGroovyProcessor.Title=ESB Groovy Action Processor - -ESBActions110_AddSystemPrintln.WindowTitle=Add System Println -ESBActions110_AddSystemPrintln.Title=ESB System Println - -ESBActions110_AddSOAPProcessor.WindowTitle=Add SOAP Processor -ESBActions110_AddSOAPProcessor.Title=ESB SOAP Processor - -ESBActions110_AddSOAPClient.WindowTitle=Add SOAP Client -ESBActions110_AddSOAPClient.Title=ESB SOAP Client - ESBPreActionAggregator101_Properties.Title=Aggregator ESBPreActionByteArrayToString101_Properties.Title=Byte Array to String ESBPreActionCommandInterpreter101_Properties.Title=Command Interpreter @@ -596,6 +512,7 @@ ESBPreActionObjectToXStream101_Properties.Title=Object to XStream ESBPreActionSOAPClient101_Properties.Title=SOAP Client ESBPreActionSOAPProcessor101_Properties.Title=SOAP Processor +ESBPreActionSOAPProxy120_Properties.Title=SOAP Proxy ESBPreActionSmooksTransformer101_Properties.Title=Smooks Transformer ESBPreActionStaticRouter101_Properties.Title=Static Router ESBPreActionStaticWiretap101_Properties.Title=Static Wiretap 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-19 12:45:37 UTC (rev 18741) +++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2009-11-19 13:52:04 UTC (rev 18742) @@ -7,6 +7,31 @@ <MAPPING name="AnyElementPresentation"> <PAIR name="route-to,object-path" value="org.jboss.tools.esb.core.model.ESBAnyElementPresentation"/> </MAPPING> + <MAPPING name="ESBSpecificActions"> + <PAIR name="org.jboss.soa.esb.actions.Aggregator" value="ESBPreActionAggregator"/> + <PAIR name="org.jboss.soa.esb.actions.BusinessRulesProcessor" value="ESBPreActionBusinessRulesProcessor"/> + <PAIR name="org.jboss.soa.esb.actions.ContentBasedRouter" value="ESBPreActionContentBasedRouter"/> + <PAIR name="org.jboss.soa.esb.actions.MessagePersister" value="ESBPreActionMessagePersister"/> + <PAIR name="org.jboss.soa.esb.actions.Notifier" value="ESBPreActionNotifier"/> + <PAIR name="org.jboss.soa.esb.actions.StaticRouter" value="ESBPreActionStaticRouter"/> + <PAIR name="org.jboss.soa.esb.actions.StaticWiretap" value="ESBPreActionStaticWiretap"/> + <PAIR name="org.jboss.soa.esb.actions.SystemPrintln" value="ESBPreActionSystemPrintln"/> + <PAIR name="org.jboss.soa.esb.actions.converters.ByteArrayToString" value="ESBPreActionByteArrayToString"/> + <PAIR name="org.jboss.soa.esb.actions.converters.LongToDateConverter" value="ESBPreActionLongToDateConverter"/> + <PAIR name="org.jboss.soa.esb.actions.converters.ObjectInvoke" value="ESBPreActionObjectInvoke"/> + <PAIR name="org.jboss.soa.esb.actions.converters.ObjectToCSVString" value="ESBPreActionObjectToCSVString"/> + <PAIR name="org.jboss.soa.esb.actions.converters.ObjectToXStream" value="ESBPreActionObjectToXStream"/> + <PAIR name="org.jboss.soa.esb.actions.converters.SmooksTransformer" value="ESBPreActionSmooksTransformer"/> + <PAIR name="org.jboss.soa.esb.actions.converters.XStreamToObject" value="ESBPreActionXStreamToObject"/> + <PAIR name="org.jboss.soa.esb.actions.jbpm.CommandInterpreter" value="ESBPreActionCommandInterpreter"/> + <PAIR + name="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor" value="ESBPreActionGroovyProcessor"/> + <PAIR name="org.jboss.soa.esb.actions.soap.SOAPClient" value="ESBPreActionSOAPClient"/> + <PAIR name="org.jboss.soa.esb.actions.soap.SOAPProcessor" value="ESBPreActionSOAPProcessor"/> + <PAIR name="org.jboss.soa.esb.actions.soap.proxy.SOAPProxy" value="ESBPreActionSOAPProxy"/> + <PAIR name="org.jboss.soa.esb.actions.transformation.xslt.XslAction" value="ESBPreActionXSLTAction"/> + <PAIR name="org.jboss.soa.esb.smooks.SmooksAction" value="ESBPreActionSmooksAction"/> + </MAPPING> <MAPPING name="FileVersions"> <PAIR name="ESB1.0.1" value="FileESB101"/> </MAPPING> @@ -114,7 +139,14 @@ <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="pre=true;category=general" - name="rule set" xmlname="ruleSet"/> + name="rule set" xmlname="ruleSet"> + <Constraint loader="Tree"> + <value name="ESBResourceTree"/> + <value name="extensions=drl"/> + <value name="linkAction=OpenRuleSet"/> + </Constraint> + <Editor name="TreeChooser"/> + </XModelAttribute> <XModelAttribute PROPERTIES="category=general;pre=true" name="rule language" xmlname="ruleLanguage"/> <XModelAttribute PROPERTIES="pre=true;category=general" @@ -147,6 +179,10 @@ </XModelAttribute> </XModelAttributes> <XActionItem kind="list"> + <XActionItem + HandlerClassName="org.jboss.tools.esb.core.model.handlers.OpenESBResourceHandler" + ICON="action.empty" PROPERTIES="actionpath=Open;attribute=rule set" + displayName="Open Rule Set" kind="action" name="OpenRuleSet"/> <XActionItem kind="list" name="CreateActions"> <XActionItem HandlerClassName="%Create%" ICON="action.empty" PROPERTIES="validator.add=true" WizardClassName="%Default%" @@ -267,7 +303,14 @@ <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="pre=true;category=general" - name="rule set" xmlname="ruleSet"/> + name="rule set" xmlname="ruleSet"> + <Constraint loader="Tree"> + <value name="ESBResourceTree"/> + <value name="extensions=drl,properties"/> + <value name="linkAction=OpenRuleSet"/> + </Constraint> + <Editor name="TreeChooser"/> + </XModelAttribute> <XModelAttribute PROPERTIES="category=general;pre=true;save=always" name="rule language" xmlname="ruleLanguage"/> <XModelAttribute PROPERTIES="pre=true;category=general" @@ -291,6 +334,10 @@ </XModelAttribute> </XModelAttributes> <XActionItem kind="list"> + <XActionItem + HandlerClassName="org.jboss.tools.esb.core.model.handlers.OpenESBResourceHandler" + ICON="action.empty" PROPERTIES="actionpath=Open;attribute=rule set" + displayName="Open Rule Set" kind="action" name="OpenRuleSet"/> <XActionItem kind="list" name="CreateActions"> <XActionItem HandlerClassName="%Create%" ICON="action.empty" PROPERTIES="validator.add=true" WizardClassName="%Default%" @@ -332,7 +379,14 @@ name="class" xmlname="class"> <Editor name="Uneditable"/> </XModelAttribute> - <XModelAttribute PROPERTIES="pre=true;category=general" name="script" xmlname="script"/> + <XModelAttribute PROPERTIES="pre=true;category=general" name="script" xmlname="script"> + <Constraint loader="Tree"> + <value name="ESBResourceTree"/> + <value name="extensions=groovy"/> + <value name="linkAction=OpenScript"/> + </Constraint> + <Editor name="TreeChooser"/> + </XModelAttribute> <XModelAttribute PROPERTIES="category=general" name="process" xmlname="process"> <Editor name="Uneditable"/> </XModelAttribute> @@ -341,6 +395,10 @@ </XModelAttribute> </XModelAttributes> <XActionItem kind="list"> + <XActionItem + HandlerClassName="org.jboss.tools.esb.core.model.handlers.OpenESBResourceHandler" + ICON="action.empty" PROPERTIES="actionpath=Open;attribute=script" + displayName="Open Script" kind="action" name="OpenScript"/> <XActionItem kind="list" name="CreateActions"/> <XActionItemReference entity="ESBProperty" name="CopyActions"/> <XActionItemReference entity="ESBProperty" name="DeleteActions"/> @@ -1053,6 +1111,86 @@ <XDependencies/> </XModelEntity> <XModelEntity ImplementingClass="%ESB%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" + XMLSUBPATH="action" name="ESBPreActionXSLTAction120"> + <XChildrenEntities> + <XChildEntity name="ESBProperty"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.action" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="xslt action" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;id=true;save=always" + name="name" xmlname="name"/> + <XModelAttribute PROPERTIES="category=general;save=always" + default="org.jboss.soa.esb.actions.transformation.xslt.XslAction" + name="class" xmlname="class"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;save=always;pre=true" + name="template file" xmlname="templateFile"> + <Constraint loader="Tree"> + <value name="ESBResourceTree"/> + <value name="extensions=xsl"/> + <value name="linkAction=OpenTemplateFile"/> + </Constraint> + <Editor name="TreeChooser"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=advanced;pre=true" + name="get payload location" xmlname="get-payload-location"/> + <XModelAttribute PROPERTIES="category=advanced;pre=true" + name="set payload location" xmlname="set-payload-location"/> + <XModelAttribute PROPERTIES="category=advanced;pre=true" + name="result type" xmlname="resultType"> + <Constraint loader="ListString"> + <value/> + <value name="STRING"/> + <value name="BYTES"/> + <value name="DOM"/> + <value name="SAX"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;pre=true" + name="fail on warning" xmlname="failOnWarning"> + <Constraint loader="ListString"> + <value/> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=advanced;pre=true" + name="uri resolver" xmlname="uriResolver"> + <Editor name="AccessibleJava"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" name="process" xmlname="process"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem + HandlerClassName="org.jboss.tools.esb.core.model.handlers.OpenESBResourceHandler" + ICON="action.empty" + PROPERTIES="actionpath=Open;attribute=template file" + displayName="Open Template File" kind="action" name="OpenTemplateFile"/> + <XActionItem kind="list" name="CreateActions"/> + <XActionItemReference entity="ESBProperty" name="CopyActions"/> + <XActionItemReference entity="ESBProperty" name="DeleteActions"/> + <XActionItemReference entity="ESBProperty" name="Properties"/> + <XActionItemReference entity="ESBProperty" name="MoveActions"/> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%ESB%" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%EntityOrdered%" XMLSUBPATH="action" name="ESBPreActionXStreamToObject101"> <XChildrenEntities> @@ -1633,13 +1771,34 @@ <XChildEntity name="ESBPreActionSystemPrintln101"/> <XChildEntity name="ESBPreActionNotifier101"/> <XChildEntity name="ESBPreActionBusinessRulesProcessor101"/> + <XChildEntity name="ESBPreActionXSLTAction120"/> </XChildrenEntities> <XActionItem kind="list"> <XActionItem ICON="action.empty" displayName="New" group="1" kind="list" name="CreateActions"> <XActionItem displayName="Add Pre-Packed Action" kind="list" name="PrePackedAction"> <XActionItemReference entity="ESBActions101" name="AddObjectInvoke"/> - <XActionItemReference entity="ESBActions101" name="Converters"/> + <XActionItem displayName="Converters" kind="list" name="Converters"> + <XActionItemReference entity="ESBActions101" name="AddByteArrayToString"/> + <XActionItemReference entity="ESBActions101" name="AddLongToDate"/> + <XActionItemReference entity="ESBActions101" name="AddObjectToCSVString"/> + <XActionItemReference entity="ESBActions101" name="AddObjectToXStream"/> + <XActionItemReference entity="ESBActions101" name="AddSmooksAction"/> + <XActionItemReference entity="ESBActions101" name="AddSmooksTransformer"/> + <XActionItemReference entity="ESBActions101" name="AddMessagePersister"/> + <XActionItemReference entity="ESBActions101" name="AddXStreamToObject"/> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="XSLT Action..." kind="action" name="AddXSLTAction"> + <EntityData EntityName="ESBPreActionXSLTAction120"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="template file"/> + <AttributeData AttributeName="get payload location" Mandatory="no"/> + <AttributeData AttributeName="set payload location" Mandatory="no"/> + <AttributeData AttributeName="result type" Mandatory="no"/> + </EntityData> + </XActionItem> + </XActionItem> <XActionItemReference entity="ESBActions101" name="AddCommandInterpreter"/> <XActionItemReference entity="ESBActions101" name="AddGroovyProcessor"/> <XActionItemReference entity="ESBActions101" name="Routers"/> 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-19 12:45:37 UTC (rev 18741) +++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/SpecificActionLoader.java 2009-11-19 13:52:04 UTC (rev 18742) @@ -15,10 +15,12 @@ import org.jboss.tools.common.meta.XAttribute; import org.jboss.tools.common.meta.XChild; +import org.jboss.tools.common.meta.XMapping; import org.jboss.tools.common.meta.XModelEntity; import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.impl.RegularObjectImpl; +import org.jboss.tools.common.model.options.PreferenceModelUtilities; import org.jboss.tools.common.model.util.XModelObjectLoaderUtil; import org.jboss.tools.esb.core.ESBCorePlugin; import org.jboss.tools.esb.core.model.converters.AliasConverter; @@ -30,68 +32,23 @@ * @author Viacheslav Kabanovich */ public class SpecificActionLoader implements ESBConstants { - static final String ACTION_ENTITY = "ESBAction"; static final String ACTIONS_FOLDER_ENTITY = "ESBActions"; - /** - * Version suffix should be added to entity name - */ - static final String[][] SPECIFIC_ACTIONS = { - {"org.jboss.soa.esb.actions.converters.ByteArrayToString", "ESBPreActionByteArrayToString"}, - //encoding - {"org.jboss.soa.esb.actions.converters.LongToDateConverter", "ESBPreActionLongToDateConverter"}, - //- - {"org.jboss.soa.esb.actions.converters.ObjectInvoke", "ESBPreActionObjectInvoke"}, - //class-processor, class-method - {"org.jboss.soa.esb.actions.converters.ObjectToCSVString", "ESBPreActionObjectToCSVString"}, - //bean-properties, fail-on-missing-property - {"org.jboss.soa.esb.actions.converters.ObjectToXStream", "ESBPreActionObjectToXStream"}, - //class-alias, exclude-package - {"org.jboss.soa.esb.actions.converters.SmooksTransformer", "ESBPreActionSmooksTransformer"}, - //resource-config; from, from-type, to, to-type - {"org.jboss.soa.esb.smooks.SmooksAction", "ESBPreActionSmooksAction"}, - //smooksConfig - {"org.jboss.soa.esb.actions.MessagePersister", "ESBPreActionMessagePersister"}, - //classification, message-store-class - {"org.jboss.soa.esb.actions.converters.XStreamToObject", "ESBPreActionXStreamToObject"}, - //class-alias, exclude-package, incoming-type, root-node, aliases - {"org.jboss.soa.esb.actions.jbpm.CommandInterpreter", "ESBPreActionCommandInterpreter"}, - // - {"org.jboss.soa.esb.actions.scripting.GroovyActionProcessor", "ESBPreActionGroovyProcessor"}, - //script - {"org.jboss.soa.esb.actions.Aggregator", "ESBPreActionAggregator"}, - //timeoutInMillies - {"org.jboss.soa.esb.actions.ContentBasedRouter", "ESBPreActionContentBasedRouter"}, - //ruleSet, ruleLanguage, ruleReload, destinations! - {"org.jboss.soa.esb.actions.StaticRouter", "ESBPreActionStaticRouter"}, - //destinations! - {"org.jboss.soa.esb.actions.StaticWiretap", "ESBPreActionStaticWiretap"}, - //destinations! - {"org.jboss.soa.esb.actions.Notifier", "ESBPreActionNotifier"}, - //destinations! NotificationList/target ... - {"org.jboss.soa.esb.actions.soap.SOAPProcessor", "ESBPreActionSOAPProcessor"}, - //jbossws-endpoint - {"org.jboss.soa.esb.actions.soap.SOAPClient", "ESBPreActionSOAPClient"}, - //wsdl, operation +other - {"org.jboss.soa.esb.actions.SystemPrintln", "ESBPreActionSystemPrintln"}, - //message, printfull, outputstream - {"org.jboss.soa.esb.actions.BusinessRulesProcessor", "ESBPreActionBusinessRulesProcessor"}, - //ruleSet, ruleLanguage, ruleReload, object-paths! - {"org.jboss.soa.esb.actions.soap.proxy.SOAPProxy", "ESBPreActionSOAPProxy"}, - //wsdl, file, endpointUrl - }; + private static Map<String,String> classToEntity = new HashMap<String, String>(); public static final SpecificActionLoader instance = new SpecificActionLoader(); - Map<String,String> classToEntity = new HashMap<String, String>(); - Map<String,String> entityToClass = new HashMap<String, String>(); - SpecificActionLoader() { - for (int i = 0; i < SPECIFIC_ACTIONS.length; i++) { - String[] action = SPECIFIC_ACTIONS[i]; - classToEntity.put(action[0], action[1]); - entityToClass.put(action[1], action[0]); + if(classToEntity.isEmpty()) { + XMapping m = PreferenceModelUtilities.getPreferenceModel().getMetaData().getMapping("ESBSpecificActions"); + if(m != null) { + String[] classes = m.getKeys(); + for (String c: classes) { + String entity = m.getValue(c); + classToEntity.put(c, entity); + } + } } } @@ -124,12 +81,7 @@ XModelObject[] as = actions.getChildren(); for (int i = 0; i < as.length; i++) { - String cls = as[i].getAttributeValue("class"); - if(cls == null) continue; - String entityName = classToEntity.get(cls); - if(entityName == null) continue; - entityName = addSuffix(entityName, actions); - XModelObject action = convertBasicActionToSpecific(as[i], entityName); + XModelObject action = convertBasicActionToSpecific(actions, as[i]); if(action != null) { as[i] = action; modified = true; @@ -141,6 +93,15 @@ } + public XModelObject convertBasicActionToSpecific(XModelObject actions, XModelObject basic) { + String cls = basic.getAttributeValue("class"); + if(cls == null) return null; + String entityName = classToEntity.get(cls); + if(entityName == null) return null; + entityName = addSuffix(entityName, actions); + return convertBasicActionToSpecific(basic, entityName); + } + public XModelObject convertBasicActionToSpecific(XModelObject basic, String entityName) { XModelEntity entity = basic.getModelEntity().getMetaModel().getEntity(entityName); if(entity == null) return null;; Modified: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddGenericActionSupport.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddGenericActionSupport.java 2009-11-19 12:45:37 UTC (rev 18741) +++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddGenericActionSupport.java 2009-11-19 13:52:04 UTC (rev 18742) @@ -1,6 +1,13 @@ package org.jboss.tools.esb.core.model.handlers; +import java.util.Properties; + +import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler; import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateSupport; +import org.jboss.tools.common.model.XModelException; +import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.util.XModelObjectLoaderUtil; +import org.jboss.tools.esb.core.model.SpecificActionLoader; public class AddGenericActionSupport extends DefaultCreateSupport { @@ -8,4 +15,12 @@ return "org.jboss.tools.esb.ui.wizard.AddGenericActionStep"; //$NON-NLS-1$ } + protected void finish() throws XModelException { + String entity = getEntityName(); + Properties p = extractStepData(0); + XModelObject c = XModelObjectLoaderUtil.createValidObject(getTarget().getModel(), entity, p); + XModelObject action = SpecificActionLoader.instance.convertBasicActionToSpecific(getTarget(), c); + if(action == null) action = c; + DefaultCreateHandler.addCreatedObject(getTarget(), action, getProperties()); + } }