[eclipse-wtp-jeetools] Update to latest upstream version 3.4.2
Gerard Ryan
galileo at fedoraproject.org
Sun May 5 20:04:16 UTC 2013
commit 0ecd3d0f5d4665f4d3ca84bf078bc0239fab60a0
Author: Gerard Ryan <gerard at ryan.lt>
Date: Sun May 5 21:03:48 2013 +0100
Update to latest upstream version 3.4.2
.gitignore | 5 +
...-jeetools-fix-jst-enterpriseui-featurexml.patch | 238 ++++++++++----------
...etools-jst.enterprise_core-fix-featurexml.patch | 183 +++++++--------
eclipse-wtp-jeetools.spec | 108 +++++++--
sources | 6 +-
5 files changed, 298 insertions(+), 242 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b95fbdf..c9a98a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,7 @@
/eclipse-wtp-jeetools-3.4.0-HEAD-20120618cvs.tar.xz
/eclipse-wtp-jeetools-3.4.0.tar.xz
+/webtools.javaee-201304111500.tar.bz2
+/webtools.ejb-201210040812.tar.bz2
+/webtools.sourceediting-201303071547.tar.bz2
+/webtools.webservices-201303062343.tar.bz2
+/R3_4_2.tar.bz2
diff --git a/eclipse-wtp-jeetools-fix-jst-enterpriseui-featurexml.patch b/eclipse-wtp-jeetools-fix-jst-enterpriseui-featurexml.patch
index 6b77f71..8142b11 100644
--- a/eclipse-wtp-jeetools-fix-jst-enterpriseui-featurexml.patch
+++ b/eclipse-wtp-jeetools-fix-jst-enterpriseui-featurexml.patch
@@ -1,126 +1,118 @@
---- org.eclipse.jst.enterprise_ui.feature/feature.xml.orig 2012-06-18 00:54:51.441865454 +0100
-+++ org.eclipse.jst.enterprise_ui.feature/feature.xml 2012-06-18 00:55:32.360097407 +0100
+--- org.eclipse.jst.enterprise_ui.feature/feature.xml.orig 2013-04-29 21:48:26.014451602 +0100
++++ org.eclipse.jst.enterprise_ui.feature/feature.xml 2013-04-29 21:56:07.702783290 +0100
@@ -36,6 +36,20 @@
- unpack="false"/>
-
- <plugin
-+ id="org.eclipse.jst.common.ui"
-+ download-size="0"
-+ install-size="0"
-+ version="0.0.0"
-+ unpack="false"/>
-+
-+ <plugin
-+ id="org.eclipse.wst.web.ui"
-+ download-size="0"
-+ install-size="0"
-+ version="0.0.0"
-+ unpack="false"/>
-+
-+ <plugin
- id="org.eclipse.jst.j2ee.ui"
- download-size="0"
- install-size="0"
+ unpack="false"/>
+
+ <plugin
++ id="org.eclipse.jst.common.ui"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
++
++ <plugin
++ id="org.eclipse.wst.web.ui"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
++
++ <plugin
+ id="org.eclipse.jst.j2ee.ui"
+ download-size="0"
+ install-size="0"
@@ -43,28 +57,28 @@
- unpack="false"/>
-
- <plugin
-- id="org.eclipse.jst.ws.axis.creation.ui"
-+ id="org.eclipse.jst.ws.consumption"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
-- id="org.eclipse.jst.ws.axis.consumption.ui"
-+ id="org.eclipse.wst.command.env.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
-- id="org.eclipse.jst.j2ee.jca.ui"
-+ id="org.eclipse.jst.ws.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
-- id="org.eclipse.jst.j2ee.navigator.ui"
-+ id="org.eclipse.jst.ws.consumption.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
-@@ -85,42 +99,49 @@
- unpack="false"/>
-
- <plugin
-- id="org.eclipse.jst.servlet.ui"
-+ id="org.eclipse.jst.ws.axis.consumption.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
-- id="org.eclipse.jst.ws.ui"
-+ id="org.eclipse.jst.ws.axis.creation.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
-- id="org.eclipse.jst.ws.uddiregistry"
-+ id="org.eclipse.jst.j2ee.jca.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
-- id="org.eclipse.jst.ws.creation.ui"
-+ id="org.eclipse.jst.j2ee.navigator.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
-- id="org.eclipse.jst.ws.consumption.ui"
-+ id="org.eclipse.jst.servlet.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
-- id="org.eclipse.jst.ws.consumption"
-+ id="org.eclipse.jst.ws.uddiregistry"
-+ download-size="0"
-+ install-size="0"
-+ version="0.0.0"
-+ unpack="false"/>
-+
-+ <plugin
-+ id="org.eclipse.jst.ws.creation.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+- id="org.eclipse.jst.ws.axis.creation.ui"
++ id="org.eclipse.jst.ws.consumption"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+- id="org.eclipse.jst.ws.axis.consumption.ui"
++ id="org.eclipse.wst.command.env.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+- id="org.eclipse.jst.j2ee.jca.ui"
++ id="org.eclipse.jst.ws.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+- id="org.eclipse.jst.j2ee.navigator.ui"
++ id="org.eclipse.jst.ws.consumption.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+@@ -85,35 +99,42 @@
+ unpack="false"/>
+
+ <plugin
+- id="org.eclipse.jst.servlet.ui"
++ id="org.eclipse.jst.ws.axis.consumption.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+- id="org.eclipse.jst.ws.ui"
++ id="org.eclipse.jst.ws.axis.creation.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+- id="org.eclipse.jst.ws.uddiregistry"
++ id="org.eclipse.jst.j2ee.jca.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+- id="org.eclipse.jst.ws.creation.ui"
++ id="org.eclipse.jst.j2ee.navigator.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+- id="org.eclipse.jst.ws.consumption.ui"
++ id="org.eclipse.jst.ws.uddiregistry"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
++
++ <plugin
++ id="org.eclipse.jst.ws.creation.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
@@ -229,6 +250,13 @@
- download-size="0"
- install-size="0"
- version="0.0.0"
-+ unpack="false"/>
-+
-+ <plugin
-+ id="org.eclipse.jst.j2ee.web"
-+ download-size="0"
-+ install-size="0"
-+ version="0.0.0"
- unpack="false"/>
-
- <plugin
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
++ unpack="false"/>
++
++ <plugin
++ id="org.eclipse.jst.j2ee.web"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
diff --git a/eclipse-wtp-jeetools-jst.enterprise_core-fix-featurexml.patch b/eclipse-wtp-jeetools-jst.enterprise_core-fix-featurexml.patch
index bf062f8..a461726 100644
--- a/eclipse-wtp-jeetools-jst.enterprise_core-fix-featurexml.patch
+++ b/eclipse-wtp-jeetools-jst.enterprise_core-fix-featurexml.patch
@@ -1,95 +1,88 @@
---- org.eclipse.jst.enterprise_core.feature/feature.xml.orig 2012-06-18 04:20:38.614996345 +0100
-+++ org.eclipse.jst.enterprise_core.feature/feature.xml 2012-06-18 04:00:33.030410281 +0100
-@@ -20,7 +20,77 @@
- </license>
-
- <plugin
-- id="org.eclipse.jst.j2ee.webservice"
-+ id="org.eclipse.jem.proxy"
-+ download-size="0"
-+ install-size="0"
-+ version="0.0.0"
-+ unpack="false"/>
-+
-+ <plugin
-+ id="org.eclipse.jem"
-+ download-size="0"
-+ install-size="0"
-+ version="0.0.0"
-+ unpack="false"/>
-+
-+ <plugin
-+ id="org.eclipse.wst.web"
-+ download-size="0"
-+ install-size="0"
-+ version="0.0.0"
-+ unpack="false"/>
-+
-+ <plugin
-+ id="org.eclipse.jem.workbench"
-+ download-size="0"
-+ install-size="0"
-+ version="0.0.0"
-+ unpack="false"/>
-+
-+ <plugin
-+ id="org.eclipse.jst.common.frameworks"
-+ download-size="0"
-+ install-size="0"
-+ version="0.0.0"
-+ unpack="false"/>
-+
-+ <plugin
-+ id="org.eclipse.jst.j2ee.core"
-+ download-size="0"
-+ install-size="0"
-+ version="0.0.0"
-+ unpack="false"/>
-+
-+ <plugin
-+ id="org.eclipse.jst.common.annotations.core"
-+ download-size="0"
-+ install-size="0"
-+ version="0.0.0"
-+ unpack="false"/>
-+
-+ <plugin
-+ id="org.eclipse.jst.common.annotations.controller"
-+ download-size="0"
-+ install-size="0"
-+ version="0.0.0"
-+ unpack="false"/>
-+
-+ <plugin
-+ id="org.eclipse.jst.j2ee"
-+ download-size="0"
-+ install-size="0"
-+ version="0.0.0"
-+ unpack="false"/>
-+
-+ <plugin
-+ id="org.eclipse.jem.proxy"
-+ download-size="0"
-+ install-size="0"
-+ version="0.0.0"
-+ unpack="false"/>
-+
-+ <plugin
-+ id="org.eclipse.jst.jee"
- download-size="0"
- install-size="0"
- version="0.0.0"
-@@ -45,6 +115,13 @@
- download-size="0"
- install-size="0"
- version="0.0.0"
-+ unpack="false"/>
-+
-+ <plugin
-+ id="org.eclipse.jst.j2ee.webservice"
-+ download-size="0"
-+ install-size="0"
-+ version="0.0.0"
- unpack="false"/>
-
- </feature>
+--- org.eclipse.jst.enterprise_core.feature/feature.xml.orig 2013-04-29 21:25:32.879417355 +0100
++++ org.eclipse.jst.enterprise_core.feature/feature.xml 2013-04-29 21:35:21.148138491 +0100
+@@ -20,7 +20,70 @@
+ </license>
+
+ <plugin
+- id="org.eclipse.jst.j2ee.webservice"
++ id="org.eclipse.jem.proxy"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
++
++ <plugin
++ id="org.eclipse.jem"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
++
++ <plugin
++ id="org.eclipse.wst.web"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
++
++ <plugin
++ id="org.eclipse.jem.workbench"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
++
++ <plugin
++ id="org.eclipse.jst.common.frameworks"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
++
++ <plugin
++ id="org.eclipse.jst.j2ee.core"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
++
++ <plugin
++ id="org.eclipse.jst.common.annotations.core"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
++
++ <plugin
++ id="org.eclipse.jst.common.annotations.controller"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
++
++ <plugin
++ id="org.eclipse.jst.j2ee"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
++
++ <plugin
++ id="org.eclipse.jst.jee"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+@@ -45,6 +108,13 @@
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
++ unpack="false"/>
++
++ <plugin
++ id="org.eclipse.jst.j2ee.webservice"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
+ unpack="false"/>
+
+ </feature>
diff --git a/eclipse-wtp-jeetools.spec b/eclipse-wtp-jeetools.spec
index e751e74..93be3ad 100644
--- a/eclipse-wtp-jeetools.spec
+++ b/eclipse-wtp-jeetools.spec
@@ -1,9 +1,23 @@
-%global eclipse_base %{_libdir}/eclipse
-%global install_loc %{_datadir}/eclipse/dropins/wtp-jeetools
+%global install_loc %{_datadir}/eclipse/dropins/wtp-jeetools
+
+%global javaee_tag 201304111500
+%global javaee_dir webtools.javaee-%{javaee_tag}
+
+%global ejb_tag 201210040812
+%global ejb_dir webtools.ejb-%{ejb_tag}
+
+%global webservices_tag 201303062343
+%global webservices_dir webtools.webservices-%{webservices_tag}
+
+%global common_dir R3_4_2
+
+%global sourceediting_tag 201303071547
+%global sourceediting_dir webtools.sourceediting-%{sourceediting_tag}
+
Name: eclipse-wtp-jeetools
-Version: 3.4.0
-Release: 6%{?dist}
+Version: 3.4.2
+Release: 1%{?dist}
Summary: Frameworks and tools focused on development of J2EE artifacts
Group: Development/Tools
@@ -11,8 +25,12 @@ License: EPL
URL: http://www.eclipse.org/webtools/jee/
# Tarball is created using fetch-wtp-jeetools-using-map.sh script
-Source0: %{name}-%{version}.tar.xz
-Source1: http://www.eclipse.org/legal/epl-v10.html
+Source0: http://git.eclipse.org/c/jeetools/webtools.javaee.git/snapshot/%{javaee_dir}.tar.bz2
+Source1: http://git.eclipse.org/c/ejb/webtools.ejb.git/snapshot/%{ejb_dir}.tar.bz2
+Source2: http://git.eclipse.org/c/webservices/webtools.webservices.git/snapshot/%{webservices_dir}.tar.bz2
+Source3: http://git.eclipse.org/c/webtools-common/webtools.common.git/snapshot/%{common_dir}.tar.bz2
+Source4: http://git.eclipse.org/c/sourceediting/webtools.sourceediting.git/snapshot/%{sourceediting_dir}.tar.bz2
+Source5: http://www.eclipse.org/legal/epl-v10.html
Patch0: %{name}-fix-javax-wsdl-versions.patch
Patch1: %{name}-jst.enterprise_core-fix-featurexml.patch
@@ -30,17 +48,16 @@ BuildRequires: axis >= 0:1.4-14
BuildRequires: eclipse-dtp >= 1.10-0.1
BuildRequires: eclipse-emf >= 2.8.0-0.7
BuildRequires: eclipse-emf-core >= 1:2.8.0-0.22
-BuildRequires: eclipse-emf-sdk >= 2.8.0
BuildRequires: eclipse-gef >= 3.8.0-0.3
BuildRequires: eclipse-jdt >= 1:4.2.0-0.22
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-webservices >= 3.4.0-5
+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: eclipse-wtp-webservices >= 3.4.2-1
BuildRequires: icu4j-eclipse >= 1:4.4.2.2-11
BuildRequires: javamail >= 1.4.3-11
BuildRequires: java-devel
@@ -53,16 +70,15 @@ Requires: axis >= 0:1.4-14
Requires: eclipse-dtp >= 1.10-0.1
Requires: eclipse-emf >= 2.8.0-0.7
Requires: eclipse-emf-core >= 1:2.8.0-0.22
-Requires: eclipse-emf-sdk >= 2.8.0
Requires: eclipse-gef >= 3.8.0-0.3
Requires: eclipse-jdt >= 1:4.2.0-0.22
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-webservices >= 3.4.0-5
+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: eclipse-wtp-webservices >= 3.4.2-1
Requires: icu4j-eclipse >= 1:4.4.2.2-11
Requires: java
Requires: javamail >= 1.4.3-11
@@ -77,17 +93,61 @@ development of J2EE artifacts.
%prep
-%setup -q
-cp %{SOURCE1} .
+%setup -q -c
+%setup -q -T -D -a 1
+cp %{SOURCE5} .
+
+# Take missing bundles from other wtp subprojects
+tar xfj %{SOURCE2}
+pushd %{webservices_dir}
+cp -r bundles/org.eclipse.jst.ws.consumption ../
+cp -r bundles/org.eclipse.jst.ws.consumption.ui ../
+cp -r bundles/org.eclipse.jst.ws.axis.consumption.core ../
+cp -r bundles/org.eclipse.jst.ws.axis.consumption.ui ../
+cp -r bundles/org.eclipse.jst.ws ../
+cp -r bundles/org.eclipse.jst.ws.axis.creation.ui ../
+cp -r bundles/org.eclipse.jst.ws.creation.ui ../
+cp -r bundles/org.eclipse.jst.ws.ui ../
+cp -r bundles/org.eclipse.jst.ws.uddiregistry ../
+cp -r bundles/org.eclipse.jst.ws.creation.ejb.ui ../
+cp -r bundles/org.eclipse.jst.ws.jaxrs.core ../
+cp -r bundles/org.eclipse.jst.ws.jaxrs.ui ../
+cp -r docs/org.eclipse.jst.ws.axis.infopop ../
+cp -r docs/org.eclipse.jst.ws.axis.ui.doc.user ../
+cp -r docs/org.eclipse.jst.ws.consumption.ui.doc.user ../
+cp -r docs/org.eclipse.jst.ws.doc.user ../
+cp -r docs/org.eclipse.jst.ws.consumption.infopop ../
+cp -r docs/org.eclipse.jst.ws.infopop ../
+popd
+rm -r %{webservices_dir}
+
+tar xfj %{SOURCE3}
+pushd %{common_dir}
+cp -r plugins/org.eclipse.jst.common.ui/ ../
+popd
+rm -r %{common_dir}
+
+tar xfj %{SOURCE4}
+pushd %{sourceediting_dir}
+cp -r docs/org.eclipse.jst.jsp.ui.infopop ../
+popd
+rm -r %{sourceediting_dir}
find . -type f -name *.jar -exec rm -f {} \;
find . -type f -name *.class -exec rm -f {} \;
-%patch0
+# 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" {} \;
+
+pushd %{javaee_dir}/features
%patch1
%patch2
+popd
+pushd %{javaee_dir}/plugins
%patch3
%patch4
+popd
%patch6
#Orbit links
@@ -105,9 +165,8 @@ find -name feature.xml -type f -exec sed -i -e 's/license-feature="org.eclipse.l
%build
%{_bindir}/eclipse-pdebuild -f org.eclipse.jst.enterprise_ui.feature \
- -d "eclipse-wtp-common emf emf-sdk wtp-sourceediting \
- org.eclipse.jst.server_ui.feature wtp-webservices xsd gef \
- emf dtp-connectivity dtp-modelbase" \
+ -d "eclipse-wtp-common wtp-sourceediting dtp-connectivity dtp-modelbase \
+ org.eclipse.jst.server_ui.feature wtp-webservices xsd gef emf" \
-o `pwd`/orbit
@@ -129,9 +188,12 @@ popd
%files
%{install_loc}
%doc epl-v10.html
-%doc org.eclipse.jst.jee/about.html
+%doc %{javaee_dir}/plugins/org.eclipse.jst.jee/about.html
%changelog
+* Sun May 05 2013 Gerard Ryan <galileo at fedoraproject.org> 3.4.2-1
+- Update to latest upstream version 3.4.2
+
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.4.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/sources b/sources
index b24d242..44a1fb3 100644
--- a/sources
+++ b/sources
@@ -1 +1,5 @@
-e01317e1d514fc582936b48466eb551e eclipse-wtp-jeetools-3.4.0.tar.xz
+d0dba0a813ecac60f5e28aadae22f558 webtools.javaee-201304111500.tar.bz2
+f4baf2ad557711a48ee7eee1eabc94ec webtools.ejb-201210040812.tar.bz2
+60a114e41ad86ce537536c4991dc8ef6 webtools.sourceediting-201303071547.tar.bz2
+534f9984cf8c45a58bbdd3f1ef2a614d webtools.webservices-201303062343.tar.bz2
+8c07efc5bee8993d9769e1f4353ec174 R3_4_2.tar.bz2
More information about the scm-commits
mailing list