Author: martinc
Date: Sun Apr 24 22:20:02 2005
New Revision: 164537
URL: http://svn.apache.org/viewcvs?rev=164537&view=rev
Log:
Detab and clean up trailing spaces before making other changes.
Modified:
struts/core/branches/STRUTS_1_2_BRANCH/build.xml
Modified: struts/core/branches/STRUTS_1_2_BRANCH/build.xml
URL:
http://svn.apache.org/viewcvs/struts/core/branches/STRUTS_1_2_BRANCH/build.xml?rev=164537&r1=164536&r2=164537&view=diff
==============================================================================
--- struts/core/branches/STRUTS_1_2_BRANCH/build.xml (original)
+++ struts/core/branches/STRUTS_1_2_BRANCH/build.xml Sun Apr 24 22:20:02 2005
@@ -8,7 +8,7 @@
For a complete list of executable tasks use -projecthelp when calling
this build file.
-
+
-->
@@ -68,7 +68,7 @@
ant.jar The path to the ant.jar that is being
used to build from this script. This is
- required only when executing the
+ required only when executing the
"generate.taglib.doc" target.
catalina.home The path to the Tomcat 4.0 installation.
@@ -198,7 +198,7 @@
<!-- Web directory -->
<property name="web.dir" value="web"/>
-
+
<!-- This is only used if you execute "ant download-dependencies" -->
<property name="libdir" value="${basedir}/lib" />
@@ -222,14 +222,14 @@
<pathelement location="${servlet.jar}"/>
<pathelement location="${antlr.jar}"/>
<pathelement location="${xerces.jar}"/>
-
+
<!-- this is harmless if not used -->
<path refid="downloaded.lib.classpath"/>
-
+
</path>
<!-- PMD Classpath -->
-
+
<path id="pmd.classpath">
<fileset dir="${pmd.home}/lib">
<include name="*.jar"/>
@@ -259,85 +259,85 @@
</target>
<target name="download-dependencies">
-
- <!--
- To use this Maven-like freedom with respect to dependency setup,
- do the following:
-
- - run ant as you normally would, but add the following target to the
command
- line:
-
- download-dependencies
-
- For example:
- C:>myproject\ant download-dependencies dist
-
-
- -->
-
- <mkdir dir="${libdir}"/>
- <mkdir dir="${libdir}/tld"/>
-
- <get dest="${libdir}/commons-beanutils.jar"
- usetimestamp="true" ignoreerrors="true"
-
src="http://www.ibiblio.org/maven/commons-beanutils/jars/commons-beanutils-1.7.0.jar"/>
-
- <get dest="${libdir}/commons-digester.jar"
- usetimestamp="true" ignoreerrors="true"
-
src="http://www.ibiblio.org/maven/commons-digester/jars/commons-digester-1.6.jar"/>
-
- <get dest="${libdir}/commons-fileupload.jar"
- usetimestamp="true" ignoreerrors="true"
-
src="http://www.ibiblio.org/maven/commons-fileupload/jars/commons-fileupload-1.0.jar"/>
-
- <get dest="${libdir}/commons-logging.jar"
- usetimestamp="true" ignoreerrors="true"
-
src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.4.jar"/>
-
- <get dest="${libdir}/commons-validator.jar"
- usetimestamp="true" ignoreerrors="true"
-
src="http://www.ibiblio.org/maven/commons-validator/jars/commons-validator-1.1.4.jar"/>
-
- <get dest="${libdir}/jakarta-oro.jar"
- usetimestamp="true" ignoreerrors="true"
-
src="http://www.ibiblio.org/maven/oro/jars/oro-2.0.7.jar"/>
-
- <get dest="${libdir}/xerces.jar"
- usetimestamp="true" ignoreerrors="true"
-
src="http://www.ibiblio.org/maven/xml-apis/jars/xml-apis-2.0.2.jar"/>
-
- <get dest="${libdir}/antlr.jar"
- usetimestamp="true" ignoreerrors="true"
-
src="http://www.ibiblio.org/maven/antlr/jars/antlr-2.7.2.jar"/>
-
- <get dest="${libdir}/servlet.jar"
- usetimestamp="true" ignoreerrors="true"
-
src="http://www.ibiblio.org/maven/servletapi/jars/servletapi-2.2.jar"/>
-
- <get dest="${libdir}/jstl-1.0.6.jar"
- usetimestamp="true" ignoreerrors="true"
-
src="http://www.ibiblio.org/maven/jstl/jars/jstl-1.0.6.jar"/>
-
- <get dest="${libdir}/standard-1.0.6.jar"
- usetimestamp="true" ignoreerrors="true"
-
src="http://www.ibiblio.org/maven/taglibs/jars/standard-1.0.6.jar"/>
-
- <property name="commons-beanutils.jar"
value="${libdir}/commons-beanutils.jar"/>
- <property name="commons-digester.jar"
value="${libdir}/commons-digester.jar"/>
- <property name="commons-fileupload.jar"
value="${libdir}/commons-fileupload.jar"/>
- <property name="commons-logging.jar"
value="${libdir}/commons-logging.jar"/>
- <property name="commons-validator.jar"
value="${libdir}/commons-validator.jar"/>
- <property name="jakarta-oro.jar"
value="${libdir}/jakarta-oro.jar"/>
- <property name="xerces.jar"
value="${libdir}/xerces.jar"/>
- <property name="antlr.jar"
value="${libdir}/antlr.jar"/>
- <property name="servlet.jar"
value="${libdir}/servlet.jar"/>
- <property name="jstl.jar"
value="${libdir}/jstl-1.0.6.jar"/>
- <property name="jstl-standard.jar"
value="${libdir}/standard-1.0.6.jar"/>
- <property name="mailreader.inherit" value="true"/>
- <property name="jstl.tld.dir" value="${libdir}/tld"/>
+ <!--
+ To use this Maven-like freedom with respect to dependency setup,
+ do the following:
+
+ - run ant as you normally would, but add the following target to the
command
+ line:
+
+ download-dependencies
+
+ For example:
+ C:>myproject\ant download-dependencies dist
+
+
+ -->
+
+ <mkdir dir="${libdir}"/>
+ <mkdir dir="${libdir}/tld"/>
+
+ <get dest="${libdir}/commons-beanutils.jar"
+ usetimestamp="true" ignoreerrors="true"
+
src="http://www.ibiblio.org/maven/commons-beanutils/jars/commons-beanutils-1.7.0.jar"/>
+
+ <get dest="${libdir}/commons-digester.jar"
+ usetimestamp="true" ignoreerrors="true"
+
src="http://www.ibiblio.org/maven/commons-digester/jars/commons-digester-1.6.jar"/>
+
+ <get dest="${libdir}/commons-fileupload.jar"
+ usetimestamp="true" ignoreerrors="true"
+
src="http://www.ibiblio.org/maven/commons-fileupload/jars/commons-fileupload-1.0.jar"/>
+
+ <get dest="${libdir}/commons-logging.jar"
+ usetimestamp="true" ignoreerrors="true"
+
src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.4.jar"/>
+
+ <get dest="${libdir}/commons-validator.jar"
+ usetimestamp="true" ignoreerrors="true"
+
src="http://www.ibiblio.org/maven/commons-validator/jars/commons-validator-1.1.4.jar"/>
+
+ <get dest="${libdir}/jakarta-oro.jar"
+ usetimestamp="true" ignoreerrors="true"
+ src="http://www.ibiblio.org/maven/oro/jars/oro-2.0.7.jar"/>
+
+ <get dest="${libdir}/xerces.jar"
+ usetimestamp="true" ignoreerrors="true"
+
src="http://www.ibiblio.org/maven/xml-apis/jars/xml-apis-2.0.2.jar"/>
+
+ <get dest="${libdir}/antlr.jar"
+ usetimestamp="true" ignoreerrors="true"
+ src="http://www.ibiblio.org/maven/antlr/jars/antlr-2.7.2.jar"/>
+
+ <get dest="${libdir}/servlet.jar"
+ usetimestamp="true" ignoreerrors="true"
+
src="http://www.ibiblio.org/maven/servletapi/jars/servletapi-2.2.jar"/>
+
+ <get dest="${libdir}/jstl-1.0.6.jar"
+ usetimestamp="true" ignoreerrors="true"
+ src="http://www.ibiblio.org/maven/jstl/jars/jstl-1.0.6.jar"/>
+
+ <get dest="${libdir}/standard-1.0.6.jar"
+ usetimestamp="true" ignoreerrors="true"
+
src="http://www.ibiblio.org/maven/taglibs/jars/standard-1.0.6.jar"/>
+
+ <property name="commons-beanutils.jar"
value="${libdir}/commons-beanutils.jar"/>
+ <property name="commons-digester.jar"
value="${libdir}/commons-digester.jar"/>
+ <property name="commons-fileupload.jar"
value="${libdir}/commons-fileupload.jar"/>
+ <property name="commons-logging.jar"
value="${libdir}/commons-logging.jar"/>
+ <property name="commons-validator.jar"
value="${libdir}/commons-validator.jar"/>
+ <property name="jakarta-oro.jar"
value="${libdir}/jakarta-oro.jar"/>
+ <property name="xerces.jar" value="${libdir}/xerces.jar"/>
+ <property name="antlr.jar" value="${libdir}/antlr.jar"/>
+ <property name="servlet.jar" value="${libdir}/servlet.jar"/>
+ <property name="jstl.jar"
value="${libdir}/jstl-1.0.6.jar"/>
+ <property name="jstl-standard.jar"
value="${libdir}/standard-1.0.6.jar"/>
+
+ <property name="mailreader.inherit" value="true"/>
+ <property name="jstl.tld.dir" value="${libdir}/tld"/>
+
-
</target>
<!--
@@ -354,7 +354,7 @@
<copy
todir="${build.home}/library/classes/org/apache/struts/resources">
<fileset dir="${conf.share.dir}" includes="**/*.dtd"/>
</copy>
-
+
<copy file="${commons-beanutils.jar}"
tofile="${build.home}/library/commons-beanutils.jar"/>
<copy file="${commons-digester.jar}"
@@ -372,7 +372,7 @@
<!-- Compile-time dependency only
<copy file="${jdbc20ext.jar}"
tofile="${build.home}/library/jdbc2_0-stdext.jar"/>
-
+
-->
</target>
@@ -417,7 +417,7 @@
</copy>
<replace dir="${build.home}/library/classes/META-INF/tlds" >
<include name="*-1.1.tld"/>
- <replacefilter token="http://struts.apache.org/tags";
+ <replacefilter token="http://struts.apache.org/tags";
value="http://jakarta.apache.org/struts/tags"/>
</replace>
<jar jarfile="${build.home}/library/${app.name}.jar"
@@ -520,8 +520,8 @@
<target name="dist.contrib" depends="dist.source" if="jstl.jar">
<mkdir dir="${dist.home}/contrib"/>
-
- <!-- The STRUTS-EL Tag Library -->
+
+ <!-- The STRUTS-EL Tag Library -->
<ant dir="${struts.el.home}"
target="clean" inheritAll="false"/>
@@ -856,7 +856,7 @@
</copy>
</target>
-
+
<!--
Clean contrib distribution
-->
@@ -937,7 +937,7 @@
<target name="compile.website"
description="Compile main website">
<ant antfile="build-webapps.xml" target="compile.docs"/>
- <ant antfile="build-webapps.xml" target="validate.docs"/>
+ <ant antfile="build-webapps.xml" target="validate.docs"/>
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
