Update of /var/cvs/all
In directory james.mmbase.org:/tmp/cvs-serv24781
Modified Files:
Tag: MMBase-1_8
build.properties.default build.xml
Log Message:
adjustments for the vpro-wizards:
- applications can now contian tagfiles. they are copied to
WEB-INF/tags/[applicatiename] by the install.tagfiles target
- a new version of commons-fileupload is required by spring. this version in
turn requires commons-io
See also: http://cvs.mmbase.org/viewcvs/all
Index: build.properties.default
===================================================================
RCS file: /var/cvs/all/build.properties.default,v
retrieving revision 1.26.2.5
retrieving revision 1.26.2.6
diff -u -b -r1.26.2.5 -r1.26.2.6
--- build.properties.default 31 Mar 2008 16:24:59 -0000 1.26.2.5
+++ build.properties.default 30 Jun 2008 09:09:32 -0000 1.26.2.6
@@ -12,7 +12,7 @@
#
# for possible mirrors.
#
-# $Id: build.properties.default,v 1.26.2.5 2008/03/31 16:24:59 michiel Exp $
+# $Id: build.properties.default,v 1.26.2.6 2008/06/30 09:09:32 ernst Exp $
# -----------------------------------------------------------------------------
@@ -123,14 +123,19 @@
xerces.jar=${expand.dir}/${xalan.fullversion}/xercesImpl.jar
xml-apis.jar=${expand.dir}/${xalan.fullversion}/xml-apis.jar
-# ----- Jakarta file upload ----------
-fileupload.version=commons-fileupload-1.0
+# ----- Apache Commons file upload ----------
+fileupload.version=commons-fileupload-1.2
fileupload.file=${fileupload.version}.tar.gz
fileupload.dest=${download.dir}/${fileupload.file}
fileupload.loc=http://www.mmbase.org/download/jars/${fileupload.file}
-fileupload.jar=${expand.dir}/${fileupload.version}/commons-fileupload-1.0.jar
-
+fileupload.jar=${expand.dir}/${fileupload.version}/lib/${fileupload.version}.jar
+# ----- Apache Commons IO ----------
+io.version=commons-io-1.4
+io.file=${io.version}.tar.gz
+io.dest=${download.dir}/${io.file}
+io.loc=http://www.mmbase.org/download/jars/${io.file}
+io.jar=${expand.dir}/${io.version}/${io.version}.jar
# ----- Standard taglib + jstl ------------
taglibs-standard.version=jakarta-taglibs-standard-1.1.2
Index: build.xml
===================================================================
RCS file: /var/cvs/all/build.xml,v
retrieving revision 1.147.2.8
retrieving revision 1.147.2.9
diff -u -b -r1.147.2.8 -r1.147.2.9
--- build.xml 17 Jun 2008 10:19:13 -0000 1.147.2.8
+++ build.xml 30 Jun 2008 09:09:32 -0000 1.147.2.9
@@ -2,7 +2,7 @@
MMBase Build File
-$Id: build.xml,v 1.147.2.8 2008/06/17 10:19:13 michiel Exp $
+$Id: build.xml,v 1.147.2.9 2008/06/30 09:09:32 ernst Exp $
=================
This build file can be used to build the following from CVS or from the source
@@ -317,6 +317,7 @@
<copy file="${log4j.jar}" tofile="${release.lib.dir}/log4j.jar" />
<copy file="${fileupload.jar}"
tofile="${release.lib.dir}/commons-fileupload.jar" />
+ <copy file="${io.jar}" tofile="${release.lib.dir}/commons-io.jar" />
<copy file="${hsqldb.jar}" todir="${release.lib.dir}" />
<!--
<copy file="${jai_codec.jar}" todir="${release.lib.dir}" />
@@ -358,6 +359,7 @@
<copy file="${servlet.jar}" todir="${compile.lib.dir}" />
<copy file="${fileupload.jar}"
tofile="${compile.lib.dir}/commons-fileupload.jar" />
+ <copy file="${io.jar}" tofile="${compile.lib.dir}/commons-io.jar" />
<copy file="${jai_codec.jar}" todir="${compile.lib.dir}" />
<copy file="${jai_core.jar}" todir="${compile.lib.dir}" />
<copy file="${log4j.jar}" tofile="${compile.lib.dir}/log4j.jar" />
@@ -699,12 +701,13 @@
<or>
<filename name="mmbase.jar" />
<filename name="mmbase-taglib-2.jar" />
- <filename name="backport-util*.jar" />
- <filename name="hsqldb*.jar" />
- <filename name="jstl*.jar" />
- <filename name="standard*.jar" />
- <filename name="log4j*.jar" />
- <filename name="commons-fileupload*.jar" />
+ <filename name="backport-util.jar" />
+ <filename name="hsqldb.jar" />
+ <filename name="jstl.jar" />
+ <filename name="standard.jar" />
+ <filename name="log4j.jar" />
+ <filename name="commons-fileupload.jar" />
+ <filename name="commons-io.jar" />
<!-- Xalan is used only by context security
Would be nice to drop that dependency.
In real life always editwizard depend too
@@ -1072,6 +1075,13 @@
<param name="expandedfile" value="${fileupload.jar}"/>
</antcall>
+ <echo message="io" />
+ <antcall target="downloadgz">
+ <param name="sourcefile" value="${io.loc}"/>
+ <param name="destfile" value="${io.dest}"/>
+ <param name="expandedfile" value="${io.jar}"/>
+ </antcall>
+
<echo message="JSTL" />
<antcall target="downloadgz">
@@ -1357,7 +1367,7 @@
<target name="javacc" depends="javacc.install">
<mkdir dir="${generated-source-src.dir}/org/mmbase/util/dateparser"/>
- <mkdir dir="${generated-source-src.dir}/org/mmbase/util/tranformers"/>
+ <mkdir dir="${generated-source-src.dir}/org/mmbase/util/transformers"/>
<echo message="${javacc.dir}" />
<javacc
target="${source-src.dir}/org/mmbase/util/DateParser.jj"
@@ -1366,7 +1376,7 @@
/>
<javacc
target="${source-src.dir}/org/mmbase/util/transformers/ListParser.jj"
-
outputdirectory="${generated-source-src.dir}/org/mmbase/util/tranformers"
+
outputdirectory="${generated-source-src.dir}/org/mmbase/util/transformers"
javacchome="${javacc.dir}"
/>
</target>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
