[eclipse-wtp-webservices] Initial import (#827917).
Gerard Ryan
galileo at fedoraproject.org
Thu Jun 14 14:14:33 UTC 2012
commit 38a133773929cbdc338c9258697a0cbb3acee49c
Author: Gerard Ryan <gerard at ryan.lt>
Date: Thu Jun 14 15:14:20 2012 +0100
Initial import (#827917).
.gitignore | 1 +
eclipse-wtp-webservices.spec | 169 ++++++
sources | 1 +
webservices-fix-wst.ws.parser-manifest.patch | 13 +
webservices-fix-wst.ws_core-featurexml.patch | 132 +++++
...-rm-javax.wsdl-version-check-in-manifests.patch | 55 ++
...avax.wsdl-version-check-in-wsdl15-feature.patch | 11 +
webservices-wsdl-unimplemented-methods.patch | 577 ++++++++++++++++++++
...-wsdl.validation-fix-for-xerces-j2-2.11.0.patch | 74 +++
9 files changed, 1033 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..1c51a95 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/eclipse-wtp-webservices-HEAD-20120602cvs.tar.xz
diff --git a/eclipse-wtp-webservices.spec b/eclipse-wtp-webservices.spec
new file mode 100644
index 0000000..17edbe5
--- /dev/null
+++ b/eclipse-wtp-webservices.spec
@@ -0,0 +1,169 @@
+%global cvstag 20120602cvs
+%global eclipse_base %{_libdir}/eclipse
+%global install_loc %{_datadir}/eclipse/dropins/wtp-webservices
+
+Name: eclipse-wtp-webservices
+Version: 3.4.0
+Release: 0.3.%{cvstag}%{?dist}
+Summary: Tools for developing and interacting with Java Web services
+
+Group: Development/Tools
+License: EPL
+URL: http://www.eclipse.org/webtools/ws/
+
+# cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/webtools export -r HEAD webservices
+# pushd webservices && rm -r archive/ tests/ && popd
+# tar -cJf eclipse-wtp-webservices-HEAD-20120602cvs.tar.xz webservices
+Source0: %{name}-HEAD-%{cvstag}.tar.xz
+
+# build fails looking for old versions of javax.wsdl
+Patch0: webservices-rm-javax.wsdl-version-check-in-manifests.patch
+Patch1: webservices-rm-javax.wsdl-version-check-in-wsdl15-feature.patch
+
+# fix order of plugins in feature.xml so they build in correct order
+# rm javax.activation & org.apache.wsil4j (orbit) from list
+Patch2: webservices-fix-wst.ws_core-featurexml.patch
+
+# Add unimplemented methods for javax.wsdl
+Patch3: webservices-wsdl-unimplemented-methods.patch
+
+# fix to work with fedora packaged xerces-j2 (more up-to-date)
+Patch4: webservices-wsdl.validation-fix-for-xerces-j2-2.11.0.patch
+
+# try to get wst.ws.parser manifest to work for jeetools
+Patch5: webservices-fix-wst.ws.parser-manifest.patch
+
+BuildArch: noarch
+
+BuildRequires: ant
+BuildRequires: axis
+BuildRequires: log4j
+BuildRequires: uddi4j
+BuildRequires: wsdl4j
+BuildRequires: wsil4j
+BuildRequires: javamail
+BuildRequires: xerces-j2
+BuildRequires: java-devel
+BuildRequires: jpackage-utils
+BuildRequires: apache-commons-codec
+BuildRequires: apache-commons-logging
+BuildRequires: apache-commons-discovery
+
+BuildRequires: eclipse-pde
+BuildRequires: eclipse-rcp
+BuildRequires: eclipse-gef
+BuildRequires: icu4j-eclipse
+BuildRequires: eclipse-emf-xsd
+BuildRequires: eclipse-emf-core
+BuildRequires: eclipse-platform
+BuildRequires: eclipse-wtp-common
+BuildRequires: eclipse-wtp-servertools
+BuildRequires: eclipse-wtp-sourceediting
+
+Requires: ant
+Requires: axis
+Requires: java
+Requires: log4j
+Requires: uddi4j
+Requires: wsdl4j
+Requires: wsil4j
+Requires: javamail
+Requires: xerces-j2
+Requires: jpackage-utils
+Requires: apache-commons-codec
+Requires: apache-commons-logging
+Requires: apache-commons-discovery
+
+Requires: eclipse-rcp
+Requires: eclipse-gef
+Requires: icu4j-eclipse
+Requires: eclipse-emf-xsd
+Requires: eclipse-emf-core
+Requires: eclipse-platform
+Requires: eclipse-wtp-common
+Requires: eclipse-wtp-servertools
+Requires: eclipse-wtp-sourceediting
+
+%description
+The JST Web services component contains tools for developing and interacting
+with Java Web services.
+Currently, this package only contains the org.eclipse.wst.ws_core feature.
+
+
+%prep
+%setup -q -n webservices
+
+find . -type f -name *.jar -exec rm -f {} \;
+find . -type f -name *.class -exec rm -f {} \;
+
+#Orbit links
+rm -rf orbit
+mkdir orbit
+pushd orbit
+%{__ln_s} %{_javadir}/log4j.jar
+%{__ln_s} %{_javadir}/uddi4j.jar
+%{__ln_s} %{_javadir}/wsdl4j.jar
+%{__ln_s} %{_javadir}/wsil4j.jar
+%{__ln_s} %{_javadir}/axis/axis.jar
+%{__ln_s} %{_javadir}/axis/saaj.jar
+%{__ln_s} %{_javadir}/axis/jaxrpc.jar
+%{__ln_s} %{_javadir}/javamail/mail.jar
+%{__ln_s} %{_javadir}/apache-commons-codec.jar
+%{__ln_s} %{_javadir}/apache-commons-logging.jar
+%{__ln_s} %{_javadir}/apache-commons-discovery.jar
+popd
+
+%patch0
+%patch1
+%patch2
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+
+
+%build
+%{_bindir}/eclipse-pdebuild \
+ -f org.eclipse.wst.ws_core.feature \
+ -d "xsd eclipse-wtp-common wtp-sourceediting emf gef \
+ org.eclipse.jst.server_ui.feature" \
+ -o `pwd`/orbit
+
+%{_bindir}/eclipse-pdebuild -f org.eclipse.wst.ws_userdoc.feature
+
+%install
+install -d -m 755 %{buildroot}%{install_loc}
+
+%{__unzip} -q -d %{buildroot}%{install_loc} \
+ build/rpmBuild/org.eclipse.wst.ws_core.feature.zip
+%{__unzip} -q -d %{buildroot}%{install_loc} \
+ build/rpmBuild/org.eclipse.wst.ws_userdoc.feature.zip
+
+#Recreate symlinks & remove duplicate jars
+pushd %{buildroot}%{install_loc}/eclipse/plugins
+rm -f javax.mail*.jar
+rm -f javax.wsdl*.jar
+rm -f org.apache.log4j*.jar
+rm -f org.apache.commons.codec*.jar
+rm -f org.apache.commons.logging*.jar
+
+%{__ln_s} %{_javadir}/log4j.jar
+%{__ln_s} %{_javadir}/wsdl4j.jar
+%{__ln_s} %{_javadir}/javamail/mail.jar
+%{__ln_s} %{_javadir}/apache-commons-codec.jar
+%{__ln_s} %{_javadir}/apache-commons-logging.jar
+popd
+
+%files
+%{install_loc}
+%doc docs/org.eclipse.wst.ws.api.doc/about.html
+%doc features/org.eclipse.wst.ws_wsdl14.feature/license.html
+
+%changelog
+* Thu Jun 14 2012 Gerard Ryan <galileo at fedoraproject.org> 3.4.0-0.3.20120602cvs
+- Include license.html as a doc, add additional Requires/BuildRequires
+
+* Wed Jun 13 2012 Gerard Ryan <galileo at fedoraproject.org> 3.4.0-0.2.20120602cvs
+- Reorder the prep section to delete prebuild stuff first
+
+* Sat Jun 02 2012 Gerard Ryan <galileo at fedoraproject.org> 3.4.0-0.1.20120602cvs
+- Initial Fedora package
diff --git a/sources b/sources
index e69de29..058d21b 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+253df9cf003e400162d5bd40ecaea84e eclipse-wtp-webservices-HEAD-20120602cvs.tar.xz
diff --git a/webservices-fix-wst.ws.parser-manifest.patch b/webservices-fix-wst.ws.parser-manifest.patch
new file mode 100644
index 0000000..bb7c8f9
--- /dev/null
+++ b/webservices-fix-wst.ws.parser-manifest.patch
@@ -0,0 +1,13 @@
+--- ./plugins/org.eclipse.wst.ws.parser/META-INF/MANIFEST.MF~ 2012-06-02 19:25:32.626473266 +0100
++++ ./plugins/org.eclipse.wst.ws.parser/META-INF/MANIFEST.MF 2012-06-11 01:02:52.699146215 +0100
+@@ -1,8 +1,8 @@
+ Manifest-Version: 1.0
+ Bundle-ManifestVersion: 2
+ Bundle-Name: %PLUGIN_NAME
+-Bundle-SymbolicName: org.eclipse.wst.ws.parser
+-Bundle-Version: 1.0.403.qualifier
++Bundle-SymbolicName: org.eclipse.wst.ws.parser; singleton:=true
++Bundle-Version: 1.0.403
+ Bundle-Activator: org.eclipse.wst.ws.internal.parser.plugin.ParserPlugin
+ Bundle-Vendor: %PLUGIN_PROVIDER
+ Bundle-Localization: plugin
diff --git a/webservices-fix-wst.ws_core-featurexml.patch b/webservices-fix-wst.ws_core-featurexml.patch
new file mode 100644
index 0000000..3e24852
--- /dev/null
+++ b/webservices-fix-wst.ws_core-featurexml.patch
@@ -0,0 +1,132 @@
+--- features/org.eclipse.wst.ws_core.feature/feature.xml.orig 2012-05-31 23:19:17.369509612 +0100
++++ features/org.eclipse.wst.ws_core.feature/feature.xml 2012-06-11 00:18:30.477304155 +0100
+@@ -45,105 +45,90 @@
+ unpack="false"/>
+
+ <plugin
+- id="org.eclipse.wst.ws"
++ id="javax.xml.rpc"
+ download-size="0"
+ install-size="0"
+- version="0.0.0"
+- unpack="false"/>
++ version="0.0.0"/>
+
+ <plugin
+- id="org.eclipse.wst.ws.parser"
++ id="javax.xml.soap"
+ download-size="0"
+ install-size="0"
+- version="0.0.0"
+- unpack="false"/>
++ version="1.3.0.qualifier"/>
+
+ <plugin
+- id="org.eclipse.wst.wsdl"
++ id="javax.mail"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+- id="org.eclipse.wst.wsdl.validation"
++ id="org.apache.axis"
+ download-size="0"
+ install-size="0"
+- version="0.0.0"
+- unpack="false"/>
++ version="0.0.0"/>
+
+ <plugin
+- id="org.eclipse.wst.wsi"
++ id="org.uddi4j"
+ download-size="0"
+ install-size="0"
+- version="0.0.0"
+- unpack="false"/>
++ version="0.0.0"/>
+
+ <plugin
+- id="org.apache.commons.logging"
++ id="org.eclipse.wst.wsdl"
+ download-size="0"
+ install-size="0"
+- version="1.0.4.qualifier"
++ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+- id="org.apache.log4j"
++ id="org.eclipse.wst.ws.parser"
+ download-size="0"
+ install-size="0"
+- version="1.2.15.qualifier"
++ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+- id="org.apache.wsil4j"
++ id="org.eclipse.wst.ws"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+- id="org.uddi4j"
++ id="org.eclipse.wst.wsdl.validation"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+- id="org.apache.commons.discovery"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"/>
+-
+- <plugin
+- id="javax.xml.rpc"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"/>
+-
+- <plugin
+- id="javax.xml.soap"
++ id="org.eclipse.wst.wsi"
+ download-size="0"
+ install-size="0"
+- version="1.2.0.qualifier"/>
++ version="0.0.0"
++ unpack="false"/>
+
+ <plugin
+- id="org.apache.axis"
++ id="org.apache.commons.logging"
+ download-size="0"
+ install-size="0"
+- version="0.0.0"/>
++ version="0.0.0"
++ unpack="false"/>
+
+ <plugin
+- id="javax.mail"
++ id="org.apache.log4j"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+- id="javax.activation"
++ id="org.apache.commons.discovery"
+ download-size="0"
+ install-size="0"
+- version="0.0.0"
+- unpack="false"/>
++ version="0.0.0"/>
+
+ <plugin
+ id="org.eclipse.wst.ws.service.policy"
diff --git a/webservices-rm-javax.wsdl-version-check-in-manifests.patch b/webservices-rm-javax.wsdl-version-check-in-manifests.patch
new file mode 100644
index 0000000..132015a
--- /dev/null
+++ b/webservices-rm-javax.wsdl-version-check-in-manifests.patch
@@ -0,0 +1,55 @@
+--- ./plugins/org.eclipse.wst.wsdl/META-INF/MANIFEST.MF.orig 2012-05-28 16:37:35.596058088 +0100
++++ ./plugins/org.eclipse.wst.wsdl/META-INF/MANIFEST.MF 2012-05-30 19:10:59.433669764 +0100
+@@ -28,7 +28,7 @@
+ Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.xsd;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
+- javax.wsdl;bundle-version="[1.5.0,1.6.0)",
++ javax.wsdl,
+ org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.apache.xerces;bundle-version="[2.8.0,3.0.0)"
+ Import-Package: com.ibm.icu.util; version="3.8"
+--- plugins/org.eclipse.wst.ws/META-INF/MANIFEST.MF.orig 2012-05-30 20:04:07.570248328 +0100
++++ plugins/org.eclipse.wst.ws/META-INF/MANIFEST.MF 2012-05-30 20:04:25.461903635 +0100
+@@ -39,7 +39,7 @@
+ 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,3.0.0)",
+- javax.wsdl;bundle-version="[1.5.0,1.6.0)",
++ javax.wsdl,
+ org.apache.wsil4j;bundle-version="[1.0.0,1.1.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.wst.command.env;bundle-version="[1.0.101,1.1.0)",
+--- ./plugins/org.eclipse.wst.wsdl.validation/META-INF/MANIFEST.MF.orig 2012-05-30 20:07:38.147191432 +0100
++++ ./plugins/org.eclipse.wst.wsdl.validation/META-INF/MANIFEST.MF 2012-05-30 20:07:57.600816646 +0100
+@@ -24,7 +24,7 @@
+ org.apache.ant;bundle-version="[1.6.5,2.0.0)";resolution:=optional,
+ org.eclipse.wst.common.uriresolver;bundle-version="[1.1.0,1.3.0)",
+ org.eclipse.wst.validation;bundle-version="[1.2.0,1.3.0)",
+- javax.wsdl;bundle-version="[1.5.0,1.6.0)",
++ javax.wsdl,
+ org.apache.xerces;bundle-version="[2.8.0,3.0.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)"
+--- ./plugins/org.eclipse.wst.wsi/META-INF/MANIFEST.MF.orig 2012-05-30 20:11:19.290930959 +0100
++++ ./plugins/org.eclipse.wst.wsi/META-INF/MANIFEST.MF 2012-05-30 20:11:44.003454858 +0100
+@@ -49,7 +49,7 @@
+ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.wst.wsdl.validation;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.wst.ws;bundle-version="[1.0.100,2.0.0)",
+- javax.wsdl;bundle-version="[1.5.0,1.6.0)",
++ javax.wsdl,
+ org.uddi4j;bundle-version="[2.0.4,2.1.0)",
+ org.apache.axis;bundle-version="[1.3.0,2.0.0)",
+ org.apache.xerces;bundle-version="[2.8.0,3.0.0)",
+--- ./plugins/org.eclipse.wst.ws.parser/META-INF/MANIFEST.MF.orig 2012-05-28 16:37:37.507021589 +0100
++++ ./plugins/org.eclipse.wst.ws.parser/META-INF/MANIFEST.MF 2012-06-02 19:25:32.626473266 +0100
+@@ -13,7 +13,7 @@
+ org.eclipse.wst.ws.internal.parser.wsil;x-internal:=true,
+ org.eclipse.wst.ws.parser
+ Require-Bundle: org.eclipse.wst.wsdl;bundle-version="[1.2.0,1.3.0)",
+- javax.wsdl;bundle-version="[1.5.0,1.6.0)",
++ javax.wsdl,
+ 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/webservices-rm-javax.wsdl-version-check-in-wsdl15-feature.patch b/webservices-rm-javax.wsdl-version-check-in-wsdl15-feature.patch
new file mode 100644
index 0000000..f12f9fb
--- /dev/null
+++ b/webservices-rm-javax.wsdl-version-check-in-wsdl15-feature.patch
@@ -0,0 +1,11 @@
+--- features/org.eclipse.wst.ws_wsdl15.feature/feature.xml.orig 2012-05-31 23:20:12.993485691 +0100
++++ features/org.eclipse.wst.ws_wsdl15.feature/feature.xml 2012-05-29 22:41:57.155719192 +0100
+@@ -24,7 +24,7 @@
+ id="javax.wsdl"
+ download-size="0"
+ install-size="0"
+- version="1.5.1.qualifier"
++ version="0.0.0"
+ unpack="false"/>
+
+ </feature>
diff --git a/webservices-wsdl-unimplemented-methods.patch b/webservices-wsdl-unimplemented-methods.patch
new file mode 100644
index 0000000..fa765fb
--- /dev/null
+++ b/webservices-wsdl-unimplemented-methods.patch
@@ -0,0 +1,577 @@
+diff -ur webservices/plugins/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEMultipartRelatedImpl.java ws3/plugins/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEMultipartRelatedImpl.java
+--- webservices/plugins/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEMultipartRelatedImpl.java 2008-02-21 01:57:53.000000000 +0000
++++ ws3/plugins/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEMultipartRelatedImpl.java 2012-06-01 18:43:23.754705900 +0100
+@@ -107,6 +107,14 @@
+ {
+ getEMIMEPart().add(mimePart);
+ }
++
++ public javax.wsdl.extensions.mime.MIMEPart removeMIMEPart(javax.wsdl.extensions.mime.MIMEPart mimePart)
++ {
++ if(getEMIMEPart().remove(mimePart))
++ return mimePart;
++ else
++ return null;
++ }
+
+ /**
+ * <!-- begin-user-doc -->
+diff -ur webservices/plugins/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEPartImpl.java ws3/plugins/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEPartImpl.java
+--- webservices/plugins/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEPartImpl.java 2008-02-21 01:57:53.000000000 +0000
++++ ws3/plugins/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEPartImpl.java 2012-06-01 01:28:41.433524586 +0100
+@@ -111,6 +111,14 @@
+ {
+ getExtensibilityElements().add(extensibilityElement);
+ }
++
++ public ExtensibilityElement removeExtensibilityElement(ExtensibilityElement extensibilityElement)
++ {
++ if (getExtensibilityElements().remove(extensibilityElement))
++ return extensibilityElement;
++ else
++ return null;
++ }
+
+ /**
+ * <!-- begin-user-doc -->
+diff -ur webservices/plugins/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPHeaderImpl.java ws3/plugins/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPHeaderImpl.java
+--- webservices/plugins/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPHeaderImpl.java 2009-01-05 15:04:26.000000000 +0000
++++ ws3/plugins/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPHeaderImpl.java 2012-06-01 18:57:38.681719635 +0100
+@@ -117,6 +117,14 @@
+ EList headerFaults = getHeaderFaults();
+ headerFaults.add(soapHeaderFault);
+ }
++
++ public javax.wsdl.extensions.soap.SOAPHeaderFault removeSOAPHeaderFault(javax.wsdl.extensions.soap.SOAPHeaderFault soapHeaderFault)
++ {
++ if (getHeaderFaults().remove(soapHeaderFault))
++ return soapHeaderFault;
++ else
++ return null;
++ }
+
+ /**
+ * <!-- begin-user-doc -->
+diff -ur webservices/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingFaultImpl.java ws3/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingFaultImpl.java
+--- webservices/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingFaultImpl.java 2009-08-01 01:01:27.000000000 +0100
++++ ws3/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingFaultImpl.java 2012-06-01 19:04:46.315891102 +0100
+@@ -340,6 +340,14 @@
+
+ return newElement;
+ }
++
++ public javax.wsdl.extensions.ExtensibilityElement removeExtensibilityElement(javax.wsdl.extensions.ExtensibilityElement extensibilityElement)
++ {
++ if (getExtensibilityElements().remove(extensibilityElement))
++ return extensibilityElement;
++ else
++ return null;
++ }
+
+ // Resolve the reference to Fault
+ public void reconcileReferences(boolean deep)
+diff -ur webservices/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingImpl.java ws3/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingImpl.java
+--- webservices/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingImpl.java 2010-01-15 18:54:13.000000000 +0000
++++ ws3/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingImpl.java 2012-06-01 19:53:58.991428598 +0100
+@@ -258,6 +258,17 @@
+ {
+ getBindingOperations().add(bindingOperation);
+ }
++
++ public javax.wsdl.BindingOperation removeBindingOperation(String name, String inputName, String outputName)
++ {
++ javax.wsdl.BindingOperation op = getBindingOperation(name, inputName, outputName);
++ if(getBindingOperations().remove(op))
++ {
++ return op;
++ }
++ else
++ return null;
++ }
+
+ /**
+ * <!-- begin-user-doc -->
+@@ -620,6 +631,14 @@
+
+ return newElement;
+ }
++
++ public javax.wsdl.extensions.ExtensibilityElement removeExtensibilityElement(javax.wsdl.extensions.ExtensibilityElement extensibilityElement)
++ {
++ if (getExtensibilityElements().remove(extensibilityElement))
++ return extensibilityElement;
++ else
++ return null;
++ }
+
+ public void reconcileReferences(boolean deep)
+ {
+diff -ur webservices/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingInputImpl.java ws3/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingInputImpl.java
+--- webservices/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingInputImpl.java 2010-01-15 18:54:12.000000000 +0000
++++ ws3/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingInputImpl.java 2012-06-01 19:21:58.686076338 +0100
+@@ -343,6 +343,14 @@
+
+ return newElement;
+ }
++
++ public javax.wsdl.extensions.ExtensibilityElement removeExtensibilityElement(javax.wsdl.extensions.ExtensibilityElement extensibilityElement)
++ {
++ if (getExtensibilityElements().remove(extensibilityElement))
++ return extensibilityElement;
++ else
++ return null;
++ }
+
+ // Resolve the reference to Input
+ public void reconcileReferences(boolean deep)
+diff -ur webservices/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingOperationImpl.java ws3/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingOperationImpl.java
+--- webservices/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingOperationImpl.java 2009-01-05 15:04:24.000000000 +0000
++++ ws3/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingOperationImpl.java 2012-06-01 19:56:15.452895125 +0100
+@@ -374,6 +374,15 @@
+ {
+ getEBindingFaults().add((BindingFault)bindingFault);
+ }
++
++ public javax.wsdl.BindingFault removeBindingFault(String name)
++ {
++ javax.wsdl.BindingFault fault = getBindingFault(name);
++ if (getEBindingFaults().remove(fault))
++ return fault;
++ else
++ return null;
++ }
+
+ /**
+ * <!-- begin-user-doc -->
+@@ -775,9 +784,17 @@
+ Element child = ((BindingFaultImpl)fault).createElement();
+ newElement.appendChild(child);
+ }
+-
+ return newElement;
+ }
++
++
++ public javax.wsdl.extensions.ExtensibilityElement removeExtensibilityElement(javax.wsdl.extensions.ExtensibilityElement extensibilityElement)
++ {
++ if (getExtensibilityElements().remove(extensibilityElement))
++ return extensibilityElement;
++ else
++ return null;
++ }
+
+ // Resolve the reference to Operation
+ public void reconcileReferences(boolean deep)
+diff -ur webservices/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingOutputImpl.java ws3/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingOutputImpl.java
+--- webservices/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingOutputImpl.java 2010-01-15 18:54:13.000000000 +0000
++++ ws3/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingOutputImpl.java 2012-06-01 19:57:45.993212496 +0100
+@@ -343,6 +343,14 @@
+
+ return newElement;
+ }
++
++ public javax.wsdl.extensions.ExtensibilityElement removeExtensibilityElement(javax.wsdl.extensions.ExtensibilityElement extensibilityElement)
++ {
++ if (getExtensibilityElements().remove(extensibilityElement))
++ return extensibilityElement;
++ else
++ return null;
++ }
+
+ // Resolve the reference to Output
+ public void reconcileReferences(boolean deep)
+diff -ur webservices/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/DefinitionImpl.java ws3/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/DefinitionImpl.java
+--- webservices/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/DefinitionImpl.java 2009-01-05 15:04:24.000000000 +0000
++++ ws3/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/DefinitionImpl.java 2012-06-01 20:18:25.320108778 +0100
+@@ -11,6 +11,7 @@
+ package org.eclipse.wst.wsdl.internal.impl;
+
+
++import java.util.Vector;
+ import java.util.ArrayList;
+ import java.util.Collection;
+ import java.util.Collections;
+@@ -414,6 +415,29 @@
+ }
+ return ePortTypes;
+ }
++
++ public HashMap getAllPortTypes()
++ {
++ Map allPortTypes = new HashMap(getPortTypes());
++ Map importMap = getImports();
++ Iterator mapItr = importMap.values().iterator();
++ while(mapItr.hasNext())
++ {
++ Vector importDefs = (Vector) mapItr.next();
++ Iterator vecItr = importDefs.iterator();
++ while(vecItr.hasNext())
++ {
++ Import importDef = (Import) vecItr.next();
++ javax.wsdl.Definition importedDef = importDef.getDefinition();
++
++ if(importedDef != null)
++ {
++ allPortTypes.putAll(importedDef.getAllPortTypes());
++ }
++ }
++ }
++ return (HashMap)allPortTypes;
++ }
+
+ /**
+ * <!-- begin-user-doc -->
+@@ -428,6 +452,29 @@
+ }
+ return eBindings;
+ }
++
++ public HashMap getAllBindings()
++ {
++ Map allBindings = new HashMap(getBindings());
++ Map importMap = getImports();
++ Iterator mapItr = importMap.values().iterator();
++ while(mapItr.hasNext())
++ {
++ Vector importDefs = (Vector) mapItr.next();
++ Iterator vecItr = importDefs.iterator();
++ while(vecItr.hasNext())
++ {
++ Import importDef = (Import) vecItr.next();
++ javax.wsdl.Definition importedDef = importDef.getDefinition();
++
++ if(importedDef != null)
++ {
++ allBindings.putAll(importedDef.getAllBindings());
++ }
++ }
++ }
++ return (HashMap)allBindings;
++ }
+
+ /**
+ * <!-- begin-user-doc -->
+@@ -442,6 +489,29 @@
+ }
+ return eServices;
+ }
++
++ public HashMap getAllServices()
++ {
++ Map allServices = new HashMap(getServices());
++ Map importMap = getImports();
++ Iterator mapItr = importMap.values().iterator();
++ while(mapItr.hasNext())
++ {
++ Vector importDefs = (Vector) mapItr.next();
++ Iterator vecItr = importDefs.iterator();
++ while(vecItr.hasNext())
++ {
++ Import importDef = (Import) vecItr.next();
++ javax.wsdl.Definition importedDef = importDef.getDefinition();
++
++ if(importedDef != null)
++ {
++ allServices.putAll(importedDef.getAllServices());
++ }
++ }
++ }
++ return (HashMap)allServices;
++ }
+
+ /**
+ * <!-- begin-user-doc -->
+@@ -564,6 +634,14 @@
+ {
+ getEImports().add((Import)importDef);
+ }
++
++ public javax.wsdl.Import removeImport(javax.wsdl.Import importDef)
++ {
++ if (getEImports().remove(importDef))
++ return importDef;
++ else
++ return null;
++ }
+
+ /**
+ * <!-- begin-user-doc -->
+@@ -652,6 +730,16 @@
+ getENamespaces().remove(prefix);
+ }
+ }
++
++ public String removeNamespace(String prefix)
++ {
++ if (getENamespaces().remove(prefix))
++ {
++ return prefix;
++ }
++ else
++ return null;
++ }
+
+ /**
+ * <!-- begin-user-doc -->
+@@ -1953,6 +2041,14 @@
+
+ return newElement;
+ }
++
++ public javax.wsdl.extensions.ExtensibilityElement removeExtensibilityElement(javax.wsdl.extensions.ExtensibilityElement extensibilityElement)
++ {
++ if (getEExtensibilityElements().remove(extensibilityElement))
++ return extensibilityElement;
++ else
++ return null;
++ }
+
+ protected void addChildElements(Element parent, List c)
+ {
+diff -ur webservices/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/FaultImpl.java ws3/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/FaultImpl.java
+--- webservices/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/FaultImpl.java 2007-03-15 00:40:10.000000000 +0000
++++ ws3/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/FaultImpl.java 2012-06-01 21:31:38.782454530 +0100
+@@ -84,4 +84,9 @@
+ setElement(newElement);
+ return newElement;
+ }
++
++ public javax.wsdl.extensions.ExtensibilityElement removeExtensibilityElement(javax.wsdl.extensions.ExtensibilityElement extensibilityElement)
++ {
++ return extensibilityElement; //is there something here that the element should be removed from?
++ }
+ } //FaultImpl
+diff -ur webservices/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ImportImpl.java ws3/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ImportImpl.java
+--- webservices/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ImportImpl.java 2009-11-11 19:58:43.000000000 +0000
++++ ws3/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ImportImpl.java 2012-06-01 21:32:44.746206029 +0100
+@@ -470,6 +470,11 @@
+ setElement(newElement);
+ return newElement;
+ }
++
++ public javax.wsdl.extensions.ExtensibilityElement removeExtensibilityElement(javax.wsdl.extensions.ExtensibilityElement extensibilityElement)
++ {
++ return extensibilityElement; //is there something here that the element should be removed from?
++ }
+
+ public void importDefinitionOrSchema()
+ {
+diff -ur webservices/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/InputImpl.java ws3/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/InputImpl.java
+--- webservices/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/InputImpl.java 2007-03-15 00:40:10.000000000 +0000
++++ ws3/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/InputImpl.java 2012-06-01 21:33:11.240705556 +0100
+@@ -84,4 +84,9 @@
+ setElement(newElement);
+ return newElement;
+ }
++
++ public javax.wsdl.extensions.ExtensibilityElement removeExtensibilityElement(javax.wsdl.extensions.ExtensibilityElement extensibilityElement)
++ {
++ return extensibilityElement; //is there something here that the element should be removed from?
++ }
+ } //InputImpl
+diff -ur webservices/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/MessageImpl.java ws3/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/MessageImpl.java
+--- webservices/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/MessageImpl.java 2010-01-15 18:54:12.000000000 +0000
++++ ws3/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/MessageImpl.java 2012-06-01 21:34:41.006013246 +0100
+@@ -205,6 +205,15 @@
+ {
+ getEParts().add((Part)part);
+ }
++
++ public javax.wsdl.Part removePart(String name)
++ {
++ javax.wsdl.Part part = getPart(name);
++ if (getEParts().remove(part))
++ return part;
++ else
++ return null;
++ }
+
+ /**
+ * <!-- begin-user-doc -->
+@@ -491,4 +500,9 @@
+ }
+ return newElement;
+ }
++
++ public javax.wsdl.extensions.ExtensibilityElement removeExtensibilityElement(javax.wsdl.extensions.ExtensibilityElement extensibilityElement)
++ {
++ return extensibilityElement; //is there something here that the element should be removed from?
++ }
+ } //MessageImpl
+diff -ur webservices/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/OperationImpl.java ws3/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/OperationImpl.java
+--- webservices/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/OperationImpl.java 2009-08-01 01:01:27.000000000 +0100
++++ ws3/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/OperationImpl.java 2012-06-01 21:36:06.740400640 +0100
+@@ -526,6 +526,15 @@
+ {
+ getEFaults().add((Fault)fault);
+ }
++
++ public javax.wsdl.Fault removeFault(String name)
++ {
++ javax.wsdl.Fault fault = getFault(name);
++ if (getEFaults().remove(fault))
++ return fault;
++ else
++ return null;
++ }
+
+ /**
+ * <!-- begin-user-doc -->
+@@ -1087,5 +1096,10 @@
+
+ return newElement;
+ }
++
++ public javax.wsdl.extensions.ExtensibilityElement removeExtensibilityElement(javax.wsdl.extensions.ExtensibilityElement extensibilityElement)
++ {
++ return extensibilityElement; //is there something here that the element should be removed from?
++ }
+
+ } //OperationImpl
+diff -ur webservices/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/OutputImpl.java ws3/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/OutputImpl.java
+--- webservices/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/OutputImpl.java 2007-03-15 00:40:10.000000000 +0000
++++ ws3/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/OutputImpl.java 2012-06-01 21:36:31.962926749 +0100
+@@ -84,4 +84,9 @@
+ setElement(newElement);
+ return newElement;
+ }
++
++ public javax.wsdl.extensions.ExtensibilityElement removeExtensibilityElement(javax.wsdl.extensions.ExtensibilityElement extensibilityElement)
++ {
++ return extensibilityElement; //is there something here that the element should be removed from?
++ }
+ } //OutputImpl
+diff -ur webservices/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PartImpl.java ws3/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PartImpl.java
+--- webservices/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PartImpl.java 2009-01-21 23:17:48.000000000 +0000
++++ ws3/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PartImpl.java 2012-06-01 21:37:01.917364211 +0100
+@@ -713,6 +713,11 @@
+ setElement(newElement);
+ return newElement;
+ }
++
++ public javax.wsdl.extensions.ExtensibilityElement removeExtensibilityElement(javax.wsdl.extensions.ExtensibilityElement extensibilityElement)
++ {
++ return extensibilityElement; //is there something here that the element should be removed from?
++ }
+
+ public void reconcileReferences(boolean deep)
+ {
+diff -ur webservices/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PortImpl.java ws3/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PortImpl.java
+--- webservices/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PortImpl.java 2009-08-01 01:01:31.000000000 +0100
++++ ws3/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PortImpl.java 2012-06-01 21:37:45.410547860 +0100
+@@ -359,6 +359,14 @@
+ }
+ return newElement;
+ }
++
++ public javax.wsdl.extensions.ExtensibilityElement removeExtensibilityElement(javax.wsdl.extensions.ExtensibilityElement extensibilityElement)
++ {
++ if (getExtensibilityElements().remove(extensibilityElement))
++ return extensibilityElement;
++ else
++ return null;
++ }
+
+ public void reconcileReferences(boolean deep)
+ {
+diff -ur webservices/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PortTypeImpl.java ws3/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PortTypeImpl.java
+--- webservices/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PortTypeImpl.java 2010-01-15 18:54:12.000000000 +0000
++++ ws3/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PortTypeImpl.java 2012-06-01 21:39:49.612218870 +0100
+@@ -205,6 +205,15 @@
+ getEOperations().add(operation);
+ }
+
++ public javax.wsdl.Operation removeOperation(String name, String inputName, String outputName)
++ {
++ javax.wsdl.Operation op = getOperation(name, inputName, outputName);
++ if (getEOperations().remove(op))
++ return op;
++ else
++ return null;
++ }
++
+ /**
+ * <!-- begin-user-doc -->
+ * Get the specified operation. Note that operation names can
+@@ -508,4 +517,9 @@
+
+ return newElement;
+ }
++
++ public javax.wsdl.extensions.ExtensibilityElement removeExtensibilityElement(javax.wsdl.extensions.ExtensibilityElement extensibilityElement)
++ {
++ return extensibilityElement; //is there something here that the element should be removed from?
++ }
+ } //PortTypeImpl
+diff -ur webservices/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ServiceImpl.java ws3/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ServiceImpl.java
+--- webservices/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ServiceImpl.java 2010-01-15 18:54:13.000000000 +0000
++++ ws3/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ServiceImpl.java 2012-06-01 21:42:32.120147586 +0100
+@@ -204,6 +204,15 @@
+ {
+ getEPorts().add((Port)port);
+ }
++
++ public javax.wsdl.Port removePort(String name)
++ {
++ javax.wsdl.Port port = getPort(name);
++ if (getEPorts().remove(port))
++ return port;
++ else
++ return null;
++ }
+
+ /**
+ * <!-- begin-user-doc -->
+@@ -473,5 +482,13 @@
+
+ return newElement;
+ }
++
++ public javax.wsdl.extensions.ExtensibilityElement removeExtensibilityElement(javax.wsdl.extensions.ExtensibilityElement extensibilityElement)
++ {
++ if (getExtensibilityElements().remove(extensibilityElement))
++ return extensibilityElement;
++ else
++ return null;
++ }
+
+ } //ServiceImpl
+diff -ur webservices/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/TypesImpl.java ws3/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/TypesImpl.java
+--- webservices/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/TypesImpl.java 2009-08-01 01:01:27.000000000 +0100
++++ ws3/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/TypesImpl.java 2012-06-01 21:43:07.273478885 +0100
+@@ -225,4 +225,12 @@
+
+ return newElement;
+ }
++
++ public javax.wsdl.extensions.ExtensibilityElement removeExtensibilityElement(javax.wsdl.extensions.ExtensibilityElement extensibilityElement)
++ {
++ if (getEExtensibilityElements().remove(extensibilityElement))
++ return extensibilityElement;
++ else
++ return null;
++ }
+ } //TypesImpl
+\ No newline at end of file
+diff -ur webservices/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/wsdl4j/WSDLReaderImpl.java ws3/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/wsdl4j/WSDLReaderImpl.java
+--- webservices/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/wsdl4j/WSDLReaderImpl.java 2007-05-02 20:42:21.000000000 +0100
++++ ws3/plugins/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/wsdl4j/WSDLReaderImpl.java 2012-06-01 02:08:20.843734447 +0100
+@@ -104,6 +104,18 @@
+ // Return the definitions of the main resource.
+ return wsdlMainResource.getDefinition();
+ }
++
++ public Definition readWSDL(WSDLLocator locator, Element element) throws WSDLException
++ {
++ try
++ {
++ return readWSDL(locator.getBaseURI());
++ }
++ finally
++ {
++ locator.close();
++ }
++ }
+
+ private boolean hasProtocol(String uri)
+ {
diff --git a/webservices-wsdl.validation-fix-for-xerces-j2-2.11.0.patch b/webservices-wsdl.validation-fix-for-xerces-j2-2.11.0.patch
new file mode 100644
index 0000000..b47c73d
--- /dev/null
+++ b/webservices-wsdl.validation-fix-for-xerces-j2-2.11.0.patch
@@ -0,0 +1,74 @@
+diff -ur webservices/plugins/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/ValidationController.java ws3/plugins/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/ValidationController.java
+--- webservices/plugins/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/ValidationController.java 2006-04-20 07:20:47.000000000 +0100
++++ ws3/plugins/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/ValidationController.java 2012-06-01 01:07:16.771193034 +0100
+@@ -308,18 +308,14 @@
+ {
+ return new XMLErrorReporter()
+ {
+- public void reportError(String domain, String key, Object[] arguments, short severity) throws XNIException
++ public String reportError(String domain, String key, Object[] arguments, short severity) throws XNIException
+ {
+- boolean reportError = true;
+- if (key.equals("PrematureEOF"))
+- {
+- reportError = false;
+- }
+-
+- if (reportError)
+- {
+- super.reportError(domain, key, arguments, severity);
+- }
++ if (key.equals("PrematureEOF"))
++ {
++ return ""; //not returning an error? I don't know circumstances, so just returning blank string
++ }
++ //otherwise error
++ return super.reportError(domain, key, arguments, severity);
+ }
+ };
+ }
+diff -ur webservices/plugins/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDLReaderImpl.java ws3/plugins/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDLReaderImpl.java
+--- webservices/plugins/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDLReaderImpl.java 2009-01-14 18:48:52.000000000 +0000
++++ ws3/plugins/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDLReaderImpl.java 2012-06-01 01:07:41.640679125 +0100
+@@ -274,18 +274,14 @@
+ {
+ return new XMLErrorReporter()
+ {
+- public void reportError(String domain, String key, Object[] arguments, short severity) throws XNIException
++ public String reportError(String domain, String key, Object[] arguments, short severity) throws XNIException
+ {
+- boolean reportError = true;
+ if (key.equals("PrematureEOF"))
+ {
+- reportError = false;
+- }
+-
+- if (reportError)
+- {
+- super.reportError(domain, key, arguments, severity);
+- }
++ return ""; //not returning an error? I don't know circumstances, so just returning blank string
++ }
++ //otherwise error
++ return super.reportError(domain, key, arguments, severity);
+ }
+ };
+ }
+diff -ur webservices/plugins/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/xml/DefaultXMLValidator.java ws3/plugins/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/xml/DefaultXMLValidator.java
+--- webservices/plugins/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/xml/DefaultXMLValidator.java 2009-01-14 18:48:51.000000000 +0000
++++ ws3/plugins/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/xml/DefaultXMLValidator.java 2012-06-01 00:11:10.656489927 +0100
+@@ -307,12 +307,12 @@
+ /* (non-Javadoc)
+ * @see org.apache.xerces.impl.XMLErrorReporter#reportError(java.lang.String, java.lang.String, java.lang.Object[], short)
+ */
+- public void reportError(String domain, String key, Object[] arguments,
++ public String reportError(String domain, String key, Object[] arguments,
+ short severity) throws XNIException
+ {
+ currentErrorKey = key;
+ currentMessageArguments = arguments;
+- super.reportError(domain, key, arguments, severity);
++ return super.reportError(domain, key, arguments, severity);
+ }
+ };
+ }
More information about the scm-commits
mailing list