summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2012-07-17 08:49:47 (EDT)
committer Dani Megert2012-07-17 08:49:47 (EDT)
commit18ce83a47054a1eab40eb3626e8e720a292b5b3e (patch)
tree432a2862d2966bea9f18e4097ca9fd0971deaae9
parent123e9686f630f219fdd56ed4893f633ebdc7d47f (diff)
downloadeclipse.platform.ua-18ce83a47054a1eab40eb3626e8e720a292b5b3e.zip
eclipse.platform.ua-18ce83a47054a1eab40eb3626e8e720a292b5b3e.tar.gz
eclipse.platform.ua-18ce83a47054a1eab40eb3626e8e720a292b5b3e.tar.bz2
Fixed bug 376066: buildJSPs.xml no longer compiles
-rw-r--r--org.eclipse.help.webapp/buildJSPs.xml8
1 files changed, 5 insertions, 3 deletions
diff --git a/org.eclipse.help.webapp/buildJSPs.xml b/org.eclipse.help.webapp/buildJSPs.xml
index e937069..3b11f1b 100644
--- a/org.eclipse.help.webapp/buildJSPs.xml
+++ b/org.eclipse.help.webapp/buildJSPs.xml
@@ -1,6 +1,6 @@
<!--
- Copyright (c) 2005, 2007 IBM Corporation and others.
+ Copyright (c) 2005, 2012 IBM Corporation and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
@@ -33,10 +33,11 @@
<patternset>
<include name="javax.servlet*.jar"/>
<include name="javax.servlet.jsp*.jar"/>
+ <include name="javax.el*.jar"/>
+ <include name="com.sun.el*.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.apache.jasper.glassfish*.jar"/>
<include name="org.eclipse.help*.jar"/>
<include name="org.eclipse.help.base*.jar"/>
</patternset>
@@ -61,6 +62,7 @@
classpathref="@dot.classpath"
fork="true"
failonerror="true">
+ <jvmarg value="-Dorg.apache.jasper.compiler.disablejsr199=true"/>
<arg value="-compile"/>
<arg value="-d"/>
<arg value="${target.folder}" />