Author: scabanovich Date: 2010-08-11 07:48:43 -0400 (Wed, 11 Aug 2010) New Revision: 24039 Added: trunk/esb/plugins/org.jboss.tools.esb.core/images/esb/from.gif trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb13.meta Modified: trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml 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/src/org/jboss/tools/esb/core/model/ESBConstants.java trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBEntityRecognizer.java Log: https://jira.jboss.org/browse/JBIDE-6615 Added: trunk/esb/plugins/org.jboss.tools.esb.core/images/esb/from.gif =================================================================== (Binary files differ) Property changes on: trunk/esb/plugins/org.jboss.tools.esb.core/images/esb/from.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml 2010-08-11 09:36:18 UTC (rev 24038) +++ trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml 2010-08-11 11:48:43 UTC (rev 24039) @@ -7,6 +7,7 @@ <meta path="meta/esb-actions.meta"/> <meta path="meta/esb-notifiers.meta"/> <meta path="meta/esb12.meta"/> + <meta path="meta/esb13.meta"/> <meta path="meta/esb-riftsaw-actions.meta"/> </extension> @@ -100,6 +101,10 @@ <uri name="http://anonsvn.jboss.org/repos/labs/labs/jbossesb/trunk/produc... uri="platform:/plugin/org.jboss.tools.esb.core/schemas/jbossesb-1.2.0.xsd"/> + + <uri + name="http://anonsvn.jboss.org/repos/labs/labs/jbossesb/trunk/produc... + uri="platform:/plugin/org.jboss.tools.esb.core/schemas/jbossesb-1.3.0.xsd"/> </catalogContribution> </extension> 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 2010-08-11 09:36:18 UTC (rev 24038) +++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-menu.properties 2010-08-11 11:48:43 UTC (rev 24039) @@ -2,6 +2,7 @@ ESB.AddNotificationList.menu=Add Notification List... ESB.AddProperty.menu=Add Property... ESB.AddAlias.menu=Add Alias... +ESB.AddFrom.menu=Add From... ESB.CreateTarget.menu=Target... ESB.CreateTag.menu=Add Tag... ESB.AddAction.menu=Custom Action... @@ -9,6 +10,7 @@ ESB.AddFilter.menu=Add Filter... ESB.AddListener.menu=Listener... ESB.AddScheduledListener.menu=Scheduled Listener... +ESB.AddCamelGateway.menu=Camel Gateway... ESB.AddJCAGateway.menu=JCA Gateway... ESB.AddJMSListener.menu=JMS Listener... ESB.AddFSListener.menu=FS Listener... @@ -18,6 +20,7 @@ ESB.AddJBRListener.menu=JBR Listener... ESB.AddGroovyListener.menu=Groovy Listener... ESB.AddBusProvider.menu=Bus Provider... +ESB.AddCamelProvider.menu=Camel Provider... ESB.AddJBRProvider.menu=JBR Provider... ESB.AddScheduleProvider.menu=Schedule Provider... ESB.AddJMSProvider.menu=JMS Provider... 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 2010-08-11 09:36:18 UTC (rev 24038) +++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties 2010-08-11 11:48:43 UTC (rev 24039) @@ -1,6 +1,7 @@ FileESB101.editorTitle=JBoss ESB Editor FileESB110.editorTitle=JBoss ESB Editor FileESB120.editorTitle=JBoss ESB 1.2 Editor +FileESB130.editorTitle=JBoss ESB 1.3 Editor #ESB File @@ -14,6 +15,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 +FileESB130_Properties.Title=ESB File 1.3.0 ESBGlobals120_Properties.Title=ESB Globals @@ -170,6 +172,63 @@ ESBProviders120_Properties.Title=Providers List +ESBProviders130_AddBusProvider_0.WindowTitle=Add Bus Provider +ESBProviders130_AddBusProvider_0.Title=ESB Provider +ESBProviders130_AddBusProvider_1.WindowTitle=Add Bus Provider +ESBProviders130_AddBusProvider_1.Title=ESB Channel + +ESBProviders130_AddCamelProvider_0.WindowTitle=Add Camel Provider +ESBProviders130_AddCamelProvider_0.Title=ESB Camel Provider +ESBProviders130_AddCamelProvider_1.WindowTitle=Add Camel Provider +ESBProviders130_AddCamelProvider_1.Title=ESB Channel + +ESBProviders130_AddJBRProvider_0.WindowTitle=Add JBR Provider +ESBProviders130_AddJBRProvider_0.Title=ESB JBR Provider +ESBProviders130_AddJBRProvider_1.WindowTitle=Add JBR Provider +ESBProviders130_AddJBRProvider_1.Title=ESB Channel + +ESBProviders130_AddScheduleProvider.WindowTitle=Add Schedule Provider +ESBProviders130_AddScheduleProvider.Title=ESB Schedule Provider +ESBProviders130_AddScheduleProvider_0.WindowTitle=Add Schedule Provider +ESBProviders130_AddScheduleProvider_0.Title=ESB Schedule Provider + +ESBProviders130_AddJMSProvider_0.WindowTitle=Add JMS Provider +ESBProviders130_AddJMSProvider_0.Title=ESB JMS Provider +ESBProviders130_AddJMSProvider_1.WindowTitle=Add JMS Provider +ESBProviders130_AddJMSProvider_1.Title=ESB Channel + +ESBProviders130_AddJCAProvider_0.WindowTitle=Add JCA Provider +ESBProviders130_AddJCAProvider_0.Title=ESB JCA Provider +ESBProviders130_AddJCAProvider_1.WindowTitle=Add JCA Provider +ESBProviders130_AddJCAProvider_1.Title=ESB Channel + +ESBProviders130_AddFSProvider_0.WindowTitle=Add FS Provider +ESBProviders130_AddFSProvider_0.Title=ESB FS Provider +ESBProviders130_AddFSProvider_1.WindowTitle=Add FS Provider +ESBProviders130_AddFSProvider_1.Title=ESB Channel + +ESBProviders130_AddFTPProvider_0.WindowTitle=Add FTP Provider +ESBProviders130_AddFTPProvider_0.Title=ESB FTP Provider +ESBProviders130_AddFTPProvider_1.WindowTitle=Add FTP Provider +ESBProviders130_AddFTPProvider_1.Title=ESB Channel + +ESBProviders130_AddSQLProvider_0.WindowTitle=Add SQL Provider +ESBProviders130_AddSQLProvider_0.Title=ESB SQL Provider +ESBProviders130_AddSQLProvider_1.WindowTitle=Add SQL Provider +ESBProviders130_AddSQLProvider_1.Title=ESB Channel + +ESBProviders130_AddHibernateProvider_0.WindowTitle=Add Hibernate Provider +ESBProviders130_AddHibernateProvider_0.Title=ESB Hibernate Provider +ESBProviders130_AddHibernateProvider_1.WindowTitle=Add Hibernate Provider +ESBProviders130_AddHibernateProvider_1.Title=ESB Channel + +ESBProviders130_AddHTTPProvider_0.WindowTitle=Add HTTP Provider +ESBProviders130_AddHTTPProvider_0.Title=ESB HTTP Provider +ESBProviders130_AddHTTPProvider_1.WindowTitle=Add HTTP Provider +ESBProviders130_AddHTTPProvider_1.Title=ESB Channel + +ESBProviders130_Properties.Title=Providers List + #War Security ESBWarSecurity120_Properties.Title=WAR Security @@ -192,6 +251,13 @@ ESBBusProvider101_Properties.Title=ESB Bus Provider +#Camel Provider + +ESBCamelProvider130_AddBus.WindowTitle=Add Camel Channel +ESBCamelProvider130_AddBus.Title=ESB Camel Channel + +ESBCamelProvider130_Properties.Title=ESB Camel Provider + #JBR Provider ESBJBRProvider101_AddBus.WindowTitle=Add JBR Channel @@ -267,6 +333,10 @@ ESBBus_Properties.Title=ESB Channel +#Camel Bus + +ESBCamelBus130_Properties.Title=ESB Camel Channel + #JBR Bus ESBJBRBus101_Properties.Title=ESB JBR Channel @@ -388,6 +458,11 @@ ESBListeners120_Properties.Title=ESB Listeners List +ESB.AddCamelGateway.WindowTitle=Add Camel Gateway +ESB.AddCamelGateway.Title=ESB Camel Gateway + +ESBListeners130_Properties.Title=ESB Listeners List + # ESB Listener ESBListener101_Properties.Title=ESB Listener @@ -397,6 +472,10 @@ ESBScheduledListener101_Properties.Title=ESB Scheduled Listener +# Camel Gateway + +ESBCamelGateway130_Properties.Title=ESB Camel Gateway + # JCA Gateway ESBJCAGateway101_Properties.Title=ESB JCA Gateway @@ -405,6 +484,7 @@ # JMS Listener ESBJMSListener101_Properties.Title=ESB JMS Listener +ESBJMSListener130_Properties.Title=ESB JMS Listener # FS Listener @@ -483,6 +563,9 @@ ESB.AddAlias.WindowTitle=Add Alias ESB.AddAlias.Title=ESB Alias +ESB.AddFrom.WindowTitle=Add From +ESB.AddFrom.Title=ESB From! + ESB.AddNamespace.WindowTitle=Add Namespace ESB.AddNamespace.Title=ESB Namespace @@ -507,6 +590,8 @@ ESB.AddClientProp.WindowTitle=Add HTTP Client Property ESB.AddClientProp.Title=HTTP Client Property +ESBFrom_Properties.Title=ESB From + ESBPreAlias_Properties.Title=ESB Alias ESBPreAttributeAlias_Properties.Title=ESB Attribute Alias ESBPreBPMVar_Properties.Title=ESB BPM Var Added: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb13.meta =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb13.meta (rev 0) +++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb13.meta 2010-08-11 11:48:43 UTC (rev 24039) @@ -0,0 +1,617 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE XModelEntityGroup PUBLIC "-//Red Hat, Inc.//DTD Meta 1.0//EN" + "meta.dtd"> +<XModelEntityGroup> + <VERSION DEPENDS="Model:1.0" MODULE="ESB" VERSION="1.0"/> + <MAPPINGS> + <MAPPING name="FileVersions"> + <PAIR name="ESB1.3.0" value="FileESB130"/> + </MAPPING> + </MAPPINGS> + <ICONS> + <GROUP name="main"> + <GROUP name="esb"> + <ICON name="from" path="plugin:org.jboss.tools.esb.core:images/esb/from.gif"/> + </GROUP> + </GROUP> + </ICONS> + <GlobalActions kind="list"/> + <XModelEntity ImplementingClass="%ESB%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%ESBOrdered%" + XMLSUBPATH="camel-bus" name="ESBCamelBus130"> + <XChildrenEntities> + <XChildEntity name="ESBProperty"/> + <XChildEntity name="ESBFrom"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.bus" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="channel" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;id=true;save=always" + name="id" xmlname="busid"/> + <XModelAttribute PROPERTIES="category=general" name="from uri" xmlname="from-uri"/> + <XModelAttribute PROPERTIES="category=advanced" name="async" xmlname="async"> + <Constraint loader="ListString"> + <value/> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=advanced" name="timeout" xmlname="timeout"/> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"> + <XActionItemReference entity="ESBAction101" name="AddProperty" path="CreateActions/AddProperty"/> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Add From..." kind="action" name="AddFrom"> + <EntityData EntityName="ESBFrom"> + <AttributeData AttributeName="uri"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/> + <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=%ESBOrdered%" + XMLSUBPATH="camel-gateway" name="ESBCamelGateway130"> + <XChildrenEntities> + <XChildEntity name="ESBProperty"/> + <XChildEntity name="ESBFrom"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.listener" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="camel gateway" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttributeReference attributes="name,channel id ref" + entity="ESBListener101" name="listener"/> + <XModelAttribute PROPERTIES="category=general" name="from uri" xmlname="from-uri"/> + <XModelAttribute PROPERTIES="category=advanced" name="async" xmlname="async"> + <Constraint loader="ListString"> + <value/> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=advanced" name="timeout" xmlname="timeout"/> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"> + <XActionItemReference entity="ESBAction101" name="AddProperty" path="CreateActions/AddProperty"/> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Add From..." kind="action" name="AddFrom"> + <EntityData EntityName="ESBFrom"> + <AttributeData AttributeName="uri"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/> + <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=%ESBOrdered%" + XMLSUBPATH="camel-provider" name="ESBCamelProvider130"> + <XChildrenEntities> + <XChildEntity name="ESBProperty"/> + <XChildEntity name="ESBBus"/> + <XChildEntity name="ESBCamelBus130"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.provider" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="camel provider" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;id=true;save=always" + name="name" xmlname="name"/> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem ICON="action.empty" displayName="New" group="1" + kind="list" name="CreateActions"> + <XActionItemReference entity="ESBAction101" name="AddProperty" path="CreateActions/AddProperty"/> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Camel Bus..." kind="action" name="AddBus"> + <EntityData EntityName="ESBCamelBus130"> + <AttributeData AttributeName="id"/> + <AttributeData AttributeName="from uri" Mandatory="no"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/> + <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="%Custom%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" + XMLSUBPATH="from" name="ESBFrom"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.from" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="from" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;id=true;save=always" + name="uri" xmlname="uri"/> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem 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;children=%ESBOrdered%" + XMLSUBPATH="jms-listener" name="ESBJMSListener130"> + <XChildrenEntities> + <XChildEntity name="ESBProperty"/> + <XChildEntity maxCount="1" name="ESBJMSMessageFilter101" required="yes"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.listener" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="jms listener" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttributeReference + attributes="name,channel id ref,max threads,is gateway" + entity="ESBListener101" name="listener"/> + <XModelAttribute PROPERTIES="category=advanced" name="client id" xmlname="clientId"/> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=advanced" + name="durable subscription name" xmlname="durableSubscriptionName"/> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"> + <XActionItemReference entity="ESBAction101" name="AddProperty" path="CreateActions/AddProperty"/> + </XActionItem> + <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/> + <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=%Ordered%;saveDefault=false" + XMLSUBPATH="listeners" name="ESBListeners130"> + <XChildrenEntities> + <XChildEntity name="ESBListener120"/> + <XChildEntity name="ESBScheduledListener101"/> + <XChildEntity name="ESBJCAGateway120"/> + <XChildEntity name="ESBJMSListener130"/> + <XChildEntity name="ESBFSListener101"/> + <XChildEntity name="ESBFTPListener120"/> + <XChildEntity name="ESBSQLListener120"/> + <XChildEntity name="ESBHibernateListener101"/> + <XChildEntity name="ESBJBRListener120"/> + <XChildEntity name="ESBGroovyListener101"/> + <XChildEntity name="ESBHTTPGateway120"/> + <XChildEntity name="ESBUDPListener110"/> + <XChildEntity name="ESBCamelGateway130"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.listeners" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="listeners list" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;id=true" + default="Listeners" name="name" visibility="false"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem ICON="action.empty" displayName="New" group="1" + kind="list" name="CreateActions"> + <XActionItemReference entity="ESBListeners120" name="AddListener" path="CreateActions/AddListener"/> + <XActionItem kind="list" name="Separator"/> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Camel Gateway.." kind="action" name="AddCamelGateway"> + <EntityData EntityName="ESBCamelGateway130"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="channel id ref" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItemReference entity="ESBListeners101" name="AddFSListener" path="CreateActions/AddFSListener"/> + <XActionItemReference entity="ESBListeners120" name="AddFTPListener" path="CreateActions/AddFTPListener"/> + <XActionItemReference entity="ESBListeners101" + name="AddGroovyListener" path="CreateActions/AddGroovyListener"/> + <XActionItemReference entity="ESBListeners101" + name="AddHibernateListener" path="CreateActions/AddHibernateListener"/> + <XActionItemReference entity="ESBListeners120" name="AddHTTPGateway" path="CreateActions/AddHTTPGateway"/> + <XActionItemReference entity="ESBListeners120" name="AddJBRListener" path="CreateActions/AddJBRListener"/> + <XActionItemReference entity="ESBListeners120" name="AddJCAGateway" path="CreateActions/AddJCAGateway"/> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="JMS Listener..." kind="action" name="AddJMSListener"> + <EntityData EntityName="ESBJMSListener130"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="channel id ref" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItemReference entity="ESBListeners101" + name="AddScheduledListener" path="CreateActions/AddScheduledListener"/> + <XActionItemReference entity="ESBListeners120" name="AddSQLListener" path="CreateActions/AddSQLListener"/> + <XActionItemReference entity="ESBListeners110" name="AddUDPListener" path="CreateActions/AddUDPListener"/> + <XActionItem HIDE="always" + HandlerClassName="org.jboss.tools.common.meta.action.impl.handlers.ShowMenuHandler" + PROPERTIES="actionList=CreateActions" displayName="Listener..." + kind="action" name="AddAnyListener"/> + </XActionItem> + <XActionItemReference entity="ESBListeners101" name="CopyActions"/> + <XActionItemReference entity="ESBListeners101" name="DeleteActions"/> + <XActionItemReference entity="ESBProperty" name="Properties"/> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%ESB%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;saveDefault=false;children=%Ordered%" + XMLSUBPATH="providers" name="ESBProviders130"> + <XChildrenEntities> + <XChildEntity name="ESBBusProvider101"/> + <XChildEntity name="ESBJBRProvider120"/> + <XChildEntity name="ESBScheduleProvider101"/> + <XChildEntity name="ESBJMSProvider101"/> + <XChildEntity name="ESBJCAProvider101"/> + <XChildEntity name="ESBFSProvider101"/> + <XChildEntity name="ESBFTPProvider101"/> + <XChildEntity name="ESBSQLProvider101"/> + <XChildEntity name="ESBHibernateProvider101"/> + <XChildEntity name="ESBHTTPProvider120"/> + <XChildEntity name="ESBCamelProvider130"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.providers" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="providers list" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;id=true" + default="Providers" name="name" visibility="false"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem ICON="action.empty" displayName="New" group="1" + kind="list" name="CreateActions"> + <XActionItemReference entity="ESBProviders101" name="AddBusProvider" path="CreateActions/AddBusProvider"/> + <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty" + PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddProviderSupport;busEntity=ESBCamelBus130" + displayName="Camel Provider..." kind="action" name="AddCamelProvider"> + <EntityData EntityName="ESBCamelProvider130"> + <AttributeData AttributeName="name"/> + </EntityData> + <EntityData EntityName="ESBBusCreator"> + <AttributeData AttributeName="id"/> + </EntityData> + </XActionItem> + <XActionItemReference entity="ESBProviders101" name="AddFSProvider" path="CreateActions/AddFSProvider"/> + <XActionItemReference entity="ESBProviders101" name="AddFTPProvider" path="CreateActions/AddFTPProvider"/> + <XActionItemReference entity="ESBProviders101" + name="AddHibernateProvider" path="CreateActions/AddHibernateProvider"/> + <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty" + PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddProviderSupport;busEntity=ESBHTTPBus120" + displayName="HTTP Provider..." kind="action" name="AddHTTPProvider"> + <EntityData EntityName="ESBHTTPProvider120"> + <AttributeData AttributeName="name"/> + </EntityData> + <EntityData EntityName="ESBBusCreator"> + <AttributeData AttributeName="id"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty" + PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddProviderSupport;busEntity=ESBJBRBus120" + displayName="JBR Provider..." kind="action" name="AddJBRProvider"> + <EntityData EntityName="ESBJBRProvider120"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="protocol"/> + <AttributeData AttributeName="host" Mandatory="no"/> + </EntityData> + <EntityData EntityName="ESBBusCreator"> + <AttributeData AttributeName="id"/> + <AttributeData AttributeName="port"/> + </EntityData> + </XActionItem> + <XActionItemReference entity="ESBProviders101" name="AddJCAProvider" path="CreateActions/AddJCAProvider"/> + <XActionItemReference entity="ESBProviders101" name="AddJMSProvider" path="CreateActions/AddJMSProvider"/> + <XActionItemReference entity="ESBProviders101" + name="AddScheduleProvider" path="CreateActions/AddScheduleProvider"/> + <XActionItemReference entity="ESBProviders101" name="AddSQLProvider" path="CreateActions/AddSQLProvider"/> + <XActionItem HIDE="always" + HandlerClassName="org.jboss.tools.common.meta.action.impl.handlers.ShowMenuHandler" + PROPERTIES="actionList=CreateActions" displayName="Provider..." + kind="action" name="AddAnyProvider"/> + </XActionItem> + <XActionItemReference entity="ESBProviders101" name="CopyActions" path="CopyActions"/> + <XActionItemReference entity="ESBProviders101" name="DeleteActions" path="DeleteActions"/> + <XActionItemReference entity="ESBProperty" name="Properties"/> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%ESB%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%ESBOrderedService%" + XMLSUBPATH="service" name="ESBService130"> + <XChildrenEntities> + <XChildEntity maxCount="1" name="ESBSecurity101P" required="yes"/> + <XChildEntity name="ESBProperty"/> + <XChildEntity maxCount="1" name="ESBListeners130" required="yes"/> + <XChildEntity maxCount="1" name="ESBActions120" required="yes"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.service" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="service" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttributeReference + attributes="name,category,description,invm scope,invm transacted" + entity="ESBService101" name="service"/> + <XModelAttribute PROPERTIES="category=advanced" + name="alertTimeThreshold" xmlname="alertTimeThreshold"/> + <XModelAttribute PROPERTIES="category=advanced" + name="alertLengthThreshold" xmlname="alertLengthThreshold"/> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItemReference entity="ESBService101" name="CreateActions" path="CreateActions"/> + <XActionItemReference entity="ESBService101" name="CopyActions" path="CopyActions"/> + <XActionItemReference entity="ESBService101" name="DeleteActions" path="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;saveDefault=false;children=%Ordered%" + XMLSUBPATH="services" name="ESBServices130"> + <XChildrenEntities> + <XChildEntity name="ESBService130"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.services" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="services list" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general;id=true" + default="Services" name="name" visibility="false"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Add Service..." kind="action" name="AddService"> + <EntityData EntityName="ESBService130"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="category"/> + <AttributeData AttributeName="description"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItemReference entity="ESBServices101" name="CopyActions" path="CopyActions"/> + <XActionItemReference entity="ESBServices101" name="DeleteActions" path="DeleteActions"/> + <XActionItemReference entity="ESBProperty" name="Properties"/> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity + ImplementationLoadingClass="org.jboss.tools.esb.core.model.ESBFileLoader" + ImplementingClass="org.jboss.tools.esb.core.model.ESBFileImpl" + ObjectEditorClass="%XML%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%EntityOrdered%;editorTreeConstraint=org.jboss.tools.esb.core.model.impl.ESBTreeConstraint" + XMLSUBPATH="jbossesb" name="FileESB130"> + <XChildrenEntities> + <XChildEntity maxCount="1" name="ESBGlobals120" required="yes"/> + <XChildEntity maxCount="1" name="ESBProviders130" required="yes"/> + <XChildEntity maxCount="1" name="ESBServices130" required="yes"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.file" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="JBoss esb" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" name="name" xmlname="NAME"/> + <XModelAttribute default="xml" name="extension" xmlname="EXTENSION"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + <XModelAttribute loader="ElementType" name="_lateload" visibility="false"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute default="no" name="isIncorrect" visibility="false"> + <Constraint loader="List"> + <value name="yes"/> + <value name="no"/> + </Constraint> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute name="incorrectBody" visibility="false"/> + <XModelAttribute PROPERTIES="save=always" + default="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/e... + name="xmlns" xmlname="xmlns"/> + <XModelAttribute PROPERTIES="save=always" + default="http://www.w3.org/2001/XMLSchema-instance" name="xmlns:xsi" xmlname="xmlns:xsi"/> + <XModelAttribute PROPERTIES="save=always" + default="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/e... http://anonsvn.jboss.org/repos/labs/labs/jbossesb/trunk/product/etc/schem... + name="xsi:schemaLocation" xmlname="xsi:schemaLocation"/> + <XModelAttribute name="encoding"> + <Constraint loader="ListString"> + <value name="ISO-8859-1"/> + <value name="UTF-8"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" default="180" + name="parameter reload secs" xmlname="parameterReloadSecs"/> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem BaseActionName="Open" HandlerClassName="%Open%" + ICON="action.empty" displayName="Open" kind="action" name="Open"/> + <XActionItem displayName="Open With" group="1" kind="list" name="OpenWith"> + <XActionItem HIDE="always" + HandlerClassName="org.jboss.tools.common.meta.action.impl.handlers.OpenWithExternalHandler" + ICON="action.empty" PROPERTIES="extension=struts-config" + displayName="Open with External Program" kind="action" name="OpenWithSelected"/> + <XActionItem HIDE="always" + HandlerClassName="org.jboss.tools.common.meta.action.impl.handlers.OpenWithChoiceHandler" + ICON="action.empty" PROPERTIES="extension=struts-config" + displayName="Choose Program..." kind="action" name="OpenWithChoice"> + <EntityData EntityName="OpenWithHelper"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="default"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItem kind="list" name="EditActions"> + <XActionItem HIDE="always" + HandlerClassName="org.jboss.tools.jsf.model.handlers.RenameFacesConfigHandler" + ICON="action.empty" PROPERTIES="validator.edit=true" + WizardClassName="%Default%" displayName="Rename..." kind="action" name="Rename"> + <EntityData EntityName="FileESB110"> + <AttributeData AttributeName="name"/> + </EntityData> + </XActionItem> + <XActionItem + HandlerClassName="org.jboss.tools.common.model.filesystems.impl.handlers.RenameEclipseFileHandler" + ICON="action.empty" displayName="Rename..." kind="action" name="RenameEclipse"/> + </XActionItem> + <XActionItemReference entity="FileTXT" name="SaveActions"/> + <XActionItem ICON="action.empty" displayName="New" group="1" + kind="list" name="CreateActions"/> + <XActionItemReference entity="FileESB101" name="CopyActions"/> + <XActionItemReference entity="FileTXT" name="DeleteActions"/> + <XActionItemReference entity="FileTXT" name="Properties"/> + <XActionItemReference entity="FileTXT" name="DiscardActions"/> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity name="FileESB130_EditorActionList"> + <XChildrenEntities/> + <XEntityRenderer/> + <XModelAttributes/> + <XActionItem kind="list"> + <XActionItem displayName="New" group="1" kind="list" name="CreateActions"/> + <XActionItem ICON="action.empty" kind="list" name="Properties"> + <XActionItem HandlerClassName="%Properties%" ICON="action.empty" + displayName="Properties..." kind="action" name="Properties"/> + </XActionItem> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XEntityExtension name="FileFolder"> + <XChildrenEntities> + <XChildEntity name="FileESB130"/> + </XChildrenEntities> + <XActionItem kind="list"/> + </XEntityExtension> + <XEntityExtension name="FileSystemFolder"> + <XChildrenEntities> + <XChildEntity name="FileESB130"/> + </XChildrenEntities> + <XActionItem kind="list"/> + </XEntityExtension> +</XModelEntityGroup> 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 2010-08-11 09:36:18 UTC (rev 24038) +++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBConstants.java 2010-08-11 11:48:43 UTC (rev 24039) @@ -17,24 +17,29 @@ public String SCHEMA_101 = "http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd"; //$NON-NLS-1$ public String SCHEMA_110 = "http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.1.0.xsd"; //$NON-NLS-1$ public String SCHEMA_120 = "http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.2.0.xsd"; //$NON-NLS-1$ + public String SCHEMA_130 = "http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.3.0.xsd"; //$NON-NLS-1$ public String NEW_SCHEMA_101 = "http://anonsvn.jboss.org/repos/labs/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd"; //$NON-NLS-1$ public String NEW_SCHEMA_110 = "http://anonsvn.jboss.org/repos/labs/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.1.0.xsd"; //$NON-NLS-1$ public String NEW_SCHEMA_120 = "http://anonsvn.jboss.org/repos/labs/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.2.0.xsd"; //$NON-NLS-1$ + public String NEW_SCHEMA_130 = "http://anonsvn.jboss.org/repos/labs/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.3.0.xsd"; //$NON-NLS-1$ public String SUFF_101 = "101"; //$NON-NLS-1$ public String SUFF_110 = "110"; //$NON-NLS-1$ public String SUFF_120 = "120"; //$NON-NLS-1$ + public String SUFF_130 = "130"; //$NON-NLS-1$ public String[] KNOWN_SUFFIXES = { SUFF_101, SUFF_110, SUFF_120, + SUFF_130, }; public String ENT_ESB_FILE = "FileESB"; //$NON-NLS-1$ public String ENT_ESB_FILE_101 = ENT_ESB_FILE + SUFF_101; public String ENT_ESB_FILE_110 = ENT_ESB_FILE + SUFF_110; public String ENT_ESB_FILE_120 = ENT_ESB_FILE + SUFF_120; + public String ENT_ESB_FILE_130 = ENT_ESB_FILE + SUFF_130; public String ENT_ESB_PROPERTY = "ESBProperty"; //$NON-NLS-1$ @@ -54,6 +59,7 @@ public String ENT_ESB_HIBERNATE_PROVIDER = "ESBHibernateProvider101"; //$NON-NLS-1$ public String ENT_ESB_HTTP_PROVIDER = "ESBHTTPProvider110"; //$NON-NLS-1$ public String ENT_ESB_HTTP_PROVIDER_120 = "ESBHTTPProvider120"; //$NON-NLS-1$ + public String ENT_ESB_CAMEL_PROVIDER_130 = "ESBCamelProvider130"; //$NON-NLS-1$ static String PREACTION_PREFIX = "ESBPreAction"; //$NON-NLS-1$ @@ -68,6 +74,7 @@ ENT_ESB_SQL_PROVIDER, ENT_ESB_HIBERNATE_PROVIDER, ENT_ESB_HTTP_PROVIDER, ENT_ESB_HTTP_PROVIDER_120, + ENT_ESB_CAMEL_PROVIDER_130, }; @@ -80,6 +87,7 @@ public String ENT_ESB_SQL_BUS = "ESBSQLBus101"; //$NON-NLS-1$ public String ENT_ESB_HTTP_BUS = "ESBHTTPBus110"; //$NON-NLS-1$ public String ENT_ESB_HTTP_BUS_120 = "ESBHTTPBus120"; //$NON-NLS-1$ + public String ENT_ESB_CAMEL_BUS_130 = "ESBCamelBus130"; //$NON-NLS-1$ public String[] BUSES_101 = { ENT_ESB_BUS, @@ -90,6 +98,7 @@ ENT_ESB_HIBERNATE_BUS, ENT_ESB_SQL_BUS, ENT_ESB_HTTP_BUS, ENT_ESB_HTTP_BUS_120, + ENT_ESB_CAMEL_BUS_130, }; //prefix @@ -101,6 +110,7 @@ public String ENT_ESB_GATEWAY = "ESBJCAGateway101"; //$NON-NLS-1$ public String ENT_ESB_GATEWAY_120 = "ESBJCAGateway120"; //$NON-NLS-1$ public String ENT_ESB_JMS_LISTENER = "ESBJMSListener101"; //$NON-NLS-1$ + public String ENT_ESB_JMS_LISTENER_130 = "ESBJMSListener130"; //$NON-NLS-1$ public String ENT_ESB_FS_LISTENER = "ESBFSListener101"; //$NON-NLS-1$ public String ENT_ESB_FTP_LISTENER = "ESBFTPListener101"; //$NON-NLS-1$ public String ENT_ESB_FTP_LISTENER_120 = "ESBFTPListener120"; //$NON-NLS-1$ @@ -113,12 +123,13 @@ public String ENT_ESB_HTTP_LISTENER = "ESBHTTPListener110"; //$NON-NLS-1$ public String ENT_ESB_HTTP_GATEWAY = "ESBHTTPGateway120"; //$NON-NLS-1$ public String ENT_ESB_UDP_LISTENER = "ESBUDPListener110"; //$NON-NLS-1$ + public String ENT_ESB_CAMEL_GATEWAY = "ESBCamelGateway130"; //$NON-NLS-1$ public String[] LISTENERS_101 = { ENT_ESB_LISTENER, ENT_ESB_LISTENER_120, ENT_ESB_SH_LISTENER, ENT_ESB_GATEWAY, ENT_ESB_GATEWAY_120, - ENT_ESB_JMS_LISTENER, + ENT_ESB_JMS_LISTENER, ENT_ESB_JMS_LISTENER_130, ENT_ESB_FS_LISTENER, ENT_ESB_FTP_LISTENER, ENT_ESB_FTP_LISTENER_120, ENT_ESB_SQL_LISTENER, ENT_ESB_SQL_LISTENER_120, @@ -127,6 +138,7 @@ ENT_ESB_GROOVY_LISTENER, ENT_ESB_HTTP_LISTENER, ENT_ESB_HTTP_GATEWAY, ENT_ESB_UDP_LISTENER, + ENT_ESB_CAMEL_GATEWAY, }; //prefix @@ -136,6 +148,7 @@ public String ENT_ESB_SERVICE_101 = ENT_ESB_SERVICE + SUFF_101; public String ENT_ESB_SERVICE_110 = ENT_ESB_SERVICE + SUFF_110; public String ENT_ESB_SERVICE_120 = ENT_ESB_SERVICE + SUFF_120; + public String ENT_ESB_SERVICE_130 = ENT_ESB_SERVICE + SUFF_130; //prefix public String ENT_ESB_ACTIONS = "ESBActions"; //$NON-NLS-1$ Modified: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBEntityRecognizer.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBEntityRecognizer.java 2010-08-11 09:36:18 UTC (rev 24038) +++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBEntityRecognizer.java 2010-08-11 11:48:43 UTC (rev 24039) @@ -52,6 +52,10 @@ if(i120 >= 0) { return ENT_ESB_FILE_120; } + int i130 = schema.indexOf("1.3.0"); //$NON-NLS-1$ + if(i130 >= 0) { + return ENT_ESB_FILE_130; + } return null; } @@ -65,9 +69,11 @@ return s.indexOf(q + SCHEMA_101 + q) > 0 || s.indexOf(q + SCHEMA_110 + q) > 0 || s.indexOf(q + SCHEMA_120 + q) > 0 + || s.indexOf(q + SCHEMA_130 + q) > 0 || s.indexOf(q + NEW_SCHEMA_101 + q) > 0 || s.indexOf(q + NEW_SCHEMA_110 + q) > 0 - || s.indexOf(q + NEW_SCHEMA_120 + q) > 0; + || s.indexOf(q + NEW_SCHEMA_120 + q) > 0 + || s.indexOf(q + NEW_SCHEMA_130 + q) > 0; } }