releasing changes for EE setting, javax.wsdl 1.4 change, junit range specified

13 files changed, 17 insertions, 17 deletions

diff --git a/bundles/org.eclipse.wst.ws.explorer/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.ws.explorer/META-INF/MANIFEST.MF
index 27d82f530..d816727f9 100644
--- a/bundles/org.eclipse.wst.ws.explorer/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.ws.explorer/META-INF/MANIFEST.MF
@@ -26,7 +26,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.wst.ws;bundle-version="[1.0.100,1.1.0)",
  org.eclipse.wst.ws.parser;bundle-version="[1.0.100,1.1.0)",
  org.eclipse.wst.wsdl;bundle-version="[1.1.0,1.2.0)",
- org.wsdl4j;bundle-version="[1.4.0,1.5.0)",
+ javax.wsdl;bundle-version="[1.4.0,1.5.0)",
  org.apache.wsil4j;bundle-version="[1.0.0,1.1.0)",
  org.uddi4j;bundle-version="[2.0.4,2.1.0)",
  org.apache.axis;bundle-version="[1.4.0,2.0.0)",
diff --git a/bundles/org.eclipse.wst.ws.parser/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.ws.parser/META-INF/MANIFEST.MF
index 7282eaaff..6e13ee454 100644
--- a/bundles/org.eclipse.wst.ws.parser/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.ws.parser/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Export-Package: org.eclipse.wst.ws.internal.parser.disco;x-internal:=true,
  org.eclipse.wst.ws.internal.parser.wsil;x-internal:=true,
  org.eclipse.wst.ws.parser
 Require-Bundle: org.eclipse.wst.wsdl;bundle-version="[1.1.0,1.2.0)",
- org.wsdl4j;bundle-version="[1.4.0,1.5.0)",
+ javax.wsdl;bundle-version="[1.4.0,1.5.0)",
  org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
  org.apache.wsil4j;bundle-version="[1.0.0,1.1.0)",
  org.uddi4j;bundle-version="[2.0.4,2.1.0)",
diff --git a/bundles/org.eclipse.wst.ws/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.ws/META-INF/MANIFEST.MF
index 50e0e0a3f..7299d338f 100644
--- a/bundles/org.eclipse.wst.ws/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.ws/META-INF/MANIFEST.MF
@@ -38,7 +38,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.wst.command.env.core;bundle-version="[1.0.101,1.1.0)",
  org.eclipse.wst.ws.parser;bundle-version="[1.0.100,1.1.0)",
  org.eclipse.emf.common;bundle-version="[2.2.0,2.4.0)",
- org.wsdl4j;bundle-version="[1.4.0,1.5.0)",
+ javax.wsdl;bundle-version="[1.4.0,1.5.0)",
  org.apache.wsil4j;bundle-version="[1.0.0,1.1.0)",
  org.eclipse.core.resources;bundle-version="[3.2.0,3.4.0)",
  org.eclipse.wst.command.env;bundle-version="[1.0.101,1.1.0)",
diff --git a/bundles/org.eclipse.wst.wsdl.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.wsdl.ui/META-INF/MANIFEST.MF
index 170c42b21..3d27bb44a 100644
--- a/bundles/org.eclipse.wst.wsdl.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.wsdl.ui/META-INF/MANIFEST.MF
@@ -70,7 +70,7 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.2.0,3.0.0)",
  org.eclipse.emf.edit.ui;bundle-version="[2.2.0,3.0.0)",
  org.eclipse.wst.validation;bundle-version="[1.1.0,1.2.0)",
- org.wsdl4j;bundle-version="[1.4.0,2.0.0)",
+ javax.wsdl;bundle-version="[1.4.0,1.5.0)",
  org.eclipse.wst.wsdl.validation;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.ltk.core.refactoring;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.ltk.ui.refactoring;bundle-version="[3.2.0,4.0.0)",
diff --git a/bundles/org.eclipse.wst.wsdl.validation/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.wsdl.validation/META-INF/MANIFEST.MF
index 9dc967c6c..93126dc11 100644
--- a/bundles/org.eclipse.wst.wsdl.validation/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.wsdl.validation/META-INF/MANIFEST.MF
@@ -24,7 +24,7 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
  org.apache.ant;bundle-version="[1.6.5,2.0.0)",
  org.eclipse.wst.common.uriresolver;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.wst.validation;bundle-version="[1.1.0,1.2.0)",
- org.wsdl4j;bundle-version="[1.4.0,1.5.0)",
+ javax.wsdl;bundle-version="[1.4.0,1.5.0)",
  org.apache.xerces;bundle-version="[2.8.0,2.9.0)";visibility:=reexport,
  org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.wst.xml.core;bundle-version="[1.1.0,1.2.0)"
diff --git a/bundles/org.eclipse.wst.wsdl/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.wsdl/META-INF/MANIFEST.MF
index 7afe9aec9..06aa81b1d 100644
--- a/bundles/org.eclipse.wst.wsdl/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.wsdl/META-INF/MANIFEST.MF
@@ -28,7 +28,7 @@ Export-Package: org.eclipse.wst.wsdl,
 Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.2.0,2.4.0)",
  org.eclipse.xsd;bundle-version="[2.2.0,2.4.0)",
  org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.wsdl4j;bundle-version="[1.4.0,1.5.0)",
+ javax.wsdl;bundle-version="[1.4.0,1.5.0)",
  org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
  org.apache.xerces;bundle-version="[2.8.0,2.9.0)",
  com.ibm.icu;bundle-version="[3.4.4,4.0.0)"
diff --git a/bundles/org.eclipse.wst.wsi.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.wsi.ui/META-INF/MANIFEST.MF
index 1e5083e51..ed83d0299 100644
--- a/bundles/org.eclipse.wst.wsi.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.wsi.ui/META-INF/MANIFEST.MF
@@ -32,7 +32,7 @@ Require-Bundle: org.eclipse.core.runtime; bundle-version="[3.2.0,4.0.0)",
  org.eclipse.wst.wsi;bundle-version="[1.0.101,1.1.0)",
  org.eclipse.wst.internet.monitor.core;bundle-version="[1.0.102,1.1.0)",
  org.eclipse.wst.internet.monitor.ui;bundle-version="[1.0.102,1.1.0)",
- org.wsdl4j;bundle-version="[1.4.0,1.5.0)",
+ javax.wsdl;bundle-version="[1.4.0,1.5.0)",
  org.eclipse.wst.xml.ui;bundle-version="[1.0.100,1.1.0)",
  org.eclipse.wst.xml.core;bundle-version="[1.1.0,1.2.0)"
 Eclipse-LazyStart: true
diff --git a/bundles/org.eclipse.wst.wsi/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.wsi/META-INF/MANIFEST.MF
index f0cb55940..b9ba65ec7 100644
--- a/bundles/org.eclipse.wst.wsi/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.wsi/META-INF/MANIFEST.MF
@@ -49,7 +49,7 @@ Require-Bundle:  org.eclipse.core.runtime; bundle-version="[3.2.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.2.0,3.4.0)",
  org.eclipse.wst.wsdl.validation;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.wst.ws;bundle-version="[1.0.100,1.1.0)",
- org.wsdl4j;bundle-version="[1.4.0,1.5.0)",
+ javax.wsdl;bundle-version="[1.4.0,1.5.0)",
  org.uddi4j;bundle-version="[2.0.4,2.1.0)",
  org.apache.axis;bundle-version="[1.3.0,2.0.0)",
  com.ibm.icu;bundle-version="[3.4.4,4.0.0)",
diff --git a/tests/org.eclipse.wst.ws.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.ws.tests/META-INF/MANIFEST.MF
index f48fe6d19..e438aa055 100644
--- a/tests/org.eclipse.wst.ws.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.ws.tests/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-Vendor: %PLUGIN_PROVIDER
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.wst.ws,
  org.eclipse.core.runtime,
- org.junit,
+ org.junit;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.core.resources,
  org.eclipse.debug.core,
  org.eclipse.jem.util,
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.wsdl.tests.performance/META-INF/MANIFEST.MF
index 1d9c3f0cd..917ebceca 100644
--- a/tests/org.eclipse.wst.wsdl.tests.performance/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-Activator: org.eclipse.wst.wsdl.tests.performance.PerformancePlugin
 Bundle-Localization: plugin
 Export-Package: org.eclipse.wst.wsdl.tests.performance,
  org.eclipse.wst.wsdl.tests.performance.scalability
-Require-Bundle: org.junit,
+Require-Bundle: org.junit;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.emf.ecore,
@@ -20,7 +20,7 @@ Require-Bundle: org.junit,
  org.eclipse.wst.wsdl,
  org.eclipse.wst.wsdl.ui,
  org.eclipse.wst.wsdl.validation,
- org.wsdl4j,
+ javax.wsdl;bundle-version="[1.4.0,1.5.0)",
  org.eclipse.wst.ws,
  org.eclipse.wst.command.env,
  org.eclipse.wst.command.env.core,
diff --git a/tests/org.eclipse.wst.wsdl.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.wsdl.tests/META-INF/MANIFEST.MF
index 8fccdbb23..8adab44e2 100644
--- a/tests/org.eclipse.wst.wsdl.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.wsdl.tests/META-INF/MANIFEST.MF
@@ -11,8 +11,8 @@ Require-Bundle: org.apache.xerces,
  org.eclipse.core.resources,
  org.eclipse.emf.ecore,
  org.eclipse.xsd,
- org.junit,
- org.wsdl4j,
+ org.junit;bundle-version="[3.8.0,4.0.0)",
+ javax.wsdl;bundle-version="[1.4.0,1.5.0)",
  org.eclipse.wst.wsdl,
  org.eclipse.wst.common.uriresolver
 Bundle-ClassPath: wsdl.tests.jar
diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.wsdl.validation.tests/META-INF/MANIFEST.MF
index a482f0dec..ff8039686 100644
--- a/tests/org.eclipse.wst.wsdl.validation.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.wsdl.validation.tests/META-INF/MANIFEST.MF
@@ -9,14 +9,14 @@ Bundle-Vendor: %_PROVIDER_NAME
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.junit,
+ org.junit;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.core.resources,
  org.eclipse.wst.wsdl.validation,
  org.eclipse.wst.ws,
  org.eclipse.wst.command.env.core,
  org.eclipse.wst.command.env,
  org.apache.ant,
- org.wsdl4j,
+ javax.wsdl;bundle-version="[1.4.0,1.5.0)",
  org.apache.xerces,
  org.eclipse.wst.validation,
  org.eclipse.wst.xml.core,
diff --git a/tests/org.eclipse.wst.wsi.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.wsi.tests/META-INF/MANIFEST.MF
index 57de4a443..2e7498fac 100644
--- a/tests/org.eclipse.wst.wsi.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.wsi.tests/META-INF/MANIFEST.MF
@@ -9,8 +9,8 @@ Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.wst.wsi,
  org.eclipse.core.resources,
- org.junit,
- org.wsdl4j,
+ org.junit;bundle-version="[3.8.0,4.0.0)",
+ javax.wsdl;bundle-version="[1.4.0,1.5.0)",
  org.eclipse.osgi,
  org.eclipse.core.runtime,
  org.eclipse.wst.command.env,