You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by cr...@apache.org on 2005/08/28 02:25:25 UTC
svn commit: r253523 - in /struts/shale/trunk: build.properties.sample
build.xml clay-plugin/build.xml core-library/build.xml default.properties
test-framework/build.xml use-cases/build.xml
Author: craigmcc
Date: Sat Aug 27 17:25:18 2005
New Revision: 253523
URL: http://svn.apache.org/viewcvs?rev=253523&view=rev
Log:
Further simplify build process by abstracting all the common stuff that does not
change into default.properties at the global level.
Modified:
struts/shale/trunk/build.properties.sample
struts/shale/trunk/build.xml
struts/shale/trunk/clay-plugin/build.xml
struts/shale/trunk/core-library/build.xml
struts/shale/trunk/default.properties
struts/shale/trunk/test-framework/build.xml
struts/shale/trunk/use-cases/build.xml
Modified: struts/shale/trunk/build.properties.sample
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/build.properties.sample?rev=253523&r1=253522&r2=253523&view=diff
==============================================================================
--- struts/shale/trunk/build.properties.sample (original)
+++ struts/shale/trunk/build.properties.sample Sat Aug 27 17:25:18 2005
@@ -47,18 +47,6 @@
# our dependencies
lib.dir=${root.dir}/lib
-# The absolute or relative pathname of the directory containing the
-# Jakarta Commons BeanUtils library
-beanutils.home = ${lib.dir}/commons-beanutils
-
-# The absolute or relative pathname of the directory containing the
-# Jakarta Commons Chain library
-chain.home = ${lib.dir}/commons-chain
-
-# The absolute or relative pathname of the directory containing the
-# Jakarta Commons Digester library
-digester.home = ${lib.dir}/commons-digester
-
# The absolute or relative pathname of the JavaServer Faces
# implementation
jsf.home = ${lib.dir}/jsf-ri
@@ -73,27 +61,6 @@
# for your implementation
jsf-impl.jar = ${jsf.home}/jsf-impl.jar
#jsf-impl.jar = ${jsf.home}/myfaces-impl.jar
-
-# The absolute or relative pathname of the JUnit 3.8.1 JAR
-junit.home = ${lib.dir}/junit
-
-# The absolute or relative pathname of the JSTL install dir
-jstl.home = ${lib.dir}/jstl-ri
-
-# The absolute or relative pathname of the Commons Validator install dir
-validator.home = ${lib.dir}/commons-validator
-
-# The absolute or relative pathname of the directory containing the
-# Jakarta Commons Logging library
-logging.home = ${lib.dir}/commons-logging
-
-# The absolute or relative pathname of the directory containing your
-# Servlet API classes JAR file (servlet.jar)
-servlet-api.home = ${lib.dir}/servlet-api
-
-# The absolute or relative pathname of the directory containing your
-# JSP API classes JAR file
-jsp-api.home = ${lib.dir}/jsp-api
# The absolute or relative pathname of the Apache Struts
# distribution
Modified: struts/shale/trunk/build.xml
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/build.xml?rev=253523&r1=253522&r2=253523&view=diff
==============================================================================
--- struts/shale/trunk/build.xml (original)
+++ struts/shale/trunk/build.xml Sat Aug 27 17:25:18 2005
@@ -336,6 +336,18 @@
</target>
+
+ <target name="init"
+ description="Execute 'init' on all modules">
+
+ <antcall target="execute">
+ <param name="target"
+ value="init"/>
+ </antcall>
+
+ </target>
+
+
<target name="dist"
description="Execute 'dist' on all modules">
@@ -345,7 +357,6 @@
</antcall>
</target>
-
<!-- =================== Initialize Local Repository ===================== -->
Modified: struts/shale/trunk/clay-plugin/build.xml
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/clay-plugin/build.xml?rev=253523&r1=253522&r2=253523&view=diff
==============================================================================
--- struts/shale/trunk/clay-plugin/build.xml (original)
+++ struts/shale/trunk/clay-plugin/build.xml Sat Aug 27 17:25:18 2005
@@ -26,48 +26,22 @@
<!-- Initialize property values -->
+ <property name="root.dir" value="${basedir}/.."/>
+ <property name="lib.dir" value="${root.dir}/lib"/>
<property file="build.properties"/>
<property file="../build.properties"/>
- <property file="../../build.properties"/>
+ <property file="../default.properties"/>
<property file="${user.home}/build.properties"/>
- <!-- Platform defaults -->
- <property name="platform.source" value="1.4"/>
- <property name="platform.target" value="1.4"/>
-
-
<!-- Dependency home directory defaults -->
- <property name="jsf.home" value="E:/usr/local/jsf-1_1_01"/>
- <property name="jstl.home" value="E:/usr/local/standard-1.0.3"/>
- <property name="junit.home" value="E:/usr/local/junit-3.8.1"/>
- <property name="server.home" value="E:/usr/local/jakarta-tomcat-5.0.25"/>
<property name="shale.home" value="${basedir}/../core-library/target"/>
- <property name="chain.home" value="E:/usr/local/commons-chain-1.0"/>
-
+ <property name="shale-test.home" value="${basedir}/../test-framework/dist"/>
<!-- Dependency library defaults -->
- <property name="commons-beanutils.jar"
- value="${lib.dir}/commons-beanutils/commons-beanutils.jar"/>
- <property name="commons-collections.jar"
- value="${lib.dir}/commons-collections/commons-collections.jar"/>
- <property name="commons-digester.jar"
- value="${lib.dir}/commons-digester/commons-digester.jar"/>
- <property name="commons-logging.jar"
- value="${lib.dir}/commons-logging/commons-logging.jar"/>
- <property name="jsf-api.jar" value="${jsf.home}/lib/jsf-api.jar"/>
- <property name="jsf-impl.jar" value="${jsf.home}/lib/jsf-impl.jar"/>
- <property name="jsp-api.jar" value="${jsp-api.home}/jsp-api.jar"/>
- <property name="jstl.jar" value="${jstl.home}/lib/jstl.jar"/>
- <property name="junit.jar" value="${junit.home}/junit.jar"/>
- <property name="servlet-api.jar" value="${servlet-api.home}/servlet-api.jar"/>
<property name="shale-core.jar" value="${shale.home}/lib/shale-core.jar"/>
- <property name="standard.jar" value="${jstl.home}/lib/standard.jar"/>
- <property name="commons-chain.jar" value="${chain.home}/commons-chain.jar"/>
- <property name="shale-test.jar" value="../test-framework/target/lib/shale-test.jar"/>
-
-
+ <property name="shale-test.jar" value="${shale-test.home}/lib/shale-test.jar"/>
<!-- Conditional Processing Flags -->
@@ -86,12 +60,6 @@
<property name="project.version" value="1.0-dev"/>
- <!-- Compile Defaults -->
- <property name="compile.debug" value="true"/>
- <property name="compile.deprecation" value="false"/>
- <property name="compile.optimize" value="true"/>
-
-
<!-- Unit Test Defaults -->
<property name="test.haltonerror" value="true"/>
<property name="test.haltonfailure" value="true"/>
@@ -105,9 +73,9 @@
<pathelement location="${commons-collections.jar}"/>
<pathelement location="${commons-digester.jar}"/>
<pathelement location="${commons-logging.jar}"/>
+ <pathelement location="${commons-validator.jar}"/>
<pathelement location="${jsf-api.jar}"/>
<pathelement location="${jsp-api.jar}"/>
- <pathelement location="${junit.jar}"/>
<pathelement location="${servlet-api.jar}"/>
<pathelement location="${shale-core.jar}"/>
<pathelement location="${build.home}/classes"/>
Modified: struts/shale/trunk/core-library/build.xml
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/build.xml?rev=253523&r1=253522&r2=253523&view=diff
==============================================================================
--- struts/shale/trunk/core-library/build.xml (original)
+++ struts/shale/trunk/core-library/build.xml Sat Aug 27 17:25:18 2005
@@ -26,54 +26,21 @@
<!-- Initialize property values -->
+ <property name="root.dir" value="${basedir}/.."/>
+ <property name="lib.dir" value="${root.dir}/lib"/>
<property file="build.properties"/>
<property file="../build.properties"/>
- <property file="../../build.properties"/>
+ <property file="../default.properties"/>
<property file="${user.home}/build.properties"/>
- <!-- Platform defaults -->
- <property name="platform.source" value="1.4"/>
- <property name="platform.target" value="1.4"/>
-
<!-- Dependency home directory defaults -->
<property name="shale-test.home" value="${basedir}/../test-framework/dist"/>
+ <property name="webflow.home" value="/usr/local/spring-webflow-pr4"/>
+
<!-- Dependency library defaults -->
- <property name="commons-beanutils.jar"
- value="${beanutils.home}/commons-beanutils.jar"/>
- <property name="commons-chain.jar"
- value="${chain.home}/commons-chain.jar"/>
- <!--
- <property name="commons-collections.jar"
- value="${collections.home}/commons-collections.jar"/>
- -->
- <property name="commons-digester.jar"
- value="${digester.home}/commons-digester.jar"/>
-<!--
- <property name="commons-fileupload.jar"
- value="${struts.home}/lib/commons-fileupload.jar"/>
--->
- <property name="commons-logging.jar"
- value="${logging.home}/commons-logging.jar"/>
-
- <property name="commons-validator.jar"
- value="${validator.home}/commons-validator.jar"/>
-
- <property name="jsf-api.jar" value="${jsf.home}/lib/jsf-api.jar"/>
- <property name="jsp-api.jar" value="${jsp-api.home}/jsp-api.jar"/>
- <property name="junit.jar" value="${junit.home}/junit.jar"/>
- <property name="servlet-api.jar" value="${servlet-api.home}/servlet-api.jar"/>
<property name="shale-test.jar" value="${shale-test.home}/lib/shale-test.jar"/>
- <property name="spring-beans.jar" value="${spring.home}/spring-beans.jar"/>
- <property name="spring-context.jar"
- value="${spring.home}/spring-context.jar"/>
- <property name="spring-core.jar" value="${spring.home}/spring-core.jar"/>
- <property name="spring-web.jar" value="${spring.home}/spring-web.jar"/>
- <property name="spring-webflow.jar"
- value="${spring.home}/spring-webflow.jar"/>
-
- <property name="tiles.jar" value="${tiles.dir}/dist/lib/tiles-core.jar"/>
<!-- Build Defaults -->
@@ -84,12 +51,6 @@
<property name="project.version" value="0.1-dev"/>
- <!-- Compile Defaults -->
- <property name="compile.debug" value="true"/>
- <property name="compile.deprecation" value="false"/>
- <property name="compile.optimize" value="true"/>
-
-
<!-- Findbugs Defaults -->
<property name="findbugs.outputFile" value="${basedir}/core-library-fb.html"/>
@@ -106,11 +67,8 @@
<pathelement location="${commons-chain.jar}"/>
<!-- <pathelement location="${commons-collections.jar}"/> -->
<pathelement location="${commons-digester.jar}"/>
-<!--
- <pathelement location="${commons-fileupload.jar}"/>
--->
+<!-- <pathelement location="${commons-fileupload.jar}"/> -->
<pathelement location="${commons-logging.jar}"/>
-
<pathelement location="${commons-validator.jar}"/>
<pathelement location="${jsf-api.jar}"/>
<pathelement location="${jsf-impl.jar}"/>
@@ -151,13 +109,9 @@
<pathelement location="${commons-chain.jar}"/>
<!-- <pathelement location="${commons-collections.jar}"/> -->
<pathelement location="${commons-digester.jar}"/>
-<!--
- <pathelement location="${commons-fileupload.jar}"/>
--->
+ <!-- <pathelement location="${commons-fileupload.jar}"/> -->
<pathelement location="${commons-logging.jar}"/>
-<!--
<pathelement location="${commons-validator.jar}"/>
--->
<pathelement location="${jsf-api.jar}"/>
<pathelement location="${jsp-api.jar}"/>
<pathelement location="${junit.jar}"/>
@@ -214,22 +168,15 @@
<filter token="package" value="${project.package}"/>
<filter token="state" value="${systest.state.saving}"/>
<filter token="version" value="${project.version}"/>
- <echo message="commons-beanutils.jar = ${commons-beanutils.jar}"/>
- <echo message="commons-chain.jar = ${commons-chain.jar}"/>
- <!-- <echo message="commons-collections.jar =${commons-collections.jar}"/> -->
- <echo message="commons-digester.jar = ${commons-digester.jar}"/>
- <echo message="commons-logging.jar = ${commons-logging.jar}"/>
<echo message="jsf-api.jar = ${jsf-api.jar}"/>
<echo message="jsf-impl.jar = ${jsf-impl.jar}"/>
- <echo message="jsp-api.jar = ${jsp-api.jar}"/>
- <echo message="servlet-api.jar = ${servlet-api.jar}"/>
<echo message="shale-test.jar = ${shale-test.jar}"/>
<echo message="spring-webflow.jar = ${spring-webflow.jar}"/>
- <echo message="jsfri.present = ${jsfri.present}"/>
- <echo message="myfaces.present= ${myfaces.present}"/>
- <echo message="spring.present= ${spring.present}"/>
- <echo message="tiles.present= ${tiles.present}"/>
- <echo message="webflow.present= ${webflow.present}"/>
+ <echo message="jsfri.present = ${jsfri.present}"/>
+ <echo message="myfaces.present= ${myfaces.present}"/>
+ <echo message="spring.present= ${spring.present}"/>
+ <echo message="tiles.present= ${tiles.present}"/>
+ <echo message="webflow.present= ${webflow.present}"/>
</target>
Modified: struts/shale/trunk/default.properties
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/default.properties?rev=253523&r1=253522&r2=253523&view=diff
==============================================================================
--- struts/shale/trunk/default.properties (original)
+++ struts/shale/trunk/default.properties Sat Aug 27 17:25:18 2005
@@ -27,10 +27,6 @@
# Location in which state saving should take place (client or server)
state.saving=client
-# Uncomment the following to compile and execute with MyFaces
-# rather than the JSF Reference Implementation
-#use.myfaces=true
-
# Name of the Maven repository from which we will download dependencies
# that are freely available
maven.repo=http://www.ibiblio.org/maven
@@ -66,3 +62,43 @@
# JUnit test execution engine
test.runner=junit.textui.TestRunner
+
+# ---------------------- Downloaded Dependencies -------------------------
+
+
+# JAR file paths for downloaded dependencies. Note that the JSF JAR files
+# are *not* set here ... they are defined in your build.properties file to
+# support easy selection of which implementation you wish to use.
+
+commons-beanutils.jar=${lib.dir}/commons-beanutils/commons-beanutils.jar
+commons-chain.jar=${lib.dir}/commons-chain/commons-chain.jar
+commons-codec.jar=${lib.dir}/commons-codec/commons-code.jar
+commons-collections.jar=${lib.dir}/commons-collections/commons-collections.jar
+commons-digester.jar=${lib.dir}/commons-digester/commons-digester.jar
+commons-el.jar=${lib.dir}/commons-el/commons-el.jar
+commons-fileupload.jar=${lib.dir}/commons-fileupload/commons-fileupload.jar
+commons-logging.jar=${lib.dir}/commons-logging/commons-logging.jar
+commons-validator.jar=${lib.dir}/commons-validator/commons-validator.jar
+jakarta-oro.jar=${lib.dir}/jakarta-oro/jakarta-oro.jar
+jsp-api.jar=${lib.dir}/jsp-api/jsp-api.jar
+jstl-api.jar=${lib.dir}/jstl-ri/jstl-api.jar
+jstl-impl.jar=${lib.dir}/jstl-ri/jstl-impl.jar
+junit.jar=${lib.dir}/junit/junit.jar
+portlet-api.jar=${lib.dir}/portlet-api/portlet-api.jar
+servlet-api.jar=${lib.dir}/servlet-api/servlet-api.jar
+spring-aop.jar=${lib.dir}/springframework/spring-aop.jar
+spring-beans.jar=${lib.dir}/springframework/spring-beans.jar
+spring-context.jar=${lib.dir}/springframework/spring-context.jar
+spring-core.jar=${lib.dir}/springframework/spring-core.jar
+spring-dao.jar=${lib.dir}/springframework/spring-dao.jar
+spring-hibernate.jar=${lib.dir}/springframework/spring-hibernate.jar
+spring.jar=${lib.dir}/springframework/spring.jar
+spring-jdbc.jar=${lib.dir}/springframework/spring-jdbc.jar
+spring-mock.jar=${lib.dir}/springframework/spring-mock.jar
+spring-orm.jar=${lib.dir}/springframework/spring-orm.jar
+spring-remoting.jar=${lib.dir}/springframework/spring-remoting.jar
+spring-support.jar=${lib.dir}/springframework/spring-support.jar
+spring-web.jar=${lib.dir}/springframework/spring-web.jar
+spring-webmvc.jar=${lib.dir}/springframework/spring-webmvc.jar
+taglibrarydoc.jar=${lib.dir}/taglibrarydoc/taglibrarydoc.jar
+tiles.jar=${lib.dir}/tiles/tiles-core.jar
Modified: struts/shale/trunk/test-framework/build.xml
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/test-framework/build.xml?rev=253523&r1=253522&r2=253523&view=diff
==============================================================================
--- struts/shale/trunk/test-framework/build.xml (original)
+++ struts/shale/trunk/test-framework/build.xml Sat Aug 27 17:25:18 2005
@@ -26,40 +26,20 @@
<!-- Initialize property values -->
+ <property name="root.dir" value="${basedir}/.."/>
+ <property name="lib.dir" value="${root.dir}/lib"/>
<property file="build.properties"/>
<property file="../build.properties"/>
- <property file="../../build.properties"/>
+ <property file="../default.properties"/>
<property file="${user.home}/build.properties"/>
- <!-- Platform defaults -->
- <property name="platform.source" value="1.4"/>
- <property name="platform.target" value="1.4"/>
-
-
<!-- Dependency home directory defaults -->
- <property name="jsf.home" value="/usr/local/jsf-1_1_01"/>
- <property name="jstl.home" value="/usr/local/standard-1.0.3"/>
- <property name="junit.home" value="/usr/local/junit-3.8.1"/>
- <property name="server.home" value="/usr/local/jakarta-tomcat-5.0.25"/>
<property name="shale.home" value="${basedir}/../core-library/target"/>
<!-- Dependency library defaults -->
- <property name="commons-beanutils.jar"
- value="${lib.dir}/commons-beanutils/commons-beanutils.jar"/>
- <property name="commons-collections.jar"
- value="${lib.dir}/commons-collections/commons-collections.jar"/>
- <property name="commons-digester.jar"
- value="${lib.dir}/commons-digester/commons-digester.jar"/>
- <property name="commons-logging.jar"
- value="${jsf.home}/lib/commons-logging.jar"/>
- <property name="jsp-api.jar" value="${lib.dir}/jsp-api/jsp-api.jar"/>
- <property name="jstl.jar" value="${lib.dir}/jstl-ri/jstl-api.jar"/>
- <property name="junit.jar" value="${lib.dir}/junit/junit.jar"/>
- <property name="servlet-api.jar" value="${lib.dir}/servlet-api/servlet-api.jar"/>
<property name="shale-core.jar" value="${shale.home}/lib/shale-core.jar"/>
- <property name="standard.jar" value="${jstl.home}/lib/standard.jar"/>
<!-- Conditional Processing Flags -->
@@ -76,12 +56,6 @@
<property name="project.name" value="Shale Proposal Test Environment"/>
<property name="project.package" value="org.apache.shale.test"/>
<property name="project.version" value="1.0-dev"/>
-
-
- <!-- Compile Defaults -->
- <property name="compile.debug" value="true"/>
- <property name="compile.deprecation" value="false"/>
- <property name="compile.optimize" value="true"/>
<!-- Unit Test Defaults -->
Modified: struts/shale/trunk/use-cases/build.xml
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/use-cases/build.xml?rev=253523&r1=253522&r2=253523&view=diff
==============================================================================
--- struts/shale/trunk/use-cases/build.xml (original)
+++ struts/shale/trunk/use-cases/build.xml Sat Aug 27 17:25:18 2005
@@ -26,60 +26,25 @@
<!-- Initialize property values -->
+ <property name="root.dir" value="${basedir}/.."/>
+ <property name="lib.dir" value="${root.dir}/lib"/>
<property file="build.properties"/>
<property file="../build.properties"/>
- <property file="../../build.properties"/>
- <property file="../../../build.properties"/>
+ <property file="../default.properties"/>
<property file="${user.home}/build.properties"/>
- <!-- Platform defaults -->
- <property name="platform.source" value="1.4"/>
- <property name="platform.target" value="1.4"/>
-
-
<!-- Dependency home directory defaults -->
- <property name="chain.home" value="/usr/local/commons-chain-1.0"/>
- <property name="htmlunit.home" value="/usr/local/htmlunit-1.6"/>
- <property name="jsf.home" value="/usr/local/jsf-1_1_01"/>
- <property name="jstl.home" value="/usr/local/jakarta-taglibs-standard-1.1.2"/>
- <property name="junit.home" value="/usr/local/junit-3.8.1"/>
- <property name="server.home" value="/usr/local/jakarta-tomcat-5.0.28"/>
- <property name="spring.home" value="/usr/local/spring-framework-1.2-rc1"/>
+ <property name="shale.home" value="${basedir}/../core-library/target"/>
+ <property name="shale-clay.home" value="${basedir}/../clay-plugin/dist"/>
+ <property name="shale-test.home" value="${basedir}/../test-framework/dist"/>
+
<!-- Dependency library defaults -->
- <property name="commons-beanutils.jar"
- value="${lib.dir}/commons-beanutils/commons-beanutils.jar"/>
- <property name="commons-chain.jar"
- value="${lib.dir}/commons-chain/commons-chain.jar"/>
- <property name="commons-collections.jar"
- value="${lib.dir}/commons-collections/commons-collections.jar"/>
- <property name="commons-digester.jar"
- value="${lib.dir}/commons-digester/commons-digester.jar"/>
- <property name="commons-logging.jar"
- value="${lib.dir}/commons-logging/commons-logging.jar"/>
- <property name="commons-validator.jar"
- value="${lib.dir}/commons-validator/commons-validator.jar"/>
- <property name="commons-codec.jar"
- value="${lib.dir}/commons-codec/commons-codec.jar"/>
- <property name="commons-fileupload.jar"
- value="${lib.dir}/commons-fileupload/commons-fileupload.jar"/>
-
- <property name="commons-el.jar" value="${lib.dir}/commons-el/commons-el.jar"/>
- <property name="jakarta-oro.jar" value="${lib.dir}/jakarta-oro/jakarta-oro.jar"/>
- <property name="jsp-api.jar" value="${lib.dir}/jsp-api/jsp-api.jar"/>
- <property name="jstl.jar" value="${lib.dir}/jstl-ri/jstl-api.jar"/>
- <property name="junit.jar" value="${lib.dir}/junit/junit.jar"/>
- <property name="servlet-api.jar" value="${lib.dir}/servlet-api/servlet-api.jar"/>
- <property name="shale-core.jar" value="${basedir}/../core-library/target/lib/shale-core.jar"/>
- <property name="shale-clay.jar" value="${basedir}/../clay-plugin/target/lib/shale-clay.jar"/>
- <property name="shale-spring.jar" value="${basedir}/../core-library/target/lib/shale-spring.jar"/>
- <property name="shale-test.jar" value="${basedir}/../test-framework/target/lib/shale-test.jar"/>
- <property name="spring-beans.jar" value="${spring.home}/spring-beans.jar"/>
- <property name="spring-context.jar" value="${spring.home}/spring-context.jar"/>
- <property name="spring-core.jar" value="${spring.home}/spring-core.jar"/>
- <property name="spring-web.jar" value="${spring.home}/spring-web.jar"/>
- <property name="standard.jar" value="${lib.dir}/jstl-ri/jstl-impl.jar"/>
+ <property name="shale-core.jar" value="${shale.home}/lib/shale-core.jar"/>
+ <property name="shale-clay.jar" value="${shale-clay.home}/lib/shale-clay.jar"/>
+ <property name="shale-spring.jar" value="${shale.home}/lib/shale-spring.jar"/>
+ <property name="shale-test.jar" value="${shale-test.home}/lib/shale-test.jar"/>
<!-- Build Defaults -->
@@ -91,12 +56,6 @@
<property name="project.version" value="0.1-dev"/>
- <!-- Compile Defaults -->
- <property name="compile.debug" value="true"/>
- <property name="compile.deprecation" value="false"/>
- <property name="compile.optimize" value="true"/>
-
-
<!-- Custom Tomcat Integration -->
<taskdef name="deploy" classname="org.apache.catalina.ant.DeployTask"/>
<taskdef name="install" classname="org.apache.catalina.ant.InstallTask"/>
@@ -204,13 +163,11 @@
<filter token="state" value="${webapp.state.saving}"/>
<filter token="version" value="${project.version}"/>
<echo message="build.standalone = ${build.standalone}"/>
- <echo message="commons-chain.jar =${commons-chain.jar}"/>
<echo message="jsf-api.jar = ${jsf-api.jar}"/>
<echo message="jsf-impl.jar = ${jsf-impl.jar}"/>
<echo message="shale-core.jar = ${shale-core.jar}"/>
<echo message="shale-clay.jar = ${shale-clay.jar}"/>
<echo message="spring-core.jar = ${spring-core.jar}"/>
- <echo message="commons-validator.jar = ${commons-validator.jar}"/>
<echo message="jsfri.present = ${jsfri.present}"/>
<echo message="myfaces.present = ${myfaces.present}"/>
<echo message="spring.present = ${spring.present}"/>
@@ -272,9 +229,9 @@
<copy todir="${build.home}/${context.path}/WEB-INF/lib"
file="${jsf-impl.jar}"/>
<copy todir="${build.home}/${context.path}/WEB-INF/lib"
- file="${jstl.jar}"/>
+ file="${jstl-api.jar}"/>
<copy todir="${build.home}/${context.path}/WEB-INF/lib"
- file="${standard.jar}"/>
+ file="${jstl-impl.jar}"/>
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org