You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by st...@apache.org on 2005/08/01 21:58:27 UTC
svn commit: r226868 - in /incubator/beehive/trunk/docs/forrest: ./
src/documentation/ src/documentation/classes/ src/documentation/translations/
Author: steveh
Date: Mon Aug 1 12:58:24 2005
New Revision: 226868
URL: http://svn.apache.org/viewcvs?rev=226868&view=rev
Log:
Upgrading from Forrest 0.6 to 0.7.
This checkin will *break* the build targets "build.dist" and "build.dist.docs", unless you upgrade to Forrest 0.7.
To upgrade to Forrest 0.7:
(1) Download Forrest 0.7 from: http://mirror.ipaska.net/apache/forrest/ and unzip the distribution on your machine.
(2) Set the FORREST_HOME variable on your machine:
FORREST_HOME=C:\apache\apache-forrest-0.7 (or wherever you unzipped the Forrest distribution)
(3) Add the following to your PATH:
FORREST_HOME\bin
Added:
incubator/beehive/trunk/docs/forrest/src/documentation/sitemap.xmap
Modified:
incubator/beehive/trunk/docs/forrest/build.xml
incubator/beehive/trunk/docs/forrest/forrest.properties
incubator/beehive/trunk/docs/forrest/src/documentation/classes/CatalogManager.properties
incubator/beehive/trunk/docs/forrest/src/documentation/translations/langcode.xml
incubator/beehive/trunk/docs/forrest/src/documentation/translations/languages_en.xml
incubator/beehive/trunk/docs/forrest/src/documentation/translations/languages_es.xml
incubator/beehive/trunk/docs/forrest/src/documentation/translations/menu.xml
incubator/beehive/trunk/docs/forrest/src/documentation/translations/menu_af.xml
incubator/beehive/trunk/docs/forrest/src/documentation/translations/menu_de.xml
incubator/beehive/trunk/docs/forrest/src/documentation/translations/menu_es.xml
incubator/beehive/trunk/docs/forrest/src/documentation/translations/menu_it.xml
incubator/beehive/trunk/docs/forrest/src/documentation/translations/menu_no.xml
incubator/beehive/trunk/docs/forrest/src/documentation/translations/menu_ru.xml
incubator/beehive/trunk/docs/forrest/src/documentation/translations/menu_sk.xml
incubator/beehive/trunk/docs/forrest/src/documentation/translations/tabs.xml
incubator/beehive/trunk/docs/forrest/src/documentation/translations/tabs_es.xml
Modified: incubator/beehive/trunk/docs/forrest/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/build.xml?rev=226868&r1=226867&r2=226868&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/build.xml (original)
+++ incubator/beehive/trunk/docs/forrest/build.xml Mon Aug 1 12:58:24 2005
@@ -13,7 +13,7 @@
<property environment="os"/>
<property name="forrest.home" location="${os.FORREST_HOME}"/>
- <import file="${os.FORREST_HOME}/forrest.build.xml"/>
+ <import file="${os.FORREST_HOME}/main/forrest.build.xml"/>
<target name="build">
<antcall target="site"/>
Modified: incubator/beehive/trunk/docs/forrest/forrest.properties
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/forrest.properties?rev=226868&r1=226867&r2=226868&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/forrest.properties (original)
+++ incubator/beehive/trunk/docs/forrest/forrest.properties Mon Aug 1 12:58:24 2005
@@ -1,4 +1,5 @@
-# Copyright 2002-2004 The Apache Software Foundation
+# Copyright 2002-2005 The Apache Software Foundation or its licensors,
+# as applicable.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,21 +15,23 @@
##############
# Properties used by forrest.build.xml for building the website
-# These are the defaults, un-comment them if you need to change them.
+# These are the defaults, un-comment them only if you need to change them.
##############
# Prints out a summary of Forrest settings for this project
-#forrest.echo=true
+#forrest.echo=true
# Project name (used to name .war file)
#project.name=my-project
# Specifies name of Forrest skin to use
-#project.skin=tigris
+# 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
@@ -87,18 +90,40 @@
# 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
#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 only works for the "forrest run" target.
+
+#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 recomended 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
+
+# Proxy configuration
+# proxy.host=
+# proxy.port=
Modified: incubator/beehive/trunk/docs/forrest/src/documentation/classes/CatalogManager.properties
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/classes/CatalogManager.properties?rev=226868&r1=226867&r2=226868&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/classes/CatalogManager.properties (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/classes/CatalogManager.properties Mon Aug 1 12:58:24 2005
@@ -1,4 +1,5 @@
-# Copyright 2002-2004 The Apache Software Foundation
+# Copyright 2002-2005 The Apache Software Foundation or its licensors,
+# as applicable.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,25 +14,44 @@
# limitations under the License.
#=======================================================================
-# CatalogManager.properties
+# CatalogManager.properties for Catalog Entity Resolver.
#
-# This is the default properties file for Apache Forrest.
+# This is the default properties file for your project.
# This facilitates local configuration of application-specific catalogs.
+# If you have defined any local catalogs, then they will be loaded
+# before Forrest's core catalogs.
#
# See the Apache Forrest documentation:
# http://forrest.apache.org/docs/your-project.html
# http://forrest.apache.org/docs/validation.html
-# verbosity ... level of messages for status/debug
-# See forrest/src/core/context/WEB-INF/cocoon.xconf
+# verbosity:
+# The level of messages for status/debug (messages go to standard output).
+# The setting here is for your own local catalogs.
+# The verbosity of Forrest's core catalogs is controlled via
+# main/webapp/WEB-INF/cocoon.xconf
+#
+# The following messages are provided ...
+# 0 = none
+# 1 = ? (... not sure yet)
+# 2 = 1+, Loading catalog, Resolved public, Resolved system
+# 3 = 2+, Catalog does not exist, resolvePublic, resolveSystem
+# 10 = 3+, List all catalog entries when loading a catalog
+# (Cocoon also logs the "Resolved public" messages.)
+verbosity=1
# catalogs ... list of additional catalogs to load
# (Note that Apache Forrest will automatically load its own default catalog
-# from src/core/context/resources/schema/catalog.xcat)
-# use full pathnames
+# from main/webapp/resources/schema/catalog.xcat)
+# Use either full pathnames or relative pathnames.
# pathname separator is always semi-colon (;) regardless of operating system
# directory separator is always slash (/) regardless of operating system
-#
-#catalogs=/home/me/forrest/my-site/src/documentation/resources/schema/catalog.xcat
-catalogs=
+catalogs=../resources/schema/catalog.xcat
+# relative-catalogs
+# If false, relative catalog URIs are made absolute with respect to the
+# base URI of the CatalogManager.properties file. This setting only
+# applies to catalog URIs obtained from the catalogs property in the
+# CatalogManager.properties file
+# Example: relative-catalogs=[yes|no]
+relative-catalogs=no
Added: incubator/beehive/trunk/docs/forrest/src/documentation/sitemap.xmap
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/sitemap.xmap?rev=226868&view=auto
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/sitemap.xmap (added)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/sitemap.xmap Mon Aug 1 12:58:24 2005
@@ -0,0 +1,72 @@
+<?xml version="1.0"?>
+<!--
+ Copyright 2002-2005 The Apache Software Foundation or its licensors,
+ as applicable.
+
+ Licensed 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.
+-->
+<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+
+ <map:components>
+ <map:actions>
+ <map:action logger="sitemap.action.sourcetype" name="sourcetype" src="org.apache.forrest.sourcetype.SourceTypeAction">
+ <sourcetype name="hello-v1.0">
+ <document-declaration public-id="-//Acme//DTD Hello Document V1.0//EN" />
+ </sourcetype>
+ </map:action>
+ </map:actions>
+
+ <map:selectors default="parameter">
+ <map:selector logger="sitemap.selector.parameter" name="parameter" src="org.apache.cocoon.selection.ParameterSelector" />
+ </map:selectors>
+ </map:components>
+
+ <map:resources>
+ <map:resource name="transform-to-document">
+ <map:act type="sourcetype" src="{src}">
+ <map:select type="parameter">
+ <map:parameter name="parameter-selector-test" value="{sourcetype}" />
+
+ <map:when test="hello-v1.0">
+ <map:generate src="{project:content.xdocs}{../../1}.xml" />
+ <map:transform src="{project:resources.stylesheets}/hello2document.xsl" />
+ <map:serialize type="xml-document"/>
+ </map:when>
+ </map:select>
+ </map:act>
+ </map:resource>
+ </map:resources>
+
+ <map:pipelines>
+ <map:pipeline>
+ <map:match pattern="old_site/*.html">
+ <map:select type="exists">
+ <map:when test="{project:content}{1}.html">
+ <map:read src="{project:content}{1}.html" mime-type="text/html"/>
+ <!--
+ Use this instead if you want JTidy to clean up your HTML
+ <map:generate type="html" src="{project:content}/{0}" />
+ <map:serialize type="html"/>
+ -->
+ </map:when>
+ </map:select>
+ </map:match>
+
+ <map:match pattern="**.xml">
+ <map:call resource="transform-to-document">
+ <map:parameter name="src" value="{project:content.xdocs}{1}.xml" />
+ </map:call>
+ </map:match>
+ </map:pipeline>
+ </map:pipelines>
+</map:sitemap>
Modified: incubator/beehive/trunk/docs/forrest/src/documentation/translations/langcode.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/translations/langcode.xml?rev=226868&r1=226867&r2=226868&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/translations/langcode.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/translations/langcode.xml Mon Aug 1 12:58:24 2005
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2002-2004 The Apache Software Foundation
+ Copyright 2002-2004 The Apache Software Foundation or its licensors,
+ as applicable.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Modified: incubator/beehive/trunk/docs/forrest/src/documentation/translations/languages_en.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/translations/languages_en.xml?rev=226868&r1=226867&r2=226868&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/translations/languages_en.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/translations/languages_en.xml Mon Aug 1 12:58:24 2005
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2002-2004 The Apache Software Foundation
+ Copyright 2002-2004 The Apache Software Foundation or its licensors,
+ as applicable.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Modified: incubator/beehive/trunk/docs/forrest/src/documentation/translations/languages_es.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/translations/languages_es.xml?rev=226868&r1=226867&r2=226868&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/translations/languages_es.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/translations/languages_es.xml Mon Aug 1 12:58:24 2005
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2002-2004 The Apache Software Foundation
+ Copyright 2002-2004 The Apache Software Foundation or its licensors,
+ as applicable.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,7 +16,7 @@
limitations under the License.
-->
<catalogue xml:lang="es">
- <message key="en">Ingles</message>
- <message key="es">Espanol</message>
- <message key="nl">Holandes</message>
+ <message key="en">Inglés</message>
+ <message key="es">Español</message>
+ <message key="nl">Holandés</message>
</catalogue>
Modified: incubator/beehive/trunk/docs/forrest/src/documentation/translations/menu.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/translations/menu.xml?rev=226868&r1=226867&r2=226868&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/translations/menu.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/translations/menu.xml Mon Aug 1 12:58:24 2005
@@ -1,6 +1,7 @@
<?xml version="1.0"?>
<!--
- Copyright 2002-2004 The Apache Software Foundation
+ Copyright 2002-2004 The Apache Software Foundation or its licensors,
+ as applicable.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Modified: incubator/beehive/trunk/docs/forrest/src/documentation/translations/menu_af.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/translations/menu_af.xml?rev=226868&r1=226867&r2=226868&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/translations/menu_af.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/translations/menu_af.xml Mon Aug 1 12:58:24 2005
@@ -1,6 +1,7 @@
<?xml version="1.0"?>
<!--
- Copyright 2002-2004 The Apache Software Foundation
+ Copyright 2002-2004 The Apache Software Foundation or its licensors,
+ as applicable.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Modified: incubator/beehive/trunk/docs/forrest/src/documentation/translations/menu_de.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/translations/menu_de.xml?rev=226868&r1=226867&r2=226868&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/translations/menu_de.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/translations/menu_de.xml Mon Aug 1 12:58:24 2005
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2002-2004 The Apache Software Foundation
+ Copyright 2002-2004 The Apache Software Foundation or its licensors,
+ as applicable.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Modified: incubator/beehive/trunk/docs/forrest/src/documentation/translations/menu_es.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/translations/menu_es.xml?rev=226868&r1=226867&r2=226868&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/translations/menu_es.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/translations/menu_es.xml Mon Aug 1 12:58:24 2005
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2002-2004 The Apache Software Foundation
+ Copyright 2002-2004 The Apache Software Foundation or its licensors,
+ as applicable.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Modified: incubator/beehive/trunk/docs/forrest/src/documentation/translations/menu_it.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/translations/menu_it.xml?rev=226868&r1=226867&r2=226868&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/translations/menu_it.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/translations/menu_it.xml Mon Aug 1 12:58:24 2005
@@ -1,6 +1,7 @@
<?xml version="1.0"?>
<!--
- Copyright 2002-2004 The Apache Software Foundation
+ Copyright 2002-2004 The Apache Software Foundation or its licensors,
+ as applicable.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Modified: incubator/beehive/trunk/docs/forrest/src/documentation/translations/menu_no.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/translations/menu_no.xml?rev=226868&r1=226867&r2=226868&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/translations/menu_no.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/translations/menu_no.xml Mon Aug 1 12:58:24 2005
@@ -1,6 +1,7 @@
<?xml version="1.0"?>
<!--
- Copyright 2002-2004 The Apache Software Foundation
+ Copyright 2002-2004 The Apache Software Foundation or its licensors,
+ as applicable.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Modified: incubator/beehive/trunk/docs/forrest/src/documentation/translations/menu_ru.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/translations/menu_ru.xml?rev=226868&r1=226867&r2=226868&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/translations/menu_ru.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/translations/menu_ru.xml Mon Aug 1 12:58:24 2005
@@ -1,6 +1,7 @@
<?xml version="1.0"?>
<!--
- Copyright 2002-2004 The Apache Software Foundation
+ Copyright 2002-2004 The Apache Software Foundation or its licensors,
+ as applicable.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Modified: incubator/beehive/trunk/docs/forrest/src/documentation/translations/menu_sk.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/translations/menu_sk.xml?rev=226868&r1=226867&r2=226868&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/translations/menu_sk.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/translations/menu_sk.xml Mon Aug 1 12:58:24 2005
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2002-2004 The Apache Software Foundation
+ Copyright 2002-2004 The Apache Software Foundation or its licensors,
+ as applicable.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Modified: incubator/beehive/trunk/docs/forrest/src/documentation/translations/tabs.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/translations/tabs.xml?rev=226868&r1=226867&r2=226868&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/translations/tabs.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/translations/tabs.xml Mon Aug 1 12:58:24 2005
@@ -1,6 +1,7 @@
<?xml version="1.0"?>
<!--
- Copyright 2002-2004 The Apache Software Foundation
+ Copyright 2002-2004 The Apache Software Foundation or its licensors,
+ as applicable.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Modified: incubator/beehive/trunk/docs/forrest/src/documentation/translations/tabs_es.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/translations/tabs_es.xml?rev=226868&r1=226867&r2=226868&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/translations/tabs_es.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/translations/tabs_es.xml Mon Aug 1 12:58:24 2005
@@ -1,6 +1,7 @@
<?xml version="1.0"?>
<!--
- Copyright 2002-2004 The Apache Software Foundation
+ Copyright 2002-2004 The Apache Software Foundation or its licensors,
+ as applicable.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.