diff -Nur freemarker-2.3.13/build.xml freemarker-2.3.13.new/build.xml
--- freemarker-2.3.13/build.xml 2008-05-05 22:56:37.000000000 +0400
+++ freemarker-2.3.13.new/build.xml 2008-07-17 18:10:55.000000000 +0400
@@ -51,6 +51,7 @@
<property name="lib.jsp12" location="lib/jsp-api-1.2.jar"/>
<property name="lib.jsp20" location="lib/jsp-api-2.0.jar"/>
<property name="lib.jsp21" location="lib/jsp-api-2.1.jar"/>
+ <property name="lib.el" location="lib/el-api.jar"/>
<property name="lib.jython" location="lib/jython.jar"/>
<!-- If not overridden, use default -->
@@ -74,6 +75,7 @@
<path id="compile.classpath">
<path refid="compile.nojsp.classpath"/>
<pathelement path="${lib.jsp21}"/>
+ <pathelement path="${lib.el}"/>
</path>
<path id="compile.jsp1.classpath">
@@ -104,7 +106,8 @@
<pathelement path="${lib.saxpath}"/>
<pathelement path="${lib.xalan}"/> <!-- Xalan is not included with Sun JRE 1.5 with the old classname! -->
<pathelement path="${lib.servlet}"/>
- <pathelement path="${lib.jsp21}"/>
+ <pathelement path="${lib.jsp21}"/>
+ <pathelement path="${lib.el}"/>
<pathelement path="${lib.logkit}"/>
<pathelement path="${lib.log4j}"/>
<pathelement path="${src.dir}"/>
@@ -261,6 +264,7 @@
<target name="fetchlibs" unless="all.libs.present" description="fetch build dependencies and put them in lib directory">
<mkdir dir="lib"/>
+<!--
<echo>Fetching libraries from server.</echo>
<get src="${libs.location}/README.txt" dest="lib/README.txt" usetimestamp="true"/>
<get src="${libs.location}/ant.jar" dest="lib/ant.jar" usetimestamp="true"/>
@@ -283,6 +287,7 @@
<get src="${libs.location}/jsp-api-2.0.jar" dest="lib/jsp-api-2.0.jar" usetimestamp="true"/>
<get src="${libs.location}/jsp-api-2.1.jar" dest="lib/jsp-api-2.1.jar" usetimestamp="true"/>
<get src="${libs.location}/xalan.jar" dest="lib/xalan.jar" usetimestamp="true"/>
+!-->
</target>
<target name="init">
@@ -445,11 +450,11 @@
<antcall target="compile-logkit"/>
<antcall target="compile-jdk14"/>
<antcall target="compile-jdk15"/>
- <antcall target="compile-jsp1"/>
+<!-- <antcall target="compile-jsp1"/> -->
<antcall target="compile-jsp2"/>
<antcall target="compile-jython"/>
<antcall target="compile-dom4j"/>
- <antcall target="compile-jdom"/>
+<!-- <antcall target="compile-jdom"/> -->
<antcall target="compile-xalan"/>
<antcall target="compile-jaxen"/>
<antcall target="compile-rhino"/>