Author: crossley Date: Tue Feb 8 04:13:42 2011 New Revision: 1068265 URL: http://svn.apache.org/viewvc?rev=1068265&view=rev Log: Incrementing version numbers and preparing docs for the next development phase.
Added: forrest/trunk/site-author/content/xdocs/docs_0_100/body-index.fv - copied unchanged from r1065902, forrest/trunk/site-author/content/xdocs/docs_0_90/body-index.fv forrest/trunk/site-author/content/xdocs/docs_0_100/build.xml - copied unchanged from r1065902, forrest/trunk/site-author/content/xdocs/docs_0_90/build.xml forrest/trunk/site-author/content/xdocs/docs_0_100/cap.xml - copied unchanged from r1065902, forrest/trunk/site-author/content/xdocs/docs_0_90/cap.xml forrest/trunk/site-author/content/xdocs/docs_0_100/catalog.xml - copied unchanged from r1065902, forrest/trunk/site-author/content/xdocs/docs_0_90/catalog.xml forrest/trunk/site-author/content/xdocs/docs_0_100/dreams.xml - copied unchanged from r1065902, forrest/trunk/site-author/content/xdocs/docs_0_90/dreams.xml forrest/trunk/site-author/content/xdocs/docs_0_100/faq.xml - copied unchanged from r1065902, forrest/trunk/site-author/content/xdocs/docs_0_90/faq.xml forrest/trunk/site-author/content/xdocs/docs_0_100/glossary.xml - copied unchanged from r1065902, forrest/trunk/site-author/content/xdocs/docs_0_90/glossary.xml forrest/trunk/site-author/content/xdocs/docs_0_100/howto/ - copied from r1065902, forrest/trunk/site-author/content/xdocs/docs_0_90/howto/ forrest/trunk/site-author/content/xdocs/docs_0_100/images/ - copied from r1065902, forrest/trunk/site-author/content/xdocs/docs_0_90/images/ forrest/trunk/site-author/content/xdocs/docs_0_100/index.xml - copied, changed from r1065902, forrest/trunk/site-author/content/xdocs/docs_0_90/index.xml forrest/trunk/site-author/content/xdocs/docs_0_100/libre-intro.xml - copied unchanged from r1065902, forrest/trunk/site-author/content/xdocs/docs_0_90/libre-intro.xml forrest/trunk/site-author/content/xdocs/docs_0_100/linking.xml - copied unchanged from r1065902, forrest/trunk/site-author/content/xdocs/docs_0_90/linking.xml forrest/trunk/site-author/content/xdocs/docs_0_100/locationmap.xml - copied unchanged from r1065902, forrest/trunk/site-author/content/xdocs/docs_0_90/locationmap.xml forrest/trunk/site-author/content/xdocs/docs_0_100/menu-index.fv - copied unchanged from r1065902, forrest/trunk/site-author/content/xdocs/docs_0_90/menu-index.fv forrest/trunk/site-author/content/xdocs/docs_0_100/primer.xml - copied unchanged from r1065902, forrest/trunk/site-author/content/xdocs/docs_0_90/primer.xml forrest/trunk/site-author/content/xdocs/docs_0_100/project-sitemap.xml - copied unchanged from r1065902, forrest/trunk/site-author/content/xdocs/docs_0_90/project-sitemap.xml forrest/trunk/site-author/content/xdocs/docs_0_100/properties.xml - copied unchanged from r1065902, forrest/trunk/site-author/content/xdocs/docs_0_90/properties.xml forrest/trunk/site-author/content/xdocs/docs_0_100/searching.xml - copied unchanged from r1065902, forrest/trunk/site-author/content/xdocs/docs_0_90/searching.xml forrest/trunk/site-author/content/xdocs/docs_0_100/sitemap-explain.xml - copied unchanged from r1065902, forrest/trunk/site-author/content/xdocs/docs_0_90/sitemap-explain.xml forrest/trunk/site-author/content/xdocs/docs_0_100/sitemap-ref.xml - copied unchanged from r1065902, forrest/trunk/site-author/content/xdocs/docs_0_90/sitemap-ref.xml forrest/trunk/site-author/content/xdocs/docs_0_100/skin-package.xml - copied unchanged from r1065902, forrest/trunk/site-author/content/xdocs/docs_0_90/skin-package.xml forrest/trunk/site-author/content/xdocs/docs_0_100/skins.xml - copied unchanged from r1065902, forrest/trunk/site-author/content/xdocs/docs_0_90/skins.xml forrest/trunk/site-author/content/xdocs/docs_0_100/status-themes.xml - copied unchanged from r1065902, forrest/trunk/site-author/content/xdocs/docs_0_90/status-themes.xml forrest/trunk/site-author/content/xdocs/docs_0_100/tab-index.fv - copied unchanged from r1065902, forrest/trunk/site-author/content/xdocs/docs_0_90/tab-index.fv forrest/trunk/site-author/content/xdocs/docs_0_100/validation.xml - copied unchanged from r1065902, forrest/trunk/site-author/content/xdocs/docs_0_90/validation.xml forrest/trunk/site-author/content/xdocs/docs_0_100/your-project.xml - copied unchanged from r1065902, forrest/trunk/site-author/content/xdocs/docs_0_90/your-project.xml Modified: forrest/trunk/main/build.xml forrest/trunk/main/forrest.build.xml forrest/trunk/site-author/content/.htaccess forrest/trunk/site-author/content/xdocs/docs_0_100/upgrading_010.xml forrest/trunk/site-author/content/xdocs/site.xml forrest/trunk/site-author/status.xml Modified: forrest/trunk/main/build.xml URL: http://svn.apache.org/viewvc/forrest/trunk/main/build.xml?rev=1068265&r1=1068264&r2=1068265&view=diff ============================================================================== --- forrest/trunk/main/build.xml (original) +++ forrest/trunk/main/build.xml Tue Feb 8 04:13:42 2011 @@ -45,7 +45,7 @@ <property name="build.compiler.type" value="classic"/> <property name="build.compiler.vm" value="1.5"/> <property name="name" value="apache-forrest"/> - <property name="forrest.version" value="0.9"/> + <property name="forrest.version" value="0.10-dev"/> <property name="forrest.core" location="."/> <property name="java.dir" location="java"/> <property name="plugins.dir" location="${forrest.home}/plugins"/> Modified: forrest/trunk/main/forrest.build.xml URL: http://svn.apache.org/viewvc/forrest/trunk/main/forrest.build.xml?rev=1068265&r1=1068264&r2=1068265&view=diff ============================================================================== --- forrest/trunk/main/forrest.build.xml (original) +++ forrest/trunk/main/forrest.build.xml Tue Feb 8 04:13:42 2011 @@ -25,7 +25,7 @@ FORREST SITE BUILDER <project default="site" basedir="." name="forrest"> <property environment="env" /> <property name="forrest.home" location="${env.FORREST_HOME}" /> - <property name="forrest.version" value="0.9"/> + <property name="forrest.version" value="0.10-dev"/> <property name="forrest.lib-dir" location="${forrest.home}/lib"/> <property name="forrest.core.lib-dir" location="${forrest.lib-dir}/core"/> <property name="forrest.endorsed.lib-dir" location="${forrest.lib-dir}/endorsed"/> Modified: forrest/trunk/site-author/content/.htaccess URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/.htaccess?rev=1068265&r1=1068264&r2=1068265&view=diff ============================================================================== --- forrest/trunk/site-author/content/.htaccess (original) +++ forrest/trunk/site-author/content/.htaccess Tue Feb 8 04:13:42 2011 @@ -16,24 +16,24 @@ RedirectMatch ^/build(.*) http://forrest Redirect /plugins/0.8-dev http://forrest.apache.org/plugins/0.8 # Maintain some old URLs to point to current release -Redirect /docs/plugins http://forrest.apache.org/pluginDocs/plugins_0_80 +Redirect /docs/plugins http://forrest.apache.org/pluginDocs/plugins_0_90 # Some convenience URLs. -Redirect /docs/dev http://forrest.apache.org/docs_0_90 -Redirect /pluginDocs/dev http://forrest.apache.org/pluginDocs/plugins_0_90 +Redirect /docs/dev http://forrest.apache.org/docs_0_100 +Redirect /pluginDocs/dev http://forrest.apache.org/pluginDocs/plugins_0_100 # Some special docs need to point to the development version -RedirectMatch ^/faq(.*) http://forrest.apache.org/docs_0_90/faq$1 -RedirectMatch ^/docs/faq(.*) http://forrest.apache.org/docs_0_90/faq$1 -RedirectMatch ^/changes(.*) http://forrest.apache.org/docs_0_90/changes$1 -RedirectMatch ^/upgrading_09(.*) http://forrest.apache.org/docs_0_90/upgrading_09$1 -RedirectMatch ^/docs_0_80/upgrading_09(.*) http://forrest.apache.org/docs_0_90/upgrading_09$1 +RedirectMatch ^/faq(.*) http://forrest.apache.org/docs_0_100/faq$1 +RedirectMatch ^/docs/faq(.*) http://forrest.apache.org/docs_0_100/faq$1 +RedirectMatch ^/changes(.*) http://forrest.apache.org/docs_0_100/changes$1 +RedirectMatch ^/upgrading_010(.*) http://forrest.apache.org/docs_0_100/upgrading_010$1 +RedirectMatch ^/docs_0_90/upgrading_010(.*) http://forrest.apache.org/docs_0_100/upgrading_010$1 Options -MultiViews # Some convenience URLs. -Redirect /docs http://forrest.apache.org/docs_0_80 -Redirect /howto http://forrest.apache.org/docs_0_80/howto +Redirect /docs http://forrest.apache.org/docs_0_90 +Redirect /howto http://forrest.apache.org/docs_0_90/howto # Some moved documents RedirectMatch ^/roles(.*) http://forrest.apache.org/tasks$1 Copied: forrest/trunk/site-author/content/xdocs/docs_0_100/index.xml (from r1065902, forrest/trunk/site-author/content/xdocs/docs_0_90/index.xml) URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_100/index.xml?p2=forrest/trunk/site-author/content/xdocs/docs_0_100/index.xml&p1=forrest/trunk/site-author/content/xdocs/docs_0_90/index.xml&r1=1065902&r2=1068265&rev=1068265&view=diff ============================================================================== --- forrest/trunk/site-author/content/xdocs/docs_0_90/index.xml (original) +++ forrest/trunk/site-author/content/xdocs/docs_0_100/index.xml Tue Feb 8 04:13:42 2011 @@ -21,12 +21,18 @@ <title>Apache Forrest documentation</title> </header> <body> + <note> + This is the <strong>development</strong> version of Apache Forrest. + Developers can obtain it from the <a href="site:version-control">Subversion</a> + repository. + See the notes for obtaining and <a href="site:build">Building Forrest</a>. + </note> <p> A good place to get started in our docs is the <a href="site:your-project">Using Forrest</a> guide. </p> <p> - There are some <a href="site:upgrading_09">upgrading notes</a> for people + There are some <a href="site:upgrading_010">upgrading notes</a> for people updating from previous versions of Forrest, along with summaries of some new features. </p> Modified: forrest/trunk/site-author/content/xdocs/docs_0_100/upgrading_010.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_100/upgrading_010.xml?rev=1068265&r1=1068264&r2=1068265&view=diff ============================================================================== --- forrest/trunk/site-author/content/xdocs/docs_0_100/upgrading_010.xml (original) +++ forrest/trunk/site-author/content/xdocs/docs_0_100/upgrading_010.xml Tue Feb 8 04:13:42 2011 @@ -29,8 +29,93 @@ repository. See the instructions for obtaining and <a href="site:build">Building Forrest</a>. + This Note will go away when the release candidate is packed. + Until then see the release notes in preparation (which extracts the + importance=high elements from the changes list). + In <code>site-author</code> + do <code>http://localhost:8888/releaseNotes_current.txt</code> </note> - <p>This is a placeholder document for the new version.</p> + <p> + This page describes some changes to Apache Forrest that affect people + who are upgrading to the 0.10-dev version. If you have other issues, then + please discuss on either the + <a href="site:mail-lists/forrest-dev">dev</a> or + <a href="site:mail-lists/forrest-user">user</a> mailing lists. As more + experience is gained, this document will be updated. + </p> + <p> + (If you are upgrading from a version prior to 0.9 then you will need to + see the notes for the previous upgrade.) + </p> + </section> + <section id="new"> + <title>New Features</title> + <p> + The following list shows some of the key new features. + See also the <code>RELEASE-NOTES</code> document that was provided with + the release package. For the full list + of changes, see the main <a href="site:changes">change log</a> and also + for each plugin. + </p> + <ul> + <li> + Placeholder + </li> + </ul> + <p> + Some new initial plugins are in the "whiteboard". See the entries in the + <a href="site:changes">change log</a> and see each plugin's + documentation and changes log. This includes the new Dispatcher. See + <a href="site:status-themes">Status of Themes: Skins and Dispatcher</a>. + </p> + </section> + <section id="docs"> + <title>Notes about documentation</title> + <p> + After each release, the "Versioned Docs" are copied to form the new + "dev" set. Ideally the docs are then upgraded in readiness for the new + release. This has not been completed for recent releases. In particular + there are example snippets of sitemaps which have not yet been upgraded + to reflect the changes to the sitemaps and the separation of some core + stuff into plugins. See issues + <a href="https://issues.apache.org/jira/browse/FOR-546">FOR-546</a> and + <a href="https://issues.apache.org/jira/browse/FOR-922">FOR-922</a> and + others. + </p> + </section> + <section id="tips"> + <title>General upgrade tips</title> + <p> + Synchronise your project's skinconf.xml and forrest.properties files: + </p> + <p> + Take advantage of the separation of concerns. In a new workspace, create + a fresh '<code>forrest seed</code>' site, then tweak its + forrest.properties and skinconf.xml until it reflects your old site. + When it is ready, replace your project's skinconf.xml and + forrest.properties files. Any remaining issues would concern other + aspects of your configuration, such as site.xml and your actual content. + </p> + </section> + <section id="project-sitemap"> + <title>Remove project sitemap if not necessary</title> + <p> + It has come to our attention that some people have a + <a href="site:project-sitemap">project sitemap</a> + even though they are not using it. Such un-necessary sitemaps should be + removed to avoid maintenance issues. + </p> + <p> + If you do use a project sitemap, then pay attention to the 0.8 upgrade + instructions "<a href="site:upgrading_08">Forrest configuration simplification</a>". + </p> + </section> + <section> + <title>To be continued...</title> + <p> + ...as more issues are discovered/remembered :) Please send feedback to + the <a href="site:mail-lists/forrest-dev">mailing list</a>. + </p> </section> </body> </document> Modified: forrest/trunk/site-author/content/xdocs/site.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/site.xml?rev=1068265&r1=1068264&r2=1068265&view=diff ============================================================================== --- forrest/trunk/site-author/content/xdocs/site.xml (original) +++ forrest/trunk/site-author/content/xdocs/site.xml Tue Feb 8 04:13:42 2011 @@ -262,7 +262,147 @@ <v0.100 label="Documentation in development" description="Set of documents for the in-development version, i.e. SVN head"> <documentation label="0.100-dev" href="docs_0_100/" tab="v0_100"> <index label="Overview" href="index.html"/> - <upgrading_010 label="Upgrading to 0.10-dev" href="upgrading_010.html"/> + <upgrading_010 href="upgrading_010.html"/> +<!-- FIXME: Needed to avoid moving files --> + <catalog href="catalog.html"/> + <project-sitemap href="project-sitemap.html"/> +<!-- FIXME: i don't understand what the previous FIXME means. Why do we need those entries without labels? --> +<!-- Insert all instructional documentation here --> + <your-project label="Using Forrest" href="your-project.html"> + <new_content_type href="#adding_new_content_type"/> + <new_dtd href="#new_dtd"/> + <webapp href="#webapp"/> + <skins href="#skins"/> + <new-skin href="#new_skin"/> + <invoking_from_ant href="#invoking_from_ant"/> + </your-project> + <howto label="How-To" href="howto/"> + <overview label="Overview" href="index.html"/> + <ForrestInstall label="Install Forrest"> + <build label="Building Forrest from Source" href="../build.html" description="Build and install the current + unreleased version"> + <run href="#run"/> + </build> + </ForrestInstall> + <upgrading_010Ref label="Upgrading to 0.10-dev" href="site:upgrading_010"/> + <ForrestCustomize label="Customize Forrest" description="Adapt and tune Forrest for your needs"> + <sitemap-explain label="Sitemaps explained" href="../sitemap-explain.html"/> + <custom-html-source label="Custom html source" href="howto-custom-html-source.html"/> + <project-sitemapRef label="Project sitemap" href="site:project-sitemap"/> + <editcss label="Edit CSS (WYSIWYG)" href="howto-editcss.html"/> + <pdf-tab label="Create tab PDF" href="howto-pdf-tab.html" + description="Generate one pdf-document for all pages of a tab"/> + <corner-css label="CSS corner SVG" href="howto-corner-images.html"/> + </ForrestCustomize> + <ForrestIntegrate label="Integrate Forrest with tools"> + <maven label="Maven Integration" href="howto-forrest-from-maven.html"/> + <catalogRef1 label="Using DTD Catalogs" href="site:catalog"/> + </ForrestIntegrate> + <ForrestExtend label="Extend Forrest" description="Extend Forrest with new functionalities"> + <buildPlugin label="Build a Plugin" href="howto-buildPlugin.html"> + <release href="#release"/> + </buildPlugin> + <skin-package label="Package new Skins" href="../skin-package.html"/> + </ForrestExtend> + <asf-mirror label="Download mirror" href="howto-asf-mirror.html"/> + <documentationCreate label="Adding Documentation" description="Instructions to enhance Forrest by writing + new pieces of documentation."> + <write-howto label="Write a How-to" href="site:write-howto" description="Instructions for writing + a new howto-document"/> + <multi label="Multipage HowTo" href="multi/"> + <intro label="Introduction" href="howto-multi.html"/> + <step1 label="Step 1" href="step1.html"/> + <step2 label="Step 2" href="step2.html"/> + <step3 label="Step 3" href="step3.html"/> + </multi> + </documentationCreate> + </howto> + <faq label="FAQs" href="faq.html"> + <build_msg_a href="#build_msg_a"/> + <docbook href="#docbook"/> + <docs href="#docs"/> + <checksums href="#checksums"/> + <coloured-ant href="#coloured-ant"/> + <edit-content href="#edit-content"/> + <ignoring_javadocs href="#ignoring_javadocs"/> + <jobs href="#jobs"/> + <link_raw href="#link_raw"/> + <linkmap href="#linkmap"/> + <logs href="#logs"/> + <oldjing href="#oldjing"/> + <pdf_images href="#pdf_images"/> + <rawHTML href="#rawHTML"/> + <run_port href="#run_port"/> + <single-document href="#single-document"/> + <sitemap-entities href="#sitemap-entities"/> + <svn-eol-style href="#svn-eol-style"/> + <tab-index href="#tab-index"/> + <cli-xconf href="#cli-xconf"/> + <pageBreaks href="#pageBreaks"/> + <php href="#php"/> + <site-xml href="#site-xml"/> + <requirements href="#requirements"/> + <verbose-ant href="#verbose-ant"/> + <version-and-properties href="#version"/> + <xml-entities href="#xml-entities"/> + </faq> + <whitepapers label="Background" description="Background documentation about Forrest and the technologies used"> + <linking label="Menus and Linking" href="linking.html"> + <menu_generation href="#menu_generation"/> + <tab-site href="#tab-site"/> + </linking> + <searching label="Search Options in Forrest" href="searching.html"/> + <locationmap label="Locationmap" href="locationmap.html"> + <namingConvention href="#namingConvention"/> + </locationmap> + <properties label="Properties system" href="properties.html"/> + <sitemap-ref label="Sitemap Reference" href="sitemap-ref.html"> + <linkrewriting_impl href="#linkrewriting_impl"/> + <menu_generation_impl href="#menu_generation_impl"/> + <source_pipelines href="#source_pipelines"/> + <forrest_xmap href="#forrest_xmap"/> + </sitemap-ref> + <default-skins label="Skins" href="skins.html" description="About default skins, their naming and features"/> + <status-themes label="Dispatcher versus Skins" href="status-themes.html"/> + <cap label="Sourcetype Action" href="cap.html"/> + <validation label="XML validation and entity resolution" href="validation.html"> + <catalog href="#catalog"/> + <debug-catalog href="#debug-catalog"/> + </validation> + </whitepapers> + <changes label="Changes" href="changes.html"> + <v010 href="#version_0.10"/> + </changes> + <changes-rss href="changes.rss"/> + <glossary label="Glossary" href="glossary.html"/> + <samples label="Reference docs"> + <dtd-docs-container label="DTD documentation"> + <dtd-docs label="Overview" href="../dtdx/dtd-docs.html"/> + <document-v20-dtd label="document-v20" href="../dtdx/document-v20.dtdx.html"/> + <howto-v20-dtd label="howto-v20" href="../dtdx/howto-v20.dtdx.html"/> + <faq-v20-dtd label="faq-v20" href="../dtdx/faq-v20.dtdx.html"/> + <document-v13-dtd label="document-v13" href="../dtdx/document-v13.dtdx.html"/> + <howto-v13-dtd label="howto-v13" href="../dtdx/howto-v13.dtdx.html"/> + <faq-v13-dtd label="faq-v13" href="../dtdx/faq-v13.dtdx.html"/> + </dtd-docs-container> + <samples-container label="Doc samples"> + <document-v12 href="../dtdx/document-v12.html"/> + <document-v13 label="document-v13" href="../dtdx/document-v13.html"/> + <document-v20 label="document-v20" href="../dtdx/document-v20.html"/> + </samples-container> + </samples> +<!-- FIXME: Consider moving these documents into their own tab as there is no point in + coying historic info from version to version. + Options: Subtab "Old Stuff" in Docs tab or as a main tab + --> + <older_documentation label="Older Docs"> + <primer label="Forrest Primer" href="primer.html"> + <cvs href="#cvs"/> + </primer> + <libre-intro label="Libre" href="libre-intro.html"/> + <dreams label="Dream list" href="dreams.html"/> + <cvsssh label="CVS over SSH" href="howto/cvs-ssh/howto-cvs-ssh.html"/> + </older_documentation> </documentation> <plugins label="0.100 Plugins" href="pluginDocs/plugins_0_100/" tab="p0_100"> <index label="Index" href="index.html"/> Modified: forrest/trunk/site-author/status.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/status.xml?rev=1068265&r1=1068264&r2=1068265&view=diff ============================================================================== --- forrest/trunk/site-author/status.xml (original) +++ forrest/trunk/site-author/status.xml Tue Feb 8 04:13:42 2011 @@ -60,7 +60,7 @@ <!-- CHANGES --> <!-- ===================================================================== --> <changes> - <release version="0.9" date="2011-02-07"> + <release version="0.10-dev" date="not yet released"> <introduction> <p> See each <link href="site:plugins/index">plugin</link> for its @@ -69,7 +69,7 @@ </introduction> <notes> <section> - <title>Apache Forrest is pleased to release the new version: apache-forrest-0.9</title> + <title>Apache Forrest is pleased to release the new version: apache-forrest-0.10-dev</title> <p> It can be downloaded from one of the <link href="http://forrest.apache.org/mirrors.cgi">Apache Software @@ -151,6 +151,14 @@ <action dev="DC" type="add" context="docs" importance="high"> <!-- Please keep this action at the top --> Added document to facilitate + <link href="site:upgrading_010">upgrading to v0.10-dev</link> + </action> +<!-- 2011-02 --> + </release> + <release version="0.9" date="2011-02-07"> + <action dev="DC" type="add" context="docs" importance="high"> +<!-- Please keep this action at the top --> + Added document to facilitate <link href="site:upgrading_09">upgrading to v0.9</link> </action> <!-- 2011-01 -->