Merge branch 'develop'
diff --git a/plugins/org.eclipse.bpel.apache.ode.runtime/definition/ode.xml b/plugins/org.eclipse.bpel.apache.ode.runtime/definition/ode.xml
index 42833ff..14fa2c9 100644
--- a/plugins/org.eclipse.bpel.apache.ode.runtime/definition/ode.xml
+++ b/plugins/org.eclipse.bpel.apache.ode.runtime/definition/ode.xml
@@ -41,7 +41,7 @@
</port>
<module>
- <type>bpel.facet.core</type>
+ <type>bpel.module</type>
<publishDir>${ode.home}/WEB-INF/processes</publishDir>
<publisherReference>org.eclipse.bpel.apache.ode.runtime.publisher</publisherReference>
</module>
diff --git a/plugins/org.eclipse.bpel.apache.ode.runtime/plugin.xml b/plugins/org.eclipse.bpel.apache.ode.runtime/plugin.xml
index 6c04a16..36538ee 100644
--- a/plugins/org.eclipse.bpel.apache.ode.runtime/plugin.xml
+++ b/plugins/org.eclipse.bpel.apache.ode.runtime/plugin.xml
@@ -12,7 +12,7 @@
name="Apache Ode 1.x Runtime" description="Apache's BPEL 2.0 execution engine - Runtime"
vendor="Apache" version="1.0"
class="org.eclipse.bpel.apache.ode.runtime.OdeServerRuntime">
- <moduleType types="bpel.facet.core" versions="1.1, 2.0" />
+ <moduleType types="bpel.module" versions="1.1, 2.0" />
</runtimeType>
</extension>
diff --git a/plugins/org.eclipse.bpel.runtimes/plugin.xml b/plugins/org.eclipse.bpel.runtimes/plugin.xml
index f95653c..1cfed84 100644
--- a/plugins/org.eclipse.bpel.runtimes/plugin.xml
+++ b/plugins/org.eclipse.bpel.runtimes/plugin.xml
@@ -45,7 +45,7 @@
<!--=========================================================================-->
<extension
- id="bpel.facet.core"
+ id="bpel.module"
name="%MODULE_TYPE_NAME"
point="org.eclipse.wst.server.core.moduleTypes">
</extension>
@@ -55,8 +55,8 @@
<extension point="org.eclipse.wst.server.ui.serverImages">
<image
- id="org.eclipse.bpel.runtimes.bpel.facet.core"
- typeIds="bpel.facet.core"
+ id="org.eclipse.bpel.runtimes.bpel.bpel.module"
+ typeIds="bpel.module"
icon="icons/obj16/bpelfacet.gif"/>
</extension>
@@ -133,7 +133,7 @@
id="org.eclipse.bpel.runtimes.module.moduleFactory">
<moduleType
versions="1.1, 2.0"
- types="bpel.facet.core">
+ types="bpel.module">
</moduleType>
</moduleFactory>
</extension>
diff --git a/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/IBPELModuleFacetConstants.java b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/IBPELModuleFacetConstants.java
index 79b95e3..8f95b77 100644
--- a/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/IBPELModuleFacetConstants.java
+++ b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/IBPELModuleFacetConstants.java
@@ -20,7 +20,7 @@
public final static String BPEL_CONTENT_DEFAULT_FOLDER = "bpelContent";
// module types
- public final static String BPEL20_MODULE_TYPE = "bpel.facet.core"; //$NON-NLS-1$
+ public final static String BPEL20_MODULE_TYPE = "bpel.module"; //$NON-NLS-1$
// module type versions
public final static String BPEL11_MODULE_VERSION = "1.1"; // $NON-NLS-1$
diff --git a/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/ui/wizards/NewBPELProjectWizardPage1.java b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/ui/wizards/NewBPELProjectWizardPage1.java
index 778616e..26f9b02 100644
--- a/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/ui/wizards/NewBPELProjectWizardPage1.java
+++ b/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/ui/wizards/NewBPELProjectWizardPage1.java
@@ -13,6 +13,11 @@
import org.eclipse.bpel.runtimes.IBPELModuleFacetConstants;
import org.eclipse.bpel.runtimes.IRuntimesUIConstants;
import org.eclipse.bpel.runtimes.RuntimesPlugin;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.PlatformUI;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.web.ui.internal.wizards.DataModelFacetCreationWizardPage;
@@ -34,11 +39,27 @@
}
protected String getModuleFacetID() {
- return IBPELModuleFacetConstants.BPEL20_MODULE_TYPE;
+ return IBPELModuleFacetConstants.BPEL20_PROJECT_FACET;
}
protected String getModuleTypeID() {
- return IBPELModuleFacetConstants.BPEL20_PROJECT_FACET;
+ return IBPELModuleFacetConstants.BPEL20_MODULE_TYPE;
}
+ protected Composite createTopLevelComposite(Composite parent) {
+ Composite top = new Composite(parent, SWT.NONE);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(top, getInfopopID());
+ top.setLayout(new GridLayout());
+ top.setLayoutData(new GridData(GridData.FILL_BOTH));
+ createProjectGroup(top);
+ createServerTargetComposite(top);
+ // createPrimaryFacetComposite() calls ProjectFacetsManager.getProjectFacet()
+ // passing it the module type id (as returned by this guy's getModuleTypeID(), see above)
+ // I have no idea why it's doing that...possibly because there's some kind of module-to-facet ID
+ // lookup table for which we need to create an entry, but I haven't been able to figure out where
+ // or how to do that. So...this will have to do for now.
+// createPrimaryFacetComposite(top);
+ createPresetPanel(top);
+ return top;
+ }
}
