Author: bbrodt Date: 2011-02-18 16:20:45 -0500 (Fri, 18 Feb 2011) New Revision: 29248 Modified: workspace/bbrodt/org.eclipse.bpel.apache.ode.runtime/src/org/eclipse/bpel/apache/ode/runtime/OdeServerRuntime.java workspace/bbrodt/org.eclipse.bpel.jboss.riftsaw.runtime/plugin.xml workspace/bbrodt/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/RiftsawServerRuntime.java workspace/bbrodt/org.eclipse.bpel.runtimes/plugin.properties workspace/bbrodt/org.eclipse.bpel.runtimes/plugin.xml workspace/bbrodt/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/IBPELRuntimeDelegate.java workspace/bbrodt/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizard.java workspace/bbrodt/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizardPage2.java workspace/bbrodt/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/WSDLCustomPage.java Log: Modified: workspace/bbrodt/org.eclipse.bpel.apache.ode.runtime/src/org/eclipse/bpel/apache/ode/runtime/OdeServerRuntime.java =================================================================== --- workspace/bbrodt/org.eclipse.bpel.apache.ode.runtime/src/org/eclipse/bpel/apache/ode/runtime/OdeServerRuntime.java 2011-02-18 21:05:08 UTC (rev 29247) +++ workspace/bbrodt/org.eclipse.bpel.apache.ode.runtime/src/org/eclipse/bpel/apache/ode/runtime/OdeServerRuntime.java 2011-02-18 21:20:45 UTC (rev 29248) @@ -10,17 +10,18 @@ public String getServerAddress() { - return "localhost"; + Map m = getAttribute("generic_server_instance_properties", new HashMap()); + return (String)m.get("serverAddress"); } public String getPort() { - Map m = getAttribute("generic_server_attributes", new HashMap()); + Map m = getAttribute("generic_server_instance_properties", new HashMap()); return (String)m.get("port"); } public String getDeployDir() { - return ""; + return "/ode/processes"; } } Modified: workspace/bbrodt/org.eclipse.bpel.jboss.riftsaw.runtime/plugin.xml =================================================================== --- workspace/bbrodt/org.eclipse.bpel.jboss.riftsaw.runtime/plugin.xml 2011-02-18 21:05:08 UTC (rev 29247) +++ workspace/bbrodt/org.eclipse.bpel.jboss.riftsaw.runtime/plugin.xml 2011-02-18 21:20:45 UTC (rev 29248) @@ -19,6 +19,9 @@ <moduleType types="bpel.module" versions="1.1, 2.0"/> + <moduleType + types="jbt.bpel.module" + versions="1.1, 2.0"/> </runtimeType> </extension> @@ -78,7 +81,18 @@ id="bpel.facet.core" version="2.0"/> </supported> + + <supported> + <runtime-component + id="org.eclipse.bpel.jboss.riftsaw.runtime.rt" + version="2.0"/> + <facet + id="jbt.bpel.facet.core" + version="1.1,2.0"/> + </supported> + </extension> + <extension point="org.eclipse.wst.common.project.facet.ui.images"> <image runtime-component-type="org.eclipse.bpel.jboss.riftsaw.runtime.rt" @@ -102,6 +116,11 @@ runtime-component="org.eclipse.bpel.jboss.riftsaw.runtime.rt" version="2.0"/> </extension> + + <runtimeFacetMapping + runtimeTypeId="org.jboss.ide.eclipse.as.runtime.51" + runtime-component="org.jboss.ide.eclipse.as.runtime.component" + version="5.1"/> <extension point="org.eclipse.jst.server.generic.core.serverdefinition"> <serverdefinition Modified: workspace/bbrodt/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/RiftsawServerRuntime.java =================================================================== --- workspace/bbrodt/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/RiftsawServerRuntime.java 2011-02-18 21:05:08 UTC (rev 29247) +++ workspace/bbrodt/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/RiftsawServerRuntime.java 2011-02-18 21:20:45 UTC (rev 29248) @@ -10,12 +10,13 @@ public String getServerAddress() { - return "localhost"; + Map m = getAttribute("generic_server_instance_properties", new HashMap()); + return (String)m.get("serverAddress"); } public String getPort() { - Map m = getAttribute("generic_server_attributes", new HashMap()); + Map m = getAttribute("generic_server_instance_properties", new HashMap()); return (String)m.get("port"); } Modified: workspace/bbrodt/org.eclipse.bpel.runtimes/plugin.properties =================================================================== --- workspace/bbrodt/org.eclipse.bpel.runtimes/plugin.properties 2011-02-18 21:05:08 UTC (rev 29247) +++ workspace/bbrodt/org.eclipse.bpel.runtimes/plugin.properties 2011-02-18 21:20:45 UTC (rev 29248) @@ -19,3 +19,7 @@ NEW_BPEL_CATEGORY=BPEL 2.0 NEW_BPEL_PROJECT=BPEL Project NEW_BPEL_PROJECT_DESCRIPTION=Create a new BPEL project. + +JBT_BPEL_FACET_TEMPLATE_LABEL=JBoss Legacy BPEL 2.0 Project +JBT_BPEL_CORE_FACET_LABEL=JBoss AS 5.1 BPEL Facet +JBT_BPEL_CORE_FACET_DESCRIPTION=For migration of JBoss BPEL projects from AS 5.1 Modified: workspace/bbrodt/org.eclipse.bpel.runtimes/plugin.xml =================================================================== --- workspace/bbrodt/org.eclipse.bpel.runtimes/plugin.xml 2011-02-18 21:05:08 UTC (rev 29247) +++ workspace/bbrodt/org.eclipse.bpel.runtimes/plugin.xml 2011-02-18 21:20:45 UTC (rev 29248) @@ -92,6 +92,31 @@ <label>%BPEL_FACET_TEMPLATE_LABEL</label> <fixed facet="bpel.facet.core"/> </template> + + <project-facet id="jbt.bpel.facet.core"> + <label>%JBT_BPEL_CORE_FACET_LABEL</label> + <description>%JBT_BPEL_CORE_FACET_DESCRIPTION</description> + </project-facet> + + <project-facet-version facet="jbt.bpel.facet.core" version="2.0"> + <group-member id="modules"></group-member> + <constraint> + <conflicts group="modules"> + </conflicts> + </constraint> + </project-facet-version> + + + <action facet="jbt.bpel.facet.core" version="2.0" type="INSTALL" id="jbt.bpel.facet.core.install"> + <delegate class="org.eclipse.bpel.runtimes.facets.BPELCoreFacetInstallDelegate"/> + <config-factory class="org.eclipse.bpel.runtimes.facets.BPELFacetInstallDataModelProvider"/> + </action> + + <template id="template.jbt.bpel.core"> + <label>%JBT_BPEL_FACET_TEMPLATE_LABEL</label> + <fixed facet="jbt.bpel.facet.core"/> + </template> + </extension> Modified: workspace/bbrodt/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/IBPELRuntimeDelegate.java =================================================================== --- workspace/bbrodt/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/IBPELRuntimeDelegate.java 2011-02-18 21:05:08 UTC (rev 29247) +++ workspace/bbrodt/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/IBPELRuntimeDelegate.java 2011-02-18 21:20:45 UTC (rev 29248) @@ -2,6 +2,10 @@ public interface IBPELRuntimeDelegate { + /* + * These are currently only used by the BPEL New File Wizard to + * figure out how to build the service address for its WSDL. + */ public String getServerAddress(); public String getPort(); public String getDeployDir(); Modified: workspace/bbrodt/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizard.java =================================================================== --- workspace/bbrodt/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizard.java 2011-02-18 21:05:08 UTC (rev 29247) +++ workspace/bbrodt/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizard.java 2011-02-18 21:20:45 UTC (rev 29248) @@ -152,10 +152,10 @@ Messages.NewFileWizard_WSDLCustomPage_Name); addPage(fMainPage); + addPage(fContainerPage); addPage(wsdlPage); - addPage(fContainerPage); - wsdlPage.setPreviousPage(fMainPage); - fContainerPage.setPreviousPage(wsdlPage); + wsdlPage.setPreviousPage(fContainerPage); + fContainerPage.setPreviousPage(fMainPage); } /** @@ -213,6 +213,16 @@ return container.getProject(); return null; } + + public IResource getResourceContainer() + { + IContainer container = fContainerPage.getResourceContainer(); + if (container == null) { + container = mContainer; + } + return container; + } + /** * Return the BPEL files container in which we can generate process from the * template. Modified: workspace/bbrodt/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizardPage2.java =================================================================== --- workspace/bbrodt/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizardPage2.java 2011-02-18 21:05:08 UTC (rev 29247) +++ workspace/bbrodt/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizardPage2.java 2011-02-18 21:20:45 UTC (rev 29248) @@ -72,7 +72,8 @@ Messages.NewFileWizardPage2_1, Messages.NewFileWizardPage2_2 ); - + + fResourceComposite.setSelectedResource(((NewFileWizard)getWizard()).getResourceContainer()); setControl( composite ); } Modified: workspace/bbrodt/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/WSDLCustomPage.java =================================================================== --- workspace/bbrodt/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/WSDLCustomPage.java 2011-02-18 21:05:08 UTC (rev 29247) +++ workspace/bbrodt/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/WSDLCustomPage.java 2011-02-18 21:20:45 UTC (rev 29248) @@ -76,38 +76,6 @@ setDescription(Messages.NewFileWizard_WSDLCustomPage_Description); setImageDescriptor(BPELUIPlugin.INSTANCE .getImageDescriptor(IBPELUIConstants.ICON_WIZARD_BANNER)); - - - // TODO: test code - implement this when we switch over to generic runtime support - // for deployment to jboss/riftsaw and others... - try { - IProject project = ((NewFileWizard)getWizard()).getProject(); - IFacetedProject facetedProject = null; - facetedProject = ProjectFacetsManager.create(project); - if (facetedProject != null - && ProjectFacetsManager.isProjectFacetDefined(IBPELModuleFacetConstants.BPEL20_PROJECT_FACET)) - { - IProjectFacet projectFacet = ProjectFacetsManager.getProjectFacet(IBPELModuleFacetConstants.BPEL20_PROJECT_FACET); - IRuntime rt = facetedProject.getPrimaryRuntime(); - String id = rt.getProperty("id"); - org.eclipse.wst.server.core.IRuntime rt2 = ServerCore.findRuntime(id); - IRuntimeType rtt = rt2.getRuntimeType(); - RuntimeDelegate delegate = (RuntimeDelegate) rt2.getAdapter(RuntimeDelegate.class); - if (delegate instanceof IBPELRuntimeDelegate) { - // get port, server address and deploy directory - // to build service name for WSDL - IBPELRuntimeDelegate bpelDelegate = (IBPELRuntimeDelegate)delegate; - String address = bpelDelegate.getServerAddress(); - String port = bpelDelegate.getPort(); - String deployDir = bpelDelegate.getDeployDir(); - } - } - } - catch(Exception e) - { - - } - } public void createControl(Composite parent) { @@ -221,6 +189,40 @@ bindingLabel.setVisible(true); bindingField.setVisible(true); } + + if (visible) { + + // TODO: test code - implement this when we switch over to generic runtime support + // for deployment to jboss/riftsaw and others... + try { + IProject project = ((NewFileWizard)getWizard()).getProject(); + IFacetedProject facetedProject = null; + facetedProject = ProjectFacetsManager.create(project); + if (facetedProject != null + && ProjectFacetsManager.isProjectFacetDefined(IBPELModuleFacetConstants.BPEL20_PROJECT_FACET)) + { + IProjectFacet projectFacet = ProjectFacetsManager.getProjectFacet(IBPELModuleFacetConstants.BPEL20_PROJECT_FACET); + IRuntime rt = facetedProject.getPrimaryRuntime(); + String id = rt.getProperty("id"); + org.eclipse.wst.server.core.IRuntime rt2 = ServerCore.findRuntime(id); + IRuntimeType rtt = rt2.getRuntimeType(); + RuntimeDelegate delegate = (RuntimeDelegate) rt2.getAdapter(RuntimeDelegate.class); + if (delegate instanceof IBPELRuntimeDelegate) { + // get port, server address and deploy directory + // to build service name for WSDL + IBPELRuntimeDelegate bpelDelegate = (IBPELRuntimeDelegate)delegate; + String address = bpelDelegate.getServerAddress(); + String port = bpelDelegate.getPort(); + String deployDir = bpelDelegate.getDeployDir(); + addressField.setText("http://" + address + ":" + port + deployDir + "/" + serviceNameField.getText().trim()); + } + } + } + catch(Exception e) + { + + } + } } protected boolean validatePage() {