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/26 19:57:54 UTC
svn commit: r240300 - in /struts/shale/trunk: build.properties.sample
build.xml core-library/build.xml
Author: craigmcc
Date: Fri Aug 26 10:57:52 2005
New Revision: 240300
URL: http://svn.apache.org/viewcvs?rev=240300&view=rev
Log:
Tweak build scripts (including build.properties.sample) for successful
building against MyFaces 1.0.9 instead of the JSF RI. If you are using
the top level Shale build.xml, you'll need to execute
"ant download-dependencies" again to pick up some new ones that MyFaces needs.
Modified:
struts/shale/trunk/build.properties.sample
struts/shale/trunk/build.xml
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=240300&r1=240299&r2=240300&view=diff
==============================================================================
--- struts/shale/trunk/build.properties.sample (original)
+++ struts/shale/trunk/build.properties.sample Fri Aug 26 10:57:52 2005
@@ -62,6 +62,17 @@
# 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
+
+# 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
+
+# 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
# The absolute or relative pathname of the JUnit 3.8.1 JAR
junit.home = /usr/local/junit-3.8.1
@@ -71,8 +82,6 @@
# The absolute or relative pathname of the Commons Validator install dir
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
Modified: struts/shale/trunk/build.xml
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/build.xml?rev=240300&r1=240299&r2=240300&view=diff
==============================================================================
--- struts/shale/trunk/build.xml (original)
+++ struts/shale/trunk/build.xml Fri Aug 26 10:57:52 2005
@@ -46,6 +46,22 @@
<fileset refid="commons-chain.libs"/>
</path>
+ <fileset id="commons-codec.libs"
+ dir="${lib.dir}/commons-codec">
+ <include name="*.jar"/>
+ </fileset>
+ <path id="commons-codec.path">
+ <fileset refid="commons-codec.libs"/>
+ </path>
+
+ <fileset id="commons-collections.libs"
+ dir="${lib.dir}/commons-collections">
+ <include name="*.jar"/>
+ </fileset>
+ <path id="commons-collections.path">
+ <fileset refid="commons-collections.libs"/>
+ </path>
+
<fileset id="commons-digester.libs"
dir="${lib.dir}/commons-digester">
<include name="*.jar"/>
@@ -54,6 +70,14 @@
<fileset refid="commons-digester.libs"/>
</path>
+ <fileset id="commons-el.libs"
+ dir="${lib.dir}/commons-el">
+ <include name="*.jar"/>
+ </fileset>
+ <path id="commons-el.path">
+ <fileset refid="commons-el.libs"/>
+ </path>
+
<fileset id="commons-logging.libs"
dir="${lib.dir}/commons-logging">
<include name="*.jar"/>
@@ -70,6 +94,14 @@
<fileset refid="commons-validator.libs"/>
</path>
+ <fileset id="jakarta-oro.libs"
+ dir="${lib.dir}/jakarta-oro">
+ <include name="*.jar"/>
+ </fileset>
+ <path id="jakarta-oro.path">
+ <fileset refid="jakarta-oro.libs"/>
+ </path>
+
<fileset id="jsf-ri-api.libs"
dir="${lib.dir}/jsf-ri">
<include name="jsf-api.jar"/>
@@ -124,6 +156,11 @@
</fileset>
<path id="myfaces-api.path">
<fileset refid="myfaces-api.libs"/>
+ <!-- MyFaces has some dependencies that the JSF RI does not ... add them here -->
+ <fileset refid="commons-codec.libs"/>
+ <fileset refid="commons-collections.libs"/>
+ <fileset refid="commons-el.libs"/>
+ <fileset refid="jakarta-oro.libs"/>
</path>
<fileset id="myfaces-impl.libs"
@@ -331,12 +368,30 @@
src="${maven.repo}/commons-chain/jars/commons-chain-1.0.jar"
usetimestamp="true"/>
+ <mkdir dir="${lib.dir}/commons-codec"/>
+ <get dest="${lib.dir}/commons-codec/commons-codec.jar"
+ ignoreerrors="true"
+ src="${maven.repo}/commons-codec/jars/commons-codec-1.2.jar"
+ usetimestamp="true"/>
+
+ <mkdir dir="${lib.dir}/commons-collections"/>
+ <get dest="${lib.dir}/commons-collections/commons-collections.jar"
+ ignoreerrors="true"
+ src="${maven.repo}/commons-collections/jars/commons-collections-3.0.jar"
+ usetimestamp="true"/>
+
<mkdir dir="${lib.dir}/commons-digester"/>
<get dest="${lib.dir}/commons-digester/commons-digester.jar"
ignoreerrors="true"
src="${maven.repo}/commons-digester/jars/commons-digester-1.7.jar"
usetimestamp="true"/>
+ <mkdir dir="${lib.dir}/commons-el"/>
+ <get dest="${lib.dir}/commons-el/commons-el.jar"
+ ignoreerrors="true"
+ src="${maven.repo}/commons-el/jars/commons-el-1.0.jar"
+ usetimestamp="true"/>
+
<mkdir dir="${lib.dir}/commons-logging"/>
<get dest="${lib.dir}/commons-logging/commons-logging.jar"
ignoreerrors="true"
@@ -347,6 +402,12 @@
<get dest="${lib.dir}/commons-validator/commons-validator.jar"
ignoreerrors="true"
src="${maven.repo}/commons-validator/jars/commons-validator-1.1.4.jar"
+ usetimestamp="true"/>
+
+ <mkdir dir="${lib.dir}/jakarta-oro"/>
+ <get dest="${lib.dir}/jakarta-oro/jakarta-oro.jar"
+ ignoreerrors="true"
+ src="${maven.repo}/oro/jars/oro-2.0.8.jar"
usetimestamp="true"/>
<mkdir dir="${lib.dir}/jsp-api"/>
Modified: struts/shale/trunk/core-library/build.xml
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/build.xml?rev=240300&r1=240299&r2=240300&view=diff
==============================================================================
--- struts/shale/trunk/core-library/build.xml (original)
+++ struts/shale/trunk/core-library/build.xml Fri Aug 26 10:57:52 2005
@@ -229,7 +229,7 @@
<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="webflow.present= ${webflow.present}"/>
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org