Author: scabanovich Date: 2008-11-17 10:37:15 -0500 (Mon, 17 Nov 2008) New Revision: 11845 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.properties trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddProviderSupport.java Log: JBIDE-3176 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 2008-11-17 14:54:18 UTC (rev 11844) +++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-attrs.properties 2008-11-17 15:37:15 UTC (rev 11845) @@ -36,6 +36,7 @@ ESB.service_name=Service Name ESB.mep=MEP ESB.id=ID +ESBBusCreator.id=Channel ID ESB.cron_expression=Cron Expression ESB.directory=Directory ESB.input_suffix=Input Suffix 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 2008-11-17 14:54:18 UTC (rev 11844) +++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties 2008-11-17 15:37:15 UTC (rev 11845) @@ -16,12 +16,12 @@ ESBProviders101_AddBusProvider_0.WindowTitle=Add Bus Provider ESBProviders101_AddBusProvider_0.Title=ESB Provider ESBProviders101_AddBusProvider_1.WindowTitle=Add Bus Provider -ESBProviders101_AddBusProvider_1.Title=ESB Bus +ESBProviders101_AddBusProvider_1.Title=ESB Channel ESBProviders101_AddJBRProvider_0.WindowTitle=Add JBR Provider ESBProviders101_AddJBRProvider_0.Title=ESB JBR Provider ESBProviders101_AddJBRProvider_1.WindowTitle=Add JBR Provider -ESBProviders101_AddJBRProvider_1.Title=ESB JBR Bus +ESBProviders101_AddJBRProvider_1.Title=ESB Channel ESBProviders101_AddScheduleProvider.WindowTitle=Add Schedule Provider ESBProviders101_AddScheduleProvider.Title=ESB Schedule Provider @@ -31,32 +31,32 @@ ESBProviders101_AddJMSProvider_0.WindowTitle=Add JMS Provider ESBProviders101_AddJMSProvider_0.Title=ESB JMS Provider ESBProviders101_AddJMSProvider_1.WindowTitle=Add JMS Provider -ESBProviders101_AddJMSProvider_1.Title=ESB JMS Bus +ESBProviders101_AddJMSProvider_1.Title=ESB Channel ESBProviders101_AddJCAProvider_0.WindowTitle=Add JCA Provider ESBProviders101_AddJCAProvider_0.Title=ESB JCA Provider ESBProviders101_AddJCAProvider_1.WindowTitle=Add JCA Provider -ESBProviders101_AddJCAProvider_1.Title=ESB JMS Bus +ESBProviders101_AddJCAProvider_1.Title=ESB Channel ESBProviders101_AddFSProvider_0.WindowTitle=Add FS Provider ESBProviders101_AddFSProvider_0.Title=ESB FS Provider ESBProviders101_AddFSProvider_1.WindowTitle=Add FS Provider -ESBProviders101_AddFSProvider_1.Title=ESB FS Bus +ESBProviders101_AddFSProvider_1.Title=ESB Channel ESBProviders101_AddFTPProvider_0.WindowTitle=Add FTP Provider ESBProviders101_AddFTPProvider_0.Title=ESB FTP Provider ESBProviders101_AddFTPProvider_1.WindowTitle=Add FTP Provider -ESBProviders101_AddFTPProvider_1.Title=ESB FTP Bus +ESBProviders101_AddFTPProvider_1.Title=ESB Channel ESBProviders101_AddSQLProvider_0.WindowTitle=Add SQL Provider ESBProviders101_AddSQLProvider_0.Title=ESB SQL Provider ESBProviders101_AddSQLProvider_1.WindowTitle=Add SQL Provider -ESBProviders101_AddSQLProvider_1.Title=ESB SQL Bus +ESBProviders101_AddSQLProvider_1.Title=ESB Channel ESBProviders101_AddHibernateProvider_0.WindowTitle=Add Hibernate Provider ESBProviders101_AddHibernateProvider_0.Title=ESB Hibernate Provider ESBProviders101_AddHibernateProvider_1.WindowTitle=Add Hibernate Provider -ESBProviders101_AddHibernateProvider_1.Title=ESB Hibernate Bus +ESBProviders101_AddHibernateProvider_1.Title=ESB Channel ESBProviders101_Properties.Title=Providers List Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta 2008-11-17 14:54:18 UTC (rev 11844) +++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta 2008-11-17 15:37:15 UTC (rev 11845) @@ -232,6 +232,24 @@ </XActionItem> <XDependencies/> </XModelEntity> + <XModelEntity name="ESBBusCreator"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.esb.bus" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute PROPERTIES="category=general;id=true;save=always" + name="id" xmlname="busid"/> + <XModelAttribute PROPERTIES="category=general;save=always" + name="port" xmlname="port"> + <Constraint loader="%IntEL%"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"/> + <XDependencies/> + </XModelEntity> <XModelEntity ImplementingClass="%ESB%" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%ESBOrdered%" XMLSUBPATH="bus-provider" name="ESBBusProvider101"> @@ -1596,23 +1614,23 @@ <XActionItem ICON="action.empty" displayName="New" group="1" kind="list" name="CreateActions"> <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty" - PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddProviderSupport" + PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddProviderSupport;busEntity=ESBBus" displayName="Bus Provider..." kind="action" name="AddBusProvider"> <EntityData EntityName="ESBBusProvider101"> <AttributeData AttributeName="name"/> </EntityData> - <EntityData EntityName="ESBBus"> + <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" + PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddProviderSupport;busEntity=ESBJBRBus101" displayName="JBR Provider..." kind="action" name="AddJBRProvider"> <EntityData EntityName="ESBJBRProvider101"> <AttributeData AttributeName="name"/> <AttributeData AttributeName="protocol"/> </EntityData> - <EntityData EntityName="ESBJBRBus101"> + <EntityData EntityName="ESBBusCreator"> <AttributeData AttributeName="id"/> <AttributeData AttributeName="port"/> </EntityData> @@ -1625,66 +1643,66 @@ </EntityData> </XActionItem> <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty" - PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddProviderSupport" + PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddProviderSupport;busEntity=ESBJMSBus101" displayName="JMS Provider..." kind="action" name="AddJMSProvider"> <EntityData EntityName="ESBJMSProvider101"> <AttributeData AttributeName="name"/> <AttributeData AttributeName="connection factory"/> </EntityData> - <EntityData EntityName="ESBJMSBus101"> + <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" + PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddProviderSupport;busEntity=ESBJMSBus101" displayName="JCA Provider..." kind="action" name="AddJCAProvider"> <EntityData EntityName="ESBJCAProvider101"> <AttributeData AttributeName="name"/> <AttributeData AttributeName="connection factory"/> </EntityData> - <EntityData EntityName="ESBJMSBus101"> + <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" + PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddProviderSupport;busEntity=ESBFSBus101" displayName="FS Provider..." kind="action" name="AddFSProvider"> <EntityData EntityName="ESBFSProvider101"> <AttributeData AttributeName="name"/> </EntityData> - <EntityData EntityName="ESBFSBus101"> + <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" + PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddProviderSupport;busEntity=ESBFTPBus101" displayName="FTP Provider..." kind="action" name="AddFTPProvider"> <EntityData EntityName="ESBFTPProvider101"> <AttributeData AttributeName="name"/> <AttributeData AttributeName="hostname"/> </EntityData> - <EntityData EntityName="ESBFTPBus101"> + <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" + PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddProviderSupport;busEntity=ESBSQLBus101" displayName="SQL Provider..." kind="action" name="AddSQLProvider"> <EntityData EntityName="ESBSQLProvider101"> <AttributeData AttributeName="name"/> </EntityData> - <EntityData EntityName="ESBSQLBus101"> + <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" + PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddProviderSupport;busEntity=ESBHibernateBus101" displayName="Hibernate Provider..." kind="action" name="AddHibernateProvider"> <EntityData EntityName="ESBHibernateProvider101"> <AttributeData AttributeName="name"/> <AttributeData AttributeName="hibernate cfg file"/> </EntityData> - <EntityData EntityName="ESBHibernateBus101"> + <EntityData EntityName="ESBBusCreator"> <AttributeData AttributeName="id"/> </EntityData> </XActionItem> Modified: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddProviderSupport.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddProviderSupport.java 2008-11-17 14:54:18 UTC (rev 11844) +++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddProviderSupport.java 2008-11-17 15:37:15 UTC (rev 11845) @@ -17,6 +17,9 @@ protected void reset() { providerEntity = getEntityData()[0].getModelEntity().getName(); busEntity = getEntityData()[1].getModelEntity().getName(); + if("ESBBusCreator".equals(busEntity)) { + busEntity = action.getProperty("busEntity"); + } } public String[] getActionNames(int stepId) {