Author: jmitchell
Date: Mon Apr 4 17:24:18 2005
New Revision: 160120
URL: http://svn.apache.org/viewcvs?view=rev&rev=160120
Log:
first set of changes to getting 1.2.7-dev nightlies online
Modified:
struts/core/branches/STRUTS_1_2_BRANCH/ (props changed)
struts/core/branches/STRUTS_1_2_BRANCH/build-tests.xml
struts/core/branches/STRUTS_1_2_BRANCH/build-webapp.xml
struts/core/branches/STRUTS_1_2_BRANCH/build.xml
struts/core/branches/STRUTS_1_2_BRANCH/struts-examples/mailreader/build.xml
Propchange: struts/core/branches/STRUTS_1_2_BRANCH/
------------------------------------------------------------------------------
--- svn:externals (added)
+++ svn:externals Mon Apr 4 17:24:18 2005
@@ -0,0 +1 @@
+contrib/el
https://svn.apache.org/repos/asf/struts/el/branches/STRUTS_1_2_BRANCH/
Modified: struts/core/branches/STRUTS_1_2_BRANCH/build-tests.xml
URL:
http://svn.apache.org/viewcvs/struts/core/branches/STRUTS_1_2_BRANCH/build-tests.xml?view=diff&r1=160119&r2=160120
==============================================================================
--- struts/core/branches/STRUTS_1_2_BRANCH/build-tests.xml (original)
+++ struts/core/branches/STRUTS_1_2_BRANCH/build-tests.xml Mon Apr 4 17:24:18
2005
@@ -96,6 +96,15 @@
<!-- Context test is taking place on -->
<property name="cactus.contextURL"
value="${cactus.contextScheme}://${cactus.contextHost}:${cactus.contextPort}/${cactus.contextApp}"/>
+ <!-- This is only used if you execute "ant download-dependencies" -->
+ <property name="libdir" value="lib" />
+
+ <path id="downloaded.lib.classpath">
+ <fileset dir="${libdir}">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
<!-- Compilation Classpath -->
<path id="compile.classpath">
<pathelement location="${build.home}/library/${app.name}.jar"/>
@@ -114,6 +123,10 @@
<pathelement location="${servlet.jar}"/>
<pathelement location="${struts.jar}"/>
<pathelement location="${antlr.jar}"/>
+
+ <!-- this is harmless if not used -->
+ <path refid="downloaded.lib.classpath"/>
+
</path>
<!-- ========== Executable Targets ======================================== -->
Modified: struts/core/branches/STRUTS_1_2_BRANCH/build-webapp.xml
URL:
http://svn.apache.org/viewcvs/struts/core/branches/STRUTS_1_2_BRANCH/build-webapp.xml?view=diff&r1=160119&r2=160120
==============================================================================
--- struts/core/branches/STRUTS_1_2_BRANCH/build-webapp.xml (original)
+++ struts/core/branches/STRUTS_1_2_BRANCH/build-webapp.xml Mon Apr 4 17:24:18
2005
@@ -157,6 +157,16 @@
<!-- The target directory for building the unpacked web application -->
<property name="webapp.target" value="${build.home}/${webapp.name}" />
+
+ <!-- This is only used if you execute "ant download-dependencies" -->
+ <property name="libdir" value="lib" />
+
+ <path id="downloaded.lib.classpath">
+ <fileset dir="${libdir}">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
<!-- The class path used for compiling this library -->
<path id="classpath">
<pathelement location="${commons-beanutils.jar}"/>
@@ -168,6 +178,11 @@
<pathelement location="${struts.libs}/struts.jar"/>
<pathelement location="${webapp.libs}"/>
<pathelement path="${compile.classpath}"/>
+
+ <!-- this is harmless if not used -->
+ <path refid="downloaded.lib.classpath"/>
+
+
</path>
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?view=diff&r1=160119&r2=160120
==============================================================================
--- struts/core/branches/STRUTS_1_2_BRANCH/build.xml (original)
+++ struts/core/branches/STRUTS_1_2_BRANCH/build.xml Mon Apr 4 17:24:18 2005
@@ -116,7 +116,7 @@
These default values assume that the checked out locations are the same
as the full repository paths, and that you are building the trunk.
-->
- <property name="struts.el.home" value="../../el/trunk"/>
+ <property name="struts.el.home" value="${basedir}/contrib/el/"/>
<!-- ========== Initialization Properties ================================= -->
@@ -149,7 +149,6 @@
<!-- Version of the project -->
<property name="project.version" value="1.2.7-dev"/>
-
<!-- ========== Derived Properties ======================================== -->
@@ -199,6 +198,22 @@
<!-- Web directory -->
<property name="web.dir" value="web"/>
+
+ <!-- Default value for building mailreader -->
+ <property name="mailreader.inherit" value="false" />
+
+ <!-- Default value for building contrib/el/ -->
+ <property name="el.inherit" value="false"/>
+
+ <!-- This is only used if you execute "ant download-dependencies" -->
+ <property name="libdir" value="${basedir}/lib" />
+
+ <path id="downloaded.lib.classpath">
+ <fileset dir="${libdir}">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
<!-- Compilation Classpath -->
<path id="compile.classpath">
@@ -213,6 +228,10 @@
<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 -->
@@ -223,7 +242,6 @@
</fileset>
</path>
-
<!-- ========== Executable Targets ======================================== -->
@@ -244,7 +262,80 @@
<tstamp>
<format property="year" pattern="yyyy"/>
</tstamp>
+ </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}"/>
+
+ <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.1.1.jar"
+ usetimestamp="true" ignoreerrors="true"
+
src="http://www.ibiblio.org/maven/jstl/jars/jstl-1.1.1.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="mailreader.inherit" value="true"/>
+ <property name="el.inherit" value="true"/>
+
</target>
<!--
@@ -261,6 +352,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}"
@@ -426,17 +518,17 @@
<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"/>
+ target="clean" inheritAll="true"/>
<ant dir="${struts.el.home}"
- target="dist" inheritAll="false"/>
+ target="dist" inheritAll="true"/>
<mkdir dir="${dist.home}/contrib/struts-el"/>
<copy todir="${dist.home}/contrib/struts-el">
<fileset dir="${struts.el.home}/dist"/>
</copy>
-
</target>
Modified:
struts/core/branches/STRUTS_1_2_BRANCH/struts-examples/mailreader/build.xml
URL:
http://svn.apache.org/viewcvs/struts/core/branches/STRUTS_1_2_BRANCH/struts-examples/mailreader/build.xml?view=diff&r1=160119&r2=160120
==============================================================================
--- struts/core/branches/STRUTS_1_2_BRANCH/struts-examples/mailreader/build.xml
(original)
+++ struts/core/branches/STRUTS_1_2_BRANCH/struts-examples/mailreader/build.xml
Mon Apr 4 17:24:18 2005
@@ -73,6 +73,14 @@
<property name="test.haltonfailure" value="true"/>
<property name="test.runner" value="junit.textui.TestRunner"/>
+ <!-- This is only used if you execute "ant download-dependencies" -->
+ <property name="libdir" value="../../lib" />
+
+ <path id="downloaded.lib.classpath">
+ <fileset dir="${libdir}">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
<!-- Compile Classpath -->
<path id="compile.classpath">
@@ -84,6 +92,11 @@
<pathelement location="${servlet.jar}"/>
<pathelement location="${struts.jar}"/>
<pathelement location="${build.home}/classes"/>
+
+ <!-- this is harmless if not used -->
+ <path refid="downloaded.lib.classpath"/>
+
+
</path>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
