Attachment 594094 Details for Bug 834970 – Include wst.xsl and jst.web_core features

[patch] Include wst.xsl and jst.web_core features

0001-Include-wst.xsl-and-jst.web_core-features-in-the-bui.patch (text/plain), 9.08 KB, created by Gerard Ryan on 2012-06-25 03:01:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gerard Ryan

Created: 2012-06-25 03:01:51 UTC

Size: 9.08 KB

patch

obsolete

>From abc2bef255e27ea311f844721cebea1063f8f155 Mon Sep 17 00:00:00 2001
>From: Gerard Ryan <gerard@ryan.lt>
>Date: Mon, 25 Jun 2012 03:55:29 +0100
>Subject: [PATCH] Include wst.xsl and jst.web_core features in the build
>
>These features depend on eclipse-wtp-webservices and
>eclipse-wtp-jeetools, which both already depend on this package. I'm
>not convinced that this is a great idea, but it appears to work.
>---
> ...-wst.xsl-rm-commons.logging-version-check.patch |   11 ++
> eclipse-wtp-sourceediting.spec                     |  108 +++++++++++++++++++-
> fetch-wtp-sourceediting-using-map.sh               |    8 +-
> 3 files changed, 119 insertions(+), 8 deletions(-)
> create mode 100644 eclipse-wtp-sourceediting-wst.xsl-rm-commons.logging-version-check.patch
>
>diff --git a/eclipse-wtp-sourceediting-wst.xsl-rm-commons.logging-version-check.patch b/eclipse-wtp-sourceediting-wst.xsl-rm-commons.logging-version-check.patch
>new file mode 100644
>index 0000000..4c240a1
>--- /dev/null
>+++ b/eclipse-wtp-sourceediting-wst.xsl-rm-commons.logging-version-check.patch
>@@ -0,0 +1,11 @@
>+--- org.eclipse.wst.xsl.feature/feature.xml.orig	2012-06-24 13:39:47.295370041 +0100
>++++ org.eclipse.wst.xsl.feature/feature.xml	2012-06-24 13:40:18.449773457 +0100
>+@@ -81,7 +81,7 @@
>+          id="org.apache.commons.logging"
>+          download-size="0"
>+          install-size="0"
>+-         version="1.0.4.qualifier"
>++         version="0.0.0"
>+          unpack="false"/>
>+ 
>+    <plugin
>diff --git a/eclipse-wtp-sourceediting.spec b/eclipse-wtp-sourceediting.spec
>index 1ebc5f3..72a566e 100644
>--- a/eclipse-wtp-sourceediting.spec
>+++ b/eclipse-wtp-sourceediting.spec
>@@ -3,7 +3,7 @@
> 
> Name:			eclipse-wtp-sourceediting
> Version:		3.4.0
>-Release:		0.1.M6%{?dist}
>+Release:		0.2.RC4%{?dist}
> Summary:		WTP Source Editing
> 
> Group:			Development/Tools
>@@ -18,31 +18,64 @@ BuildArch: noarch
> Patch1:			xml-core-feature.patch
> Patch2:			xml-core.patch
> Patch3:         fix-jsdt.patch
>+Patch4:		%{name}-wst.xsl-rm-commons.logging-version-check.patch
>+
>+BuildRequires: java-devel
>+BuildRequires: jpackage-utils
> 
> BuildRequires: eclipse-platform >= 1:3.7.0
> BuildRequires: eclipse-pde >= 1:3.7.0
> BuildRequires: eclipse-emf >= 2.6.0
> BuildRequires: eclipse-emf-xsd >= 2.6.0
>+BuildRequires: eclipse-emf-core >= 2.8.0
> BuildRequires: eclipse-gef >= 3.7.0
> BuildRequires: eclipse-wtp-common >= 3.3.1
>+BuildRequires: eclipse-rcp >= 4.2.0
>+BuildRequires: eclipse-swt >= 4.2.0
>+BuildRequires: eclipse-jdt >= 4.2.0
>+BuildRequires: icu4j-eclipse >= 1:4.4.2.2
>+
>+# This might be a really bad idea...these two packages depend on this package
>+# already. Will this cause problems?
>+BuildRequires: eclipse-wtp-jeetools >= 3.4.0
>+BuildRequires: eclipse-wtp-webservices >= 3.4.0
> 
>+BuildRequires: ant >= 1.8.3
> BuildRequires: xerces-j2 >= 2.11.0
>-BuildRequires: xalan-j2 >= 2.7.1
>+BuildRequires: xalan-j2 >= 2.7.1-10
> BuildRequires: xml-commons-apis >= 1.3.4
> BuildRequires: xml-commons-resolver >= 1.2
> BuildRequires: rhino >= 1.7-0.9.r2
>+BuildRequires: java_cup >= 1:0.11a-8
>+BuildRequires: bcel >= 5.1-11
>+BuildRequires: glassfish-jsp-api >= 2.2.1
>+BuildRequires: apache-commons-logging >= 1.1.1
>+
>+Requires: java
>+Requires: jpackage-utils
> 
> Requires: eclipse-platform >= 1:3.7.0
> Requires: eclipse-emf >= 2.6.0
> Requires: eclipse-emf-xsd >= 2.6.0
>+Requires: eclipse-emf-core >= 2.8.0
> Requires: eclipse-gef >= 3.7.0
> Requires: eclipse-wtp-common >= 3.3.1
>-
>+Requires: eclipse-wtp-jeetools >= 3.4.0
>+Requires: eclipse-wtp-webservices >= 3.4.0
>+Requires: eclipse-rcp >= 4.2.0
>+Requires: eclipse-swt >= 4.2.0
>+Requires: eclipse-jdt >= 4.2.0
>+Requires: icu4j-eclipse >= 1:4.4.2.2
>+
>+Requires: ant >= 1.8.3
> Requires: xerces-j2 >= 2.11.0
>-Requires: xalan-j2 >= 2.7.1
>+Requires: xalan-j2 >= 2.7.1-10
> Requires: xml-commons-apis >= 1.3.4
> Requires: xml-commons-resolver >= 1.2
> Requires: rhino >= 1.7-0.9.r2
>+Requires: java_cup >= 1:0.11a-8
>+Requires: bcel >= 5.1-11
>+Requires: glassfish-jsp-api >= 2.2.1
> 
> 
> %description
>@@ -58,10 +91,21 @@ rm -rf orbit
> mkdir orbit
> pushd orbit
> %{__ln_s} %{_javadir}/xalan-j2-serializer.jar
>+%{__ln_s} %{_javadir}/xalan-j2.jar
> %{__ln_s} %{_javadir}/xerces-j2.jar
> %{__ln_s} %{_javadir}/xml-commons-apis.jar
> %{__ln_s} %{_javadir}/xml-resolver.jar
> %{__ln_s} %{_javadir}/rhino.jar
>+%{__ln_s} %{_javadir}/apache-commons-discovery.jar
>+%{__ln_s} %{_javadir}/apache-commons-logging.jar
>+%{__ln_s} %{_javadir}/axis/axis.jar
>+%{__ln_s} %{_javadir}/axis/axis-ant.jar
>+%{__ln_s} %{_javadir}/bcel.jar
>+%{__ln_s} %{_javadir}/java_cup-runtime.jar
>+%{__ln_s} %{_javadir}/axis/jaxrpc.jar
>+%{__ln_s} %{_javadir}/axis/saaj.jar
>+%{__ln_s} %{_javadir}/uddi4j.jar
>+%{__ln_s} %{_javadir}/wsil4j.jar
> popd
> 
> #Patch XML_CORE feature.xml xerces version
>@@ -73,6 +117,9 @@ popd
> #Add dependency to jsdt (it needs the xml_ui to be built first_
> %patch3
> 
>+#Remove old version check for org.apache.commons.logging
>+%patch4
>+
> #Remove license attributes from feature.xml
> find -name feature.xml -exec sed -i -e 's/license-feature.*"//' '{}' \;
> 
>@@ -81,11 +128,25 @@ eclipse-pdebuild -f org.eclipse.wst.web_ui.feature \
> 	-d "xsd emf gef eclipse-wtp-common" \
> 	-o `pwd`/orbit
> 
>+eclipse-pdebuild -f org.eclipse.wst.xsl.feature \
>+	-d "xsd emf gef eclipse-wtp-common wtp-webservices \
>+	   wtp-jeetools org.eclipse.jst.server_ui.feature" \
>+	-o `pwd`/orbit
>+
>+eclipse-pdebuild -f org.eclipse.jst.web_core.feature \
>+	-d "xsd emf gef eclipse-wtp-common wtp-webservices \
>+	   wtp-jeetools org.eclipse.jst.server_ui.feature" \
>+	-o `pwd`/orbit
>+
> %install
> install -d -m 755 %{buildroot}%{install_loc}
> 
>-%{__unzip} -q -d %{buildroot}%{install_loc} \
>+%{__unzip} -q -o -d %{buildroot}%{install_loc} \
>      build/rpmBuild/org.eclipse.wst.web_ui.feature.zip
>+%{__unzip} -q -o -d %{buildroot}%{install_loc} \
>+     build/rpmBuild/org.eclipse.wst.xsl.feature.zip
>+%{__unzip} -q -o -d %{buildroot}%{install_loc} \
>+     build/rpmBuild/org.eclipse.jst.web_core.feature.zip
> 
> #Recreate symlinks & remove duplicate jars
> pushd %{buildroot}%{install_loc}/eclipse/plugins
>@@ -94,16 +155,50 @@ rm -f org.apache.xerces*.jar
> rm -f javax.xml*.jar
> rm -f org.apache.xml.resolver*.jar
> rm -f org.mozilla.javascript*.jar
>+rm -f java_cup.runtime_*.jar
>+rm -f org.apache.bcel_*.jar
>+rm -f org.apache.commons.codec_*.jar
>+rm -f org.apache.commons.logging_*.jar
>+rm -f org.apache.xalan_*.jar
>+rm -f org.apache.log4j_*.jar
>+rm -f javax.wsdl_*.jar
>+rm -f javax.mail_*.jar
> 
> #Remove duplicates because of improper including
> rm -f org.eclipse.jem.util*.jar
> rm -f org.eclipse.wst.common.*.jar
>+rm -f org.eclipse.wst.command.env_*.jar
>+rm -f org.eclipse.wst.command.env.core_*.jar
>+rm -f org.eclipse.wst.ws_*.jar
>+rm -f org.eclipse.wst.wsdl_*.jar
>+rm -f org.eclipse.wst.wsdl.validation_*.jar
>+rm -f org.eclipse.wst.wsi_*.jar
>+rm -f org.eclipse.wst.ws.parser_*.jar
>+rm -f org.eclipse.wst.ws.service.policy_*.jar
>+rm -f org.eclipse.jst.common.annotations.controller_*.jar
>+rm -f org.eclipse.jst.common.annotations.core_*.jar
>+rm -f org.eclipse.jst.common.frameworks_*.jar
>+rm -f org.eclipse.jst.j2ee_*.jar
>+rm -f org.eclipse.jst.j2ee.core_*.jar
>+rm -f org.eclipse.jst.j2ee.web_*.jar
>+rm -f org.eclipse.jst.jee_*.jar
>+
> 
> %{__ln_s} %{_javadir}/xalan-j2-serializer.jar
> %{__ln_s} %{_javadir}/xerces-j2.jar
> %{__ln_s} %{_javadir}/xml-commons-apis.jar
> %{__ln_s} %{_javadir}/xml-resolver.jar
> %{__ln_s} %{_javadir}/rhino.jar
>+%{__ln_s} %{_javadir}/java_cup-runtime.jar
>+%{__ln_s} %{_javadir}/bcel.jar
>+%{__ln_s} %{_javadir}/apache-commons-codec.jar
>+%{__ln_s} %{_javadir}/apache-commons-logging.jar
>+%{__ln_s} %{_javadir}/xalan-j2.jar
>+%{__ln_s} %{_javadir}/log4j.jar
>+%{__ln_s} %{_javadir}/wsdl4j.jar
>+%{__ln_s} %{_javadir}/javamail/mail.jar
>+
>+
> popd
> 
> %files
>@@ -111,6 +206,9 @@ popd
> %doc org.eclipse.wst.doc.user/about.html
> 
> %changelog
>+* Sun Jun 24 2012 Gerard Ryan <galileo@fedoraproject.org> 3.4.0-0.2.RC4
>+- Include wst.xsl and jst.web_core features in the build.
>+
> * Fri Apr 27 2012 Krzysztof Daniel <kdaniel@redhat.com> 3.4.0-0.1.M6
> - Update to latest upstream revision (3.4.0 post M6)
> 
>diff --git a/fetch-wtp-sourceediting-using-map.sh b/fetch-wtp-sourceediting-using-map.sh
>index 53aecdb..317c5a5 100755
>--- a/fetch-wtp-sourceediting-using-map.sh
>+++ b/fetch-wtp-sourceediting-using-map.sh
>@@ -3,7 +3,7 @@ set -e
> 
> NAME="eclipse-wtp-sourceediting"
> VERSION=R3.4.0
>-TAG=S-3.4.0M6-20120319200442
>+TAG=S-3.4.0RC4-20120612174739
> 
> echo "Exporting from CVS..."
> mkdir $NAME-$VERSION
>@@ -15,11 +15,13 @@ wget "http://download.eclipse.org/webtools/downloads/drops/$VERSION/$TAG/directo
> 
> 
> dos2unix $MAPFILE
>-grep ^[a-z] $MAPFILE | grep -i "sourceediting" | grep "org.eclipse.wst" | grep -v "test" > $TEMPMAPFILE
>+grep ^[a-z] $MAPFILE | grep -i "sourceediting" | grep -v "test" > $TEMPMAPFILE
> grep ^[a-z] $MAPFILE | grep -i "org.eclipse.jsdt" | grep "org.eclipse.wst" | grep -v "test" >> $TEMPMAPFILE
> grep ^[a-z] $MAPFILE | grep -i "jeetools" | grep "org.eclipse.wst" | grep -v "test" >> $TEMPMAPFILE
> grep ^[a-z] $MAPFILE | grep -i "servertools" | grep "org.eclipse.wst" | grep -v "test" >> $TEMPMAPFILE
>-exit
>+grep ^[a-z] $MAPFILE | grep -i "org.eclipse.jem.beaninfo" | grep -v "test" >> $TEMPMAPFILE
>+grep ^[a-z] $MAPFILE | grep -i "org.eclipse.jst.jee.web" | grep -v "test" >> $TEMPMAPFILE
>+
> gawk 'BEGIN {
> 	FS=","
> }
>-- 
>1.7.10.2
>

Actions: View | Diff

Attachments on bug 834970: 594094