Author: bbrodt Date: 2010-11-12 17:50:25 -0500 (Fri, 12 Nov 2010) New Revision: 26532 Added: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/src/org/eclipse/bpel/apache/ode/runtime/OdeServerRuntime.java trunk/bpel/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/IBPELRuntimeDelegate.java Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/plugin.xml trunk/bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizard.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/WSDLCustomPage.java Log: OPEN - issue JBIDE-6588: BPEL deployment to ODE running in Tomcat https://jira.jboss.org/browse/JBIDE-6588 This change has zero net effect - just preparation for switching to generic runtime support in BPEL designer Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/plugin.xml =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/plugin.xml 2010-11-12 22:22:20 UTC (rev 26531) +++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/plugin.xml 2010-11-12 22:50:25 UTC (rev 26532) @@ -8,7 +8,7 @@ description="Apache's BPEL 2.0 execution engine - Runtime" vendor="Apache" version="1.0" - class="org.eclipse.jst.server.generic.core.internal.GenericServerRuntime"> + class="org.eclipse.bpel.apache.ode.runtime.OdeServerRuntime"> <moduleType types="bpel.module" versions="1.1, 2.0"/> Added: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/src/org/eclipse/bpel/apache/ode/runtime/OdeServerRuntime.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/src/org/eclipse/bpel/apache/ode/runtime/OdeServerRuntime.java (rev 0) +++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/src/org/eclipse/bpel/apache/ode/runtime/OdeServerRuntime.java 2010-11-12 22:50:25 UTC (rev 26532) @@ -0,0 +1,16 @@ +package org.eclipse.bpel.apache.ode.runtime; + +import java.util.HashMap; +import java.util.Map; + +import org.eclipse.jst.server.generic.core.internal.GenericServerRuntime; +import org.eclipse.bpel.runtimes.IBPELRuntimeDelegate; + +public class OdeServerRuntime extends GenericServerRuntime implements IBPELRuntimeDelegate { + + public String getPort() + { + Map m = getAttribute("generic_server_attributes", new HashMap()); + return (String)m.get("port"); + } +} Added: trunk/bpel/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/IBPELRuntimeDelegate.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/IBPELRuntimeDelegate.java (rev 0) +++ trunk/bpel/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/IBPELRuntimeDelegate.java 2010-11-12 22:50:25 UTC (rev 26532) @@ -0,0 +1,7 @@ +package org.eclipse.bpel.runtimes; + +public interface IBPELRuntimeDelegate { + + public String getPort(); + +} Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF 2010-11-12 22:22:20 UTC (rev 26531) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF 2010-11-12 22:50:25 UTC (rev 26532) @@ -31,7 +31,9 @@ org.eclipse.ui.console;bundle-version="3.5.0", org.eclipse.wst.common.modulecore, org.eclipse.wst.common.emfworkbench.integration, - org.eclipse.jem.util + org.eclipse.jem.util, + org.eclipse.wst.common.project.facet.core, + org.eclipse.wst.server.core Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.bpel.ui, org.eclipse.bpel.ui.actions, @@ -70,4 +72,7 @@ org.eclipse.bpel.ui.util.marker, org.eclipse.bpel.ui.wizards Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Import-Package: org.eclipse.bpel.validator +Import-Package: org.eclipse.bpel.runtimes, + org.eclipse.bpel.validator, + org.eclipse.wst.common.project.facet.core, + org.eclipse.wst.server.core Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizard.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizard.java 2010-11-12 22:22:20 UTC (rev 26531) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizard.java 2010-11-12 22:50:25 UTC (rev 26532) @@ -203,6 +203,16 @@ return true; } + public IProject getProject() + { + IContainer container = fContainerPage.getResourceContainer(); + if (container == null) { + container = mContainer; + } + if (container!=null) + return container.getProject(); + return null; + } /** * Return the BPEL files container in which we can generate process from the * template. Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/WSDLCustomPage.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/WSDLCustomPage.java 2010-11-12 22:22:20 UTC (rev 26531) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/WSDLCustomPage.java 2010-11-12 22:50:25 UTC (rev 26532) @@ -3,10 +3,14 @@ import java.util.HashMap; import java.util.Map; +import org.eclipse.bpel.runtimes.IBPELModuleFacetConstants; import org.eclipse.bpel.ui.BPELUIPlugin; import org.eclipse.bpel.ui.IBPELUIConstants; import org.eclipse.bpel.ui.Templates; import org.eclipse.bpel.ui.Templates.Template; +import org.eclipse.bpel.runtimes.IBPELRuntimeDelegate; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; @@ -19,6 +23,14 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Text; +import org.eclipse.wst.common.project.facet.core.IFacetedProject; +import org.eclipse.wst.common.project.facet.core.IProjectFacet; +import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; +import org.eclipse.wst.common.project.facet.core.runtime.IRuntime; +import org.eclipse.wst.server.core.IRuntimeType; +import org.eclipse.wst.server.core.IRuntimeWorkingCopy; +import org.eclipse.wst.server.core.ServerCore; +import org.eclipse.wst.server.core.model.RuntimeDelegate; public class WSDLCustomPage extends WizardPage { @@ -64,6 +76,34 @@ 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 + } + } + } + catch(Exception e) + { + + } + } public void createControl(Composite parent) {