Author: craigmcc
Date: Sat Aug 27 14:12:22 2005
New Revision: 240457
URL: http://svn.apache.org/viewcvs?rev=240457&view=rev
Log:
Further tweaks to the global build script, to use resources from the
downloaded dependencies library directory in all cases. Also, updated
dependencies to use the official version of MyFaces 1.0.9, instead of
the rc3 version.
PR: Bugzilla #36393
Submitted By: Manfred Klug <manklu AT web.de>
Modified:
struts/shale/trunk/build.properties.sample
struts/shale/trunk/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=240457&r1=240456&r2=240457&view=diff
==============================================================================
--- struts/shale/trunk/build.properties.sample (original)
+++ struts/shale/trunk/build.properties.sample Sat Aug 27 14:12:22 2005
@@ -61,24 +61,24 @@
# The absolute or relative pathname of the JavaServer Faces
# implementation
-jsf.home = /usr/local/jsf-1_1_01
-#jsf.home = /usr/local/myfaces-1.0.9
+jsf.home = ${lib.dir}/jsf-ri
+#jsf.home = ${lib.dir}/myfaces
# The absolute pathname of the JavaServer Faces API jar file
# for your implementation
-jsf-api.jar = ${jsf.home}/lib/jsf-api.jar
-#jsf-api.jar = ${jsf.home}/lib/myfaces-jsf-api.jar
+jsf-api.jar = ${jsf.home}//jsf-api.jar
+#jsf-api.jar = ${jsf.home}/myfaces-api.jar
# The absolute pathname of the JavaServer Faces implementation jar file
# for your implementation
-jsf-impl.jar = ${jsf.home}/lib/jsf-impl.jar
-#jsf-impl.jar = ${jsf.home}/lib/myfaces-impl.jar
+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 = /usr/local/junit-3.8.1
+junit.home = ${lib.dir}/junit
# The absolute or relative pathname of the JSTL install dir
-jstl.home = /Developer/Java/Tools/jakarta/jakarta-taglibs-standard-1.1.0
+jstl.home = ${lib.dir}/jstl-ri
# The absolute or relative pathname of the Commons Validator install dir
validator.home = ${lib.dir}/commons-validator
Modified: struts/shale/trunk/build.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/build.xml?rev=240457&r1=240456&r2=240457&view=diff
==============================================================================
--- struts/shale/trunk/build.xml (original)
+++ struts/shale/trunk/build.xml Sat Aug 27 14:12:22 2005
@@ -78,6 +78,14 @@
<fileset refid="commons-el.libs"/>
</path>
+ <fileset id="commons-fileupload.libs"
+ dir="${lib.dir}/commons-fileupload">
+ <include name="*.jar"/>
+ </fileset>
+ <path id="commons-fileupload.path">
+ <fileset refid="commons-fileupload.libs"/>
+ </path>
+
<fileset id="commons-logging.libs"
dir="${lib.dir}/commons-logging">
<include name="*.jar"/>
@@ -160,7 +168,7 @@
<fileset refid="commons-codec.libs"/>
<fileset refid="commons-collections.libs"/>
<fileset refid="commons-el.libs"/>
- <fileset refid="jakarta-oro.libs"/>
+ <fileset refid="commons-fileupload.libs"/>
</path>
<fileset id="myfaces-impl.libs"
@@ -392,6 +400,12 @@
src="${maven.repo}/commons-el/jars/commons-el-1.0.jar"
usetimestamp="true"/>
+ <mkdir dir="${lib.dir}/commons-fileupload"/>
+ <get dest="${lib.dir}/commons-fileupload/commons-fileupload.jar"
+ ignoreerrors="true"
+
src="${maven.repo}/commons-fileupload/jars/commons-fileupload-1.0.jar"
+ usetimestamp="true"/>
+
<mkdir dir="${lib.dir}/commons-logging"/>
<get dest="${lib.dir}/commons-logging/commons-logging.jar"
ignoreerrors="true"
@@ -435,11 +449,11 @@
<mkdir dir="${lib.dir}/myfaces"/>
<get dest="${lib.dir}/myfaces/myfaces-api.jar"
ignoreerrors="true"
- src="${maven.repo}/myfaces/jars/myfaces-jsf-api-1.0.9rc3.jar"
+ src="${maven.repo}/myfaces/jars/myfaces-jsf-api-1.0.9.jar"
usetimestamp="true"/>
<get dest="${lib.dir}/myfaces/myfaces-impl.jar"
ignoreerrors="true"
- src="${maven.repo}/myfaces/jars/myfaces-impl-1.0.9rc3.jar"
+ src="${maven.repo}/myfaces/jars/myfaces-impl-1.0.9.jar"
usetimestamp="true"/>
<mkdir dir="${lib.dir}/portlet-api"/>
Modified: struts/shale/trunk/use-cases/build.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/use-cases/build.xml?rev=240457&r1=240456&r2=240457&view=diff
==============================================================================
--- struts/shale/trunk/use-cases/build.xml (original)
+++ struts/shale/trunk/use-cases/build.xml Sat Aug 27 14:12:22 2005
@@ -60,7 +60,13 @@
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"/>
@@ -246,6 +252,8 @@
<copy todir="${build.home}/${context.path}/WEB-INF/lib"
file="${commons-validator.jar}"/>
<copy todir="${build.home}/${context.path}/WEB-INF/lib"
+ file="${jakarta-oro.jar}"/>
+ <copy todir="${build.home}/${context.path}/WEB-INF/lib"
file="${shale-core.jar}"/>
<copy todir="${build.home}/${context.path}/WEB-INF/lib"
file="${shale-clay.jar}"/>
@@ -318,17 +326,13 @@
<!-- Copy additional libraries required by MyFaces (version 1.0.8) -->
<copy todir="${build.home}/${context.path}/WEB-INF/lib"
- file="${jsf.home}/lib/commons-codec-1.2.jar"/>
- <copy todir="${build.home}/${context.path}/WEB-INF/lib"
- file="${jsf.home}/lib/commons-el.jar"/>
- <copy todir="${build.home}/${context.path}/WEB-INF/lib"
- file="${jsf.home}/lib/commons-fileupload-1.0.jar"/>
+ file="${commons-codec.jar}"/>
<copy todir="${build.home}/${context.path}/WEB-INF/lib"
- file="${jsf.home}/lib/commons-validator.jar"/>
+ file="${commons-el.jar}"/>
<copy todir="${build.home}/${context.path}/WEB-INF/lib"
- file="${jsf.home}/lib/jakarta-oro.jar"/>
+ file="${commons-fileupload.jar}"/>
<copy todir="${build.home}/${context.path}/WEB-INF/lib"
- file="${jsf.home}/lib/myfaces-extensions.jar"/>
+ file="${jsf.home}/myfaces-extensions.jar"/>
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
