[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master-3.8, updated. eclipse/3.8.0_rc3-1-4-g7e34096

[Jakub Adam]

The following commit has been merged in the master-3.8 branch:
commit 7e34096e1de429bc6ac8b8703cebeecbf1720f90
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Wed Jun 6 21:13:04 2012 +0200

    Fix JSP precompilation in org.eclipse.help.webapp

diff --git a/debian/changelog b/debian/changelog
index ba11598..a6442ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ eclipse (3.8.0~rc3-2) UNRELEASED; urgency=low
   * Fix FTBFS on most architectures.
   * Install libgnomeproxy-1.0.0.so to system JNI directory.
    - Prevents the library from being copied in to user's ~/.eclipse
+  * Fix JSP precompilation in org.eclipse.help.webapp.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Tue, 05 Jun 2012 22:34:51 +0200
 
diff --git a/debian/patches/eclipse-help-fix-jsp-precompilation.patch b/debian/patches/eclipse-help-fix-jsp-precompilation.patch
new file mode 100644
index 0000000..e70d562
--- /dev/null
+++ b/debian/patches/eclipse-help-fix-jsp-precompilation.patch
@@ -0,0 +1,42 @@
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Wed, 6 Jun 2012 21:11:28 +0200
+Subject: eclipse-help-fix-jsp-precompilation
+
+---
+ .../plugins/org.eclipse.help.webapp/buildJSPs.xml  |   20 ++++++++++++++++++--
+ 1 file changed, 18 insertions(+), 2 deletions(-)
+
+diff --git a/eclipse/plugins/org.eclipse.help.webapp/buildJSPs.xml b/eclipse/plugins/org.eclipse.help.webapp/buildJSPs.xml
+index e937069..a808256 100644
+--- a/eclipse/plugins/org.eclipse.help.webapp/buildJSPs.xml
++++ b/eclipse/plugins/org.eclipse.help.webapp/buildJSPs.xml
+@@ -54,11 +54,27 @@
+ 	<!-- Compile the JSPs                                                      -->
+ 	<!-- ===================================================================== -->
+ 	<target name="compile">
+-		
++
++		<path id="class_path" >
++                        <path refid="@dot.classpath"/>
++                        <fileset dir="..">
++                                <patternset>
++                                        <include name="javax.servlet*.jar"/>
++                                        <include name="javax.servlet.jsp*.jar"/>
++                                        <include name="org.apache.ant*/lib/ant.jar"/>
++                                        <include name="org.apache.commons.el*.jar"/>
++                                        <include name="org.apache.commons.logging*.jar"/>
++                                        <include name="org.apache.jasper*.jar"/>
++                                        <include name="org.eclipse.help*.jar"/>
++                                        <include name="org.eclipse.help.base*.jar"/>
++                                </patternset>
++                        </fileset>
++                </path>
++
+ 		<!-- Invoke Jasper compiler -->
+ 		<java
+ 			classname="org.apache.jasper.JspC"
+-			classpathref="@dot.classpath"
++			classpathref="class_path"
+ 			fork="true"
+ 			failonerror="true">
+ 			<arg value="-compile"/>
diff --git a/debian/patches/series b/debian/patches/series
index 959940a..d3e1cf9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -35,3 +35,4 @@ disable-useless-patches.patch
 generate-additional-archs.patch
 eclipse-add-archs-net.patch
 install-libgnomeproxy-to-jni-directory.patch
+eclipse-help-fix-jsp-precompilation.patch

-- 
eclipse - Powerful IDE written in java - Debian package.