Author: remm Date: Wed Feb 1 07:58:35 2006 New Revision: 374092 URL: http://svn.apache.org/viewcvs?rev=374092&view=rev Log: - Update Ant build script for the current source layout.
Modified: tomcat/jasper/tc6.0.x/build.properties.sample tomcat/jasper/tc6.0.x/build.xml Modified: tomcat/jasper/tc6.0.x/build.properties.sample URL: http://svn.apache.org/viewcvs/tomcat/jasper/tc6.0.x/build.properties.sample?rev=374092&r1=374091&r2=374092&view=diff ============================================================================== --- tomcat/jasper/tc6.0.x/build.properties.sample (original) +++ tomcat/jasper/tc6.0.x/build.properties.sample Wed Feb 1 07:58:35 2006 @@ -9,9 +9,48 @@ # $Id$ # ----------------------------------------------------------------------------- +# ----- Default Base Path for Dependent Packages ----- +# Please note this path must be absolute, not relative, +# as it is referenced with different working directory +# contexts by the various build scripts. +base.path=/usr/share/java +#base.path=C:/path/to/the/repository +#base.path=/usr/local + # ----- Pointer to Catalina ----- catalina.home=../../jakarta-tomcat-5/build # ----- Pointer to JSP Standard Tag Library distribution ----- #standard.home=${base.path}/jakarta-taglibs/standard #jsp20el.jar=${standard.home}/../dist/jsp20el/jsp20el.jar + +compile.source=1.5 + +# ----- Servlet API v2.4 ----- +servlet-api.home=${base.path}/servlet-api-2.4 +servlet-api.lib=${servlet-api.home}/lib +servlet-api.jar=${servlet-api.lib}/servlet-api.jar + +# ----- JSP API v2.0 ----- +jsp-api.home=${base.path}/jsp-api-2.0 +jsp-api.lib=${jsp-api.home}/lib +jsp-api.jar=${jsp-api.lib}/jsp-api.jar + +# ----- Commons Logging, version 1.0.1 or later ----- +commons-logging.home=${base.path}/commons-logging-1.0.4 +commons-logging.lib=${commons-logging.home} +commons-logging-api.jar=${commons-logging.lib}/commons-logging-api.jar +commons-logging.jar=${commons-logging.lib}/commons-logging.jar +commons-logging.loc=${base-jakarta.loc}/commons/logging/binaries/commons-logging-1.0.4.tar.gz + +# ----- Commons Expression Language (EL), version 1.0 or later ----- +commons-el.home=${base.path}/commons-el-1.0 +commons-el.lib=${commons-el.home} +commons-el.jar=${commons-el.lib}/commons-el.jar +commons-el.loc=${base-jakarta.loc}/commons/el/binaries/commons-el-1.0.tar.gz + +# ----- Eclipse JDT, version 3.1.1 or later ----- +jdt.home=${base.path}/eclipse/plugins +jdt.lib=${jdt.home} +jdt.jar=${jdt.lib}/org.eclipse.jdt.core_3.1.1.jar +jdt.loc=http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.1.1-200509290840/eclipse-JDT-3.1.1.zip Modified: tomcat/jasper/tc6.0.x/build.xml URL: http://svn.apache.org/viewcvs/tomcat/jasper/tc6.0.x/build.xml?rev=374092&r1=374091&r2=374092&view=diff ============================================================================== --- tomcat/jasper/tc6.0.x/build.xml (original) +++ tomcat/jasper/tc6.0.x/build.xml Wed Feb 1 07:58:35 2006 @@ -1,4 +1,4 @@ -<project name="Jasper2" default="deploy" basedir="."> +<project name="Jasper2" default="build-only" basedir="."> <!-- ===================== Initialize Property Values =================== --> @@ -21,6 +21,7 @@ <property name="ant.jar" value="${ant.home}/lib/ant.jar"/> <property name="servlet-api.jar" value="${api.home}/jsr154/dist/lib/servlet-api.jar"/> <property name="jsp-api.jar" value="${api.home}/jsr152/dist/lib/jsp-api.jar"/> + <property name="jasper-compiler-jdt.jar" value="${jdt.jar}"/> <!-- Construct Jasper classpath --> @@ -28,16 +29,9 @@ <pathelement location="${ant.jar}"/> <pathelement location="${servlet-api.jar}"/> <pathelement location="${jsp-api.jar}"/> - <pathelement location="${tools.jar}"/> - <pathelement location="${jasper-compiler-jdt.jar}"/> - <pathelement location="${xerces.jar}"/> - <pathelement location="${xercesImpl.jar}"/> - <pathelement location="${xml-apis.jar}"/> - <pathelement location="${commons-el.jar}"/> - <pathelement location="${commons-collections.jar}"/> + <pathelement location="${jdt.jar}"/> <pathelement location="${commons-logging.jar}"/> - <pathelement location="${commons-daemon-launcher.jar}"/> - <pathelement location="${jasper.build}/shared/classes"/> + <pathelement location="${commons-el.jar}"/> </path> <!-- Construct unit tests classpath --> @@ -116,10 +110,12 @@ </target> <!-- Just build jasper --> - <target name="build-only"> + <target name="build-only" depends="build-prepare"> <property name="jasper.classes" value="${jasper.build}/shared/classes"/> <property name="jasper-compiler.jar" value="${jasper.build}/shared/lib/jasper-compiler.jar"/> <property name="jasper-runtime.jar" value="${jasper.build}/shared/lib/jasper-runtime.jar"/> + <property name="jasper-el.jar" value="${jasper.build}/shared/lib/jasper-el.jar"/> + <property name="el-api.jar" value="${jasper.build}/shared/lib/el-api.jar"/> <!-- Compile internal server components --> <javac srcdir="src/share" destdir="${jasper.classes}" @@ -165,6 +161,26 @@ <include name="org/apache/jasper/runtime/**" /> <include name="org/apache/jasper/security/**" /> <include name="org/apache/jasper/util/**" /> + <!-- Javadoc and i18n exclusions --> + <exclude name="**/package.html" /> + <exclude name="**/LocalStrings_*" /> + </fileset> + </jar> + + <!-- Jasper EL Implementation JAR File --> + <jar jarfile="${el-api.jar}"> + <fileset dir="${jasper.classes}"> + <include name="javax/el/**" /> + <!-- Javadoc and i18n exclusions --> + <exclude name="**/package.html" /> + <exclude name="**/LocalStrings_*" /> + </fileset> + </jar> + + <!-- Jasper EL Implementation JAR File --> + <jar jarfile="${jasper-el.jar}"> + <fileset dir="${jasper.classes}"> + <include name="org/apache/el/**" /> <!-- Javadoc and i18n exclusions --> <exclude name="**/package.html" /> <exclude name="**/LocalStrings_*" /> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]