xml-general-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerem...@apache.org
Subject svn commit: r314866 - in /xml/site: ./ src/documentation/ src/documentation/conf/ src/documentation/content/ src/documentation/content/xdocs/
Date Wed, 12 Oct 2005 12:45:09 GMT
Author: jeremias
Date: Wed Oct 12 05:44:50 2005
New Revision: 314866

URL: http://svn.apache.org/viewcvs?rev=314866&view=rev
Log:
XML Site refresh:
- Now using Forrest 0.7
- Now using default skin
- ApacheCon US 2005 logo
- CVS to SVN migrations
- book.xml -> site.xml
- mirrors.cgi update
- updated site publishing docs
- and a few nits...

Added:
    xml/site/src/documentation/content/mirrors.cgi
    xml/site/src/documentation/content/xdocs/favicon.ico   (with props)
    xml/site/src/documentation/content/xdocs/mirrors.html
      - copied, changed from r314799, xml/site/src/documentation/content/xdocs/mirrors.ehtml
    xml/site/src/documentation/content/xdocs/site.xml   (with props)
Removed:
    xml/site/src/documentation/content/xdocs/book.xml
    xml/site/src/documentation/content/xdocs/mirrors.ehtml
Modified:
    xml/site/forrest.properties
    xml/site/src/documentation/conf/cli.xconf
    xml/site/src/documentation/content/xdocs/contact.xml
    xml/site/src/documentation/content/xdocs/cvs.xml
    xml/site/src/documentation/content/xdocs/guidelines.xml
    xml/site/src/documentation/content/xdocs/index.xml
    xml/site/src/documentation/content/xdocs/legal.xml
    xml/site/src/documentation/content/xdocs/news.xml
    xml/site/src/documentation/content/xdocs/svn.xml
    xml/site/src/documentation/content/xdocs/whoweare.xml
    xml/site/src/documentation/skinconf.xml

Modified: xml/site/forrest.properties
URL: http://svn.apache.org/viewcvs/xml/site/forrest.properties?rev=314866&r1=314865&r2=314866&view=diff
==============================================================================
--- xml/site/forrest.properties (original)
+++ xml/site/forrest.properties Wed Oct 12 05:44:50 2005
@@ -26,7 +26,7 @@
 # Specifies name of Forrest skin to use
 #project.skin=tigris
 #project.skin=pelt
-project.skin=forrest-site
+#project.skin=forrest-site
 
 # comma separated list, file:// is supported
 #forrest.skins.descriptors=http://forrest.apache.org/skins/skins.xml,file:///c:/myskins/skins.xml

Modified: xml/site/src/documentation/conf/cli.xconf
URL: http://svn.apache.org/viewcvs/xml/site/src/documentation/conf/cli.xconf?rev=314866&r1=314865&r2=314866&view=diff
==============================================================================
--- xml/site/src/documentation/conf/cli.xconf (original)
+++ xml/site/src/documentation/conf/cli.xconf Wed Oct 12 05:44:50 2005
@@ -163,7 +163,36 @@
 	<exclude pattern="/xerces**"/>
 	<exclude pattern="/xindice**"/>
 
-   <uri src="favicon.ico"/>
+   <!--+
+       | <uri> nodes can be grouped together in a <uris> node. This
+       | enables a group of URIs to share properties. The following
+       | properties can be set for a group of URIs:
+       |   * follow-links:       should pages be crawled for links
+       |   * confirm-extensions: should file extensions be checked
+       |                         for the correct mime type
+       |   * src-prefix:         all source URIs should be
+       |                         pre-pended with this prefix before
+       |                         generation. The prefix is not
+       |                         included when calculating the
+       |                         destination URI
+       |   * dest:               the base destination URI to be
+       |                         shared by all pages in this group
+       |   * type:               the method to be used to calculate
+       |                         the destination URI. See above
+       |                         section on <uri> node for details.
+       |
+       | Each <uris> node can have a name attribute. When a name
+       | attribute has been specified, the -n switch on the command
+       | line can be used to tell Cocoon to only process the URIs
+       | within this URI group. When no -n switch is given, all
+       | <uris> nodes are processed. Thus, one xconf file can be
+       | used to manage multiple sites.
+       +-->
+   <uris name="mirrors" follow-links="false">
+     <uri type="append" src="mirrors.html"/>
+   </uris>
+
+   <!--uri src="favicon.ico"/-->
 
    <!--+
        |  File containing URIs (plain text, one per

Added: xml/site/src/documentation/content/mirrors.cgi
URL: http://svn.apache.org/viewcvs/xml/site/src/documentation/content/mirrors.cgi?rev=314866&view=auto
==============================================================================
--- xml/site/src/documentation/content/mirrors.cgi (added)
+++ xml/site/src/documentation/content/mirrors.cgi Wed Oct 12 05:44:50 2005
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+# 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.
+# 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.
+
+# Wrapper script around mirrors.cgi script
+# (we must change to that directory in order for python to pick up the
+#  python includes correctly)
+# Copied from Stefan's http://www.apache.org/~bodewig/mirror.html
+cd /www/www.apache.org/dyn/mirrors 
+/www/www.apache.org/dyn/mirrors/mirrors.cgi $*

Modified: xml/site/src/documentation/content/xdocs/contact.xml
URL: http://svn.apache.org/viewcvs/xml/site/src/documentation/content/xdocs/contact.xml?rev=314866&r1=314865&r2=314866&view=diff
==============================================================================
--- xml/site/src/documentation/content/xdocs/contact.xml (original)
+++ xml/site/src/documentation/content/xdocs/contact.xml Wed Oct 12 05:44:50 2005
@@ -10,17 +10,21 @@
       <p>
         If you have questions or comments about this website itself, please send email to:
 
-        <jump href="mailto:webmaster@xml.apache.org">webmaster@xml.apache.org</jump>
+        <jump href="mailto:webmaster@xml.apache.org">webmaster.at.xml.apache.org</jump>
       </p>
       <p>
         If you have technical questions about any of the subprojects hosted at this 
         website, please see the <jump href="http://xml.apache.org/mail.html">developer mailing lists</jump> for each subproject.
       </p>
       <p>
+        If you need to contact the PMC (Project Management Committee) of the Apache XML project, please send email to:
+        <jump href="mailto:pmc@xml.apache.org">pmc.at.xml.apache.org</jump>
+      </p>
+      <p>
     The xml.apache.org project is an effort of the Apache Software Foundation. The
     address for general ASF correspondence and licensing questions is:
 
-                   <jump href="mailto:apache@apache.org">apache@apache.org</jump>
+                   <jump href="mailto:apache@apache.org">apache.at.apache.org</jump>
 
                    You can find more contact information for the Apache Software Foundation on the
                    contact page of the <jump href="http://www.apache.org/">main Apache site</jump>. 

Modified: xml/site/src/documentation/content/xdocs/cvs.xml
URL: http://svn.apache.org/viewcvs/xml/site/src/documentation/content/xdocs/cvs.xml?rev=314866&r1=314865&r2=314866&view=diff
==============================================================================
--- xml/site/src/documentation/content/xdocs/cvs.xml (original)
+++ xml/site/src/documentation/content/xdocs/cvs.xml Wed Oct 12 05:44:50 2005
@@ -12,41 +12,8 @@
       </p>
       <ul>
         <li>
-          <jump href="http://xml.apache.org/websrc/cvsweb.cgi/xml-axis">xml-axis</jump>
-        </li>
-        <li>
-          <jump href="http://xml.apache.org/websrc/cvsweb.cgi/xml-commons">xml-commons</jump>
-        </li>
-        <li>
-          <jump href="http://xml.apache.org/websrc/cvsweb.cgi/xml-contrib">xml-contrib</jump>
-        </li>
-        <li>
-          <jump href="http://xml.apache.org/websrc/cvsweb.cgi/xml-crimson">xml-crimson</jump>
-        </li>
-        <li>
-          <jump href="http://xml.apache.org/websrc/cvsweb.cgi/xml-rpc">xml-rpc</jump>
-        </li>
-        <li>
           <jump href="http://xml.apache.org/websrc/cvsweb.cgi/xml-security">xml-security</jump>
         </li>
-        <li>
-          <jump href="http://xml.apache.org/websrc/cvsweb.cgi/xml-site">xml-site</jump>
-        </li>
-        <li>
-          <jump href="http://xml.apache.org/websrc/cvsweb.cgi/xml-soap">xml-soap</jump>
-        </li>
-        <li>
-          <jump href="http://xml.apache.org/websrc/cvsweb.cgi/xml-stylebook">xml-stylebook</jump>
-        </li>
-        <li>
-          <jump href="http://xml.apache.org/websrc/cvsweb.cgi/xml-xalan">xml-xalan</jump>
-        </li>
-        <li>
-          <jump href="http://xml.apache.org/websrc/cvsweb.cgi/xml-xang">xml-xang</jump>
-        </li>
-        <li>
-          <jump href="http://xml.apache.org/websrc/cvsweb.cgi/xml-xerces">xml-xerces</jump>
-        </li>
       </ul>
       <p>
         Don't see the project you need? Check on <link href="svn.html">Subversion
@@ -85,41 +52,12 @@
           Modules available for access are:
         </p>
         <ul>
-          <li>xml-axis</li>
-          <li>cocoon-2.0</li>
-          <li>cocoon-2.1</li>
-          <li>xml-commons</li>
-          <li>xml-contrib (so-called "whiteboard" area)</li>
-          <li>xml-crimson</li>
-          <li>xml-rpc</li>
           <li>xml-security</li>
-          <li>xml-site</li>
-          <li>xml-soap</li>
-          <li>xml-stylebook</li>
-          <li>xml-xalan</li>
-          <li>xml-xang</li>
-          <li>xml-xerces</li>
         </ul>
         <p>
           Don't see the project you need? Check on <link href="svn.html">Subversion
           Repository</link> page.
         </p>
-        <p>
-            The Xerces2 project has been merged into the main trunk of
-            the xml-xerces module. The Xerces 1.x codebase has been
-            moved to a branch of the CVS module. In
-            order to extract the Xerces 1.x code, you must specify the
-            "xerces_j_1" branch using the "-r" option. For example, to
-            extract the Java sources for Xerces 1.x in a directory called
-            "xerces1", enter the following commands: (each "cvs" command
-            is entered on a single line)
-        </p>
-        <source>cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic
-login
-password: anoncvs
-
-cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic
-checkout -d xerces1 -r xerces_j_1 xml-xerces</source>
       </section>
     </section>
     <section>

Added: xml/site/src/documentation/content/xdocs/favicon.ico
URL: http://svn.apache.org/viewcvs/xml/site/src/documentation/content/xdocs/favicon.ico?rev=314866&view=auto
==============================================================================
Binary file - no diff available.

Propchange: xml/site/src/documentation/content/xdocs/favicon.ico
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: xml/site/src/documentation/content/xdocs/guidelines.xml
URL: http://svn.apache.org/viewcvs/xml/site/src/documentation/content/xdocs/guidelines.xml?rev=314866&r1=314865&r2=314866&view=diff
==============================================================================
--- xml/site/src/documentation/content/xdocs/guidelines.xml (original)
+++ xml/site/src/documentation/content/xdocs/guidelines.xml Wed Oct 12 05:44:50 2005
@@ -40,142 +40,106 @@
 		of the documentation and then generate a static set of .html 
 		files for most of this website.
 	  </p>
-	  <p>
-		Briefly: the entire xml.apache.org website is stored in CVS repositories.
-		Both the source .xml documents and the generated .html docs are checked in, 
-		and the actual website itself is simply a checked-out copy of the repository. The update process happens automatically every 6 hours.
-	  </p>
 		<p>
 		While each subproject's individual areas may be managed separately 
 		(by that subproject's committers) the top-level of the website 
-		must be managed through the xml-site repository.  Thus to change 
+		must be managed through the 
+		<link href="http://svn.apache.org/repos/asf/xml/site/">"site" repository</link>.
+		Thus to change 
 		any of the files at the root of http://xml.apache.org/ you would 
-		first check out the xml-site repository from cvs.apache.org
+		first check out the "site" repository from svn.apache.org
 	  </p>
 	  <note>
-		The website is gradually being converted to use
-		<link href="http://forrest.apache.org/">Forrest</link>.  Whilst 
-		this conversion is occuring, there are two methods for updating 
-		content, dependent on what part of the site is being updated.
+		  The repository for the XML website has recently been migrated 
+		  from CVS to SVN. At the same the website generation is changed
+		  from plain <link href="http://forrest.apache.org/">Apache Forrest</link>
+		  to Forrest with (local) ForrestBot. The generated website won't 
+		  be stored in SVN anymore but uploaded to minotaur directly using SSH/SCP.
 	  </note>
 
-	  <section id="website-top">
-		<title>Updating the top-level site</title>
-		
-		<p>
-		  The top level of the site is created using Forrest.  To update,
-		  committers with access to xml-site should checkout this module,
-		  and make the content changes to the source files found in
-		  "<em>xml-site/src/documentation/content/xdocs</em>".
-      The generated website is stored in the same CVS at
-		  "<em>xml-site/targets</em>".
-		</p>
-    <p>
-      Install the current release of Apache Forrest (v0.6) 
-      by following the instructions at the index.html in the
-      distribution, to set the environment variables
-      $FORREST_HOME and $PATH.
-    </p>
-
-    <p>See the examples of the
-      <link href="http://forrest.apache.org/docs/document-v13.html">Forrest xdocs format</link>.
-      If you add a new page or change a page's name, update 
-      <code>xdocs/book.xml</code> from which the menu is generated.
-    </p>
-
-    <p>Here is a quick tour:</p>
-    <ul>
-    <li>cd into the local "xml-site" SVN directory.</li>
-     <li>Do 'forrest run'.</li>
-     <li>Browser http://localhost:8888/ to review the site.</li>
-     <li>Edit the docs <strong>in place</strong> at <code>xdocs/*.xml</code>
-     and see changes in the browser by re-loading the page.</li>
-     </ul>
-
-     <p>When you are satisifed, you will rebuild the whole site and
-     add the changed documents to the "targets" directory ...
-     </p>
-
-    <p>In the top-level "<code>xml-site</code>" CVS directory,
-      do 'forrest' to
-      render the HTML and PDF files into "<code>build/site</code>".
-      Forrest validates the XML, so will catch any syntax errors.
-      You can also simply validate the source xdocs without rendering
-      by doing 'forrest validate'.
-    </p>
-
-    <p>If the site built without errors, you now need to synchronise the
-     <code>xml-site/build/site</code> directory into the
-     <code>xml-site/targets</code> directory.</p>
-     <source>
-cd xml-site
-cvs -q update -dP
-... careful, there is lots of stuff that you might want to avoid
-    with better use of 'cvs update', e.g. targets/xindice/api/*
-diff -rq build/site targets | grep -v "CVS"
-... Ensure that the differences are what you expect.
-cp -Rf build/site/* targets
-... Now do the usual CVS stuff: 'cvsu' 'cvs add' 'cvs diff' 'cvs commit'
-     </source>
-
-     <p>To update the website, the "xml-site/targets"
-       CVS directory is checked-out on the server.
-     </p>
-     <source>
-ssh www.apache.org
-cd /www/incubator.apache.org
-cvs -q update -dP
-     </source>
+      <section id="web-forrestbot-publish">
+        <title>ForrestBot "publish" Step-by-Step</title>
+        <p>
+          We're using ForrestBot for build and deploy the XML website. ForrestBot comes with Apache Forrest 0.7. 
+          The root directory of your XML site checkout contains the file "publish.xml" which is an Ant build file
+          that manages the build and the deployment of the XML website. Please look into this file for
+          further instructions to set up ForrestBot on your machine. Basically, we're simply running ForrestBot 
+          manually by typing "ant -f publish.xml" once we're happy with our changes to the site. Be sure to set
+          up the "deploy.settings" file as described in the "publish.xml" file. Step-by-step instructions for 
+          the deployment process again:
+        </p>
+        <ul>
+          <li>Modify the sources of the website and check locally with Forrest 0.7 (run "forrest run" or just "forrest").</li>
+          <li>
+            Once you're satisfied, run "ant -f publish.xml" to do a clean build of the website. If the build 
+            runs without problems, the website will be uploaded as a whole using SCP to cvs.apache.org.
+          </li>
+          <li>Wait for the next rsync cycle and check your changes in the live site. (Sorry, no manual rsync available ATM)</li>
+        </ul>
+      </section>
+      <section id="web-local-forrest">
+        <title>Using a Local Forrest</title>
+        <p>To use a local Forrest (during website development, not for deployment):</p>
+        <ul>
+          <li><link href="http://forrest.apache.org/mirrors.cgi#closest">download</link> latest the Forrest release (currently Forrest 0.7)</li>
+          <li>set environment variable FORREST_HOME=~/apache-forrest-0.7 where ~ is the directory where Forrest is installed
+              (see <link href="http://forrest.apache.org/docs/your-project.html">http://forrest.apache.org/docs/your-project.html</link> for details)</li>
+          <li>set environment variable PATH=$PATH:$FORREST_HOME/bin</li>
+          <li>cd to your local XML site checkout</li>
+          <li>update your local XML site checkout (svn update)</li>
+          <li>run forrest(.bat), which will build the web-site documents in build/site.</li>
+        </ul>
+        <note>
+          You can use "forrest run" to start a local web server. That improves development speed as you 
+          can simply refresh in the browser after a change. Point your browser to http://localhost:8888/ 
+          to review the site in this case.
+        </note>
+      </section>
+      <section id="delete">
+        <title>Deleting Documentation Files</title>
+        <p>
+          ForrestBot simply uploads the whole generated site. It doesn't delete obsolete files. You
+          can do that manually in the /www/xml.apache.org/ folder on cvs.apache.org. Be careful
+          when doing stuff like that.
+        </p>
+        <note>
+          Please make sure you always have <strong>group rw permissions on all files</strong> under the /www directory!
+        </note>
+      </section>
 
-<!--FIXME: Hide the forrestbot option unitl it is updated.
-		<p>
-		  The second method is to use the <em>forrestbot</em>.
-		</p>
-		<source>
-Log in to http://forrestbot.cocoondev.org
-Select 'xml-site' from the drop-down list
-Click 'refresh', wait for the site to rebuild
-Click 'publish'
-		</source>
-		<note>
-		  To stop random people triggering resource-intensive rebuilds, the page is
-		  password-protected.  Committers wishing to use this facility should contact
-		  the <jump href="http://forrest.apache.org/mail-lists.html">forrest-dev</jump> mailing list.
-		</note>
--->
-	  </section>
 	  <section id="website-sub-forrest">
 		<title>Updating Forrest based sub-project websites</title>
 
         <p>The sub-projects generate their website from their own sources and
           put the result into the relevant project directory, i.e.
-          <code>xml-site/targets/your-project/</code>
+          <code>/xml/site/targets/[your-project]/</code>
         </p>
         <p>To use <link href="http://forrest.apache.org/">Forrest</link>
           for your project install it
           <link href="http://forrest.apache.org/docs/your-project.html">as described</link>,
           then cd in the directory of your project and run "forrest". Publish the
           HTML/PDF result of the build into the xml-site/targets module (copy
-          the results of ./build/site/ to xml-site/targets/your-project/ and commit changes).
+          the results of ./build/site/ to /xml/site/targets/your-project/ and commit changes).
           The sources of the top-level xml.apache.org website are in the
-          xml-site/src/documentation/ directory.
+          <jump href="http://svn.apache.org/repos/asf/xml/site/src/documentation/">/xml/site/src/documentation/</jump> directory.
 		</p>
 	  </section>
 	  <section id="website-sub-other">
 		<title>Updating non-Forrest sub-project websites</title>
 		<p>
 		  To update a part of the website (that does *not* use Forrest) do this:
-		  <br/>Checkout the xml-site module (you only actually need a few subdirs,
+		  <br/>Checkout the /xml/site module (you only actually need a few subdirs,
 			but the whole thing is quite large).
-			<br/>Make updates to your .xml files in the xml-site/sources/your-project
+			<br/>Make updates to your .xml files in the /xml/site/sources/your-project
 		  directory.
-		  <br/>Go to the xml-site/sources directory locally and run the relevant
+		  <br/>Go to the /xml/site/sources directory locally and run the relevant
 		  shell or bat script.
 		  <br/>Check that the .html structure in your local targets directory is
 			built correctly.
-			<br/>Checkin to CVS both your updated sources/ and targets/ trees as
-		  needed,
-		  <br/>Either login to xml.apache.org and cd to /www/xml.apache.org and
+			<br/>Checkin to SVN both your updated sources/ and 
+			<jump href="http://svn.apache.org/repos/asf/xml/site/targets/">targets/</jump>
+			trees as needed,
+		  <br/>Either login to cvs.apache.org and cd to /www/xml.apache.org and
 		  do an update of directories there as needed,
 		  <br/>Or send an email to infrastructure&lt;at&gt;apache.org and ask for
 			your website to be added to the cronjob for automatic update.

Modified: xml/site/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/xml/site/src/documentation/content/xdocs/index.xml?rev=314866&r1=314865&r2=314866&view=diff
==============================================================================
--- xml/site/src/documentation/content/xdocs/index.xml (original)
+++ xml/site/src/documentation/content/xdocs/index.xml Wed Oct 12 05:44:50 2005
@@ -241,7 +241,7 @@
           <td colspan="3">XML parsers, in Java and C++ (with Perl and COM bindings).</td>
         </tr>
         <tr>
-          <td><jump href="http://xml.apache.org/xang/"><strong>Apache Xang</strong></jump></td>
+          <td><jump href="http://xml.apache.org/xang/"><strong>Apache Xang</strong></jump> (inactive)</td>
           <td>Web applications</td>
           <td>JavaScript</td>
         </tr>

Modified: xml/site/src/documentation/content/xdocs/legal.xml
URL: http://svn.apache.org/viewcvs/xml/site/src/documentation/content/xdocs/legal.xml?rev=314866&r1=314865&r2=314866&view=diff
==============================================================================
--- xml/site/src/documentation/content/xdocs/legal.xml (original)
+++ xml/site/src/documentation/content/xdocs/legal.xml Wed Oct 12 05:44:50 2005
@@ -11,8 +11,9 @@
         All Rights Reserved.
     </p>
     <p>
-        For details look at the file:
-        <jump href="http://xml.apache.org/dist/LICENSE.txt">License.txt</jump>.
+        All new software releases and documentation are published under the 
+        <jump href="http://www.apache.org/licenses/">Apache License, version 2.0</jump>.
+        Older software releases have been published under the Apache License versions 1.0 and 1.1.
     </p>
     <p>
         IBM is a trademark of International Business Systems, Inc. Lotus is a trademark of

Copied: xml/site/src/documentation/content/xdocs/mirrors.html (from r314799, xml/site/src/documentation/content/xdocs/mirrors.ehtml)
URL: http://svn.apache.org/viewcvs/xml/site/src/documentation/content/xdocs/mirrors.html?p2=xml/site/src/documentation/content/xdocs/mirrors.html&p1=xml/site/src/documentation/content/xdocs/mirrors.ehtml&r1=314799&r2=314866&rev=314866&view=diff
==============================================================================
--- xml/site/src/documentation/content/xdocs/mirrors.ehtml (original)
+++ xml/site/src/documentation/content/xdocs/mirrors.html Wed Oct 12 05:44:50 2005
@@ -1,32 +1,31 @@
+<!--
+  Copyright 2003-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.
+-->
+<!-- Note: To understand how this template is used, see the documentation
+  at http://forrest.apache.org/howto/howto-asf-mirror.html
+-->
 <html>
-<head>
-<title>Downloading</title>
-</head>
+  <head>
+    <title>Apache XML Project Downloads</title>
+  </head>
 <body>
-	<h1>Apache XML Project Downloads</h1>
 
-	<!-- Create a dummy table of contents in site style -->
-	<ul class="minitoc">
-	  <li>
-		<a href="#notes">Download Notes</a>
-	  </li>
-	  <li>
-		<a href="#mirrors">Select a Mirror</a>
-	  </li>
-	  <li>
-	  	<a href="#source">Source Downloads</a>
-	  </li>
-	  <li>
-	  	<a href="#binary">Binary Downloads</a>
-	  </li>
-	  <li>
-	  	<a href="#verify">PGP/MD5 Verification of Archives</a>
-	  </li>
-	</ul>
 
-
-	  <a name="notes" />
-	  <h3>Download Notes</h3>
+	  
+	  <h1><a name="notes"/>Download Notes</h1>
         <p>This page gives access to source and binary downloads of the latest releases
 	       for all xml.apache.org sub-projects.  Releases are now distributed
 		   via various <strong>mirror</strong> sites around the world, and
@@ -49,13 +48,19 @@
 		</p>
 		<p>
 		   Access to the latest (and possibly
-		   unstable) source can be accessed via <a href="cvs.html">cvs</a>.
+		   unstable) source can be accessed via <a href="svn.html">SVN</a> or <a href="cvs.html">CVS</a>.
 		   Archives of old releases can be found at the 
 		   <a href="http://archive.apache.org/dist/xml">Apache Archives</a>.
 		</p>
+		<p>
+		  Since many XML subprojects have migrated to top-level projects their releases
+		  are not available through this page anymore. Please go to their respective 
+		  project websites instead. You can find a list of all former XML subproject
+		  on the <a href="http://xml.apache.org/">XML front page</a>.
+		</p>
 
-	  <a name="mirrors"/>
-      <h3>Mirrors</h3>
+	  
+      <h1><a name="mirrors"/>Mirrors</h1>
 	
         <p>You are currently using the <strong>[preferred]</strong> mirror.
 		  If you encounter a problem with this mirror, please select another
@@ -77,95 +82,9 @@
 [end]
         </select>
 		 <input type="submit" value="Change"/> 	 </form>
-	 <a name="source"/>
-	 <h3>Source Archives</h3>
-
-  	  	<p><strong>Xerces-C</strong> - <a href="http://www.apache.org/dist/xml/xerces-c/KEYS">KEYS</a></p>
-	   	  <ul>
-     		<li><a href="[preferred]/xml/xerces-c/xerces-c-current.tar.gz">
-				Version 2.5.0 - tar.gz</a>
-				[ <a href="http://www.apache.org/dist/xml/xerces-c/xerces-c-current.tar.gz.asc">PGP</a> ]
-				[ <a href="http://www.apache.org/dist/xml/xerces-c/xerces-c-current.tar.gz.md5">MD5</a> ]
-			</li>
-			<li><a href="[preferred]/xml/xerces-c/xerces-c-current.zip">
-				Version 2.5.0 - zip</a>
-				[ <a href="http://www.apache.org/dist/xml/xerces-c/xerces-c-current.zip.asc">PGP</a> ]
-				[ <a href="http://www.apache.org/dist/xml/xerces-c/xerces-c-current.zip.md5">MD5</a> ]
-			</li>
-			<li><a href="[preferred]/xml/xerces-c/">Browse Download Area</a></li>
-	  	  </ul>
-
-  	  	<p><strong>Xerces-J</strong> - <a href="http://www.apache.org/dist/xml/xerces-j/KEYS">KEYS</a></p>
-	   	  <ul>
-     		<li><a href="[preferred]/xml/xerces-j/Xerces-J-src.2.6.2.zip">
-				Version 2.6.2 - zip</a>
-				[ <a href="http://www.apache.org/dist/xml/xerces-j/Xerces-J-src.2.6.2.zip.sig">PGP</a> ]
-			</li>
-			<li><a href="[preferred]/xml/xerces-j/">Browse Download Area</a></li>
-	  	  </ul>
-
-	    <p><strong>Xerces-P</strong> - <a href="http://www.apache.org/dist/xml/xerces-p/KEYS">KEYS</a></p>
-          <ul>
-			<li><a href="[preferred]/xml/xerces-p/XML-Xerces-current.tar.gz">
-				Version 2.5.0 - tar.gz</a>
-				[ <a href="http://www.apache.org/dist/xml/xerces-p/XML-Xerces-current.tar.gz.asc">PGP</a> ]
-			</li>
-			<li><a href="[preferred]/xml/xerces-p/">Browse Download Area</a></li>
-	  	  </ul>
-
-		<p><strong>Xalan-C</strong> - <a href="http://www.apache.org/dist/xml/xalan-c/KEYS">KEYS</a></p>
-      	  <ul>
-			<li><a href="[preferred]/xml/xalan-c/Xalan-C_current-src.tar.gz">
-				Version 1.8 - tar.gz</a>
-				[ <a href="http://www.apache.org/dist/xml/xalan-c/Xalan-C_current-src.tar.gz.sig">PGP</a> ]
-			</li>
-			<li><a href="[preferred]/xml/xalan-c/Xalan-C_current-src.zip">
-				Version 1.8 - zip</a>
-				[ <a href="http://www.apache.org/dist/xml/xalan-c/Xalan-C_current-src.zip.sig">PGP</a> ]
-			</li>
-			<li><a href="[preferred]/xml/xalan-c/">Browse Download Area</a></li>
-	  	  </ul>
-	
-  	  	<p><strong>Xalan-J</strong> - <a href="http://www.apache.org/dist/xml/xalan-j/KEYS">KEYS</a></p>
-	   	  <ul>
-     		<li><a href="[preferred]/xml/xalan-j/xalan-j-current-src.zip">
-				Version 2.6 - zip</a>
-				[ <a href="http://www.apache.org/dist/xml/xalan-j/xalan-j-current-src.zip.sig">PGP</a> ]
-			</li>
-     		<li><a href="[preferred]/xml/xalan-j/xalan-j-current-src.tar.gz">
-				Version 2.6 - tar.gz</a>
-			</li>
-			<li><a href="[preferred]/xml/xalan-j/">Browse Download Area</a></li>
-	  	  </ul>
-
-	    <p><strong>Fop</strong> - <a href="http://www.apache.org/dist/xml/fop/KEYS">KEYS</a></p>
-          <ul>
-			<li><a href="[preferred]/xml/fop/fop-0.20.5-src.tar.gz">
-				Version 0.20.5 - tar.gz</a>
-				[ <a href="http://www.apache.org/dist/xml/fop/fop-0.20.5-src.tar.gz.asc">PGP</a> ]
-				[ <a href="http://www.apache.org/dist/xml/fop/fop-0.20.5-src.tar.gz.md5">MD5</a> ]
-			</li>
-			<li><a href="[preferred]/xml/fop/fop-0.20.5-src.zip">
-				Version 0.20.5 - zip</a>				[ <a href="http://www.apache.org/dist/xml/fop/fop-0.20.5-src.zip.asc">PGP</a> ]
-				[ <a href="http://www.apache.org/dist/xml/fop/fop-0.20.5-src.zip.md5">MD5</a> ]
-			</li>
-			<li><a href="[preferred]/xml/fop/">Browse Download Area</a></li>
-	  	  </ul>
-
-		<p><strong>Apache Forrest</strong> - <a href="http://www.apache.org/dist/forrest/KEYS">KEYS</a></p>
-      	  <ul>
-			<li><a href="[preferred]/forrest/apache-forrest-0.6.tar.gz">
-				Version 0.6 - tar.gz</a> (combinary source and binary for UNIX)
-				[ <a href="http://www.apache.org/dist/forrest/apache-forrest-0.6.tar.gz.asc">PGP</a> ]
-				[ <a href="http://www.apache.org/dist/forrest/apache-forrest-0.6.tar.gz.md5">MD5</a> ]
-			</li>
-			<li><a href="[preferred]/forrest/apache-forrest-0.6.zip">
-				Version 0.6 - zip</a> (combinary source and binary for Windows)
-				[ <a href="http://www.apache.org/dist/forrest/apache-forrest-0.6.zip.asc">PGP</a> ]
-				[ <a href="http://www.apache.org/dist/forrest/apache-forrest-0.6.zip.md5">MD5</a> ]
-			</li>
-			<li><a href="[preferred]/forrest/">Browse Download Area</a></li>
-	  	  </ul>
+		 
+	 
+	 <h1><a name="source"/>Source Archives</h1>
 
 		<p><strong>Security-J</strong> - <a href="http://www.apache.org/dist/xml/security/KEYS">KEYS</a></p>
        	  <ul>
@@ -224,16 +143,6 @@
             <!-- More xml-commons components: which, external - to come Sep-03 scurcuru -->
 	  	  </ul>
 
-	    <p><strong>Batik</strong> - <a href="http://www.apache.org/dist/xml/batik/KEYS">KEYS</a></p>
-          <ul>
-			<li><a href="[preferred]/xml/batik/batik-src-current.zip">
-				Version 1.5.1 - zip</a>
-				[ <a href="http://www.apache.org/dist/xml/batik/batik-src-current.zip.asc">PGP</a> ]
-				[ <a href="http://www.apache.org/dist/xml/batik/batik-src-current.zip.md5">MD5</a> ]
-			</li>
-			<li><a href="[preferred]/xml/batik/">Browse Download Area</a></li>
-	  	  </ul>
-
 	    <p><strong>AxKit</strong> - <a href="http://www.apache.org/dist/xml/axkit/KEYS">KEYS</a></p>
           <ul>
 			<li><a href="[preferred]/xml/axkit/axkit-current.tar.gz">
@@ -243,178 +152,8 @@
 			<li><a href="[preferred]/xml/axkit/">Browse Download Area</a></li>
 	  	  </ul>
 
-	 <a name="binary"/>
-	 <h3>Binary Distributions</h3>
-
-  	  	<p><strong>Xerces-C</strong> - <a href="http://www.apache.org/dist/xml/xerces-c/KEYS">KEYS</a></p>
-	      <!-- Xerces C++ Library -->
-	   	  <ul>
-     		<li><a href="[preferred]/xml/xerces-c/binaries/AIX51_6.00/xerces-c_2_5_0-aix_510-xlc_60_040127.tar.gz">
-				Version 2.5.0 - AIX 5.1</a>
-				[ <a href="http://www.apache.org/dist/xml/xerces-c/binaries/AIX51_6.00/xerces-c_2_5_0-aix_510-xlc_60_040127.tar.gz.asc">PGP</a> ]
-				[ <a href="http://www.apache.org/dist/xml/xerces-c/binaries/AIX51_6.00/xerces-c_2_5_0-aix_510-xlc_60_040127.tar.gz.md5">MD5</a> ]
-			</li>
-     		<li><a href="[preferred]/xml/xerces-c/binaries/AIX51_6.00_64/xerces-c_2_4_0-aix_510_64-xlc_60_040127.tar.gz">
-				Version 2.5.0 - AIX 5.1 (64 bit)</a>
-				[ <a href="http://www.apache.org/dist/xml/xerces-c/binaries/AIX51_6.00_64/xerces-c_2_5_0-aix_510_64-xlc_60_040127.tar.gz.asc">PGP</a> ]
-				[ <a href="http://www.apache.org/dist/xml/xerces-c/binaries/AIX51_6.00_64/xerces-c_2_5_0-aix_510_64-xlc_60_040127.tar.gz.md5">MD5</a> ]
-			</li>
-     		<li><a href="[preferred]/xml/xerces-c/binaries/HP11ACC/xerces-c_2_5_0-hpux_11-acc_a03.tar.gz">
-				Version 2.5.0 - HP-UX 11.0</a>
-				[ <a href="http://www.apache.org/dist/xml/xerces-c/binaries/HP11ACC/xerces-c_2_5_0-hpux_11-acc_a03.tar.gz.asc">PGP</a> ]
-				[ <a href="http://www.apache.org/dist/xml/xerces-c/binaries/HP11ACC/xerces-c_2_5_0-hpux_11-acc_a03.tar.gz.md5">MD5</a> ]
-			</li>
-     		<li><a href="[preferred]/xml/xerces-c/binaries/HP11ACC_64/xerces-c_2_5_0-hpux_11_64-acc_a03.tar.gz">
-				Version 2.5.0 - HP-UX 11.0 (64 bit)</a>
-				[ <a href="http://www.apache.org/dist/xml/xerces-c/binaries/HP11ACC_64/xerces-c_2_5_0-hpux_11_64-acc_a03.tar.gz.asc">PGP</a> ]
-				[ <a href="http://www.apache.org/dist/xml/xerces-c/binaries/HP11ACC_64/xerces-c_2_5_0-hpux_11_64-acc_a03.tar.gz.md5">MD5</a> ]
-			</li>
-     		<li><a href="[preferred]/xml/xerces-c/binaries/Sol2.7ForCC/xerces-c_2_5_0-solaris_27-cc_62.tar.gz">
-				Version 2.5.0 - Solaris 2.7</a>
-				[ <a href="http://www.apache.org/dist/xml/xerces-c/binaries/Sol2.7ForCC/xerces-c_2_5_0-solaris_27-cc_62.tar.gz.asc">PGP</a> ]
-				[ <a href="http://www.apache.org/dist/xml/xerces-c/binaries/Sol2.7ForCC/xerces-c_2_5_0-solaris_27-cc_62.tar.gz.md5">MD5</a> ]
-			</li>
-     		<li><a href="[preferred]/xml/xerces-c/binaries/Sol2.7ForCC_64/xerces-c_2_5_0-solaris_27_64-cc_62.tar.gz">
-				Version 2.5.0 - Solaris 2.7 (64 bit)</a>
-				[ <a href="http://www.apache.org/dist/xml/xerces-c/binaries/Sol2.7ForCC_64/xerces-c_2_5_0-solaris_27_64-cc_62.tar.gz.asc">PGP</a> ]
-				[ <a href="http://www.apache.org/dist/xml/xerces-c/binaries/Sol2.7ForCC_64/xerces-c_2_5_0-solaris_27_64-cc_62.tar.gz.md5">MD5</a> ]
-			</li>
-     		<li><a href="[preferred]/xml/xerces-c/binaries/SuSE_81/xerces-c_2_5_0-suse_81-gcc_32.tar.gz">
-				Version 2.5.0 - SuSE Linux 8.1</a>
-				[ <a href="http://www.apache.org/dist/xml/xerces-c/binaries/SuSE_81/xerces-c_2_5_0-suse_81-gcc_32.tar.gz.asc">PGP</a> ]
-				[ <a href="http://www.apache.org/dist/xml/xerces-c/binaries/SuSE_81/xerces-c_2_5_0-suse_81-gcc_32.tar.gz.md5">MD5</a> ]
-			</li>
-     		<li><a href="[preferred]/xml/xerces-c/binaries/linux7.2Proton/xerces-c_2_5_0-redhat_72-icc_71.tar.gz">
-				Version 2.5.0 - RedHat Linux 7.2</a>
-				[ <a href="http://www.apache.org/dist/xml/xerces-c/binaries/linux7.2Proton/xerces-c_2_5_0-redhat_72-icc_71.tar.gz.asc">PGP</a> ]
-				[ <a href="http://www.apache.org/dist/xml/xerces-c/binaries/linux7.2Proton/xerces-c_2_5_0-redhat_72-icc_71.tar.gz.md5">MD5</a> ]
-			</li>
-     		<li><a href="[preferred]/xml/xerces-c/binaries/linux7.2Electron_64/xerces-c_2_5_0-redhat_72_64-ecc_71.tar.gz">
-				Version 2.5.0 - RedHat Linux 7.2 (IA64)</a>
-				[ <a href="http://www.apache.org/dist/xml/xerces-c/binaries/linux7.2Electron_64/xerces-c_2_5_0-redhat_72_64-ecc_71.tar.gz.asc">PGP</a> ]
-				[ <a href="http://www.apache.org/dist/xml/xerces-c/binaries/linux7.2Electron_64/xerces-c_2_5_0-redhat_72_64-ecc_71.tar.gz.md5">MD5</a> ]
-			</li>
-     		<li><a href="[preferred]/xml/xerces-c/binaries/win32/xerces-c_2_5_0-windows_nt-msvc_60.zip">
-				Version 2.5.0 - Windows NT4.0 SP5</a>
-				[ <a href="http://www.apache.org/dist/xml/xerces-c/binaries/win32/xerces-c_2_5_0-windows_nt-msvc_60.zip.asc">PGP</a> ]
-				[ <a href="http://www.apache.org/dist/xml/xerces-c/binaries/win32/xerces-c_2_5_0-windows_nt-msvc_60.zip.md5">MD5</a> ]
-			</li>
-     		<li><a href="[preferred]/xml/xerces-c/binaries/win2003_64Elec/xerces-c_2_5_0-windows_2003_64-ecc_71.zip">
-				Version 2.5.0 - Windows 2003 (IA64)</a>
-				[ <a href="http://www.apache.org/dist/xml/xerces-c/binaries/win2003_64Elec/xerces-c_2_5_0-windows_2003_64-ecc_71.zip.asc">PGP</a> ]
-				[ <a href="http://www.apache.org/dist/xml/xerces-c/binaries/win2003_64Elec/xerces-c_2_5_0-windows_2003_64-ecc_71.zip.md5">MD5</a> ]
-			</li>
-		  </ul>
-
-  	  	<p><strong>Xerces-J</strong> - <a href="http://www.apache.org/dist/xml/xerces-j/KEYS">KEYS</a></p>
-		  <!-- Xerces Java Library -->
-	   	  <ul>
-     		<li><a href="[preferred]/xml/xerces-j/Xerces-J-bin.2.6.2.zip">
-				Version 2.6.2 - zip</a>
-				[ <a href="http://www.apache.org/dist/xml/xerces-j/Xerces-J-bin.2.6.2.zip.sig">PGP</a> ]
-			</li>
-	  	  </ul>
-		
-		<!-- No Xerces-P Binary -->
-
-  	  	<p><strong>Xalan-C</strong> - <a href="http://www.apache.org/dist/xml/xalan-c/KEYS">KEYS</a></p>
-		  <!-- Xalan C++ Library -->
-	   	  <ul>
-     		<li><a href="[preferred]/xml/xalan-c/binaries/Xalan-C_1_8_0-aix_510-xlc_60.tar.gz">
-				Version 1.8 - AIX 5.1</a>
-				[ <a href="http://www.apache.org/dist/xml/xalan-c/binaries/Xalan-C_1_8_0-aix_510-xlc_60.tar.gz.sig">PGP</a> ]
-			</li>
-     		<li><a href="[preferred]/xml/xalan-c/binaries/Xalan-C_1_8_0-aix_510_64-xlc_60.tar.gz">
-				Version 1.8 - AIX 5.1 (64 bit)</a>
-				[ <a href="http://www.apache.org/dist/xml/xalan-c/binaries/Xalan-C_1_8_0-aix_510_64-xlc_60.tar.gz.sig">PGP</a> ]
-			</li>
-     		<li><a href="[preferred]/xml/xalan-c/binaries/Xalan-C_1_8_0-hpux_11-acc_a03.tar.gz">
-				Version 1.8 - HP-UX 11.0</a>
-				[ <a href="http://www.apache.org/dist/xml/xalan-c/binaries/Xalan-C_1_8_0-hpux_11-acc_a03.tar.gz.sig">PGP</a> ]
-			</li>
-     		<li><a href="[preferred]/xml/xalan-c/binaries/Xalan-C_1_8_0-hpux_11_64-acc_a03.tar.gz">
-				Version 1.8 - HP-UX 11.0 (64 bit)</a>
-				[ <a href="http://www.apache.org/dist/xml/xalan-c/binaries/Xalan-C_1_8_0-hpux_11_64-acc_a03.tar.gz.sig">PGP</a> ]
-			</li>
-     		<li><a href="[preferred]/xml/xalan-c/binaries/Xalan-C_1_8_0-solaris_27-cc_62.tar.gz">
-				Version 1.8 - Solaris 2.7</a>
-				[ <a href="http://www.apache.org/dist/xml/xalan-c/binaries/Xalan-C_1_8_0-solaris_27-cc_62.tar.gz.sig">PGP</a> ]
-			</li>
-     		<li><a href="[preferred]/xml/xalan-c/binaries/Xalan-C_1_8_0-solaris_27_64-cc_62.tar.gz">
-				Version 1.8 - Solaris 2.7 (64 bit)</a>
-				[ <a href="http://www.apache.org/dist/xml/xalan-c/binaries/Xalan-C_1_8_0-solaris_27_64-cc_62.tar.gz.sig">PGP</a> ]
-			</li>
-     		<li><a href="[preferred]/xml/xalan-c/binaries/Xalan-C_1_8_0-redhat_72-icc_71.tar.gz">
-				Version 1.8 - RedHat Linux 7.2</a>
-				[ <a href="http://www.apache.org/dist/xml/xalan-c/binaries/Xalan-C_1_8_0-redhat_72-icc_71.tar.gz.sig">PGP</a> ]
-			</li>
-     		<li><a href="[preferred]/xml/xalan-c/binaries/Xalan-C_1_8_0-redhat_72_64-ecc_71.tar.gz">
-				Version 1.8 - RedHat Linux 7.2 (IA64)</a>
-				[ <a href="http://www.apache.org/dist/xml/xalan-c/binaries/Xalan-C_1_8_0-redhat_72_64-ecc_71.tar.gz.sig">PGP</a> ]
-			</li>
-     		<li><a href="[preferred]/xml/xalan-c/binaries/Xalan-C_1_8_0-suse_81-gcc_32.tar.gz">
-				Version 1.8 - SuSE Linux 8.1</a>
-				[ <a href="http://www.apache.org/dist/xml/xalan-c/binaries/Xalan-C_1_8_0-suse_81-gcc_32.tar.gz.sig">PGP</a> ]
-			</li>
-     		<li><a href="[preferred]/xml/xalan-c/binaries/Xalan-C_1_8_0-windows_nt-msvc_60.zip">
-				Version 1.8 - Windows 32</a>
-				[ <a href="http://www.apache.org/dist/xml/xalan-c/binaries/Xalan-C_1_8_0-windows_nt-msvc_60.zip.sig">PGP</a> ]
-			</li>
-     		<li><a href="[preferred]/xml/xalan-c/binaries/Xalan-C_1_8_0-windows_2003_64-ecl_71.zip">
-				Version 1.8 - Windows 32</a>
-				[ <a href="http://www.apache.org/dist/xml/xalan-c/binaries/Xalan-C_1_8_0-windows_2003_64-ecl_71.zip.sig">PGP</a> ]
-			</li>
-		  </ul>
-
-  	  	<p><strong>Xalan-J</strong> - <a href="http://www.apache.org/dist/xml/xalan-j/KEYS">KEYS</a></p>
-	      <!-- Xalan-J -->
-	   	  <ul>
-     		<li><a href="[preferred]/xml/xalan-j/xalan-j-current-bin.zip">
-				Version 2.6 - zip</a>
-				[ <a href="http://www.apache.org/dist/xml/xalan-j/xalan-j-current-bin.zip.sig">PGP</a> ]
-			</li>
-     		<li><a href="[preferred]/xml/xalan-j/xalan-j-current-bin.tar.gz">
-				Version 2.6 - tar.gz</a>
-				[ <a href="http://www.apache.org/dist/xml/xalan-j/xalan-j-current-bin.tar.gz.sig">PGP</a> ]
-			</li>
-     		<li><a href="[preferred]/xml/xalan-j/xalan-j-current-bin-2jars.zip">
-				Version 2.6 (2 Jars) - zip</a>
-				[ <a href="http://www.apache.org/dist/xml/xalan-j/xalan-j-current-bin-2jars.zip.sig">PGP</a> ]
-			</li>
-     		<li><a href="[preferred]/xml/xalan-j/xalan-j-current-bin-2jars.tar.gz">
-				Version 2.6 (2 Jars) - tar.gz</a>
-				[ <a href="http://www.apache.org/dist/xml/xalan-j/xalan-j-current-bin-2jars.tar.gz.sig">PGP</a> ]
-			</li>
-	  	  </ul>
-
-  	  	<p><strong>Fop</strong> - <a href="http://www.apache.org/dist/xml/fop/KEYS">KEYS</a></p>
-	      <!-- Fop -->
-	   	  <ul>
-     		<li><a href="[preferred]/xml/fop/fop-0.20.5-bin.tar.gz">
-				Version 0.20.5 - tar.gz</a>
-				[ <a href="http://www.apache.org/dist/xml/fop/fop-0.20.5-bin.tar.gz.asc">PGP</a> ]
-				[ <a href="http://www.apache.org/dist/xml/fop/fop-0.20.5-bin.tar.gz.md5">MD5</a> ]
-			</li>
-     		<li><a href="[preferred]/xml/fop/fop-0.20.5-bin.zip">
-				Version 0.20.5 - zip</a>
-				[ <a href="http://www.apache.org/dist/xml/fop/fop-0.20.5-bin.zip.asc">PGP</a> ]
-				[ <a href="http://www.apache.org/dist/xml/fop/fop-0.20.5-bin.zip.md5">MD5</a> ]
-			</li>
-		  </ul>
-
-  	  	<p><strong>Apache Forrest</strong> - <a href="http://www.apache.org/dist/forrest/KEYS">KEYS</a></p>
-	   	  <ul>
-     		<li><a href="[preferred]/forrest/apache-forrest-0.6.tar.gz">
-				Version 0.6 - tar.gz</a> (combinary source and binary for UNIX)
-				[ <a href="http://www.apache.org/dist/forrest/apache-forrest-0.6.tar.gz.asc">PGP</a> ]
-				[ <a href="http://www.apache.org/dist/forrest/apache-forrest-0.6.tar.gz.md5">MD5</a> ]
-			</li>
-     		<li><a href="[preferred]/forrest/apache-forrest-0.6.zip">
-				Version 0.6 - zip</a> (combinary source and binary for Windows)
-				[ <a href="http://www.apache.org/dist/forrest/apache-forrest-0.6.zip.asc">PGP</a> ]
-				[ <a href="http://www.apache.org/dist/forrest/apache-forrest-0.6.zip.md5">MD5</a> ]
-			</li>
-		  </ul>
+	 
+	 <h1><a name="binary"/>Binary Distributions</h1>
 
   	  	<p><strong>Security-J</strong> - <a href="http://www.apache.org/dist/xml/security/KEYS">KEYS</a></p>
 	      <!-- Security - Java library only, no binary available for C++ library -->
@@ -427,26 +166,11 @@
 
 		  <!-- No Xindice binaries for 1.0 -->
 
-  	  	<p><strong>Batik</strong> - <a href="http://www.apache.org/dist/xml/batik/KEYS">KEYS</a></p>
-	      <!-- Batik -->
-	   	  <ul>
-     		<li><a href="[preferred]/xml/batik/batik-current.zip">
-				Version 1.5.1 - zip</a>
-				[ <a href="http://www.apache.org/dist/xml/batik/batik-current.zip.asc">PGP</a> ]
-				[ <a href="http://www.apache.org/dist/xml/batik/batik-current.zip.md5">MD5</a> ]
-			</li>
-     		<li><a href="[preferred]/xml/batik/batik-docs-current.zip">
-				Version 1.5.1 (Documentation) - zip</a>
-				[ <a href="http://www.apache.org/dist/xml/batik/batik-docs-current.zip.asc">PGP</a> ]
-				[ <a href="http://www.apache.org/dist/xml/batik/batik-docs-current.zip.md5">MD5</a> ]
-			</li>
-		  </ul>
-
 		  <!-- No AxKit binaries for 1.6.2 -->
 
 
-	<a name="verify"/>
-	<h3>Verify The Integrity of the Files</h3>
+	
+	<h1><a name="verify"/>Verify The Integrity of the Files</h1>
  	
 	  <p>It is essential that you verify the integrity of the 
 	 	downloaded files using the PGP or MD5 signatures.</p>
@@ -455,7 +179,7 @@
 		First download the KEYS as well as the asc/sig signature 
 		file for the particular distribution. Make sure you get 
 	   these files from the main distribution directory, rather 
-	   than from a mirror. Then verify the signatures using :
+	   than from a mirror. Then verify the signatures using:
 	  </p>
 		
 	  <pre class="code">

Modified: xml/site/src/documentation/content/xdocs/news.xml
URL: http://svn.apache.org/viewcvs/xml/site/src/documentation/content/xdocs/news.xml?rev=314866&r1=314865&r2=314866&view=diff
==============================================================================
--- xml/site/src/documentation/content/xdocs/news.xml (original)
+++ xml/site/src/documentation/content/xdocs/news.xml Wed Oct 12 05:44:50 2005
@@ -13,15 +13,26 @@
         updating the xml.apache.org website in the
         <link href="guidelines.html">guidelines</link>.
       </p>
-      <section id="apachecon-eu-2005">
-        <title>ApacheCon Europe 2005 (18-22 July 2005)</title>
+      <section id="apachecon-us-2005">
+        <title>ApacheCon US 2005 (10-14 December 2005)</title>
         <p>
           <link href="http://apachecon.com/">
-            <img src="http://apache.org/images/ac2005eu_135x50.gif"
-              alt="ApacheCon Europe 2005" width="135" height="50"/>
+            <img src="http://apache.org/images/ac2005us_white_184x80.jpg"
+              alt="ApacheCon US 2005" width="184" height="80"/>
           </link>
+          <link href="http://apachecon.com/2005/US/">ApacheCon US 2005</link>
+            (10-14 December 2005). ApacheCon is the conference for all
+            things Apache. Come along and learn about a range of new
+            technologies, meet some Apache folks and share the knowledge.
+            See more information about
+            <link href="http://www.apache.org/foundation/conferences.html">Apache Conferences</link>.
+        </p>
+      </section>
+      <section id="apachecon-eu-2005">
+        <title>ApacheCon Europe 2005 (18-22 July 2005)</title>
+        <p>
           <link href="http://apachecon.com/">ApacheCon Europe 2005</link>
-            (18-22 July 2005). ApacheCon is the conference for all
+            (18-22 July 2005) was a success. ApacheCon is the conference for all
             things Apache. Come along and learn about a range of new
             technologies, meet some Apache folks and share the knowledge.
             See more information about
@@ -354,66 +365,6 @@
         <title>Batik was nominated for an award! (Sep-01)</title>
         <p>Some details were posted on <jump href="http://marc.theaimsgroup.com/?l=xml-apache-general&amp;m=99973420212175&amp;w=2">the general mailing list</jump>
         </p>
-      </section>
-    </section>
-    <section id="project-status">
-      <title>Project Status</title>
-      <section id="batik-status">
-        <title>Batik Status: Source Code and Binaries Available</title>
-        <p>
-      Batik, the Java Based toolkit for applications that want to use images in
-      the Scalable Vector Graphics (SVG) format is finally available on our
-      <jump href="http://xml.apache.org/dist/">download pages</jump>!
-    </p>
-      </section>
-      <section id="xang-status">
-        <title>Xang - Source code for XPages from Datachannel released</title>
-        <p>
-      Xang, the new code name of the XPages project from DataChannel is
-      currently available in source form for download. Check out the
-      <jump href="http://xml.apache.org/dist/">download pages</jump> for the source.
-    </p>
-      </section>
-      <section id="crimson-status">
-        <title>Crimson - Source code for Project X from Sun released</title>
-        <p>
-      Crimson, the code name of the XML Parser Project X from Sun is
-      currently available in source form for download.
-      Check out the
-      <jump href="http://xml.apache.org/dist/">download pages</jump> for the source.
-    </p>
-        <p>The current production release is Crimson 1.1.2beta2(Sep-01).
-    Work on Crimson is mostly limited to bugfixing; discussions take place on general@xml.apache.org.</p>
-      </section>
-      <section id="xerces-status">
-        <title>Xerces status: Source Code and Binaries Available</title>
-        <p>
-      Xerces XML parsers in Java, C++, Perl, and COM are currently available in
-      source code and binary form. Check out the
-      <jump href="http://xml.apache.org/dist/">download pages</jump> for binaries
-      and source!
-    </p>
-        <p>The current production release is Xerces-J 1.4.3 (Sep-01).
-    Work on 1.x is mostly limited to bugfixing; most of the Xerces community
-    is moving forward with Xerces 2.x codebase.</p>
-      </section>
-      <section id="xalan-status">
-        <title>Xalan Status: Source Code and Binaries Available</title>
-        <p>
-      Xalan XSLT stylesheet processor in Java is currently available in
-      source code and binary form. Check out the
-      <jump href="http://xml.apache.org/dist/">download pages</jump> for binaries and
-      source!
-    </p>
-      </section>
-      <section id="fop-status">
-        <title>FOP Status: Source Code and Binaries Available</title>
-        <p>
-      FOP, the XSL:FO formatting objects processor in Java, is currently available in
-      source code and binary form. Check out the
-      <jump href="http://xml.apache.org/dist/">download pages</jump> for binaries and
-      source!
-    </p>
       </section>
     </section>
     <section id="past-news">

Added: xml/site/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewcvs/xml/site/src/documentation/content/xdocs/site.xml?rev=314866&view=auto
==============================================================================
--- xml/site/src/documentation/content/xdocs/site.xml (added)
+++ xml/site/src/documentation/content/xdocs/site.xml Wed Oct 12 05:44:50 2005
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 2005 The Apache Software Foundation
+
+  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.
+-->
+<site label="The Apache XML Project" href="" xmlns="http://apache.org/forrest/linkmap/1.0" tab="home">
+
+  <about label="About">
+    <index label="Welcome" href="index.html"/>
+    <news label="News" href="news.html"/>
+    <mission label="Mission" href="mission.html"/>
+    <guidelines label="Guidelines" href="guidelines.html"/>
+  </about>
+  
+  <federation label="XML Federation">
+    <axis href="http://ws.apache.org/axis/index.html" label="Axis"/>
+    <batik href="/batik/" label="Batik"/>
+    <cocoon href="http://cocoon.apache.org/" label="Cocoon"/>
+    <forrest href="http://forrest.apache.org/" label="Forrest"/>
+    <fop href="http://xmlgraphics.apache.org/fop/" label="FOP"/>
+    <soap href="http://ws.apache.org/soap/index.html" label="SOAP"/>
+    <xalanj href="/xalan-j/" label="Xalan Java 2"/>
+    <xalanc href="/xalan-c/" label="Xalan C++"/>
+    <xercesj href="/xerces2-j/" label="Xerces Java 2"/>
+    <xercesc href="/xerces-c/" label="Xerces C++"/>
+    <xercesp href="/xerces-p/" label="Xerces Perl"/>
+    <xmlbeans href="http://xmlbeans.apache.org/" label="XMLBeans"/>
+    <xmlrpc href="http://ws.apache.org/xmlrpc/" label="XML-RPC"/>
+  </federation>
+
+  <local label="Local Projects">
+    <commons href="/commons/"  label="XML Commons" />
+    <security href="/security/" label="XML Security" />
+    <xindice href="/xindice/"  label="Xindice" />
+    <axkit href="http://axkit.org" label="AxKit" />
+  </local>
+<!-- 
+  <incubating label="Incubating Projects">
+  </incubating>
+-->
+
+  <hibernated label="Hibernated Projects">
+    <xercesj1 href="/xerces-j/" label="Xerces Java 1"/>
+    <xang href="/xang/" label="Xang"/>
+    <crimson href="/crimson/" label="Crimson"/>
+  </hibernated>
+    
+  <community label="Community">
+    <whoweare label="Who We Are" href="whoweare.html"/>
+    <credits label="Credits" href="ack.html"/>
+  </community>
+
+  <resources label="Resources">
+    <download label="Downloads" href="http://xml.apache.org/mirrors.cgi"/>
+    <download_html href="mirrors.html"/><!-- so the page is part of a tab -->
+    <bugs label="Bug Database" href="http://issues.apache.org/bugzilla/"/>
+    <wiki label="Wiki" href="http://wiki.apache.org/general/FrontPage"/> <!-- there's no XML Wiki -->
+    <gump label="Gump" href="http://gump.apache.org/"/>
+  </resources>
+  
+  <info label="Information">
+    <involved label="Get Involved" href="overview.html"/>
+    <svn label="SVN Repository" href="svn.html"/>
+    <cvs label="CVS Repositories" href="cvs.html"/>
+    <lists label="Mailing Lists" href="mail.html"/>
+    <reference label="Reference" href="library.html"/>
+    <legal label="Legal Stuff" href="legal.html"/>
+    <contact label="Contact Info" href="contact.html"/>
+  </info>
+
+  <external-refs>
+    <xmlgraphics.apache.org href="http://xmlgraphics.apache.org">
+      <batik href="batik/"/>
+      <fop href="fop/"/>
+    </xmlgraphics.apache.org>
+    <xml.apache.org href="http://xml.apache.org/">
+      <xindice href="xindice/"/>
+    </xml.apache.org>
+    <ant href="http://ant.apache.org/"/>
+  </external-refs>
+
+</site>

Propchange: xml/site/src/documentation/content/xdocs/site.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: xml/site/src/documentation/content/xdocs/svn.xml
URL: http://svn.apache.org/viewcvs/xml/site/src/documentation/content/xdocs/svn.xml?rev=314866&r1=314865&r2=314866&view=diff
==============================================================================
--- xml/site/src/documentation/content/xdocs/svn.xml (original)
+++ xml/site/src/documentation/content/xdocs/svn.xml Wed Oct 12 05:44:50 2005
@@ -9,19 +9,33 @@
     <section>
       <title>Web Access to the Repository</title>
       <p>
-        You can browse the xml.apache.org workspaces via the web.
+        You can browse the <jump href="http://svn.apache.org/viewcvs.cgi/xml/">xml.apache.org workspaces</jump> via the web.
       </p>
       <ul>
         <li>
-          <jump href="http://svn.apache.org/viewcvs.cgi/forrest/trunk/">forrest</jump>
+          <jump href="http://svn.apache.org/viewcvs.cgi/xml/commons/">commons</jump> (XML Commons)
         </li>
         <li>
-          <jump href="http://svn.apache.org/viewcvs.cgi/xml/xindice/trunk/">xindice</jump>
+          <jump href="http://svn.apache.org/viewcvs.cgi/xml/crimson/">crimson</jump> (Crimson parser, inactive)
+        </li>
+        <li>
+          <jump href="http://svn.apache.org/viewcvs.cgi/xml/site/">site</jump> (xml.apache.org site)
+        </li>
+        <li>
+          <jump href="http://svn.apache.org/viewcvs.cgi/xml/stylebook/">stylebook</jump> (Stylebook)
+        </li>
+        <li>
+          <jump href="http://svn.apache.org/viewcvs.cgi/xml/xang/">xang</jump> (Xang, inactive)
+        </li>
+        <li>
+          <jump href="http://svn.apache.org/viewcvs.cgi/xml/xindice/">xindice</jump> (XIndice)
         </li>
       </ul>
       <p>
         Don't see the project you need? Check on <link href="cvs.html">CVS
-        Repositories</link> page.
+        Repositories</link> page. Otherwise, the repository you're looking for is not
+        under the control of the Apache XML project. Please follow the links on the
+        <link href="/index.html">front page</link> to find the right project page.
       </p>
     </section>
     <section>
@@ -50,12 +64,17 @@
           Projects available for access are:
         </p>
         <ul>
-          <li>forrest (see <link href="http://forrest.apache.org/build.html">SVN notes</link>)</li>
+          <li>commons</li>
+          <li>crimson</li>
+          <li>stylebook</li>
+          <li>xang</li>
           <li>xindice</li>
         </ul>
         <p>
           Don't see the project you need? Check on <link href="cvs.html">CVS
-          Repositories</link> page.
+          Repositories</link> page. Otherwise, the repository you're looking for is not
+          under the control of the Apache XML project. Please follow the links on the
+          <link href="/index.html">front page</link> to find the right project page.
         </p>
     </section>
 

Modified: xml/site/src/documentation/content/xdocs/whoweare.xml
URL: http://svn.apache.org/viewcvs/xml/site/src/documentation/content/xdocs/whoweare.xml?rev=314866&r1=314865&r2=314866&view=diff
==============================================================================
--- xml/site/src/documentation/content/xdocs/whoweare.xml (original)
+++ xml/site/src/documentation/content/xdocs/whoweare.xml Wed Oct 12 05:44:50 2005
@@ -30,7 +30,7 @@
 		<li>Vincent Hardy</li>
 		<li>Berin Lautenbach - berin at ozemail.com.au</li>
     <li>Ted Leung - twl at apache.org</li>
-		<li>Jeremias Maerki</li>
+		<li>Jeremias Märki</li>
 		<li>Brian Minchau</li>
 		<li>Steven Noels</li>
 		<li>Santiago Pericas-Geertsen</li>

Modified: xml/site/src/documentation/skinconf.xml
URL: http://svn.apache.org/viewcvs/xml/site/src/documentation/skinconf.xml?rev=314866&r1=314865&r2=314866&view=diff
==============================================================================
--- xml/site/src/documentation/skinconf.xml (original)
+++ xml/site/src/documentation/skinconf.xml Wed Oct 12 05:44:50 2005
@@ -54,14 +54,14 @@
     Use e.g. align="center" to move the compliance links logos to 
     an alternate location default is left.
     (if the skin supports it) -->
-  <disable-compliance-links>false</disable-compliance-links>
+  <disable-compliance-links>true</disable-compliance-links>
 
   <!-- Render mailto: links unrecognisable by spam harvesters? -->
   <obfuscate-mail-links>true</obfuscate-mail-links>
   <obfuscate-mail-value>.at.</obfuscate-mail-value>
 
   <!-- Disable the javascript facility to change the font size -->
-  <disable-font-script>true</disable-font-script>
+  <disable-font-script>false</disable-font-script>
 
   <!-- mandatory project logo
        default skin: renders it at the top -->
@@ -87,10 +87,10 @@
   <host-logo></host-logo>
 
   <!-- relative url of a favicon file, normally favicon.ico -->
-  <favicon-url></favicon-url>
+  <favicon-url>favicon.ico</favicon-url>
 
   <!-- The following are used to construct a copyright statement -->
-  <year>2002-2004</year>
+  <year>2002-2005</year>
   <vendor>The Apache Software Foundation.</vendor>
   <!-- The optional copyright-link URL will be used as a link in the
     copyright statement
@@ -122,7 +122,7 @@
   <toc max-depth="2" min-sections="1" location="page"/>
 
   <!-- Heading types can be clean|underlined|boxed  -->
-  <headings type="boxed"/>
+  <headings type="underlined"/>
   
   <!-- The optional feedback element will be used to construct a
     feedback link in the footer with the page pathname appended:
@@ -328,18 +328,38 @@
     <disable-copyright-footer>false</disable-copyright-footer>
   </pdf>
 
-  <!-- Credits are typically rendered as a set of small clickable
+  <!-- 
+    Credits are typically rendered as a set of small clickable
     images in the page footer.
-    Use box-location="alt" to move the credit to an alternate location
-    (if the skin supports it). 
+    
+    Use box-location="alt" to move the credits to an alternate location
+    (if the skin supports it).
+
+    For example, pelt skin:
+    - box-location="alt" will place the logo at the end of the
+      left-hand coloured menu panel.
+    - box-location="alt2" will place them underneath that panel
+      in the left-hand whitespace.
+    - Otherwise they are placed next to the compatibility icons
+      at the bottom of the screen.
+
+    Comment out the whole <credit>-element if you want no credits in the
+    web pages 
   -->
   <credits>
-    <credit>
+    <credit box-location="alt">
       <name>Built with Apache Forrest</name>
       <url>http://forrest.apache.org/</url>
       <image>images/built-with-forrest-button.png</image>
       <width>88</width>
       <height>31</height>
+    </credit>
+    <credit box-location="alt2">
+      <name>ApacheCon US 2005</name>
+      <url>http://apachecon.com/2005/US/</url>
+      <image>http://apache.org/images/ac2005us_blue_125x125.jpg</image>
+      <width>125</width>
+      <height>125</height>
     </credit>
     <!-- A credit with @role="pdf" will be used to compose a footer
      for each page in the PDF, using either "name" or "url" or both.



---------------------------------------------------------------------
To unsubscribe, e-mail: general-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: general-cvs-help@xml.apache.org


Mime
View raw message