Fix javax.wsdl version conflicts
diff --git a/examples/plugins/org.eclipse.bpel.extensionsample.model/META-INF/MANIFEST.MF b/examples/plugins/org.eclipse.bpel.extensionsample.model/META-INF/MANIFEST.MF
index 5019d0c..b899e56 100644
--- a/examples/plugins/org.eclipse.bpel.extensionsample.model/META-INF/MANIFEST.MF
+++ b/examples/plugins/org.eclipse.bpel.extensionsample.model/META-INF/MANIFEST.MF
@@ -15,6 +15,6 @@
org.eclipse.bpel.model;visibility:=reexport,
org.eclipse.wst.wsdl;visibility:=reexport,
org.eclipse.xsd;visibility:=reexport,
- javax.wsdl;bundle-version="[1.5.0,1.6.0)"
+ javax.wsdl;bundle-version="[1.5.0,1.6.2]"
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.bpel.ui.util
diff --git a/examples/projects/org.eclipse.bpel.examples.orderprocessing/bpelContent/OASISSampleProcess.bpelex b/examples/projects/org.eclipse.bpel.examples.orderprocessing/bpelContent/OASISSampleProcess.bpelex
index 6abbd35..93dd551 100644
--- a/examples/projects/org.eclipse.bpel.examples.orderprocessing/bpelContent/OASISSampleProcess.bpelex
+++ b/examples/projects/org.eclipse.bpel.examples.orderprocessing/bpelContent/OASISSampleProcess.bpelex
@@ -2,6 +2,110 @@
<extensionmodel:ExtensionMap xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:extensionmodel="http:///extensionmodel.ecore" xmlns:org.eclipse.bpel.ui.uiextensionmodel="http:///org/eclipse/bpel/ui/uiextensionmodel.ecore" namespace="http://org.eclipse.bpel.ui/">
<extensions>
<extendedObject href="OASISSampleProcess.bpel#/"/>
- <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ProcessExtension" modificationStamp="1334944302410"/>
+ <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ProcessExtension" modificationStamp="1336048112652"/>
+ </extensions>
+ <extensions>
+ <extendedObject href="OASISSampleProcess.bpel#//@variables/@children.0"/>
+ <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/>
+ </extensions>
+ <extensions>
+ <extendedObject href="OASISSampleProcess.bpel#//@variables/@children.1"/>
+ <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/>
+ </extensions>
+ <extensions>
+ <extendedObject href="OASISSampleProcess.bpel#//@variables/@children.2"/>
+ <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/>
+ </extensions>
+ <extensions>
+ <extendedObject href="OASISSampleProcess.bpel#//@variables/@children.3"/>
+ <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/>
+ </extensions>
+ <extensions>
+ <extendedObject href="OASISSampleProcess.bpel#//@variables/@children.4"/>
+ <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/>
+ </extensions>
+ <extensions>
+ <extendedObject href="OASISSampleProcess.bpel#//@variables/@children.5"/>
+ <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/>
+ </extensions>
+ <extensions>
+ <extendedObject href="OASISSampleProcess.bpel#//@activity"/>
+ <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/>
+ </extensions>
+ <extensions>
+ <extendedObject href="OASISSampleProcess.bpel#//@activity/@activities.0"/>
+ <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/>
+ </extensions>
+ <extensions>
+ <extendedObject href="OASISSampleProcess.bpel#//@activity/@activities.1"/>
+ <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/>
+ </extensions>
+ <extensions>
+ <extendedObject href="OASISSampleProcess.bpel#//@activity/@activities.1/@activities.0"/>
+ <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension" x="8" y="8"/>
+ </extensions>
+ <extensions>
+ <extendedObject href="OASISSampleProcess.bpel#//@activity/@activities.1/@activities.0/@activities.0"/>
+ <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/>
+ </extensions>
+ <extensions>
+ <extendedObject href="OASISSampleProcess.bpel#//@activity/@activities.1/@activities.0/@activities.0/@copy.0"/>
+ <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:CopyExtension"/>
+ </extensions>
+ <extensions>
+ <extendedObject href="OASISSampleProcess.bpel#//@activity/@activities.1/@activities.0/@activities.1"/>
+ <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/>
+ </extensions>
+ <extensions>
+ <extendedObject href="OASISSampleProcess.bpel#//@activity/@activities.1/@activities.0/@activities.2"/>
+ <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/>
+ </extensions>
+ <extensions>
+ <extendedObject href="OASISSampleProcess.bpel#//@activity/@activities.1/@activities.1"/>
+ <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension" x="176" y="8"/>
+ </extensions>
+ <extensions>
+ <extendedObject href="OASISSampleProcess.bpel#//@activity/@activities.1/@activities.1/@activities.0"/>
+ <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/>
+ </extensions>
+ <extensions>
+ <extendedObject href="OASISSampleProcess.bpel#//@activity/@activities.1/@activities.1/@activities.1"/>
+ <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/>
+ </extensions>
+ <extensions>
+ <extendedObject href="OASISSampleProcess.bpel#//@activity/@activities.1/@activities.1/@activities.2"/>
+ <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/>
+ </extensions>
+ <extensions>
+ <extendedObject href="OASISSampleProcess.bpel#//@activity/@activities.1/@activities.2"/>
+ <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension" x="344" y="8"/>
+ </extensions>
+ <extensions>
+ <extendedObject href="OASISSampleProcess.bpel#//@activity/@activities.1/@activities.2/@activities.0"/>
+ <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/>
+ </extensions>
+ <extensions>
+ <extendedObject href="OASISSampleProcess.bpel#//@activity/@activities.1/@activities.2/@activities.1"/>
+ <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/>
+ </extensions>
+ <extensions>
+ <extendedObject href="OASISSampleProcess.bpel#//@activity/@activities.1/@links/@children.0"/>
+ <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:LinkExtension"/>
+ </extensions>
+ <extensions>
+ <extendedObject href="OASISSampleProcess.bpel#//@activity/@activities.1/@links/@children.1"/>
+ <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:LinkExtension"/>
+ </extensions>
+ <extensions>
+ <extendedObject href="OASISSampleProcess.bpel#//@activity/@activities.2"/>
+ <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/>
+ </extensions>
+ <extensions>
+ <extendedObject href="OASISSampleProcess.bpel#//@faultHandlers/@catch.0/@faultVariable"/>
+ <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/>
+ </extensions>
+ <extensions>
+ <extendedObject href="OASISSampleProcess.bpel#//@faultHandlers/@catch.0/@activity"/>
+ <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/>
</extensions>
</extensionmodel:ExtensionMap>
diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.model/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpel.apache.ode.deploy.model/META-INF/MANIFEST.MF
index e0571ea..48ba94f 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.model/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.model/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@
org.eclipse.bpel.apache.ode.deploy.model.dd.impl,
org.eclipse.bpel.apache.ode.deploy.model.dd.util
Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
- javax.wsdl;bundle-version="1.6.2",
+ javax.wsdl;bundle-version="[1.5.0,1.6.2]",
org.eclipse.bpel.model;bundle-version="1.0.0",
org.eclipse.wst.wsdl;bundle-version="[1.1.200,2.0.0)",
org.eclipse.xsd;bundle-version="[2.4.0,3.0.0)"
diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpel.apache.ode.deploy.ui/META-INF/MANIFEST.MF
index 357c89c..3f84933 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.ui/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@
org.eclipse.bpel.model;bundle-version="1.0.0",
org.eclipse.wst.wsdl;bundle-version="[1.1.200,2.0.0)",
org.eclipse.xsd;bundle-version="[2.4.0,3.0.0)",
- javax.wsdl;bundle-version="1.6.2",
+ javax.wsdl;bundle-version="[1.5.0,1.6.2]",
org.eclipse.emf.edit.ui;bundle-version="[2.4.0,3.0.0)",
org.eclipse.bpel.ui;bundle-version="1.0.0",
org.eclipse.wst.common.modulecore,
diff --git a/plugins/org.eclipse.bpel.common.wsdl/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpel.common.wsdl/META-INF/MANIFEST.MF
index a95132a..c216638 100644
--- a/plugins/org.eclipse.bpel.common.wsdl/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.bpel.common.wsdl/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@
org.eclipse.xsd,
org.eclipse.wst.wsdl,
org.eclipse.emf.ecore.xmi,
- javax.wsdl;bundle-version="1.6.2"
+ javax.wsdl;bundle-version="[1.5.0,1.6.2]"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.bpel.common.wsdl.helpers,
diff --git a/plugins/org.eclipse.bpel.compare.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpel.compare.ui/META-INF/MANIFEST.MF
index 4845cfb..e3ac153 100644
--- a/plugins/org.eclipse.bpel.compare.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.bpel.compare.ui/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@
org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)",
org.eclipse.bpel.model;bundle-version="1.0.0",
org.eclipse.wst.wsdl;bundle-version="[1.1.200,2.0.0)",
- javax.wsdl;bundle-version="1.6.2",
+ javax.wsdl;bundle-version="[1.5.0,1.6.2]",
org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.1.3",
org.eclipse.emf.compare.match;bundle-version="[1.0.0,2.0.0)",
org.eclipse.emf.compare.diff;bundle-version="[1.0.0,2.0.0)",
diff --git a/plugins/org.eclipse.bpel.examples.extensionPoints/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpel.examples.extensionPoints/META-INF/MANIFEST.MF
index b4328b2..bdcd8b2 100644
--- a/plugins/org.eclipse.bpel.examples.extensionPoints/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.bpel.examples.extensionPoints/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@
org.eclipse.bpel.ui;bundle-version="0.3.0",
org.eclipse.bpel.model;bundle-version="0.3.0",
org.eclipse.emf.ecore;bundle-version="2.3.0",
- javax.wsdl;bundle-version="1.6.2",
+ javax.wsdl;bundle-version="[1.5.0,1.6.2]",
org.eclipse.core.resources,
org.eclipse.ui.views.properties.tabbed,
org.eclipse.ui.editors,
diff --git a/plugins/org.eclipse.bpel.model/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpel.model/META-INF/MANIFEST.MF
index db9d4cc..c4b0e79 100644
--- a/plugins/org.eclipse.bpel.model/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.bpel.model/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@
org.eclipse.emf.ecore.xmi;bundle-version="[2.4.0,3.0.0)",
org.eclipse.xsd;bundle-version="[2.4.0,3.0.0)",
org.eclipse.wst.wsdl,
- javax.wsdl;bundle-version="1.6.2",
+ javax.wsdl;bundle-version="[1.5.0,1.6.2]",
org.eclipse.bpel.common.model;bundle-version="1.0.0",
org.eclipse.wst.xml.core,
org.eclipse.wst.xml.ui
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/BPELExtensibleElementImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/BPELExtensibleElementImpl.java
index b7ae18e..8ca318c 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/BPELExtensibleElementImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/BPELExtensibleElementImpl.java
@@ -401,7 +401,7 @@
this.updatingDOM = updatingDOM;
}
- @Override
+// @Override
public ExtensibilityElement removeExtensibilityElement(
ExtensibilityElement arg0) {
// TODO Auto-generated method stub
diff --git a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ServiceRefImpl.java b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ServiceRefImpl.java
index 77bcdaf..3662d83 100644
--- a/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ServiceRefImpl.java
+++ b/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/impl/ServiceRefImpl.java
@@ -246,7 +246,7 @@
return result.toString();
}
- @Override
+// @Override
public ExtensibilityElement removeExtensibilityElement(
ExtensibilityElement arg0) {
// TODO Auto-generated method stub
diff --git a/plugins/org.eclipse.bpel.runtimes/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpel.runtimes/META-INF/MANIFEST.MF
index 8ac4ff8..57fc19c 100644
--- a/plugins/org.eclipse.bpel.runtimes/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.bpel.runtimes/META-INF/MANIFEST.MF
@@ -20,7 +20,7 @@
org.eclipse.debug.ui;bundle-version="[3.4.0,4.0.0)",
org.eclipse.bpel.model;bundle-version="1.0.0",
org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)",
- javax.wsdl;bundle-version="1.6.2",
+ javax.wsdl;bundle-version="[1.5.0,1.6.2]",
org.eclipse.wst.wsdl;bundle-version="[1.1.200,2.0.0)",
org.eclipse.jst.common.frameworks,
org.eclipse.jem.workbench
diff --git a/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF
index 62f5138..7453d67 100644
--- a/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF
@@ -23,7 +23,7 @@
org.eclipse.bpel.wsil.model;bundle-version="1.0.0",
org.eclipse.wst.sse.ui;bundle-version="[1.1.0,2.0.0)",
org.eclipse.wst.sse.core;bundle-version="[1.1.300,2.0.0)",
- javax.wsdl;bundle-version="1.6.2";visibility:=reexport,
+ javax.wsdl;bundle-version="[1.5.0,1.6.2]";visibility:=reexport,
org.eclipse.wst.xsd.ui;bundle-version="[1.2.101,2.0.0)",
org.eclipse.wst.wsdl.ui;bundle-version="[1.2.100,2.0.0)",
org.eclipse.wst.xml.ui;bundle-version="[1.0.400,2.0.0)",
diff --git a/plugins/org.eclipse.bpel.validator/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpel.validator/META-INF/MANIFEST.MF
index 21a7f89..876d98a 100644
--- a/plugins/org.eclipse.bpel.validator/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.bpel.validator/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@
org.eclipse.wst.validation;bundle-version="[1.2.0,2.0.0)",
org.eclipse.wst.wsdl.validation;bundle-version="[1.1.301,2.0.0)",
org.eclipse.wst.xml.core;bundle-version="[1.1.300,2.0.0)",
- javax.wsdl;bundle-version="1.6.2",
+ javax.wsdl;bundle-version="[1.5.0,1.6.2]",
org.eclipse.bpel.xpath10;bundle-version="1.0.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.bpel.common.wsdl.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.bpel.common.wsdl.tests/META-INF/MANIFEST.MF
index 1b8f8ba..baff5b7 100644
--- a/tests/org.eclipse.bpel.common.wsdl.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.bpel.common.wsdl.tests/META-INF/MANIFEST.MF
@@ -9,6 +9,6 @@
Require-Bundle: org.eclipse.bpel.common.wsdl,
org.eclipse.emf.ecore.xmi,
org.eclipse.wst.wsdl,
- javax.wsdl;bundle-version="1.6.2",
+ javax.wsdl;bundle-version="[1.5.0,1.6.2]",
org.eclipse.xsd,
org.junit;bundle-version="4.8.1"
