Author: wsmoak
Date: Sun Jul 24 22:09:49 2005
New Revision: 224692
URL: http://svn.apache.org/viewcvs?rev=224692&view=rev
Log:
- Updated suggested properties in sample build.properties file
- Changed core-library build to use downloaded dependencies
Modified:
struts/shale/trunk/build.properties.sample
struts/shale/trunk/core-library/build.xml
Modified: struts/shale/trunk/build.properties.sample
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/build.properties.sample?rev=224692&r1=224691&r2=224692&view=diff
==============================================================================
--- struts/shale/trunk/build.properties.sample (original)
+++ struts/shale/trunk/build.properties.sample Sun Jul 24 22:09:49 2005
@@ -37,7 +37,7 @@
# Fully qualified pathname of the directory containing the "dist" output
# of a build of the standalone version of Tiles (currently in the Struts
# Sandbox).
-tiles.dir=${root.dir}/../sandbox/tiles/core-library/dist
+tiles.dir=${root.dir}/../sandbox/tiles
# FindBugs Output File
findbugs.outputFile=${root.dir}/find-bugs.html
@@ -48,15 +48,15 @@
# The absolute or relative pathname of the directory containing the
# Jakarta Commons BeanUtils library
-beanutils.home = /usr/local/commons-beanutils-1.7
+beanutils.home = ${lib.dir}/commons-beanutils
# The absolute or relative pathname of the directory containing the
# Jakarta Commons Chain library
-chain.home = /usr/local/commons-chain-1.0
+chain.home = ${lib.dir}/commons-chain
# The absolute or relative pathname of the directory containing the
# Jakarta Commons Digester library
-digester.home = /usr/local/commons-digester-1.6
+digester.home = ${lib.dir}/commons-digester
# The absolute or relative pathname of the JavaServer Faces
# implementation
@@ -69,25 +69,29 @@
jstl.home = /Developer/Java/Tools/jakarta/jakarta-taglibs-standard-1.1.0
# The absolute or relative pathname of the Commons Validator install dir
-commons-validator.home = /Developer/Java/Tools/jakarta/commons-validator-1.0.2
+validator.home = ${lib.dir}/commons-validator
# (OPTIONAL) The absolute or relative pathname to the "dist" directory
# The absolute or relative pathname of the directory containing the
# Jakarta Commons Logging library
-logging.home = /usr/local/commons-logging-1.0.4
+logging.home = ${lib.dir}/commons-logging
# The absolute or relative pathname of the directory containing your
# Servlet API classes JAR file (servlet.jar)
-server.home = /usr/local/jakarta-tomcat-5.0.28
+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
struts.home = /usr/local/jakarta-struts
# (OPTIONAL) The absolute or relative pathname to the "dist" directory
-# of the Spring Framework distribution (version 1.1.5 or later)
-spring.home=/usr/local/spring-framework-1.1.5
+# of the Spring Framework distribution (version 1.2.2 or later)
+spring.home=${lib.dir}/springframework
# (Optional) The absolute or relative pathname of the directory containing
# the "findbugs" tool (http://findbugs.sourceforge/net/)
Modified: struts/shale/trunk/core-library/build.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/build.xml?rev=224692&r1=224691&r2=224692&view=diff
==============================================================================
--- struts/shale/trunk/core-library/build.xml (original)
+++ struts/shale/trunk/core-library/build.xml Sun Jul 24 22:09:49 2005
@@ -39,9 +39,11 @@
<property name="commons-beanutils.jar"
value="${beanutils.home}/commons-beanutils.jar"/>
<property name="commons-chain.jar"
-
value="${chain.home}/commons-chain-1.0.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"/>
<!--
@@ -52,20 +54,21 @@
value="${logging.home}/commons-logging.jar"/>
<property name="commons-validator.jar"
-
value="${struts.home}/lib/commons-validator.jar"/>
+
value="${validator.home}/commons-validator.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="${server.home}/common/lib/jsp-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="${server.home}/common/lib/servlet-api.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}/dist/spring-beans.jar"/>
+ <property name="spring-beans.jar" value="${spring.home}/spring-beans.jar"/>
<property name="spring-context.jar"
-
value="${spring.home}/dist/spring-context.jar"/>
- <property name="spring-core.jar"
value="${spring.home}/dist/spring-core.jar"/>
- <property name="spring-web.jar"
value="${spring.home}/dist/spring-web.jar"/>
- <property name="tiles.jar"
value="${tiles.home}/dist/lib/tiles-core.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 -->
@@ -96,7 +99,7 @@
<path id="compile.classpath">
<pathelement location="${commons-beanutils.jar}"/>
<pathelement location="${commons-chain.jar}"/>
- <pathelement location="${commons-collections.jar}"/>
+ <!-- <pathelement location="${commons-collections.jar}"/> -->
<pathelement location="${commons-digester.jar}"/>
<!--
<pathelement location="${commons-fileupload.jar}"/>
@@ -121,7 +124,7 @@
<path id="findbugs.classpath">
<pathelement location="${commons-beanutils.jar}"/>
<pathelement location="${commons-chain.jar}"/>
- <pathelement location="${commons-collections.jar}"/>
+ <!-- <pathelement location="${commons-collections.jar}"/> -->
<pathelement location="${commons-digester.jar}"/>
<pathelement location="${commons-logging.jar}"/>
<pathelement location="${findbugs.home}/lib/findbugs-ant.jar"/>
@@ -140,7 +143,7 @@
<path id="test.classpath">
<pathelement location="${commons-beanutils.jar}"/>
<pathelement location="${commons-chain.jar}"/>
- <pathelement location="${commons-collections.jar}"/>
+ <!-- <pathelement location="${commons-collections.jar}"/> -->
<pathelement location="${commons-digester.jar}"/>
<!--
<pathelement location="${commons-fileupload.jar}"/>
@@ -204,7 +207,7 @@
<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-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}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
