Renamed to 0.95beta.

Made changes and release notes work again by switching to the projectInfo plug-in rather than relying on our local copy of the stylesheets. There's a little bug (missing images) in the release notes for which I submitted a patch (https://issues.apache.org/jira/browse/FOR-1076) to Forrest.
Brought status.xml more in line with the official status DTD.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@633437 13f79535-47bb-0310-9956-ffa450edef68

6 files changed, 112 insertions, 93 deletions

diff --git a/forrest.properties b/forrest.properties
index 40e6cf06c..95260e665 100644
--- a/forrest.properties
+++ b/forrest.properties
@@ -107,5 +107,4 @@ bugtracking-url=http://issues.apache.org/bugzilla/show_bug.cgi?id=
 # The names of plugins that are required to build the project
 # comma separated list (no spaces)
 # project.required.plugins=
-#project.required.plugins=org.apache.forrest.plugin.input.projectInfo,org.apache.forrest.plugin.output.pdf
-project.required.plugins=org.apache.forrest.plugin.output.pdf
+project.required.plugins=org.apache.forrest.plugin.input.projectInfo,org.apache.forrest.plugin.output.pdf
diff --git a/forrest.properties.xml b/forrest.properties.xml
new file mode 100644
index 000000000..d0c01bf4a
--- /dev/null
+++ b/forrest.properties.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
+<properties>
+<!-- Project identity -->
+  <property name="projectInfo.project.fullname" value="Apache FOP"/>
+  <property name="projectInfo.project.url" value="http://xmlgraphics.apache.org/fop/"/>
+</properties>
diff --git a/src/documentation/content/xdocs/site.xml b/src/documentation/content/xdocs/site.xml
index 79094c52d..18716903c 100644
--- a/src/documentation/content/xdocs/site.xml
+++ b/src/documentation/content/xdocs/site.xml
@@ -96,10 +96,10 @@
   <!--
   BEGIN Version 0.95 documentation tab
   -->
-  <trunk label="FOP 0.95rc" href="0.95/" tab="stableversion">
+  <trunk label="FOP 0.95beta" href="0.95/" tab="stableversion">
     <about label="About" href="index.html"/>
-    <release label="Release Notes" href="releaseNotes_0.95.html"/>
-    <changes label="Changes" href="changes_0.95.html"/>
+    <release label="Release Notes" href="releaseNotes_0.95beta.html"/>
+    <changes label="Changes" href="changes_0.95beta.html"/>
     <knownissues label="Known Issues" href="knownissues_overview.html"/>
     <upgrading label="Upgrading" href="upgrading.html"/>
     
diff --git a/src/documentation/content/xdocs/tabs.xml b/src/documentation/content/xdocs/tabs.xml
index 5fe5763a9..a42fc9bd7 100644
--- a/src/documentation/content/xdocs/tabs.xml
+++ b/src/documentation/content/xdocs/tabs.xml
@@ -22,7 +22,7 @@
 <tabs software="FOP" title="FOP" copyright="@year@ The Apache Software Foundation" xmlns:xlink="http://www.w3.org/1999/xlink">
   <tab label="Home" dir=""/>
   <tab label="Version 0.94" dir="0.94/"/>
-  <tab label="Version 0.95rc" dir="0.95/"/>
+  <tab label="Version 0.95beta" dir="0.95/"/>
   <tab label="FOP Trunk" dir="trunk/"/>
   <tab label="Development" dir="dev/"/>
 </tabs>
diff --git a/src/documentation/sitemap.xmap b/src/documentation/sitemap.xmap
index 21e289547..470db0b7b 100644
--- a/src/documentation/sitemap.xmap
+++ b/src/documentation/sitemap.xmap
@@ -20,37 +20,6 @@
   </map:components>
 
   <map:pipelines>
-    <map:pipeline>
-    
-      <map:match type="regexp" pattern="^(.*?)([^/]*)changes.xml$">
-        <map:generate type="file" src="{properties:status}" />
-        <map:transform src="resources/stylesheets/changes2document.xsl" >
-          <map:parameter name="bugtracking-url" value="{properties:bugtracking-url}"/>
-          <map:parameter name="path" value="{1}{2}"/>
-        </map:transform>
-        <map:serialize type="xml-document"/>
-      </map:match>
-    
-      <map:match type="regexp" pattern="^(.*?)([^/]*)changes_(.*).xml$">
-        <map:generate type="file" src="{properties:status}" />
-        <map:transform src="resources/stylesheets/changes2document.xsl" >
-          <map:parameter name="bugtracking-url" value="{properties:bugtracking-url}"/>
-          <map:parameter name="path" value="{1}{2}"/>
-          <map:parameter name="versionNumber" value="{3}"/>
-        </map:transform>
-        <map:serialize type="xml-document"/>
-      </map:match>
-
-      <map:match type="regexp" pattern="^(.*?)([^/]*)releaseNotes_(.*).xml$">
-        <map:generate type="file" src="{properties:status}" />
-        <map:transform src="resources/stylesheets/releaseNotes2document.xsl">
-          <map:parameter name="versionNumber" value="{3}"/>
-          <map:parameter name="path" value="{1}{2}"/>
-        </map:transform>
-        <map:serialize type="xml-document"/>
-      </map:match>
-
-    </map:pipeline>
     
     <!-- This is used by xinclude statements in knownissues.xml -->
     <map:pipeline internal-only="true">
diff --git a/status.xml b/status.xml
index 197d599b4..3765b5aed 100644
--- a/status.xml
+++ b/status.xml
@@ -16,23 +16,50 @@
   limitations under the License.
 -->
 <!-- $Id$ -->
+<!DOCTYPE status PUBLIC "-//APACHE//DTD Status V1.3//EN"
+  "http://forrest.apache.org/dtd/status-v13.dtd">
 <status>
 
   <developers>
-    <!-- Maintained in src/documentation/content/xdocs/team.xml -->
+    <!-- In alphabetical order (last name) -->
+    <person name="Max Berger"        email="mayberger@apache.org"     id="MB"/>
+    <person name="Chris Bowditch"    email="cbowditch@apache.org"     id="CB"/>
+    <person name="Jay Bryant"        email="jbryant@apache.org"       id="JB"/>
+    <person name="Adrian Cumiskey"   email="acumiskey@apache.org"     id="AC"/>
+    <person name="Bertrand Delacrétaz" email="bdelacretaz@apache.org" id="BD"/>
+    <person name="Andreas Delmelle"  email="adelmelle@apache.org"     id="AD"/>
+    <person name="Luca Furini"       email="lfurini@apache.org"       id="LF"/>
+    <person name="Christian Geisert" email="chrisg@apache.org"        id="CG"/>
+    <person name="Vincent Hennebert" email="vhennebert@apache.org"    id="VH"/>
+    <person name="Clay Leeds"        email="clay@apache.org"          id="CL"/>
+    <person name="Manuel Mall"       email="manuel@apache.org"        id="MM"/>
+    <person name="Jeremias Märki"    email="jeremias@apache.org"      id="JM"/>
+    <person name="Simon Pepping"     email="spepping@apache.org"      id="SP"/>
+    <person name="the FOP committers" email="fop-dev@xmlgraphics.apache.org" id="all"/>
+    <person name="Volunteer needed"  email="general@xmlgraphics.apache.org" id="open"/>
+    <!-- See also src/documentation/content/xdocs/team.xml -->
   </developers>
 
-  <todo>
-    <!-- See Bugzilla and http://wiki.apache.org/xmlgraphics-fop/FOPProjectTasks -->
-  </todo>
-
+  <contexts>
+    <context id="Docs" title="Changes to Documentation"/>
+    <context id="Code" title="Changes to the Code Base"/>
+    <context id="Layout" title="Changes to the Layout Engine"/>
+    <context id="Renderers" title="Changes to Renderers (Output Formats)"/>
+    <context id="Fonts" title="Changes to the Font Subsystem"/>
+    <context id="API" title="Changes to the End-User API"/>
+    <context id="Extensions" title="Changes to the Bundled Extensions"/>
+    <context id="Images" title="Changes to the Image Support"/>
+  </contexts>
+  
   <changes>
-    <release version="FOP Trunk">
+    <!--release version="FOP Trunk" date="TBD"-->
       <!-- change reverted, to be added back later
         <action context="Renderers" dev="AC" importance="high" type="add">
         Added SVG support for AFP (GOCA).
         </action>
       -->
+    <!--/release-->
+    <release version="0.95beta" date="8 March 2008">
       <action context="Renderers" dev="JM" type="fix" due-to="Gordon Cooke">
         Slight improvement for thin lines in Java2D/AWT output.
       </action>
@@ -42,7 +69,7 @@
       <action context="Code" dev="MB" type="add">
         Turned on XInclude processing for the main source given on the command line.
       </action>
-      <action context="Fonts" dev="JM" type="fix" fixed-bug="44451" due-to="Justus Piater">
+      <action context="Fonts" dev="JM" type="fix" fixes-bug="44451" due-to="Justus Piater">
         Improved the font auto-detection so fonts accessed using the font-family name are
         selected with higher accuracy.
       </action>
@@ -284,31 +311,21 @@
         Added a configuration setting for the renderer/device resolution to the AFP renderer.
       </action>
       <action context="Layout" dev="AD" type="update">
-        <p>
-          Facilitate the implementation for font-selection-strategy:
-        </p>
-        <ul>
-          <li>Changed FontInfo.fontLookup to always return an array of FontTriplet</li>
-          <li>Changed CommonFont.getFontState to return an array of FontTriplet</li>
-          <li>Initial modifications to the related LMs: initialized with
-            the font corresponding to the first of the triplets</li>
-        </ul>
+        Facilitate the implementation for font-selection-strategy:<br/>
+        • Changed FontInfo.fontLookup to always return an array of FontTriplet.<br/>
+        • Changed CommonFont.getFontState to return an array of FontTriplet.<br/>
+        • Initial modifications to the related LMs: initialized with
+            the font corresponding to the first of the triplets.<br/>
       </action>
       <action context="Layout" dev="AD" type="update">
-        <p>PropertyCache phase 2:</p>
-        <ul>
-          <li>
-            improvement of the PropertyCache itself should now guarantee acceptable
+        PropertyCache phase 2:<br/>
+        • improvement of the PropertyCache itself should now guarantee acceptable
             performance of the static caches in multi-session environments, which is 
-            a possible problem with synchronizedMap
-          </li>
-          <li>
-            changed CommonFont to use the cache: 
+            a possible problem with synchronizedMap.<br/>
+        • changed CommonFont to use the cache: 
             added CachedCommonFont to contain the properties that are always cacheable
-            CommonFont itself is only cached if the remaining properties are absolutes
-          </li>
-          <li>changed CommonHyphenation, KeepProperty, ColorProperty and FontFamilyProperty to use the cache</li>
-        </ul>
+            CommonFont itself is only cached if the remaining properties are absolutes.<br/>
+        • changed CommonHyphenation, KeepProperty, ColorProperty and FontFamilyProperty to use the cache.<br/>
       </action>
       <action context="Layout" dev="AD" type="fix" fixes-bug="42705">
         Fixed swallowing PCDATA in text-node children of
@@ -468,33 +485,36 @@
     </release>    
     <release version="0.93" date="9 January 2007">
       <notes>
-        <p>This is the first production grade release of the new FOP
-        codebase.</p>
-        <ul>
-          <li>It contains the new API first introduced in release 0.92
-            beta. The preceding API has been removed.
-          </li>
-          <li>
-            See the <a href="../compliance.html">compliance page</a> for an
-            overview of the compliance of this release with the XSL 1.0 and
-            1.1 recommendations.
-          </li>
-          <li>
-            This release again contains many bug fixes and new features. See
-            below for details.
-          </li>
-          <li>
-            See the <a href="../knownissues.html">known issues page</a>
-            for an overview of the known issues with this release.
-          </li>
-        </ul>
-        <p>Caveats:</p>
-        <ul>
-          <li>
-            You may experience different behaviour compared to version 0.20.5.
-            Please consult the <a href="upgrading.html">"Upgrading"</a> page for details.
-          </li>
-        </ul>
+        <section>
+          <title>Notes</title>
+          <p>This is the first production grade release of the new FOP
+            codebase.</p>
+          <ul>
+            <li>It contains the new API first introduced in release 0.92
+              beta. The preceding API has been removed.
+            </li>
+            <li>
+              See the <link href="../compliance.html">compliance page</link> for an
+              overview of the compliance of this release with the XSL 1.0 and
+              1.1 recommendations.
+            </li>
+            <li>
+              This release again contains many bug fixes and new features. See
+              below for details.
+            </li>
+            <li>
+              See the <link href="../knownissues.html">known issues page</link>
+              for an overview of the known issues with this release.
+            </li>
+          </ul>
+          <p>Caveats:</p>
+          <ul>
+            <li>
+              You may experience different behaviour compared to version 0.20.5.
+              Please consult the <link href="upgrading.html">"Upgrading"</link> page for details.
+            </li>
+          </ul>
+        </section>
       </notes>
       <action context="Code" dev="BD" type="add" importance="high">
         Added support for the use of Open Type fonts
@@ -1069,9 +1089,18 @@
       <action context="Code" dev="all" type="update">
         For the change log for the maintenance branch 
         (where FOP 0.20.5 came from), please see the "CHANGES" file in the distribution, or 
-        <a href="http://svn.apache.org/viewcvs.cgi/xmlgraphics/fop/branches/fop-0_20_2-maintain/CHANGES?view=markup">the CHANGES file in the SVN repository</a>.
+        <link href="http://svn.apache.org/viewcvs.cgi/xmlgraphics/fop/branches/fop-0_20_2-maintain/CHANGES?view=markup">the CHANGES file in the SVN repository</link>.
       </action>
     </release>
   </changes>
 
+  <todo>
+    <!-- See Bugzilla and http://wiki.apache.org/xmlgraphics-fop/FOPProjectTasks -->
+    <actions>
+      <action dev="open" type="update" context="Docs">
+        Improve the documentation.
+      </action>
+    </actions>
+  </todo>
+  
 </status>