Merge branch 'develop'
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..897803d 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
@@ -31,6 +31,7 @@
// facet
public final static String BPEL20_PROJECT_FACET = "bpel.facet.core"; //$NON-NLS-1$
+ public final static String JBT_BPEL20_PROJECT_FACET = "jbt.bpel.facet.core"; //$NON-NLS-1$
// bpel file extension
public final static String BPEL_FILE_EXTENSION = "bpel"; //$NON-NLS-1$
diff --git a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELUtil.java b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELUtil.java
index b45ee86..70b9aaf 100644
--- a/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELUtil.java
+++ b/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELUtil.java
@@ -1840,6 +1840,10 @@
if (fproj.hasProjectFacet(getBPELFacetVersion())) {
return true;
}
+ // added for backward compatibility with jbt.bpel.facet.core:
+ if (fproj.hasProjectFacet(getJBT_BPELFacetVersion())) {
+ return true;
+ }
}
return false;
@@ -1851,6 +1855,12 @@
return bpelFacetVersion;
}
+ public static IProjectFacetVersion getJBT_BPELFacetVersion() {
+ IProjectFacet bpelFacet = ProjectFacetsManager.getProjectFacet(IBPELModuleFacetConstants.JBT_BPEL20_PROJECT_FACET);
+ IProjectFacetVersion bpelFacetVersion = bpelFacet.getVersion(IBPELModuleFacetConstants.BPEL20_MODULE_VERSION);
+ return bpelFacetVersion;
+ }
+
public static org.eclipse.core.resources.IContainer getBPELContentFolder(IProject project) {
org.eclipse.core.resources.IContainer bpelContent = null;
diff --git a/site/category.xml b/site/category.xml
index a79965f..5d77853 100644
--- a/site/category.xml
+++ b/site/category.xml
@@ -6,9 +6,12 @@
<feature url="features/org.eclipse.bpel.feature_1.0.1.qualifier.jar" id="org.eclipse.bpel.feature" version="1.0.1.qualifier">
<category name="Eclipse BPEL Designer"/>
</feature>
+ <!-- Removed for now because it conflicts with jboss tools' own deployment plugin for Riftsaw.
+ -- This was only intended as an additional example deployer anyway, which was more-or-less similar to the Ode deployer.
<feature url="features/org.eclipse.bpel.jboss.riftsaw.runtime.feature_1.0.1.qualifier.jar" id="org.eclipse.bpel.jboss.riftsaw.runtime.feature" version="1.0.1.qualifier">
<category name="Eclipse BPEL Designer"/>
</feature>
+ -->
<feature url="features/org.eclipse.bpel.common.feature_1.0.1.qualifier.jar" id="org.eclipse.bpel.common.feature" version="1.0.1.qualifier">
<category name="Eclipse BPEL Designer"/>
</feature>
