Author: jmitchell
Date: Tue Apr 5 08:41:17 2005
New Revision: 160186
URL: http://svn.apache.org/viewcvs?view=rev&rev=160186
Log:
final (i hope ;) changes for 1.2.x nightlies
Modified:
struts/el/branches/STRUTS_1_2_BRANCH/build-webapp.xml
struts/el/branches/STRUTS_1_2_BRANCH/build-webapps.xml
struts/el/branches/STRUTS_1_2_BRANCH/build.xml
Modified: struts/el/branches/STRUTS_1_2_BRANCH/build-webapp.xml
URL:
http://svn.apache.org/viewcvs/struts/el/branches/STRUTS_1_2_BRANCH/build-webapp.xml?view=diff&r1=160185&r2=160186
==============================================================================
--- struts/el/branches/STRUTS_1_2_BRANCH/build-webapp.xml (original)
+++ struts/el/branches/STRUTS_1_2_BRANCH/build-webapp.xml Tue Apr 5 08:41:17
2005
@@ -305,6 +305,7 @@
<target name="compile" depends="static" if="webapp.compile"
description="Compile Java sources">
<echo message="Processing webapp ${webapp.name}"/>
+ <echo message="struts.libs=${struts.libs}"/>
<javac srcdir="${webapp.src}"
destdir="${webapp.target}/WEB-INF/classes"
debug="${compile.debug}"
Modified: struts/el/branches/STRUTS_1_2_BRANCH/build-webapps.xml
URL:
http://svn.apache.org/viewcvs/struts/el/branches/STRUTS_1_2_BRANCH/build-webapps.xml?view=diff&r1=160185&r2=160186
==============================================================================
--- struts/el/branches/STRUTS_1_2_BRANCH/build-webapps.xml (original)
+++ struts/el/branches/STRUTS_1_2_BRANCH/build-webapps.xml Tue Apr 5 08:41:17
2005
@@ -36,7 +36,6 @@
-->
<property name="build.home" value="${basedir}/target"/>
-<property name="servlet.jar"
value="../jakarta-servletapi/lib/servlet.jar"/>
<property name="struts.libs" value="${build.home}/library"/>
Modified: struts/el/branches/STRUTS_1_2_BRANCH/build.xml
URL:
http://svn.apache.org/viewcvs/struts/el/branches/STRUTS_1_2_BRANCH/build.xml?view=diff&r1=160185&r2=160186
==============================================================================
--- struts/el/branches/STRUTS_1_2_BRANCH/build.xml (original)
+++ struts/el/branches/STRUTS_1_2_BRANCH/build.xml Tue Apr 5 08:41:17 2005
@@ -46,6 +46,14 @@
or later).
-->
+ <!--
+ Location of other Struts subprojects
+
+ 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.core.home" value="../.."/>
+
<!-- Load local and user build preferences -->
<property file="build.properties"/>
<property file="../../build.properties"/>
@@ -54,23 +62,10 @@
<!-- Default values for unspecified properties -->
<property name="jdbc20ext.jar" value="../jdbc2_0-stdext.jar"/>
- <property name="servlet.jar" value="../jakarta-servletapi/lib/servlet.jar"/>
<property name="struts.jar" value="${struts.core.home}/dist/lib/struts.jar"/>
<property name="struts-el.jar"
value="dist/lib/struts-el.jar"/>
- <property name="jstl.jar" value="../jakarta-taglibs/dist/lib/jstl.jar"/>
- <property name="jstl-standard.jar"
- value="../jakarta-taglibs/dist/lib/standard.jar"/>
- <property name="commons-beanutils.jar"
- value="../jakarta-commons/beanutils/dist/lib/beanutils.jar"/>
- <!--
- Location of other Struts subprojects
-
- 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.core.home" value="../../core/trunk"/>
<!-- ========== Initialization Properties =================================
-->
@@ -152,6 +147,22 @@
<!-- Web directory -->
<property name="web.dir" value="web"/>
+ <!-- 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>
+
+ <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="jstl.tld.dir" value="${libdir}/tld"/>
+ <property name="servlet.jar" value="${libdir}/servlet.jar"/>
+
+
+
<!-- Compilation Classpath -->
<path id="compile.classpath">
<pathelement location="${commons-beanutils.jar}"/>
@@ -165,6 +176,8 @@
<pathelement location="${struts-el.jar}"/>
<pathelement location="${jstl.jar}"/>
<pathelement location="${jstl-standard.jar}"/>
+
+
</path>
<!-- ========== Executable Targets ========================================
-->
@@ -222,7 +235,7 @@
-->
<target name="compile.webapps" depends="compile.library,static.webapps"
description="Compile Struts web applications">
- <ant antfile="build-webapps.xml" target="compile"/>
+ <ant antfile="build-webapps.xml" target="compile" />
</target>
<!--
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
