Create tag for Apache Xalan-J 2.7.2 release candidate 1.
git-svn-id: https://svn.apache.org/repos/asf/xalan/java/tags/xalan-j_2_7_2-rc1@1581812 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/.classpath b/.classpath
index c3d5a7b..a390f75 100644
--- a/.classpath
+++ b/.classpath
@@ -1,24 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry exported="true" kind="lib" path="lib/xml-apis.jar"/>
- <classpathentry kind="lib" path="lib/xercesImpl.jar"/>
+ <classpathentry kind="lib" path="C:/vcs/svn/apache/xalan-j/branches/xalan-j_2_7_1_maint/java/lib/endorsed/xml-apis.jar"/>
+ <classpathentry kind="lib" path="C:/vcs/svn/apache/xalan-j/branches/xalan-j_2_7_1_maint/java/lib/endorsed/xercesImpl.jar"/>
<classpathentry kind="lib" path="lib/BCEL.jar"/>
<classpathentry kind="lib" path="lib/runtime.jar"/>
<classpathentry kind="lib" path="lib/regexp.jar"/>
diff --git a/KEYS b/KEYS
index 3469523..e31cf63 100644
--- a/KEYS
+++ b/KEYS
@@ -411,3 +411,36 @@
=NDBw
-----END PGP PUBLIC KEY BLOCK-----
+Gary David Gregory (Code signing key) <ggregory@apache.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.11 (MingW32)
+
+mQENBE2kzuwBCACYV+G9yxNkSjAKSji0B5ipMGM74JAL1Ogtcu+993pLHHYsdXri
+WWXi37x9PLjeHxw63mN26SFyrbMJ4A8erLB03PDjw0DEzAwiu9P2vSvL/RFxGBbk
+cM0BTNXNR1rk8DpIzvXtejp8IHtD1qcDLTlJ8D0W3USebShDPo6NmMxTNuH0u99B
+WHCMAdSa34wsg0ZpffwQmRxeA+ebrf2ydKupGkeZsKjkLlaXNkTVp1ghn5ts/lvg
+KeHv1SJivWKCRmFlbPhBK4+mxSUSOPdoBNAfxA51QzZoPizSk0VbRz3YufYRVLFy
+9vqPSorDmYJhCvn3f6+A38FS/j8VE+8obQ2rABEBAAG0O0dhcnkgRGF2aWQgR3Jl
+Z29yeSAoQ29kZSBzaWduaW5nIGtleSkgPGdncmVnb3J5QGFwYWNoZS5vcmc+iQE4
+BBMBAgAiBQJNpM7sAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRCG/cfi
+oRJiy2vXCACU6jW2+XIWuWBKSmeowBMxlUMJFSq7QjLt+o6B1ZYClbzBLDKcxlnS
+dF6v0jLhp71LozTde+HFI4/qIv6OO4UaGHin8Z1rNU/i5L07HkhLxcrbDoWhaSGD
+buRsWCv9ljm5GCXyK9s6Uj7d4af9mDWaGhNFJJFIs+yqOvTwffoaB7y+2a1YWStZ
+ZXDJ0KiHdY7xQ7bbYR/61MgvJslF1uX+u4jLTNmbU0tCXLtUrLd2VbJiAMFezqy6
+hV/ZxQLZoBPpr3FYhR2SIzNhQ30nj9AVcPgCCuLD49nx6Ad5CpcP8sTwb4aWk9GK
++Uu3Bfz4jTAvd9Q7TsRMt3NV+7sOGD4vuQENBE2kzuwBCACzeGpkd6X/xTfKDBWv
+XgHOOKIJ2pht9XmtZZKiIj7LIiSwvSds/ZkoZKxAm7AY+KPh8Xjf968FtoUBQJvH
+AG4rbowEqT7OOrJae2JcenH5qzaod7TpIPQVv+Ysz8I1wLlC6LzKRj1X99Hng6X+
+obsEasnPbmEEkuiZ/Sgi4vVC8SHkDmYt1Dx8jDgm53oUeWkEJO9LSI2zcrZhSgvg
+1xa4Q4gY5UUK7gE4LbmGCjFlATuuW/0sryxu8zxph15gkn4Nqgk0CPMSjesMYEGO
+sdDzfQXl2tXbt+Pe6mBoWh67MZ1v5zOq3EDtoSqDpWPxponAeaCuNDDFX44vGjfx
+GE0tABEBAAGJAR8EGAECAAkFAk2kzuwCGwwACgkQhv3H4qESYsvEMAf/VGyqIEcw
+4T2D3gZZ3ITkeoBevQdxBT/27xNvoWOZyGSzGYlRbRQrlo+uZsjfMc9MNvaSmxyy
+4gLVbcdvQr3PF//GxphJ98W8pk9l+M57jfyHnnCumn7MO4o9ed+WuigN5oeuNJ6B
+Iq3ff2o1DsrEvDChYOJEOeFuWxv+u7I2ABJJep7NbByM2n9PE8vlGU3zUBgWUBsk
+6jT+klKnEyHE76WzegPLz3jtElTuyB7jRhjyQJu1yiJEMbs2zH8aJGObi5f8Jum4
+tILZuEAdoI0M3c3VRq12cz/vLy+9VXa/s//8IsGn88kjyyYqOy8WJEjoOXFh++dp
+WiM7nZkgQcNi5A==
+=0UFs
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/build.bat b/build.bat
index 1281e46..36de687 100755
--- a/build.bat
+++ b/build.bat
@@ -23,7 +23,7 @@
rem - you should set JAVA_HOME
rem - you can set ANT_HOME if you use your own Ant install
rem - JAVA_OPTS is added to the java command line
-rem - PARSER_JAR may be set to use alternate parser (default:lib\xercesImpl.jar)
+rem - PARSER_JAR may be set to use alternate parser (default:lib\endorsed\xercesImpl.jar)
echo.
echo Xalan-J 2.x Build
echo -------------
@@ -52,9 +52,9 @@
set _ANT_JAR=%ANT_JAR%
if "%_ANT_JAR%" == "" set _ANT_JAR=tools\ant.jar
set _PARSER_JAR=%PARSER_JAR%
-if "%_PARSER_JAR%" == "" set _PARSER_JAR=lib\xercesImpl.jar
+if "%_PARSER_JAR%" == "" set _PARSER_JAR=lib\endorsed\xercesImpl.jar
set _XML-APIS_JAR=%XML-APIS_JAR%
-if "%_XML-APIS_JAR%" == "" set _XML-APIS_JAR=lib\xml-apis.jar
+if "%_XML-APIS_JAR%" == "" set _XML-APIS_JAR=lib\endorsed\xml-apis.jar
rem Attempt to automatically add system classes to _CLASSPATH
rem Use _underscore prefix to not conflict with user's settings
diff --git a/build.sh b/build.sh
index 4e75ee1..e21d6e1 100755
--- a/build.sh
+++ b/build.sh
@@ -39,11 +39,11 @@
ANT_JAR=./tools/ant.jar
fi
if [ "$PARSER_JAR" = "" ] ; then
- PARSER_JAR=./lib/xercesImpl.jar
+ PARSER_JAR=./lib/endorsed/xercesImpl.jar
fi
if [ "$XML_APIS_JAR" = "" ] ; then
- XML_APIS_JAR=./lib/xml-apis.jar
+ XML_APIS_JAR=./lib/endorsed/xml-apis.jar
fi
# Use _underscore prefix to not conflict with user's settings
diff --git a/build.xml b/build.xml
index be96dce..395bae1 100644
--- a/build.xml
+++ b/build.xml
@@ -64,6 +64,8 @@
<property name="name" value="xalan"/>
<property name="year" value="2014"/>
<property name="build.debug" value="on"/>
+ <property name="compiler.target" value="1.3"/>
+ <property name="compiler.source" value="1.3"/>
<!-- Xalan Java version information -->
<property name="version.VERSION" value="2"/>
@@ -79,9 +81,10 @@
<property name="parser.version.MINOR" value="0"/>
<!-- Xalan Java directories -->
-<!-- <property name="bin.dir" value="./bin"/> -->
+ <!-- <property name="bin.dir" value="./bin"/> -->
<property name="build.dir" value="./build"/>
<property name="lib.dir" value="./lib"/>
+ <property name="endorsed.dir" value="${lib.dir}/endorsed"/>
<property name="samples.dir" value="./samples"/>
<property name="src.dir" value="./src"/>
<property name="tools.dir" value="./tools"/>
@@ -94,11 +97,11 @@
<property name="domxpath.reldir" value="org/w3c/dom/xpath"/>
<property name="xsltc.reldir" value="${xalan.reldir}/xsltc"/>
- <!-- Jars needed to run Xalan Java (Interpretive, Compiled, or both) -->
+ <!-- Jars to run Xalan Java (Interpretive, Compiled, or both) -->
<property name="xmlapis.jar.name" value="xml-apis.jar"/>
- <property name="xmlapis.jar" value="${lib.dir}/${xmlapis.jar.name}"/>
+ <property name="xmlapis.jar" value="${endorsed.dir}/${xmlapis.jar.name}"/>
<property name="parser.jar.name" value="xercesImpl.jar"/>
- <property name="parser.jar" value="${lib.dir}/${parser.jar.name}"/>
+ <property name="parser.jar" value="${endorsed.dir}/${parser.jar.name}"/>
<property name="bcel.jar.name" value="BCEL.jar"/>
<property name="bcel.jar" value="${lib.dir}/${bcel.jar.name}"/>
<property name="runtime.jar.name" value="runtime.jar"/>
@@ -106,7 +109,7 @@
<property name="regexp.jar.name" value="regexp.jar"/>
<property name="regexp.jar" value="${lib.dir}/${regexp.jar.name}"/>
- <!-- Jars need to build Xalan Java (Interpretive, Compiled, or both) or build the docs -->
+ <!-- Jars to build Xalan Java (Interpretive, Compiled, or both) or build the docs -->
<property name="java_cup.jar.name" value="java_cup.jar"/>
<property name="java_cup.jar" value="${tools.dir}/${java_cup.jar.name}"/>
<property name="jlex.jar.name" value="JLex.jar"/>
@@ -118,6 +121,13 @@
<property name="taglet.jar.name" value="xalan2jtaglet.jar"/>
<property name="taglet.jar" value="${tools.dir}/${taglet.jar.name}"/>
+ <!-- Jars to build Xalan Java samples -->
+ <property name="servlet-api.jar.name" value="servlet-api-2.5.jar"/>
+ <property name="servlet-api.jar" value="${lib.dir}/${servlet-api.jar.name}"/>
+ <property name="javaee-api.jar.name" value="javaee-api-5.0-2.jar"/>
+ <property name="javaee-api.jar" value="${lib.dir}/${javaee-api.jar.name}"/>
+ <property name="brazil.jar.name" value="brazil-2.1.jar"/>
+ <property name="brazil.jar" value="${lib.dir}/${brazil.jar.name}"/>
<!-- Relative locations of source directories -->
<property name="manifest.mf" value="./src/MANIFEST.MF"/>
@@ -373,7 +383,8 @@
<echo message="Compiling DTM implementation and utilities" />
<javac srcdir="${src.dir}"
destdir="${build.classes}"
- debug="${build.debug}" >
+ debug="${build.debug}"
+ target="${compiler.target}" source="${compiler.source}">
<include name="${apachexml.reldir}/**/*.java" />
<!-- exclude the serializer -->
<exclude name="${serializer.reldir}/**/*.java" />
@@ -400,7 +411,8 @@
<echo message="Compiling Xalan interpretive classes" />
<javac srcdir="${src.dir}"
destdir="${build.classes}"
- debug="${build.debug}" >
+ debug="${build.debug}"
+ target="${compiler.target}" source="${compiler.source}">
<include name="${xpath.reldir}/**/*.java" />
<include name="${domxpath.reldir}/**/*.java" />
<include name="${xalan.reldir}/**/*.java" />
@@ -446,7 +458,8 @@
<javac srcdir="${src.dir}"
destdir="${build.classes}"
includes="${xsltc.reldir}/util/**/*.java"
- debug="${build.debug}">
+ debug="${build.debug}"
+ target="${compiler.target}" source="${compiler.source}">
<classpath refid="xsltc.class.path" />
<bootclasspath refid="xslt.boot.class.path" />
</javac>
@@ -509,7 +522,8 @@
destdir="${build.classes}"
includes="${xsltc.reldir}/**/*.java"
excludes="${serializer.reldir}/**/*.java"
- debug="${build.debug}">
+ debug="${build.debug}"
+ target="${compiler.target}" source="${compiler.source}">
<classpath refid="xsltc.class.path" />
<bootclasspath refid="xslt.boot.class.path" />
</javac>
@@ -522,7 +536,8 @@
<javac srcdir="${src.dir}"
destdir="${build.classes}"
includes="${xsltc.reldir}/**/*.java"
- debug="${build.debug}">
+ debug="${build.debug}"
+ target="${compiler.target}" source="${compiler.source}">
<classpath refid="xsltc.class.path" />
<bootclasspath refid="xslt.boot.class.path" />
</javac>
@@ -723,27 +738,32 @@
<!-- Since the samples are packageless, they must be compiled separately. -->
<javac srcdir="${samples.dir}/SimpleTransform"
destdir="${build.samples}" excludes="${exclude}"
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
+ target="${compiler.target}" source="${compiler.source}">
<classpath refid="samples.class.path" />
</javac>
<javac srcdir="${samples.dir}/UseStylesheetPI"
destdir="${build.samples}" excludes="${exclude}"
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
+ target="${compiler.target}" source="${compiler.source}">
<classpath refid="samples.class.path" />
</javac>
<javac srcdir="${samples.dir}/UseStylesheetParam"
destdir="${build.samples}" excludes="${exclude}"
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
+ target="${compiler.target}" source="${compiler.source}">
<classpath refid="samples.class.path" />
</javac>
<javac srcdir="${samples.dir}/SAX2SAX"
destdir="${build.samples}" excludes="${exclude}"
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
+ target="${compiler.target}" source="${compiler.source}">
<classpath refid="samples.class.path" />
</javac>
<javac srcdir="${samples.dir}/DOM2DOM"
destdir="${build.samples}" excludes="${exclude}"
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
+ target="${compiler.target}" source="${compiler.source}">
<classpath refid="samples.class.path" />
</javac>
<javac srcdir="${samples.dir}/Pipe"
@@ -753,47 +773,56 @@
</javac>
<javac srcdir="${samples.dir}/UseXMLFilters"
destdir="${build.samples}" excludes="${exclude}"
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
+ target="${compiler.target}" source="${compiler.source}">
<classpath refid="samples.class.path" />
</javac>
<javac srcdir="${samples.dir}/Trace"
destdir="${build.samples}" excludes="${exclude}"
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
+ target="${compiler.target}" source="${compiler.source}">
<classpath refid="samples.class.path" />
</javac>
<javac srcdir="${samples.dir}/ApplyXPath"
destdir="${build.samples}" excludes="${exclude}"
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
+ target="${compiler.target}" source="${compiler.source}">
<classpath refid="samples.class.path" />
</javac>
<javac srcdir="${samples.dir}/ApplyXPathDOM"
destdir="${build.samples}" excludes="${exclude}"
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
+ target="${compiler.target}" source="${compiler.source}">
<classpath refid="samples.class.path" />
</javac>
<javac srcdir="${samples.dir}/trax"
destdir="${build.samples}" excludes="${exclude}"
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
+ target="${compiler.target}" source="${compiler.source}">
<classpath refid="samples.class.path" />
</javac>
<javac srcdir="${samples.dir}/extensions"
destdir="${build.samples}" excludes="${exclude}"
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
+ target="${compiler.target}" source="${compiler.source}">
<classpath refid="samples.class.path" />
</javac>
<javac srcdir="${samples.dir}/Validate"
destdir="${build.samples}" excludes="${exclude}"
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
+ target="${compiler.target}" source="${compiler.source}">
<classpath refid="samples.class.path" />
</javac>
<javac srcdir="${samples.dir}/TransformThread"
destdir="${build.samples}" excludes="${exclude}"
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
+ target="${compiler.target}" source="${compiler.source}">
<classpath refid="samples.class.path" />
</javac>
<javac srcdir="${samples.dir}/XPathAPI"
destdir="${build.samples}" excludes="${exclude}"
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
+ target="${compiler.target}" source="${compiler.source}">
<classpath refid="samples.class.path" />
</javac>
<jar jarfile="${build.samples.jar}" basedir="${build.samples}"
@@ -808,8 +837,8 @@
depends="servlet,xsltc.applet,xsltc.ejb,xsltc.servlet"/>
<target name="extra.std.samples.nojardepends"
- depends="servlet.nojardepends,xsltc.applet.nojardepends,
- xsltc.ejb.nojardepends,xsltc.servlet.nojardepends"/>
+ depends="servlet.jardepends,xsltc.applet.nojardepends,
+ xsltc.ejb.jardepends,xsltc.servlet.jardepends"/>
<!-- =================================================================== -->
<!-- Compiles all samples that require extra non-standard components in -->
@@ -817,16 +846,16 @@
<!-- =================================================================== -->
<target name="extra.nonstd.samples" depends="xsltc.brazil"/>
- <target name="extra.nonstd.samples.nojardepends" depends="xsltc.brazil.nojardepends"/>
+ <target name="extra.nonstd.samples.nojardepends" depends="xsltc.brazil.jardepends"/>
<!-- =================================================================== -->
<!-- Compiles the sample servlet and jars the class files. -->
<!-- The javax.servlet and javax.servlet.http packages -->
<!-- must be on the classpath -->
<!-- =================================================================== -->
- <target name="servlet" depends="jar,servlet.nojardepends"/>
+ <target name="servlet" depends="jar,servlet.jardepends"/>
- <target name="servlet.nojardepends"
+ <target name="servlet.jardepends"
description="Compile and jar the servlet samples in xalanservlet.war" >
<echo message="To compile the sample servlets, javax.servlet and javax.servlet.http must be on the classpath"/>
<mkdir dir="${build.servlet}"/>
@@ -835,8 +864,10 @@
<javac srcdir="${samples.dir}/servlet"
destdir="${build.servlet}/WEB-INF/classes"
debug="${build.debug}"
- bootclasspathref="xslt.boot.class.path" >
- <classpath refid="samples.class.path" />
+ bootclasspathref="xslt.boot.class.path"
+ target="${compiler.target}" source="${compiler.source}">
+ <classpath refid="samples.class.path" />
+ <classpath location="${servlet-api.jar}" />
</javac>
<copy todir="${build.servlet}/WEB-INF/classes/servlet">
<fileset dir="${samples.dir}/servlet" includes="media.properties"/>
@@ -875,10 +906,12 @@
<javac srcdir="${samples.dir}/translets"
classpath="${java.class.path}:${build.xalan.jar}"
destdir="${build.samples}" excludes="${exclude}"
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path" />
+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
+ target="${compiler.target}" source="${compiler.source}"/>
<javac srcdir="${samples.dir}/CompiledJAXP"
destdir="${build.samples}" excludes="${exclude}"
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path" />
+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
+ target="${compiler.target}" source="${compiler.source}"/>
</target>
<!-- =================================================================== -->
@@ -890,7 +923,8 @@
<mkdir dir="${build.samples}/CompiledApplet"/>
<javac srcdir="${samples.dir}/CompiledApplet"
destdir="${build.samples}/CompiledApplet" excludes="${exclude}"
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path" />
+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
+ target="${compiler.target}" source="${compiler.source}"/>
<jar jarfile="${build.xsltc.applet.jar}"
basedir="${build.samples}/CompiledApplet"
includes="*.class"/>
@@ -899,13 +933,16 @@
<!-- =================================================================== -->
<!-- Compiles the XSLTC brazil example and jars the class files. -->
<!-- =================================================================== -->
- <target name="xsltc.brazil" depends="jar,xsltc.brazil.nojardepends"/>
+ <target name="xsltc.brazil" depends="jar,xsltc.brazil.jardepends"/>
- <target name="xsltc.brazil.nojardepends">
+ <target name="xsltc.brazil.jardepends">
<mkdir dir="${build.samples}/CompiledBrazil"/>
<javac srcdir="${samples.dir}/CompiledBrazil"
destdir="${build.samples}/CompiledBrazil" excludes="${exclude}"
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path" />
+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
+ target="${compiler.target}" source="${compiler.source}">
+ <classpath location="${brazil.jar}"/>
+ </javac>
<jar jarfile="${build.xsltc.brazil.jar}"
basedir="${build.samples}/CompiledBrazil"
includes="*.class"/>
@@ -916,13 +953,16 @@
<!-- ejb.jar must be on the classpath to compile this sample. -->
<!-- EJB 2.0 can be found at http://java.sun.com/products/ejb/docs.html -->
<!-- =================================================================== -->
- <target name="xsltc.ejb" depends="jar,xsltc.ejb.nojardepends"/>
+ <target name="xsltc.ejb" depends="jar,xsltc.ejb.jardepends"/>
- <target name="xsltc.ejb.nojardepends">
+ <target name="xsltc.ejb.jardepends">
<mkdir dir="${build.samples}/CompiledEJB"/>
<javac srcdir="${samples.dir}/CompiledEJB"
destdir="${build.samples}/CompiledEJB" excludes="${exclude}"
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path" />
+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
+ target="${compiler.target}" source="${compiler.source}">
+ <classpath location="${javaee-api.jar}"/>
+ </javac>
<jar jarfile="${build.xsltc.ejb.jar}"
basedir="${build.samples}/CompiledEJB"
includes="*.class"/>
@@ -931,13 +971,16 @@
<!-- =================================================================== -->
<!-- Compiles the XSLTC servlet example and jars the class files. -->
<!-- =================================================================== -->
- <target name="xsltc.servlet" depends="jar,xsltc.servlet.nojardepends" />
+ <target name="xsltc.servlet" depends="jar,xsltc.servlet.jardepends" />
- <target name="xsltc.servlet.nojardepends">
+ <target name="xsltc.servlet.jardepends">
<mkdir dir="${build.samples}/CompiledServlet"/>
<javac srcdir="${samples.dir}/CompiledServlet"
destdir="${build.samples}/CompiledServlet" excludes="${exclude}"
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path" />
+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
+ target="${compiler.target}" source="${compiler.source}">
+ <classpath location="${servlet-api.jar}"/>
+ </javac>
<jar jarfile="${build.xsltc.servlet.jar}"
basedir="${build.samples}/CompiledServlet"
includes="*.class"/>
@@ -1643,7 +1686,8 @@
<echo message="Compiling the Serializer" />
<javac srcdir="${serializer.src.dir}"
destdir="${serializer.build.classes}"
- debug="${serializer.build.debug}" >
+ debug="${serializer.build.debug}"
+ target="${compiler.target}" source="${compiler.source}">
<include name="${serializer.reldir}/**/*.java" />
<classpath refid="compile.class.path" />
<bootclasspath refid="xslt.boot.class.path" />
diff --git a/lib/brazil-2.1.jar b/lib/brazil-2.1.jar
new file mode 100644
index 0000000..78a1e78
--- /dev/null
+++ b/lib/brazil-2.1.jar
Binary files differ
diff --git a/lib/xercesImpl.jar b/lib/endorsed/xercesImpl.jar
similarity index 100%
rename from lib/xercesImpl.jar
rename to lib/endorsed/xercesImpl.jar
Binary files differ
diff --git a/lib/xml-apis.jar b/lib/endorsed/xml-apis.jar
similarity index 100%
rename from lib/xml-apis.jar
rename to lib/endorsed/xml-apis.jar
Binary files differ
diff --git a/lib/javaee-api-5.0-2.jar b/lib/javaee-api-5.0-2.jar
new file mode 100644
index 0000000..65acd77
--- /dev/null
+++ b/lib/javaee-api-5.0-2.jar
Binary files differ
diff --git a/lib/servlet-api-2.5.jar b/lib/servlet-api-2.5.jar
new file mode 100644
index 0000000..b0537c4
--- /dev/null
+++ b/lib/servlet-api-2.5.jar
Binary files differ
