|
|
d35ebdb |
--- freemarker-2.3.13/build.xml.orig 2011-02-28 15:02:29.572173242 -0500
|
|
|
d35ebdb |
+++ freemarker-2.3.13/build.xml 2011-02-28 15:02:39.340418592 -0500
|
|
|
d35ebdb |
@@ -48,8 +48,6 @@
|
|
|
d35ebdb |
<property name="lib.struts" location="lib/struts.jar"/>
|
|
|
d35ebdb |
<property name="lib.rhino" location="lib/js.jar"/>
|
|
|
d35ebdb |
<property name="lib.servlet" location="lib/servlet.jar"/>
|
|
|
d35ebdb |
- <property name="lib.jsp12" location="lib/jsp-api-1.2.jar"/>
|
|
|
d35ebdb |
- <property name="lib.jsp20" location="lib/jsp-api-2.0.jar"/>
|
|
|
d35ebdb |
<property name="lib.jsp21" location="lib/jsp-api-2.1.jar"/>
|
|
|
d35ebdb |
<property name="lib.el" location="lib/el-api.jar"/>
|
|
|
d35ebdb |
|
|
|
d35ebdb |
@@ -83,9 +81,9 @@
|
|
|
d35ebdb |
<pathelement path="${lib.jsp12}"/>
|
|
|
d35ebdb |
</path>
|
|
|
d35ebdb |
|
|
|
d35ebdb |
- <path id="compile.jsp2.classpath">
|
|
|
d35ebdb |
+ <path id="compile.jsp21.classpath">
|
|
|
d35ebdb |
<path refid="compile.nojsp.classpath"/>
|
|
|
d35ebdb |
- <pathelement path="${lib.jsp20}"/>
|
|
|
d35ebdb |
+ <pathelement path="${lib.jsp21}"/>
|
|
|
d35ebdb |
</path>
|
|
|
d35ebdb |
|
|
|
d35ebdb |
<path id="compile.classpath.testcases">
|
|
|
d35ebdb |
@@ -93,7 +91,7 @@
|
|
|
d35ebdb |
<pathelement path="${lib.jython}"/>
|
|
|
d35ebdb |
<pathelement path="${lib.jdom}"/>
|
|
|
d35ebdb |
<pathelement path="${lib.servlet}"/>
|
|
|
d35ebdb |
- <pathelement path="${lib.jsp20}"/>
|
|
|
d35ebdb |
+ <pathelement path="${lib.jsp21}"/>
|
|
|
d35ebdb |
</path>
|
|
|
d35ebdb |
|
|
|
d35ebdb |
<path id="compile.classpath.javadoc">
|
|
|
d35ebdb |
@@ -221,9 +219,9 @@
|
|
|
d35ebdb |
<include name="freemarker/ext/jsp/FreeMarkerPageContext1.java"/>
|
|
|
d35ebdb |
</patternset>
|
|
|
d35ebdb |
|
|
|
d35ebdb |
- <patternset id="freemarker.compile.jsp2">
|
|
|
d35ebdb |
- <include name="freemarker/ext/jsp/FreeMarkerPageContext2.java"/>
|
|
|
d35ebdb |
- <include name="freemarker/ext/jsp/FreeMarkerJspFactory2.java"/>
|
|
|
d35ebdb |
+ <patternset id="freemarker.compile.jsp21">
|
|
|
d35ebdb |
+ <include name="freemarker/ext/jsp/FreeMarkerPageContext21.java"/>
|
|
|
d35ebdb |
+ <include name="freemarker/ext/jsp/FreeMarkerJspFactory21.java"/>
|
|
|
d35ebdb |
</patternset>
|
|
|
d35ebdb |
|
|
|
d35ebdb |
|
|
|
d35ebdb |
@@ -451,7 +449,7 @@
|
|
|
d35ebdb |
<antcall target="compile-jdk14"/>
|
|
|
d35ebdb |
<antcall target="compile-jdk15"/>
|
|
|
d35ebdb |
|
|
|
d35ebdb |
- <antcall target="compile-jsp2"/>
|
|
|
d35ebdb |
+ <antcall target="compile-jsp21"/>
|
|
|
d35ebdb |
<antcall target="compile-jython"/>
|
|
|
d35ebdb |
<antcall target="compile-dom4j"/>
|
|
|
d35ebdb |
|
|
|
d35ebdb |
@@ -513,11 +511,11 @@
|
|
|
d35ebdb |
</javac>
|
|
|
d35ebdb |
</target>
|
|
|
d35ebdb |
|
|
|
d35ebdb |
- <target name="compile-jsp2">
|
|
|
d35ebdb |
+ <target name="compile-jsp21">
|
|
|
d35ebdb |
<javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="6" source="6">
|
|
|
d35ebdb |
<src path="${src.dir}"/>
|
|
|
d35ebdb |
- <classpath refid="compile.jsp2.classpath"/>
|
|
|
d35ebdb |
- <patternset refid="freemarker.compile.jsp2"/>
|
|
|
d35ebdb |
+ <classpath refid="compile.jsp21.classpath"/>
|
|
|
d35ebdb |
+ <patternset refid="freemarker.compile.jsp21"/>
|
|
|
d35ebdb |
</javac>
|
|
|
d35ebdb |
</target>
|
|
|
d35ebdb |
|