Attachment 715701 Details for Bug 927023 – update to 3.4.2

[patch] update to 3.4.2

0001-Update-to-3.4.2-Add-tests-various-other-changes.patch (text/plain), 10.10 KB, created by Gerard Ryan on 2013-03-24 22:04:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gerard Ryan

Created: 2013-03-24 22:04:37 UTC

Size: 10.10 KB

patch

obsolete

>From 95025b357c1f6ab0f262334753c92444c5c06755 Mon Sep 17 00:00:00 2001
>From: Gerard Ryan <gerard@ryan.lt>
>Date: Sun, 24 Mar 2013 21:50:56 +0000
>Subject: [PATCH] Update to 3.4.2; Add tests; various other changes
>
>- Update to upstream 3.4.2
>- Force removal of any prebuilt stuff before build
>- Add test features (one not running yet
>- Force context qualifier to be the same as eclipse-wtp-common
>---
> eclipse-wtp-servertools-jetty_versions.patch | 41 ++++++++++++++
> eclipse-wtp-servertools-text_html.patch      | 11 ++++
> eclipse-wtp-servertools.spec                 | 83 ++++++++++++++++++++++++----
> fetch-wtp-servertools.sh                     | 42 --------------
> 4 files changed, 124 insertions(+), 53 deletions(-)
> create mode 100644 eclipse-wtp-servertools-jetty_versions.patch
> create mode 100644 eclipse-wtp-servertools-text_html.patch
> delete mode 100755 fetch-wtp-servertools.sh
>
>diff --git a/eclipse-wtp-servertools-jetty_versions.patch b/eclipse-wtp-servertools-jetty_versions.patch
>new file mode 100644
>index 0000000..193c84e
>--- /dev/null
>+++ b/eclipse-wtp-servertools-jetty_versions.patch
>@@ -0,0 +1,41 @@
>+--- webtools.servertools-20130320_1628/plugins/org.eclipse.wst.server.preview/META-INF/MANIFEST.MF.orig	2013-03-24 15:37:51.845887107 +0000
>++++ webtools.servertools-20130320_1628/plugins/org.eclipse.wst.server.preview/META-INF/MANIFEST.MF	2013-03-24 15:39:00.134581999 +0000
>+@@ -8,13 +8,13 @@
>+ Bundle-Localization: plugin
>+ Export-Package: org.eclipse.wst.server.preview.internal;x-internal:=true
>+ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
>+- org.eclipse.jetty.http;bundle-version="[8.0.4,9.0.0)",
>+- org.eclipse.jetty.server;bundle-version="[8.0.4,9.0.0)",
>+- org.eclipse.jetty.util;bundle-version="[8.0.4,9.0.0)",
>++ org.eclipse.jetty.http,
>++ org.eclipse.jetty.server,
>++ org.eclipse.jetty.util,
>+  org.apache.commons.logging;bundle-version="[1.0.4,2.0.0)",
>+  javax.servlet;bundle-version="[2.6.0,3.1.0)",
>+- org.eclipse.jetty.webapp;bundle-version="[8.0.4,9.0.0)",
>+- org.eclipse.jetty.servlet;bundle-version="[8.0.4,9.0.0)",
>+- org.eclipse.jetty.xml;bundle-version="[8.0.4,9.0.0)"
>++ org.eclipse.jetty.webapp,
>++ org.eclipse.jetty.servlet,
>++ org.eclipse.jetty.xml
>+ Bundle-ActivationPolicy: lazy
>+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
>+--- webtools.servertools-20130320_1628/features/org.eclipse.wst.server_adapters.feature/feature.xml.orig	2013-03-24 15:57:01.396937505 +0000
>++++ webtools.servertools-20130320_1628/features/org.eclipse.wst.server_adapters.feature/feature.xml	2013-03-24 15:57:32.217346558 +0000
>+@@ -51,14 +51,14 @@
>+ 		 id="org.eclipse.jetty.webapp"
>+          download-size="0"
>+          install-size="0"
>+-         version="8.1.3.qualifier"
>++         version="0.0.0"
>+          unpack="false"/>
>+ 	
>+ 	<plugin
>+ 		 id="org.eclipse.jetty.xml"
>+          download-size="0"
>+          install-size="0"
>+-         version="8.1.3.qualifier"
>++         version="0.0.0"
>+          unpack="false"/>	         
>+ 
>+ </feature>
>diff --git a/eclipse-wtp-servertools-text_html.patch b/eclipse-wtp-servertools-text_html.patch
>new file mode 100644
>index 0000000..91f97fd
>--- /dev/null
>+++ b/eclipse-wtp-servertools-text_html.patch
>@@ -0,0 +1,11 @@
>+--- webtools.servertools-20130320_1628/plugins/org.eclipse.wst.server.preview/src/org/eclipse/wst/server/preview/internal/WTPDefaultHandler.java.orig	2013-03-24 18:01:08.863645282 +0000
>++++ webtools.servertools-20130320_1628/plugins/org.eclipse.wst.server.preview/src/org/eclipse/wst/server/preview/internal/WTPDefaultHandler.java	2013-03-24 18:04:17.202134657 +0000
>+@@ -39,7 +39,7 @@
>+ 		baseRequest.setHandled(true);
>+ 		
>+ 		response.setStatus(HttpServletResponse.SC_NOT_FOUND);
>+-		response.setContentType(MimeTypes.TEXT_HTML);
>++		response.setContentType("text/html");
>+ 		
>+ 		ByteArrayISO8859Writer writer = new ByteArrayISO8859Writer(1500);
>+ 		
>diff --git a/eclipse-wtp-servertools.spec b/eclipse-wtp-servertools.spec
>index 8dc5cc2..4b4fae0 100644
>--- a/eclipse-wtp-servertools.spec
>+++ b/eclipse-wtp-servertools.spec
>@@ -1,17 +1,32 @@
> %global eclipse_base	%{_libdir}/eclipse
> %global install_loc		%{_datadir}/eclipse/dropins
> 
>+# Latest tags from 3.4.2 branch
>+%global git_tag			20130320_1628
>+%global docs_tag		20120830_2252
>+%global servertools_dir	webtools.servertools-%{git_tag}
>+%global docs_dir		webtools.servertools.docs-%{docs_tag}
>+
> Name:			eclipse-wtp-servertools
>-Version:		3.4.1
>-Release:		2%{?dist}
>+Version:		3.4.2
>+Release:		1%{?dist}
> Summary:		WTP Server Tools
> 
> Group:			Development/Tools
> License:		EPL
> URL:			http://www.eclipse.org/webtools/server/server.php
> 
>-Source0:		%{name}-%{version}-fetched-src.tar.bz2
>-Source1:		fetch-wtp-servertools.sh
>+Source0:		http://git.eclipse.org/c/servertools/webtools.servertools.git/snapshot/%{servertools_dir}.tar.bz2
>+Source1:		http://git.eclipse.org/c/servertools/webtools.servertools.docs.git/snapshot/%{docs_dir}.tar.bz2
>+Source2:		http://git.eclipse.org/c/servertools/webtools.servertools.tests.git/snapshot/R3_4_2.tar.bz2
>+
>+# Remove versioning for jetty dependencies
>+Patch0:			%{name}-jetty_versions.patch
>+
>+# TODO: This shouldn't be necessary
>+# Can't find org.eclipse.jetty.http.MimeTypes.TEXT_HTML so use string literal
>+# The class is imported fine, and the value exists, but it still fails
>+Patch1:			%{name}-text_html.patch
> 
> BuildArch:		noarch
> 
>@@ -20,11 +35,15 @@ BuildRequires: eclipse-pde >= 1:4.2.0-0.6
> BuildRequires: eclipse-emf >= 2.6.0
> BuildRequires: eclipse-wtp-common >= 3.3.1
> BuildRequires: eclipse-gef
>+BuildRequires: jetty-webapp
>+BuildRequires: jetty-xml
> 
> Requires: eclipse-platform >= 1:3.8.0
> Requires: eclipse-emf >= 2.6.0
> Requires: eclipse-wtp-common >= 3.3.1
> Requires: eclipse-gef
>+Requires: jetty-webapp
>+Requires: jetty-xml
> 
> %description
> The Server tools project is responsible for the framework and adapters 
>@@ -32,7 +51,16 @@ for selected servers. It provides a generic infrastructure and J2EE specific
> server components. 
> 
> %prep
>-%setup -q
>+%setup -q -c
>+%setup -q -T -D -a 1
>+%setup -q -T -D -a 2
>+
>+find -name *.jar -delete
>+find -name *.war -delete
>+find -name *.rar -delete
>+find -name *.zip -delete
>+find -name *.class -delete
>+
> 
> #Remove license attributes from feature.xml
> find -name feature.xml -exec sed -i -e 's/license-feature.*"//' '{}' \;
>@@ -42,21 +70,48 @@ rm -rf orbit
> mkdir orbit
> pushd orbit
> %{__ln_s} %{_javadir}/emf/eclipse/plugins/org.eclipse.emf.edit_*.jar
>+%{__ln_s} %{_javadir}/jetty/jetty-http.jar
>+%{__ln_s} %{_javadir}/jetty/jetty-server.jar
>+%{__ln_s} %{_javadir}/jetty/jetty-servlet.jar
>+%{__ln_s} %{_javadir}/jetty/jetty-util.jar
>+%{__ln_s} %{_javadir}/jetty/jetty-webapp.jar
>+%{__ln_s} %{_javadir}/jetty/jetty-xml.jar
> popd
> 
>+%patch0
>+%patch1
> 
> %build
>+# If changing qualifier here, it should be the same as eclipse-wtp-common
>+OPTIONS="-DforceContextQualifier=201109301723 -DjavacSource=1.5 -DjavacTarget=1.5"
>+
> eclipse-pdebuild -f org.eclipse.wst.server_ui.feature \
>-	-d "emf gef eclipse-wtp-common" -o `pwd`/orbit
>+	-d "emf gef eclipse-wtp-common" -o `pwd`/orbit -a "${OPTIONS}"
> 
> eclipse-pdebuild -f org.eclipse.jst.server_ui.feature \
>-	-d "emf gef eclipse-wtp-common"
>+	-d "emf gef eclipse-wtp-common" -a "${OPTIONS}"
>+
>+eclipse-pdebuild -f org.eclipse.wst.server_adapters.feature -d "gef" \
>+	-o `pwd`/orbit -a "${OPTIONS}"
>+
>+eclipse-pdebuild -f org.eclipse.jst.server_adapters.feature \
>+	-a "${OPTIONS}"
> 
>-eclipse-pdebuild -f org.eclipse.wst.server_adapters.feature -d "gef"
>+eclipse-pdebuild -f org.eclipse.jst.server_adapters.ext.feature \
>+	-a "${OPTIONS}"
> 
>-eclipse-pdebuild -f org.eclipse.jst.server_adapters.feature
>+# Tests
>+eclipse-pdebuild -f org.eclipse.wst.server_tests.feature \
>+	-d "emf gef eclipse-wtp-common" -o `pwd`/orbit -a "${OPTIONS}"
> 
>-eclipse-pdebuild -f org.eclipse.jst.server_adapters.ext.feature
>+eclipse-pdebuild -f org.eclipse.jst.server_tests.feature \
>+	-d "emf gef eclipse-wtp-common" -a "${OPTIONS}"
>+
>+# TODO
>+# This test feature depends on eclipse-wtp-jeetools, which would cause
>+# a cyclical dependency - may also need some other tweaks
>+#eclipse-pdebuild -f org.eclipse.jst.server_adapters.ext_tests.feature \
>+#	-a "${OPTIONS}"
> 
> %install
> install -d -m 755 %{buildroot}%{install_loc}/org.eclipse.jst.server_ui.feature
>@@ -90,9 +145,15 @@ popd
> %{install_loc}/org.eclipse.jst.server_adapters.feature
> %{install_loc}/org.eclipse.jst.server_adapters.ext.feature
> 
>-%doc docs/org.eclipse.jst.server.ui.doc.user/about.html
>+%doc %{docs_dir}/docs/org.eclipse.jst.server.ui.doc.user/about.html
> 
> %changelog
>+* Sun Mar 24 2013 Gerard Ryan <galileo@fedoraproject.org> - 3.4.2-1
>+- Update to upstream 3.4.2
>+- Force removal of any prebuilt stuff
>+- Add test features
>+- Force context qualifier to be the same as eclipse-wtp-common
>+
> * Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.4.1-2
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
> 
>diff --git a/fetch-wtp-servertools.sh b/fetch-wtp-servertools.sh
>deleted file mode 100755
>index 94cf678..0000000
>--- a/fetch-wtp-servertools.sh
>+++ /dev/null
>@@ -1,42 +0,0 @@
>-#!/bin/bash
>-
>-GIT_TAG="R3_4_1"
>-DOCS_TAG="master"
>-VERSION=`echo ${GIT_TAG} | sed -e 's/_/./g' | sed -e 's/R//'`
>-SRC_DIR="eclipse-wtp-servertools-${VERSION}"
>-
>-# Cleanup
>-rm -rf ${SRC_DIR}
>-rm -rf ${MODULE}
>-
>-# Get webtools.servertools tarball from git.eclipse.org, and extract
>-curl -o ${GIT_TAG}.tar.bz2 http://git.eclipse.org/c/servertools/webtools.servertools.git/snapshot/${GIT_TAG}.tar.bz2
>-tar xfj ${GIT_TAG}.tar.bz2
>-
>-# Get webtools.servertools.docs tarball from git.eclipse.org, and extract
>-curl -o ${DOCS_TAG}.tar.bz2 http://git.eclipse.org/c/servertools/webtools.servertools.docs.git/snapshot/webtools.servertools.docs-${DOCS_TAG}.tar.bz2
>-tar xfj ${DOCS_TAG}.tar.bz2
>-
>-cp -r webtools.servertools.docs-${DOCS_TAG}/docs ${GIT_TAG}
>-
>-pushd ${GIT_TAG}
>-# Cleanup the checkout
>-rm -rf tests
>-
>-# Fix documentation permissions
>-chmod 644 `find | grep -e "\.html$"`
>-chmod 644 `find | grep -e "\.xml$"`
>-popd
>-
>-# Rename dir
>-mv ${GIT_TAG} ${SRC_DIR}
>-
>-# Create the Tarball
>-rm -f ${SRC_DIR}-fetched-src.tar.bz2
>-tar cjf ${SRC_DIR}-fetched-src.tar.bz2 ${SRC_DIR}
>-
>-# Cleanup sources
>-rm -rf ${SRC_DIR} webtools.servertools.docs-${DOCS_TAG}
>-rm -f ${GIT_TAG}.tar.bz2 ${DOCS_TAG}.tar.bz2
>-
>-exit 0
>-- 
>1.8.1.4
>

Actions: View | Diff

Attachments on bug 927023: 715701