Author: cdupoirieux
Date: Fri Mar 16 07:54:08 2007
New Revision: 518991
URL: http://svn.apache.org/viewvc?view=rev&rev=518991
Log:
Test target improvement to test a skinned site AND a dispatcher one.
Added:
forrest/trunk/main/fresh-site/forrest.properties.dispatcher.properties
(with props)
Modified:
forrest/trunk/main/build.xml
Modified: forrest/trunk/main/build.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/build.xml?view=diff&rev=518991&r1=518990&r2=518991
==============================================================================
--- forrest/trunk/main/build.xml (original)
+++ forrest/trunk/main/build.xml Fri Mar 16 07:54:08 2007
@@ -22,7 +22,18 @@
Run the build script: build.bat or build.sh
</description>
- <target name="init">
+ <!-- Global properties for taskdef ... -->
+ <property name="forrest.home" location=".."/>
+ <property name="forrest.ant.lib-dir"
location="${forrest.home}/tools/ant/lib"/>
+
+ <!-- Defintion of optional but useful targets ... -->
+ <taskdef resource="net/sf/antcontrib/antlib.xml">
+ <classpath>
+ <fileset dir="${forrest.ant.lib-dir}" includes="ant-contrib-*.jar" />
+ </classpath>
+ </taskdef>
+
+ <target name="init">
<tstamp>
<format property="YEAR" pattern="yyyy" locale="en"/>
</tstamp>
@@ -43,7 +54,6 @@
<property name="name" value="apache-forrest"/>
<property name="forrest.version" value="0.8-dev"/>
- <property name="forrest.home" location=".."/>
<property name="forrest.core" location="."/>
<property name="java.dir" location="java"/>
@@ -329,16 +339,33 @@
</target>
<target name="testseed" depends="init, cleanPlugins">
- <echo>=============================</echo>
- <echo>Testing a seeded site</echo>
- <echo>=============================</echo>
- <property name="test.dir" value="${build.dir}/test"/>
+ <for list="skinned,dispatcher" param="type">
+ <sequential>
+ <antcall target="testSeedSiteType">
+ <param name="test.seed.site.type" value="@{type}"/>
+ </antcall>
+ </sequential>
+ </for>
+ </target>
+
+ <target name="testSeedSiteType" if="test.seed.site.type">
+ <echo>
+ -------------------------------------
+ Testing seeded ${test.seed.site.type} site ...
+ -------------------------------------
+ </echo>
+ <echo/>
+ <property name="test.dir"
value="${build.dir}/test_${test.seed.site.type}_site"/>
<delete dir="${test.dir}"/>
<mkdir dir="${test.dir}"/>
<ant antfile="${forrest.core}/forrest.build.xml" target="seed">
<property name="forrest.home" value="${forrest.home}"/>
<property name="project.home" value="${test.dir}"/>
</ant>
+ <copy
file="${test.dir}/forrest.properties.${test.seed.site.type}.properties"
tofile="${test.dir}/forrest.properties" failonerror="false"/>
+ <delete file="${test.dir}/forrest.properties.*.properties"
failonerror="false">
+ <fileset dir="${test.dir}" includes="forrest.properties.*.properties"/>
+ </delete>
<ant antfile="${forrest.core}/forrest.build.xml" target="site">
<property name="forrest.home" value="${forrest.home}"/>
<property name="project.home" value="${test.dir}"/>
Added: forrest/trunk/main/fresh-site/forrest.properties.dispatcher.properties
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/fresh-site/forrest.properties.dispatcher.properties?view=auto&rev=518991
==============================================================================
--- forrest/trunk/main/fresh-site/forrest.properties.dispatcher.properties
(added)
+++ forrest/trunk/main/fresh-site/forrest.properties.dispatcher.properties Fri
Mar 16 07:54:08 2007
@@ -0,0 +1,152 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+##############
+# These are the defaults, un-comment them only if you need to change them.
+#
+# You can even have a completely empty file, to assist with maintenance.
+# This file is required, even if empty.
+#
+# The file obtained from 'forrest seed-sample' shows the defaults.
+##############
+
+# Prints out a summary of Forrest settings for this project
+#forrest.echo=true
+
+# Project name (used to name .war file)
+#project.name=my-project
+
+# Specifies name of Forrest skin to use
+# See list at http://forrest.apache.org/docs/skins.html
+#project.skin=pelt
+
+# Descriptors for plugins and skins
+# comma separated list, file:// is supported
+#forrest.skins.descriptors=http://forrest.apache.org/skins/skins.xml,file:///c:/myskins/skins.xml
+#forrest.plugins.descriptors=http://forrest.apache.org/plugins/plugins.xml,http://forrest.apache.org/plugins/whiteboard-plugins.xml
+
+##############
+# behavioural properties
+#project.menu-scheme=tab_attributes
+#project.menu-scheme=directories
+
+##############
+# layout properties
+
+# Properties that can be set to override the default locations
+#
+# Parent properties must be set. This usually means uncommenting
+# project.content-dir if any other property using it is uncommented
+
+#project.status=status.xml
+#project.content-dir=src/documentation
+#project.raw-content-dir=${project.content-dir}/content
+#project.conf-dir=${project.content-dir}/conf
+#project.sitemap-dir=${project.content-dir}
+#project.xdocs-dir=${project.content-dir}/content/xdocs
+#project.resources-dir=${project.content-dir}/resources
+#project.stylesheets-dir=${project.resources-dir}/stylesheets
+#project.images-dir=${project.resources-dir}/images
+#project.schema-dir=${project.resources-dir}/schema
+#project.skins-dir=${project.content-dir}/skins
+#project.skinconf=${project.content-dir}/skinconf.xml
+#project.lib-dir=${project.content-dir}/lib
+#project.classes-dir=${project.content-dir}/classes
+#project.translations-dir=${project.content-dir}/translations
+
+#project.build-dir=${project.home}/build
+#project.site=site
+#project.site-dir=${project.build-dir}/${project.site}
+#project.temp-dir=${project.build-dir}/tmp
+
+##############
+# Cocoon catalog entity resolver properties
+# A local OASIS catalog file to supplement the default Forrest catalog
+#project.catalog=${project.schema-dir}/catalog.xcat
+
+##############
+# validation properties
+
+# This set of properties determine if validation is performed
+# Values are inherited unless overridden.
+# e.g. if forrest.validate=false then all others are false unless set to true.
+#forrest.validate=true
+#forrest.validate.xdocs=${forrest.validate}
+#forrest.validate.skinconf=${forrest.validate}
+#forrest.validate.sitemap=${forrest.validate}
+#forrest.validate.stylesheets=${forrest.validate}
+#forrest.validate.skins=${forrest.validate}
+#forrest.validate.skins.stylesheets=${forrest.validate.skins}
+
+# *.failonerror=(true|false) - stop when an XML file is invalid
+#forrest.validate.failonerror=true
+
+# *.excludes=(pattern) - comma-separated list of path patterns to not validate
+# Note: If you do add an "excludes" list then you need to specify site.xml too.
+# e.g.
+#forrest.validate.xdocs.excludes=site.xml, samples/subdir/**, samples/faq.xml
+#forrest.validate.xdocs.excludes=site.xml
+
+
+##############
+# General Forrest properties
+
+# The URL to start crawling from
+#project.start-uri=linkmap.html
+
+# Set logging level for messages printed to the console
+# (DEBUG, INFO, WARN, ERROR, FATAL_ERROR)
+#project.debuglevel=ERROR
+
+# Max memory to allocate to Java
+#forrest.maxmemory=64m
+
+# Any other arguments to pass to the JVM. For example, to run on an X-less
+# server, set to -Djava.awt.headless=true
+#forrest.jvmargs=
+
+# The bugtracking URL - the issue number will be appended
+# Projects would use their own issue tracker, of course.
+#project.bugtracking-url=http://issues.apache.org/bugzilla/show_bug.cgi?id=
+#project.bugtracking-url=http://issues.apache.org/jira/browse/
+
+# The issues list as rss
+#project.issues-rss-url=
+
+#I18n Property. Based on the locale request for the browser.
+#If you want to use it for static site then modify the JVM system.language
+# and run once per language
+project.i18n=true
+
+# The names of plugins that are required to build the project
+# comma separated list (no spaces)
+# You can request a specific version by appending "-VERSION" to the end of
+# the plugin name. If you exclude a version number, the latest released version
+# will be used. However, be aware that this may be a development version. In
+# a production environment it is recommended that you specify a known working
+# version.
+# Run "forrest available-plugins" for a list of plug-ins currently available.
+project.required.plugins=org.apache.forrest.plugin.output.pdf
+project.required.plugins=org.apache.forrest.plugin.output.pdf,org.apache.forrest.plugin.internal.dispatcher,org.apache.forrest.themes.core,org.apache.forrest.plugin.output.inputModule
+
+# codename: Dispatcher
+# Add the following plugins to project.required.plugins:
+
+# Proxy configuration
+# - proxy.user and proxy.password are only needed if the proxy is an
authenticated one...
+# proxy.host=myproxy.myhost.com
+# proxy.port=<ProxyPort>
+# proxy.user=<login, if authenticated proxy>
+# proxy.password=<password, if authenticated proxy>
Propchange:
forrest/trunk/main/fresh-site/forrest.properties.dispatcher.properties
------------------------------------------------------------------------------
svn:eol-style = native
