Merge develop into master
diff --git a/plugins/org.eclipse.bpel.apache.ode.runtime/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpel.apache.ode.runtime/META-INF/MANIFEST.MF
index 15e6998..4341757 100644
--- a/plugins/org.eclipse.bpel.apache.ode.runtime/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.bpel.apache.ode.runtime/META-INF/MANIFEST.MF
@@ -6,11 +6,24 @@
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
org.eclipse.wst.server.core;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)",
org.eclipse.jst.server.generic.core;bundle-version="[1.0.305,2.0.0)",
+ org.eclipse.wst.wsdl;bundle-version="[1.1.200,2.0.0)",
+ org.eclipse.bpel.model;bundle-version="0.1.0",
+ org.eclipse.jem.util;bundle-version="[2.0.100,3.0.0)",
org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.bpel.runtimes;bundle-version="1.0.0",
- org.eclipse.jst.server.core;bundle-version="[1.1.0,2.0.0)"
+ org.eclipse.bpel.runtimes;bundle-version="0.1.0",
+ org.eclipse.jst.server.generic.ui;bundle-version="[1.0.305,2.0.0)",
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.4.0,3.0.0)",
+ org.eclipse.bpel.ui;bundle-version="0.1.0",
+ org.apache.xerces;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.xsd;bundle-version="[2.4.0,3.0.0)",
+ org.eclipse.jst.server.ui;bundle-version="[1.0.303,2.0.0)",
+ org.eclipse.jst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)",
+ org.eclipse.jst.server.core;bundle-version="[1.1.0,2.0.0)",
+ javax.wsdl;bundle-version="[1.5.0,1.6.0)"
Bundle-Activator: org.eclipse.bpel.apache.ode.runtime.OdePlugin
Export-Package: org.eclipse.bpel.apache.ode.runtime
Bundle-ActivationPolicy: lazy
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 14fa2c9..42833ff 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.module</type>
+ <type>bpel.facet.core</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 8a50ad4..6c04a16 100644
--- a/plugins/org.eclipse.bpel.apache.ode.runtime/plugin.xml
+++ b/plugins/org.eclipse.bpel.apache.ode.runtime/plugin.xml
@@ -8,11 +8,11 @@
=========================================================================
-->
<extension point="org.eclipse.wst.server.core.runtimeTypes">
- <runtimeType id="org.eclipse.bpel.apache.ode.runtime.rt"
+ <runtimeType id="org.eclipse.jst.server.generic.runtime.apache.ode.1x"
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.module" versions="1.1, 2.0" />
+ <moduleType types="bpel.facet.core" versions="1.1, 2.0" />
</runtimeType>
</extension>
@@ -24,10 +24,10 @@
<extension point="org.eclipse.wst.server.core.serverTypes">
<serverType runtime="true"
class="org.eclipse.jst.server.generic.core.internal.GenericServer"
- id="org.eclipse.bpel.apache.ode.runtime.st"
+ id="org.eclipse.jst.server.generic.apache.ode.1x"
initialState="stopped"
supportsRemoteHosts="true"
- runtimeTypeId="org.eclipse.bpel.apache.ode.runtime.rt"
+ runtimeTypeId="org.eclipse.jst.server.generic.runtime.apache.ode.1x"
description="Apache's BPEL 2.0 execution engine - Server"
launchConfigId="org.eclipse.jst.server.generic.core.launchConfigurationType"
behaviourClass="org.eclipse.jst.server.generic.core.internal.GenericServerBehaviour"
@@ -35,55 +35,95 @@
hasConfiguration="false"
startTimeout="480000"
stopTimeout="60000"
- launchModes="run, debug"
+ launchModes="run,debug"
startBeforePublish="true">
</serverType>
</extension>
<!--
=========================================================================
-Server icons
+Server runtime wizard contributions
=========================================================================
-->
- <extension point="org.eclipse.wst.server.ui.serverImages">
- <image id="org.eclipse.jst.server.generic.image" icon="icons/obj16/ode.gif"
- typeIds="org.eclipse.bpel.apache.ode.runtime.rt" />
- <image id="org.eclipse.jst.server.generic.image" icon="icons/obj16/ode.gif"
- typeIds="org.eclipse.bpel.apache.ode.runtime.st" />
+ <extension point="org.eclipse.wst.server.ui.wizardFragments">
+ <fragment id="org.eclipse.jst.server.generic.runtime"
+ typeIds="org.eclipse.jst.server.generic.runtime.apache.ode.1x"
+ class="org.eclipse.jst.server.generic.ui.internal.GenericServerRuntimeWizardFragment" />
+ <fragment id="org.eclipse.jst.server.generic.server"
+ typeIds="org.eclipse.jst.server.generic.apache.ode.1x"
+ class="org.eclipse.jst.server.generic.ui.internal.GenericServerWizardFragment" />
+ </extension>
+
+<!--
+=========================================================================
+Server runtime wizard definition
+=========================================================================
+-->
+ <extension point="org.eclipse.jst.server.generic.core.serverdefinition">
+ <serverdefinition
+ id="org.eclipse.jst.server.generic.runtime.apache.ode.1x"
+ definitionfile="definition/ode.xml"/>
</extension>
<!--
=========================================================================
-Generic publisher
+Runtime Class Providers
=========================================================================
-->
- <extension point="org.eclipse.jst.server.generic.core.genericpublisher">
- <genericpublisher
- class="org.eclipse.bpel.apache.ode.runtime.OdeBPELPublisher"
- id="org.eclipse.bpel.apache.ode.runtime.publisher" />
+ <extension
+ point="org.eclipse.jst.server.core.runtimeClasspathProviders">
+ <runtimeClasspathProvider
+ id="org.eclipse.jst.server.generic.runtime.apache.ode.runtimeClasspathProvider"
+ runtimeTypeIds="org.eclipse.jst.server.generic.runtime.apache.ode.1x"
+ class="org.eclipse.jst.server.generic.core.internal.GenericServerRuntimeTargetHandler" />
+ </extension>
+
+<!--
+=========================================================================
+Server icons
+=========================================================================
+-->
+ <extension point="org.eclipse.wst.server.ui.serverImages">
+ <image id="org.eclipse.jst.server.generic.image" icon="/icons/obj16/ode.gif"
+ typeIds="org.eclipse.jst.server.generic.runtime.apache.ode.1x" />
+ <image id="org.eclipse.jst.server.generic.image" icon="/icons/obj16/ode.gif"
+ typeIds="org.eclipse.jst.server.generic.apache.ode.1x" />
</extension>
-
+
<!--
=========================================================================
Project facet Runtime types
=========================================================================
-->
<extension point="org.eclipse.wst.common.project.facet.core.runtimes">
- <runtime-component-type id="org.eclipse.bpel.apache.ode.runtime.rt" />
+ <runtime-component-type
+ id="org.eclipse.jst.server.generic.runtime.apache.ode" />
- <runtime-component-version type="org.eclipse.bpel.apache.ode.runtime.rt"
- version="2.0" />
+ <runtime-component-version
+ type="org.eclipse.jst.server.generic.runtime.apache.ode"
+ version="1.0" />
<adapter>
- <runtime-component id="org.eclipse.bpel.apache.ode.runtime.rt" />
+ <runtime-component
+ id="org.eclipse.jst.server.generic.runtime.apache.ode" />
<factory
- class="org.eclipse.jst.server.core.internal.RuntimeClasspathProvider$Factory" />
- <type class="org.eclipse.jst.common.project.facet.core.IClasspathProvider" />
+ class="org.eclipse.jst.server.core.internal.RuntimeClasspathProvider$Factory" />
+ <type
+ class="org.eclipse.jst.common.project.facet.core.IClasspathProvider" />
+ </adapter>
+ <adapter>
+ <runtime-component
+ id="org.eclipse.jst.server.generic.runtime.apache.ode" />
+ <factory
+ class="org.eclipse.jst.server.ui.internal.RuntimeLabelProvider$Factory" />
+ <type
+ class="org.eclipse.wst.common.project.facet.ui.IRuntimeComponentLabelProvider" />
</adapter>
<supported>
- <runtime-component id="org.eclipse.bpel.apache.ode.runtime.rt"
- version="2.0" />
+ <runtime-component
+ id="org.eclipse.jst.server.generic.runtime.apache.ode"
+ version="1.0" />
<facet id="bpel.facet.core" version="2.0" />
</supported>
</extension>
@@ -94,18 +134,8 @@
=========================================================================
-->
<extension point="org.eclipse.wst.common.project.facet.ui.images">
- <image runtime-component-type="org.eclipse.bpel.apache.ode.runtime.rt"
- path="icons/obj16/ode.gif" />
- </extension>
-
- <extension point="org.eclipse.wst.common.project.facet.core.runtimes">
- <adapter>
- <runtime-component id="org.eclipse.bpel.apache.ode.runtime.rt" />
- <factory
- class="org.eclipse.jst.server.ui.internal.RuntimeLabelProvider$Factory" />
- <type
- class="org.eclipse.wst.common.project.facet.ui.IRuntimeComponentLabelProvider" />
- </adapter>
+ <image runtime-component-type="org.eclipse.jst.server.generic.runtime.apache.ode"
+ path="/icons/obj16/ode.gif" />
</extension>
<!--
@@ -114,33 +144,21 @@
=========================================================================
-->
<extension point="org.eclipse.jst.server.core.runtimeFacetMappings">
- <runtimeFacetMapping runtimeTypeId="org.eclipse.bpel.apache.ode.runtime.rt"
- runtime-component="org.eclipse.bpel.apache.ode.runtime.rt" version="2.0" />
+ <runtimeFacetMapping
+ runtimeTypeId="org.eclipse.jst.server.generic.runtime.apache.ode.1x"
+ runtime-component="org.eclipse.jst.server.generic.runtime.apache.ode" version="1.0" />
</extension>
+
<!--
=========================================================================
-Server runtime wizard definition
+Generic publisher
=========================================================================
-->
- <extension point="org.eclipse.jst.server.generic.core.serverdefinition">
- <serverdefinition id="org.eclipse.bpel.apache.ode.runtime.rt"
- definitionfile="definition/ode.xml">
- </serverdefinition>
- </extension>
-
-<!--
-=========================================================================
-Server runtime wizard contributions
-=========================================================================
--->
- <extension point="org.eclipse.wst.server.ui.wizardFragments">
- <fragment id="org.eclipse.jst.server.generic.runtime"
- typeIds="org.eclipse.bpel.apache.ode.runtime.rt"
- class="org.eclipse.jst.server.generic.ui.internal.GenericServerRuntimeWizardFragment" />
- <fragment id="org.eclipse.jst.server.generic.server"
- typeIds="org.eclipse.bpel.apache.ode.runtime.st"
- class="org.eclipse.jst.server.generic.ui.internal.GenericServerWizardFragment" />
+ <extension point="org.eclipse.jst.server.generic.core.genericpublisher">
+ <genericpublisher
+ class="org.eclipse.bpel.apache.ode.runtime.OdeBPELPublisher"
+ id="org.eclipse.bpel.apache.ode.runtime.publisher" />
</extension>
</plugin>
diff --git a/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/META-INF/MANIFEST.MF
index c0b42be..aa71ec4 100644
--- a/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/META-INF/MANIFEST.MF
@@ -5,15 +5,28 @@
Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.wst.server.core;bundle-version="[1.1.0,2.0.0)",
+Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.wst.server.core;bundle-version="[1.1.0,2.0.0)",
org.eclipse.wst.web.ui;bundle-version="[1.1.200,2.0.0)",
org.eclipse.wst.common.project.facet.ui;bundle-version="[1.3.0,2.0.0)",
org.eclipse.wst.common.modulecore;bundle-version="[1.1.200,2.0.0)",
+ org.eclipse.wst.common.frameworks;bundle-version="[1.1.200,2.0.0)",
+ org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)",
org.eclipse.wst.common.frameworks.ui;bundle-version="[1.1.200,2.0.0)",
org.eclipse.jst.server.generic.core;bundle-version="[1.0.305,2.0.0)",
org.eclipse.jst.server.core,
+ org.eclipse.jem.util;bundle-version="[2.0.100,3.0.0)",
org.eclipse.debug.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.bpel.runtimes
+ org.eclipse.bpel.model;bundle-version="0.1.0",
+ org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)",
+ javax.wsdl;bundle-version="[1.5.0,1.6.0)",
+ org.eclipse.wst.wsdl;bundle-version="[1.1.200,2.0.0)",
+ org.eclipse.jst.common.frameworks,
+ org.eclipse.jem.workbench,
+ org.eclipse.bpel.runtimes,
+ org.eclipse.bpel.validator
Bundle-Activator: org.eclipse.bpel.jboss.riftsaw.runtime.RiftsawPlugin
Export-Package: org.eclipse.bpel.jboss.riftsaw.runtime,
org.eclipse.bpel.jboss.riftsaw.runtime.facets,
diff --git a/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/definition/riftsaw2x.xml b/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/definition/riftsaw2x.xml
index 34323e4..245363e 100644
--- a/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/definition/riftsaw2x.xml
+++ b/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/definition/riftsaw2x.xml
@@ -36,7 +36,7 @@
</port>
<module>
- <type>jbt.bpel.module</type>
+ <type>jbt.bpel.facet.core</type>
<publishDir>${jboss.home}/server/${serverConfig}/deploy</publishDir>
<publisherReference>org.eclipse.jboss.tools.bpel.runtimes.module</publisherReference>
</module>
diff --git a/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/plugin.xml b/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/plugin.xml
index e9a6c94..7d8222e 100644
--- a/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/plugin.xml
+++ b/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/plugin.xml
@@ -8,11 +8,11 @@
=========================================================================
-->
<extension point="org.eclipse.wst.server.core.runtimeTypes">
- <runtimeType id="org.eclipse.bpel.jboss.riftsaw.runtime.rt"
+ <runtimeType id="org.eclipse.jst.server.generic.runtime.jboss.riftsaw.2x"
name="JBoss Riftsaw 2.x Runtime" description="JBoss Riftsaw BPEL 2.0 execution engine - Runtime"
vendor="JBoss" version="1.0"
class="org.eclipse.bpel.jboss.riftsaw.runtime.RiftsawServerRuntime">
- <moduleType types="jbt.bpel.module" versions="1.1, 2.0" />
+ <moduleType types="jbt.bpel.facet.core" versions="1.1, 2.0" />
</runtimeType>
</extension>
@@ -24,10 +24,10 @@
<extension point="org.eclipse.wst.server.core.serverTypes">
<serverType runtime="true"
class="org.eclipse.jst.server.generic.core.internal.GenericServer"
- id="org.eclipse.bpel.jboss.riftsaw.runtime.st"
+ id="org.eclipse.jst.server.generic.jboss.riftsaw.2x"
initialState="stopped"
supportsRemoteHosts="true"
- runtimeTypeId="org.eclipse.bpel.jboss.riftsaw.runtime.rt"
+ runtimeTypeId="org.eclipse.jst.server.generic.runtime.jboss.riftsaw.2x"
description="JBoss Riftsaw BPEL 2.0 execution engine - Server"
launchConfigId="org.eclipse.jst.server.generic.core.launchConfigurationType"
behaviourClass="org.eclipse.jst.server.generic.core.internal.GenericServerBehaviour"
@@ -48,18 +48,18 @@
<extension point="org.eclipse.wst.server.ui.serverImages">
<image id="org.eclipse.jst.server.generic.image.rt"
icon="icons/obj16/riftsaw.gif"
- typeIds="org.eclipse.bpel.jboss.riftsaw.runtime.rt" />
+ typeIds="org.eclipse.jst.server.generic.runtime.jboss.riftsaw.2x" />
<image id="org.eclipse.jst.server.generic.image.st"
icon="icons/obj16/riftsaw.gif"
- typeIds="org.eclipse.bpel.jboss.riftsaw.runtime.st" />
+ typeIds="org.eclipse.jst.server.generic.jboss.riftsaw.2x" />
<image
id="org.eclipse.jst.server.generic.image.module"
icon="icons/obj16/riftsaw.gif"
- typeIds="jbt.bpel.module" />
+ typeIds="jbt.bpel.facet.core" />
<image
id="org.eclipse.jst.server.generic.image.module"
icon="icons/obj16/riftsaw.gif"
- typeIds="jbt.bpel.module" />
+ typeIds="jbt.bpel.facet.core" />
</extension>
<!--
@@ -79,26 +79,26 @@
=========================================================================
-->
<extension point="org.eclipse.wst.common.project.facet.core.runtimes">
- <runtime-component-type id="org.eclipse.bpel.jboss.riftsaw.runtime.rt" />
+ <runtime-component-type id="org.eclipse.jst.server.generic.runtime.jboss.riftsaw" />
- <runtime-component-version type="org.eclipse.bpel.jboss.riftsaw.runtime.rt"
- version="2.0" />
+ <runtime-component-version type="org.eclipse.jst.server.generic.runtime.jboss.riftsaw"
+ version="1.1,2.0" />
<adapter>
- <runtime-component id="org.eclipse.bpel.jboss.riftsaw.runtime.rt" />
+ <runtime-component id="org.eclipse.jst.server.generic.runtime.jboss.riftsaw" />
<factory
class="org.eclipse.jst.server.core.internal.RuntimeClasspathProvider$Factory" />
<type class="org.eclipse.jst.common.project.facet.core.IClasspathProvider" />
</adapter>
<!--
<supported>
- <runtime-component id="org.eclipse.bpel.jboss.riftsaw.runtime.rt"
+ <runtime-component id="org.eclipse.jst.server.generic.runtime.jboss.riftsaw"
version="2.0" />
<facet id="bpel.facet.core" version="2.0" />
</supported>
-->
<supported>
- <runtime-component id="org.eclipse.bpel.jboss.riftsaw.runtime.rt"
+ <runtime-component id="org.eclipse.jst.server.generic.runtime.jboss.riftsaw"
version="2.0" />
<facet id="jbt.bpel.facet.core" version="2.0" />
</supported>
@@ -110,13 +110,13 @@
=========================================================================
-->
<extension point="org.eclipse.wst.common.project.facet.ui.images">
- <image runtime-component-type="org.eclipse.bpel.jboss.riftsaw.runtime.rt"
+ <image runtime-component-type="org.eclipse.jst.server.generic.runtime.jboss.riftsaw"
path="icons/obj16/riftsaw.gif" />
</extension>
<extension point="org.eclipse.wst.common.project.facet.core.runtimes">
<adapter>
- <runtime-component id="org.eclipse.bpel.jboss.riftsaw.runtime.rt" />
+ <runtime-component id="org.eclipse.jst.server.generic.runtime.jboss.riftsaw.2x" />
<factory
class="org.eclipse.jst.server.ui.internal.RuntimeLabelProvider$Factory" />
<type
@@ -130,8 +130,8 @@
=========================================================================
-->
<extension point="org.eclipse.jst.server.core.runtimeFacetMappings">
- <runtimeFacetMapping runtimeTypeId="org.eclipse.bpel.jboss.riftsaw.runtime.rt"
- runtime-component="org.eclipse.bpel.jboss.riftsaw.runtime.rt" version="2.0" />
+ <runtimeFacetMapping runtimeTypeId="org.eclipse.jst.server.generic.runtime.jboss.riftsaw.2x"
+ runtime-component="org.eclipse.jst.server.generic.runtime.jboss.riftsaw.2x" version="2.0" />
</extension>
<!--
@@ -140,7 +140,7 @@
=========================================================================
-->
<extension point="org.eclipse.jst.server.generic.core.serverdefinition">
- <serverdefinition id="org.eclipse.bpel.jboss.riftsaw.runtime.rt"
+ <serverdefinition id="org.eclipse.jst.server.generic.runtime.jboss.riftsaw.2x"
definitionfile="definition/riftsaw2x.xml">
</serverdefinition>
</extension>
@@ -152,10 +152,10 @@
-->
<extension point="org.eclipse.wst.server.ui.wizardFragments">
<fragment id="org.eclipse.jst.server.generic.runtime"
- typeIds="org.eclipse.bpel.jboss.riftsaw.runtime.rt"
+ typeIds="org.eclipse.jst.server.generic.runtime.jboss.riftsaw.2x"
class="org.eclipse.jst.server.generic.ui.internal.GenericServerRuntimeWizardFragment" />
<fragment id="org.eclipse.jst.server.generic.server"
- typeIds="org.eclipse.bpel.jboss.riftsaw.runtime.st"
+ typeIds="org.eclipse.jst.server.generic.jboss.riftsaw.2x"
class="org.eclipse.jst.server.generic.ui.internal.GenericServerWizardFragment" />
</extension>
@@ -253,7 +253,7 @@
id="org.eclipse.bpel.jboss.riftsaw.runtime.module.moduleFactory">
<moduleType
versions="1.1, 2.0"
- types="jbt.bpel.module">
+ types="jbt.bpel.facet.core">
</moduleType>
</moduleFactory>
</extension>
diff --git a/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/IRiftsawModuleFacetConstants.java b/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/IRiftsawModuleFacetConstants.java
index cc969cf..c627968 100644
--- a/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/IRiftsawModuleFacetConstants.java
+++ b/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/src/org/eclipse/bpel/jboss/riftsaw/runtime/IRiftsawModuleFacetConstants.java
@@ -16,7 +16,7 @@
IBPELModuleFacetConstants {
// module types
- public final static String JBT_BPEL_MODULE_TYPE = "jbt.bpel.module"; //$NON-NLS-1$
+ public final static String JBT_BPEL_MODULE_TYPE = "jbt.bpel.facet.core"; //$NON-NLS-1$
// facet template
public final static String JBT_BPEL_FACET_TEMPLATE = "jbt.template.bpel.core"; //$NON-NLS-1$
diff --git a/plugins/org.eclipse.bpel.runtimes/plugin.xml b/plugins/org.eclipse.bpel.runtimes/plugin.xml
index 1ef7c52..f95653c 100644
--- a/plugins/org.eclipse.bpel.runtimes/plugin.xml
+++ b/plugins/org.eclipse.bpel.runtimes/plugin.xml
@@ -45,7 +45,7 @@
<!--=========================================================================-->
<extension
- id="bpel.module"
+ id="bpel.facet.core"
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.module"
- typeIds="bpel.module"
+ id="org.eclipse.bpel.runtimes.bpel.facet.core"
+ typeIds="bpel.facet.core"
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.module">
+ types="bpel.facet.core">
</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 8f95b77..79b95e3 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.module"; //$NON-NLS-1$
+ public final static String BPEL20_MODULE_TYPE = "bpel.facet.core"; //$NON-NLS-1$
// module type versions
public final static String BPEL11_MODULE_VERSION = "1.1"; // $NON-NLS-1$
