brondsem 2004/01/29 11:55:00
Modified: src/core default-forrest.properties forrest.build.xml
src/core/fresh-site forrest.properties
. status.xml
Added: lib/core ant-contrib-0.6.jar
Log:
<action dev="DB" type="update" context="skins">
Support multiple skin descriptor files via the forrest.skins.descriptors property
</action>
Revision Changes Path
1.6 +3 -0 xml-forrest/src/core/default-forrest.properties
Index: default-forrest.properties
===================================================================
RCS file: /home/cvs/xml-forrest/src/core/default-forrest.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- default-forrest.properties 22 Dec 2003 21:19:39 -0000 1.5
+++ default-forrest.properties 29 Jan 2004 19:55:00 -0000 1.6
@@ -14,6 +14,9 @@
#project.skin=avalon-tigris
#project.skin=krysalis-site
+# comma seperated list, file:/// is supported
+forrest.skins.descriptors=http://xml.apache.org/forrest/skins/skins.xml
+
##############
# behavioural properties
project.menu-scheme=tab_attributes
1.25 +39 -11 xml-forrest/src/core/forrest.build.xml
Index: forrest.build.xml
===================================================================
RCS file: /home/cvs/xml-forrest/src/core/forrest.build.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- forrest.build.xml 29 Jan 2004 15:23:39 -0000 1.24
+++ forrest.build.xml 29 Jan 2004 19:55:00 -0000 1.25
@@ -28,6 +28,11 @@
<fileset dir="${forrest.home}/lib/core" includes="jing*.jar" />
</classpath>
</taskdef>
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties">
+ <classpath>
+ <fileset dir="${forrest.home}/lib/core" includes="ant-contrib-*.jar" />
+ </classpath>
+ </taskdef>
<!-- ***************************************************************** -->
@@ -1097,12 +1102,19 @@
<!-- public targets -->
<target name="available-skins"
- depends="init-props, skin-unavailable, fetch-skins-descriptor"
+ depends="init-props, skin-unavailable, fetch-skins-descriptors"
description="What skins are available?">
- <xslt in="${forrest.skins-dir}/skins.xml"
+ <for param="skin-descriptor-file">
+ <path>
+ <fileset dir="${forrest.skins-dir}" includes="skins-*.xml"/>
+ </path>
+ <sequential>
+ <xslt in="@{skin-descriptor-file}"
out="${project.temp-dir}/skinlist2echobuild.xml"
style="${forrest.home}/var/skinlist2echo.xsl"/>
<ant antfile="${project.temp-dir}/skinlist2echobuild.xml"/>
+ </sequential>
+ </for>
</target>
<target name="package-skin" description="Make a package of an existing skin" depends="init-props">
@@ -1155,17 +1167,32 @@
</delete>
</target>
- <target name="fetch-skins-descriptor"
- if = "skin.unavailable">
- <get src="http://xml.apache.org/forrest/skins/skins.xml"
- dest="${forrest.skins-dir}/skins.xml"
- verbose="true" usetimestamp="true" ignoreerrors="false"/>
+ <target name="fetch-skins-descriptors">
+ <delete>
+ <fileset dir="${forrest.skins-dir}" includes="skins-*.xml"/>
+ </delete>
+
+ <var name="skin-counter" value="1"/>
+ <for list="${forrest.skins.descriptors}" param="url">
+ <sequential>
+ <echo>fetching descriptor: @{url}</echo>
+ <get src="@{url}"
+ dest="${forrest.skins-dir}/skins-${skin-counter}.xml"
+ verbose="true" usetimestamp="true" ignoreerrors="true"/>
+ <math result="skin-counter" operand1="${skin-counter}" operation="+" operand2="1"
datatype="int"/>
+ </sequential>
+ </for>
</target>
<target name="fetch-skin"
if = "skin.unavailable"
- depends="init-props, fetch-skins-descriptor">
- <xslt in="${forrest.skins-dir}/skins.xml"
+ depends="init-props, fetch-skins-descriptors">
+ <for param="skin-descriptor-file">
+ <path>
+ <fileset dir="${forrest.skins-dir}" includes="skins-*.xml"/>
+ </path>
+ <sequential>
+ <xslt in="@{skin-descriptor-file}"
out="${project.temp-dir}/skinlist2fetchbuild.xml"
style="${forrest.home}/var/skinlist2fetch.xsl"
force="true">
@@ -1173,7 +1200,8 @@
<param name="forrest-version" expression="${version}"/>
</xslt>
<ant antfile="${project.temp-dir}/skinlist2fetchbuild.xml"/>
+ </sequential>
+ </for>
</target>
-
</project>
1.4 +3 -0 xml-forrest/src/core/fresh-site/forrest.properties
Index: forrest.properties
===================================================================
RCS file: /home/cvs/xml-forrest/src/core/fresh-site/forrest.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- forrest.properties 3 Jan 2004 15:32:53 -0000 1.3
+++ forrest.properties 29 Jan 2004 19:55:00 -0000 1.4
@@ -14,6 +14,9 @@
#project.skin=krysalis-site
#project.skin=tigris-style
+# comma seperated list, file:/// is supported
+#forrest.skins.descriptors=http://xml.apache.org/forrest/skins/skins.xml,file:///c:/myskins/skins.xml
+
##############
# behavioural properties
#project.menu-scheme=tab_attributes
1.280 +4 -1 xml-forrest/status.xml
Index: status.xml
===================================================================
RCS file: /home/cvs/xml-forrest/status.xml,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -r1.279 -r1.280
--- status.xml 29 Jan 2004 15:42:19 -0000 1.279
+++ status.xml 29 Jan 2004 19:55:00 -0000 1.280
@@ -29,6 +29,9 @@
<changes>
<release version="0.6-dev" date="unreleased">
+ <action dev="DB" type="update" context="skins">
+ Support multiple skin descriptor files via the forrest.skins.descriptors property
+ </action>
<action dev="JJP" type="fix" context="core">
Move ant + Jetty under tools on the build target
</action>
1.1 xml-forrest/lib/core/ant-contrib-0.6.jar
<<Binary file>>
|