From 89cfef5d9d07d1f0bc06a5b43f882cacfe8b75d1 Mon Sep 17 00:00:00 2001 From: Krzysztof Daniel Date: Wed, 29 Aug 2012 17:50:48 +0200 Subject: [PATCH] use glassfish jsp. --- ...pse-help-feature-adjust-dependencies.patch | 58 +++---------------- eclipse-no-source-for-dependencies.patch | 2 +- eclipse.spec | 25 +++----- 3 files changed, 18 insertions(+), 67 deletions(-) diff --git a/eclipse-help-feature-adjust-dependencies.patch b/eclipse-help-feature-adjust-dependencies.patch index 1a295f9..ed42c55 100644 --- a/eclipse-help-feature-adjust-dependencies.patch +++ b/eclipse-help-feature-adjust-dependencies.patch @@ -1,41 +1,21 @@ diff -r -Nu eclipse-3.8.0-M1-src/features/org.eclipse.help/feature.xml eclipse-3.8.0-M1-src.patched/features/org.eclipse.help/feature.xml ---- eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml 2011-03-27 10:30:27.000000000 -0400 -+++ eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml 2011-08-23 14:01:19.026328809 -0400 -@@ -34,30 +34,37 @@ - install-size="0" - version="0.0.0" +--- eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml 2011-03-27 10:30:27.000000000 -0400 ++++ eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml 2011-08-23 14:01:19.026328809 -0400 +@@ -36,7 +36,7 @@ unpack="false"/> -- -- -- - -- -+ -+ -+ -+ -+ -+ - - diff -r -Nu eclipse-3.8.0-M1-src/plugins/org.eclipse.help.base/META-INF/MANIFEST.MF eclipse-3.8.0-M1-src.patched/plugins/org.eclipse.help.base/META --- eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java.old 2012-01-18 08:58:41.397436636 +0100 +++ eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java 2012-01-18 08:59:35.994625494 +0100 diff --git a/eclipse-no-source-for-dependencies.patch b/eclipse-no-source-for-dependencies.patch index e95b9ed..59d14a2 100644 --- a/eclipse-no-source-for-dependencies.patch +++ b/eclipse-no-source-for-dependencies.patch @@ -489,7 +489,7 @@ + + + -+ ++ + + diff --git a/eclipse.spec b/eclipse.spec index de75605..e91b2ec 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -45,14 +45,8 @@ Source2: macros.%{name} # -com.sun.el # +javax.el -# +org.apache.commons.el -# -org.apache.commons.logging -# +org.apache.commons.logging # -org.apache.jasper.glassfish -# +org.apache.tomcat -# +org.apache.jasper -# +org.apache.juli -# -org.apache.lucene +# +org.glassfish.web.javax.servlet.jsp # -org.apache.lucene # +org.apache.lucene.core Patch0: %{name}-help-feature-adjust-dependencies.patch @@ -173,6 +167,9 @@ Patch24: %{name}-pdebuild-add-target.patch # additional poms are a part of e-b Patch25: %{name}-change-build-packagings.patch + +Patch26: %{name}-compile-webapp.patch + BuildRequires: ant >= 1.8.3 BuildRequires: rsync BuildRequires: jpackage-utils >= 0:1.5, make, gcc @@ -370,6 +367,7 @@ tar --strip-components=1 -xf %{SOURCE1} %patch23 %patch24 %patch25 +%patch26 #https://bugs.eclipse.org/bugs/show_bug.cgi?id=386040 %pom_disable_module bundles/org.eclipse.equinox.http.jetty5 rt.equinox.bundles . @@ -511,7 +509,6 @@ pushd plugins %_symlink org.apache.batik.util_ batik/batik-util.jar %_symlink org.apache.batik.util.gui_ batik/batik-gui-util.jar %_symlink org.apache.commons.codec_ commons-codec.jar -%_symlink org.apache.commons.el_ commons-el.jar %_symlink org.apache.commons.httpclient_ commons-httpclient.jar %_symlink org.apache.commons.logging_ commons-logging.jar %_symlink org.apache.el_ tomcat/jasper-el.jar @@ -519,11 +516,8 @@ pushd plugins %_symlink org.apache.felix.gogo.runtime_ felix/org.apache.felix.gogo.runtime.jar %_symlink org.apache.felix.gogo.shell_ felix/org.apache.felix.gogo.shell.jar %_symlink org.apache.geronimo.specs.geronimo-annotation_1.1_spec_ geronimo-annotation.jar -%_symlink org.apache.jasper_ tomcat/jasper.jar -%_symlink org.apache.juli_ tomcat/tomcat-juli.jar %_symlink org.apache.lucene.core_ lucene.jar %_symlink org.apache.lucene.analysis_ lucene-contrib/lucene-analyzers.jar -%_symlink org.apache.tomcat_ tomcat/tomcat-api.jar %_symlink org.eclipse.ecf_ ecf/eclipse/plugins/org.eclipse.ecf_*.jar %_symlink org.eclipse.ecf.identity_ ecf/eclipse/plugins/org.eclipse.ecf.identity_*.jar %_symlink org.eclipse.ecf.filetransfer_ ecf/eclipse/plugins/org.eclipse.ecf.filetransfer_*.jar @@ -830,7 +824,8 @@ install -m 0644 externalpoms/servlet-1.0.0-v20070606.pom $RPM_BUILD_ROOT/%{_mave %add_maven_depmap JPP.eclipse-equinox.http.servlet.pom %{name}/equinox.http.servlet.jar -a "org.eclipse.equinox.http:servlet" -f platform pushd $RPM_BUILD_ROOT%{_javadir}/eclipse -ln -s ../../../../%{_libdir}/%{name}/plugins/org.eclipse.jdt.core_*.jar jdt.core.jar +ln -s ../../../../%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.core_*.jar jdt.core.jar + popd install -m 0644 externalpoms/org.eclipse.jdt.core-3.8.0.v_C03.pom $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.eclipse-jdt.core.pom %add_maven_depmap JPP.eclipse-jdt.core.pom %{name}/jdt.core.jar -a "org.eclipse:jdt.core,org.eclipse.tycho:org.eclipse.jdt.core" -f jdt @@ -928,21 +923,17 @@ rm -rf %{_bindir}/efj/ %{_libdir}/%{name}/features/org.eclipse.emf.ecore_* %{_libdir}/%{name}/plugins/com.ibm.icu_* %{_libdir}/%{name}/plugins/com.jcraft.jsch_* -%{_libdir}/%{name}/plugins/org.eclipse.jdt.core_* %{_libdir}/%{name}/plugins/javax.servlet_* %{_libdir}/%{name}/plugins/javax.servlet.jsp_* %{_libdir}/%{name}/plugins/javax.el_* %{_libdir}/%{name}/plugins/javax.inject_*.jar %{_libdir}/%{name}/plugins/javax.xml_1.3.4.*.jar -%{_libdir}/%{name}/plugins/org.apache.tomcat_* -%{_libdir}/%{name}/plugins/org.apache.juli_* %{_libdir}/%{name}/plugins/org.apache.el_* %{_libdir}/%{name}/plugins/org.apache.ant_* %{_libdir}/%{name}/plugins/org.apache.batik.css_* %{_libdir}/%{name}/plugins/org.apache.batik.util.gui_* %{_libdir}/%{name}/plugins/org.apache.batik.util_* %{_libdir}/%{name}/plugins/org.apache.commons.codec_* -%{_libdir}/%{name}/plugins/org.apache.commons.el_* %{_libdir}/%{name}/plugins/org.apache.commons.httpclient_* %{_libdir}/%{name}/plugins/org.apache.commons.logging_* %{_libdir}/%{name}/plugins/org.apache.felix.gogo.command_* @@ -1041,7 +1032,6 @@ rm -rf %{_bindir}/efj/ %{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ui_* %{_libdir}/%{name}/features/org.eclipse.cvs_* %{_libdir}/%{name}/features/org.eclipse.help_* -%{_libdir}/%{name}/plugins/org.apache.jasper_* %{_libdir}/%{name}/plugins/org.eclipse.equinox.frameworkadmin_* %{_libdir}/%{name}/plugins/org.eclipse.equinox.frameworkadmin.equinox_* %{_libdir}/%{name}/plugins/org.eclipse.equinox.simpleconfigurator.manipulator_* @@ -1156,6 +1146,7 @@ rm -rf %{_bindir}/efj/ - Fix eclipse-pdebuild script to have proper path to pde bundle. - Ensure there are right R dependencies between subpackages. - Overall spec improvements. +- Bug 820248 - Start using glassfish-jsp * Thu Aug 23 2012 Krzysztof Daniel 1:4.2.0-11 - Symlink junit 4.