[eclipse-wtp-webservices] Upgrade to latest stable upstream version 3.4.2
Gerard Ryan
galileo at fedoraproject.org
Sat Apr 27 17:02:25 UTC 2013
commit 5d0b8ef3ce7263653a1b02eb9ed3f89da99b67b1
Author: Gerard Ryan <gerard at ryan.lt>
Date: Sat Apr 27 17:55:00 2013 +0100
Upgrade to latest stable upstream version 3.4.2
.gitignore | 7 ++
...tp-webservices-commons-discovery-manifest.patch | 50 +++-------
eclipse-wtp-webservices-feature-versions.patch | 80 ++++++++--------
...e-wtp-webservices-jst.ws.annotations.core.patch | 26 +++---
eclipse-wtp-webservices.spec | 103 ++++++++++++++++----
sources | 8 ++-
6 files changed, 163 insertions(+), 111 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 83a5fd1..d28c04b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,10 @@
.project
*.tar.xz
*.src.rpm
+/webtools.webservices-201303062343.tar.bz2
+/webtools.webservices.axis2-6e6074e63ae0169e2342f6b26f483f423e938e9c.tar.bz2
+/webtools.webservices.jaxws-201304121523.tar.bz2
+/javax.xml.rpc_1.1.0.v201209140446.jar
+/javax.xml.soap_1.2.0.v201005080501.jar
+/org.apache.axis_1.4.0.v201005080400.jar
+/org.apache.commons.discovery_0.2.0.v201004190315.jar
diff --git a/eclipse-wtp-webservices-commons-discovery-manifest.patch b/eclipse-wtp-webservices-commons-discovery-manifest.patch
index 00da187..158e6fe 100644
--- a/eclipse-wtp-webservices-commons-discovery-manifest.patch
+++ b/eclipse-wtp-webservices-commons-discovery-manifest.patch
@@ -1,36 +1,14 @@
---- org.eclipse.orbit/org.apache.commons.discovery/META-INF/MANIFEST.MF.orig 2012-11-12 01:07:10.747468778 +0000
-+++ org.eclipse.orbit/org.apache.commons.discovery/META-INF/MANIFEST.MF 2012-11-14 00:17:10.732375842 +0000
-@@ -7,11 +7,11 @@
- Implementation-Vendor: Apache Software Foundation
- Implementation-Version: 0.2
- Bundle-SymbolicName: org.apache.commons.discovery
--Bundle-Version: 0.2.0.qualifier
-+Bundle-Version: 0.5.0.qualifier
- Bundle-Vendor: %Bundle-Vendor.0
- Bundle-Localization: plugin
- Bundle-RequiredExecutionEnvironment: J2SE-1.4
--Bundle-ClassPath: lib/commons-discovery-0.2.jar
-+Bundle-ClassPath: lib/apache-commons-discovery.jar
- Export-Package: org.apache.commons.discovery,
- org.apache.commons.discovery.ant,
- org.apache.commons.discovery.jdk,
---- org.eclipse.orbit/org.apache.commons.discovery/.classpath.orig 2012-11-12 00:14:49.414522883 +0000
-+++ org.eclipse.orbit/org.apache.commons.discovery/.classpath 2012-11-12 00:15:54.904280939 +0000
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <classpath>
-- <classpathentry exported="true" kind="lib" path="lib/commons-discovery-0.2.jar"/>
-+ <classpathentry exported="true" kind="lib" path="lib/apache-commons-discovery.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path=""/>
---- org.eclipse.orbit/org.apache.commons.discovery/build.properties.orig 2012-11-12 00:27:46.523143418 +0000
-+++ org.eclipse.orbit/org.apache.commons.discovery/build.properties 2012-11-12 00:28:05.556825950 +0000
-@@ -10,6 +10,6 @@
- ###############################################################################
- bin.includes = META-INF/,\
- plugin.properties,\
-- lib/commons-discovery-0.2.jar,\
-+ lib/apache-commons-discovery.jar,\
- about_files/,\
- about.html
+--- org.apache.commons.discovery/META-INF/MANIFEST.MF.orig 2013-04-27 17:01:04.835018292 +0100
++++ org.apache.commons.discovery/META-INF/MANIFEST.MF 2013-04-27 17:27:02.482141240 +0100
+@@ -9,9 +9,9 @@
+ .log,org.apache.commons.discovery.resource,org.apache.commons.discove
+ ry.resource.classes,org.apache.commons.discovery.resource.names,org.a
+ pache.commons.discovery.tools
+-Bundle-Version: 0.2.0.v201004190315
++Bundle-Version: 0.5.0.v201004190315
+ Specification-Version: 1.0
+-Bundle-ClassPath: lib/commons-discovery-0.2.jar
++Bundle-ClassPath: lib/commons-discovery.jar
+ Specification-Vendor: Apache Software Foundation
+ Bundle-Vendor: %Bundle-Vendor.0
+ Bundle-Name: %Bundle-Name.0
diff --git a/eclipse-wtp-webservices-feature-versions.patch b/eclipse-wtp-webservices-feature-versions.patch
index 1d97611..8f6f97f 100644
--- a/eclipse-wtp-webservices-feature-versions.patch
+++ b/eclipse-wtp-webservices-feature-versions.patch
@@ -1,43 +1,43 @@
---- org.eclipse.wst.ws_core.feature/feature.xml.orig 2012-11-11 14:44:58.015500628 +0000
-+++ org.eclipse.wst.ws_core.feature/feature.xml 2012-11-11 14:52:30.011127499 +0000
+--- org.eclipse.wst.ws_core.feature/feature.xml 2013-04-27 15:21:32.801524770 +0100
++++ org.eclipse.wst.ws_core.feature/feature.xml.orig 2013-04-27 15:24:30.912182792 +0100
@@ -83,14 +83,14 @@
- id="org.apache.commons.logging"
- download-size="0"
- install-size="0"
-- version="1.0.4.qualifier"
-+ version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.log4j"
- download-size="0"
- install-size="0"
-- version="1.2.15.qualifier"
-+ version="0.0.0"
- unpack="false"/>
-
- <plugin
+ id="org.apache.commons.logging"
+ download-size="0"
+ install-size="0"
+- version="1.0.4.qualifier"
++ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.log4j"
+ download-size="0"
+ install-size="0"
+- version="1.2.15.qualifier"
++ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
@@ -123,7 +123,7 @@
- id="javax.xml.soap"
- download-size="0"
- install-size="0"
-- version="1.2.0.qualifier"/>
-+ version="0.0.0"/>
-
- <plugin
- id="org.apache.axis"
+ id="javax.xml.soap"
+ download-size="0"
+ install-size="0"
+- version="1.2.0.qualifier"/>
++ version="0.0.0"/>
+
+ <plugin
+ id="org.apache.axis"
@@ -138,12 +138,12 @@
- version="0.0.0"
- unpack="false"/>
-
-- <plugin
-+<!-- <plugin
- id="javax.activation"
- download-size="0"
- install-size="0"
- version="0.0.0"
-- unpack="false"/>
-+ unpack="false"/> -->
-
- <plugin
- id="org.eclipse.wst.ws.service.policy"
+ version="0.0.0"
+ unpack="false"/>
+
+- <plugin
++<!-- <plugin
+ id="javax.activation"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+- unpack="false"/>
++ unpack="false"/>-->
+
+ <plugin
+ id="org.eclipse.wst.ws.service.policy"
diff --git a/eclipse-wtp-webservices-jst.ws.annotations.core.patch b/eclipse-wtp-webservices-jst.ws.annotations.core.patch
index b144241..e21d30c 100644
--- a/eclipse-wtp-webservices-jst.ws.annotations.core.patch
+++ b/eclipse-wtp-webservices-jst.ws.annotations.core.patch
@@ -1,14 +1,14 @@
---- org.eclipse.wst.ws_ui.feature/feature.xml.orig 2012-07-21 21:33:49.097828653 +0100
-+++ org.eclipse.wst.ws_ui.feature/feature.xml 2012-07-21 21:36:23.152691461 +0100
+--- org.eclipse.wst.ws_ui.feature/feature.xml.orig 2013-04-27 16:38:05.854705855 +0100
++++ org.eclipse.wst.ws_ui.feature/feature.xml 2013-04-27 16:57:56.910502452 +0100
@@ -87,4 +87,11 @@
- version="0.0.0"
- unpack="false"/>
-
-+ <plugin
-+ id="org.eclipse.jst.ws.annotations.core"
-+ download-size="0"
-+ install-size="0"
-+ version="0.0.0"
-+ unpack="false"/>
-+
- </feature>
+ version="0.0.0"
+ unpack="false"/>
+
++ <plugin
++ id="org.eclipse.jst.ws.annotations.core"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
++
+ </feature>
diff --git a/eclipse-wtp-webservices.spec b/eclipse-wtp-webservices.spec
index fb5395f..a8587fb 100644
--- a/eclipse-wtp-webservices.spec
+++ b/eclipse-wtp-webservices.spec
@@ -1,10 +1,26 @@
-%global eclipse_base %{_libdir}/eclipse
%global eclipse_dropins %{_datadir}/eclipse/dropins
%global install_loc %{eclipse_dropins}/wtp-webservices
+%global webservices_tag 201303062343
+%global webservices_dir webtools.webservices-%{webservices_tag}
+
+%global axis2_commit 6e6074e63ae0169e2342f6b26f483f423e938e9c
+%global axis2_dir webtools.webservices.axis2-%{axis2_commit}
+
+%global jaxws_tag 201304121523
+%global jaxws_dir webtools.webservices.jaxws-%{jaxws_tag}
+
+%global orbit_drop I20130425200647
+%global orbit_base_url http://download.eclipse.org/tools/orbit/downloads/drops/%{orbit_drop}/repository/plugins
+
+%global javax_xml_rpc_ver 1.1.0.v201209140446
+%global javax_xml_soap_ver 1.2.0.v201005080501
+%global org_apache_axis_ver 1.4.0.v201005080400
+%global commons_discovery_ver 0.2.0.v201004190315
+
Name: eclipse-wtp-webservices
-Version: 3.4.0
-Release: 7%{?dist}
+Version: 3.4.2
+Release: 1%{?dist}
Summary: Tools for developing and interacting with Java Web services
Group: Development/Tools
@@ -12,11 +28,18 @@ License: EPL
URL: http://www.eclipse.org/webtools/ws/
# tarball created with fetch-wtp-webservices-using-map.sh
-Source0: %{name}-R%{version}.tar.xz
-Source1: http://www.eclipse.org/legal/epl-v10.html
+Source0: http://git.eclipse.org/c/webservices/webtools.webservices.git/snapshot/%{webservices_dir}.tar.bz2
+Source1: http://git.eclipse.org/c/webservices/webtools.webservices.axis2.git/snapshot/%{axis2_dir}.tar.bz2
+Source2: http://git.eclipse.org/c/webservices/webtools.webservices.jaxws.git/snapshot/%{jaxws_dir}.tar.bz2
+Source3: http://www.eclipse.org/legal/epl-v10.html
+
+# These 'jars' are intended to be unzipped (it's really just a delivery mechanism here)
+Source4: %{orbit_base_url}/plugins/javax.xml.rpc_%{javax_xml_rpc_ver}.jar
+Source5: %{orbit_base_url}/javax.xml.soap_%{javax_xml_soap_ver}.jar
+Source6: %{orbit_base_url}/org.apache.axis_%{org_apache_axis_ver}.jar
+Source7: %{orbit_base_url}/org.apache.commons.discovery_%{commons_discovery_ver}.jar
# build fails looking for old versions of javax.wsdl
-Patch0: %{name}-fix-javax.wsdl-version-in-manifests.patch
Patch1: %{name}-rm-javax.wsdl-version-check-in-wsdl15-feature.patch
# Add unimplemented methods for javax.wsdl
@@ -62,9 +85,9 @@ BuildRequires: eclipse-pde >= 1:4.2.0-0.22
BuildRequires: eclipse-platform >= 1:4.2.0-0.22
BuildRequires: eclipse-rcp >= 1:4.2.0-0.22
BuildRequires: eclipse-swt >= 1:4.2.0-0.22
-BuildRequires: eclipse-wtp-common >= 3.4.0-0.1
-BuildRequires: eclipse-wtp-servertools >= 3.3.1-4
-BuildRequires: eclipse-wtp-sourceediting >= 3.4.0-0.1
+BuildRequires: eclipse-wtp-common >= 3.4.2-4
+BuildRequires: eclipse-wtp-servertools >= 3.4.2-2
+BuildRequires: eclipse-wtp-sourceediting >= 3.4.2-2
BuildRequires: icu4j-eclipse >= 1:4.4.2.2-11
Requires: java
@@ -89,9 +112,9 @@ Requires: eclipse-gef >= 3.8.0-0.3
Requires: eclipse-platform >= 1:4.2.0-0.22
Requires: eclipse-rcp >= 1:4.2.0-0.22
Requires: eclipse-swt >= 1:4.2.0-0.22
-Requires: eclipse-wtp-common >= 3.4.0-0.1
-Requires: eclipse-wtp-servertools >= 3.3.1-4
-Requires: eclipse-wtp-sourceediting >= 3.4.0-0.1
+Requires: eclipse-wtp-common >= 3.4.2-4
+Requires: eclipse-wtp-servertools >= 3.4.2-2
+Requires: eclipse-wtp-sourceediting >= 3.4.2-2
Requires: icu4j-eclipse >= 1:4.4.2.2-11
%description
@@ -100,8 +123,27 @@ with Java Web services.
%prep
-%setup -q -n %{name}-R%{version}
-cp %{SOURCE1} .
+%setup -q -c
+%setup -q -T -D -a 1
+%setup -q -T -D -a 2
+
+mkdir javax.xml.rpc && pushd javax.xml.rpc
+unzip -qq %{SOURCE4}
+popd
+
+mkdir javax.xml.soap && pushd javax.xml.soap
+unzip -qq %{SOURCE5}
+popd
+
+mkdir org.apache.axis && pushd org.apache.axis
+unzip -qq %{SOURCE6}
+popd
+
+mkdir org.apache.commons.discovery && pushd org.apache.commons.discovery
+unzip -qq %{SOURCE7}
+popd
+
+cp %{SOURCE3} .
find . -type f -name *.jar -delete
find . -type f -name *.class -delete
@@ -119,33 +161,49 @@ pushd orbit
%{__ln_s} %{_javadir}/wsil4j.jar
popd
-%patch0
+pushd %{webservices_dir}/features/
%patch1
-%patch3 -p2
+popd
+
+pushd %{webservices_dir}/
+%patch3 -p1
+popd
+
+pushd %{webservices_dir}/bundles/
%patch4
+popd
+
+pushd %{webservices_dir}/features/
%patch6
%patch7
+popd
+
%patch8
+
+# build fails looking for old versions of javax.wsdl
+find -name MANIFEST.MF -exec sed -i -e \
+ "s/javax.wsdl;bundle-version=\"\[1\.5\.0,1\.6\.0)/javax.wsdl;bundle-version=\"\[1\.6\.2,1\.7\.0)/g" {} \;
+
# Remove problematic org.eclipse.license stuff
find -name feature.xml -type f -exec sed -i -e 's/license-feature="org.eclipse.license"//g' {} \;
# Link Fedora jars into these weird eclipse wrapper bundles.
# These were removed before, but it turns out they're necessary : RHBZ 872806
-pushd org.eclipse.orbit/org.apache.axis/lib/
+pushd org.apache.axis/lib/
rm -f axis.jar axis-ant.jar
%{__ln_s} %{_javadir}/axis/axis.jar
%{__ln_s} %{_javadir}/axis/axis-ant.jar
popd
-pushd org.eclipse.orbit/javax.xml.rpc/lib/
+pushd javax.xml.rpc/lib/
rm -f jaxrpc.jar
%{__ln_s} %{_javadir}/axis/jaxrpc.jar
popd
-pushd org.eclipse.orbit/org.apache.commons.discovery/lib/
+pushd org.apache.commons.discovery/lib/
rm -f commons-discovery-0.2.jar
%{__ln_s} %{_javadir}/apache-commons-discovery.jar
popd
-pushd org.eclipse.orbit/javax.xml.soap/lib/
+pushd javax.xml.soap/lib/
rm -f saaj.jar
%{__ln_s} %{_javadir}/axis/saaj.jar
popd
@@ -259,10 +317,13 @@ popd
%files
%{install_loc}
-%doc org.eclipse.wst.ws.api.doc/about.html
+%doc %{webservices_dir}/docs/org.eclipse.wst.ws.api.doc/about.html
%doc epl-v10.html
%changelog
+* Sat Apr 27 2013 Gerard Ryan <galileo at fedoraproject.org> 3.4.2-1
+- Upgrade to latest stable upstream version 3.4.2
+
* Mon Mar 04 2013 Gerard Ryan <galileo at fedoraproject.org> 3.4.0-7
- Remove emf-sdk requirement
diff --git a/sources b/sources
index 34e1b62..23e7564 100644
--- a/sources
+++ b/sources
@@ -1 +1,7 @@
-a0039d9caf4e835b2ddd580cda4f4458 eclipse-wtp-webservices-R3.4.0.tar.xz
+534f9984cf8c45a58bbdd3f1ef2a614d webtools.webservices-201303062343.tar.bz2
+2816702e43601e0613347b881d5edc20 webtools.webservices.axis2-6e6074e63ae0169e2342f6b26f483f423e938e9c.tar.bz2
+dd22c786b2378b66d5ebe2c98210a686 webtools.webservices.jaxws-201304121523.tar.bz2
+e60438190b2f482c1050f7584a1849e7 javax.xml.rpc_1.1.0.v201209140446.jar
+316a0890ad26ddba7eae8ece1068bd53 javax.xml.soap_1.2.0.v201005080501.jar
+2aa85e58978aaa0aee10a58b19f6dc0d org.apache.axis_1.4.0.v201005080400.jar
+9685a5592b96c427300bd59eafcb66dd org.apache.commons.discovery_0.2.0.v201004190315.jar
More information about the scm-commits
mailing list