From c85b947f97c4ead28f60ec8f6f0be921ee9fb5f9 Mon Sep 17 00:00:00 2001
From: Thomas Neidhart <tn@apache.org>
Date: Wed, 20 Feb 2013 15:58:49 +0000
Subject: [PATCH] Updated site.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/logging/trunk@1448266 13f79535-47bb-0310-9956-ffa450edef68
---
 src/site/site.xml                    | 12 -----
 src/site/xdoc/download_logging.xml   | 32 ++++++-------
 src/site/xdoc/index.xml              | 28 +++++-------
 src/site/xdoc/issue-tracking.xml.bak | 67 ----------------------------
 src/site/xdoc/junit-report.xml       |  6 +--
 5 files changed, 30 insertions(+), 115 deletions(-)
 delete mode 100644 src/site/xdoc/issue-tracking.xml.bak

diff --git a/src/site/site.xml b/src/site/site.xml
index 4af24bf..d014d34 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -84,17 +84,5 @@ under the License.
       <item   name='Release Notes'
               href='http://commons.apache.org/logging/commons-logging-1.0.4/RELEASE-NOTES.txt'/>
     </menu>
-    <menu name='1.0.3 Release'>
-      <item   name='User Guide'
-              href='http://commons.apache.org/logging/commons-logging-1.0.3/usersguide.html'/>
-      <item   name='JavaDoc'
-              href='http://commons.apache.org/logging/commons-logging-1.0.3/docs/api/'/>
-      <item   name='Release Notes'
-              href='http://commons.apache.org/logging/commons-logging-1.0.3/RELEASE-NOTES.txt'/>
-    </menu>
-    <menu name='1.0.2 Release'>
-      <item   name='JavaDoc'
-              href='http://commons.apache.org/logging/commons-logging-1.0.2/docs/api/'/>
-    </menu>
   </body>
 </project>
diff --git a/src/site/xdoc/download_logging.xml b/src/site/xdoc/download_logging.xml
index 736d7b6..c8ee107 100644
--- a/src/site/xdoc/download_logging.xml
+++ b/src/site/xdoc/download_logging.xml
@@ -54,7 +54,7 @@ limitations under the License.
       <p>
         We recommend you use a mirror to download our release
         builds, but you <strong>must</strong> verify the integrity of
-        the downloaded files using signatures downloaded from our main 
+        the downloaded files using signatures downloaded from our main
         distribution directories. Recent releases (48 hours) may not yet
         be available from the mirrors.
       </p>
@@ -71,7 +71,7 @@ limitations under the License.
 
       <form action="[location]" method="get" id="SelectMirror">
         <p>
-          Other mirrors: 
+          Other mirrors:
           <select name="Preferred">
           [if-any http]
             [for http]<option value="[http]">[http]</option>[end]
@@ -90,37 +90,37 @@ limitations under the License.
       <p>
         The <a href="http://www.apache.org/dist/commons/KEYS">KEYS</a>
         link links to the code signing keys used to sign the product.
-        The <code>PGP</code> link downloads the OpenPGP compatible signature from our main site. 
+        The <code>PGP</code> link downloads the OpenPGP compatible signature from our main site.
         The <code>MD5</code> link downloads the checksum from the main site.
       </p>
     </subsection>
     </section>
-    <section name="Commons Logging 1.1.1 ">
+    <section name="Commons Logging 1.1.2 ">
       <subsection name="Binaries">
         <table>
           <tr>
-              <td><a href="[preferred]/commons/logging/binaries/commons-logging-1.1.1-bin.tar.gz">commons-logging-1.1.1-bin.tar.gz</a></td>
-              <td><a href="http://www.apache.org/dist/commons/logging/binaries/commons-logging-1.1.1-bin.tar.gz.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/commons/logging/binaries/commons-logging-1.1.1-bin.tar.gz.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/logging/binaries/commons-logging-1.1.2-bin.tar.gz">commons-logging-1.1.2-bin.tar.gz</a></td>
+              <td><a href="http://www.apache.org/dist/commons/logging/binaries/commons-logging-1.1.2-bin.tar.gz.md5">md5</a></td>
+              <td><a href="http://www.apache.org/dist/commons/logging/binaries/commons-logging-1.1.2-bin.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
-              <td><a href="[preferred]/commons/logging/binaries/commons-logging-1.1.1-bin.zip">commons-logging-1.1.1-bin.zip</a></td>
-              <td><a href="http://www.apache.org/dist/commons/logging/binaries/commons-logging-1.1.1-bin.zip.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/commons/logging/binaries/commons-logging-1.1.1-bin.zip.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/logging/binaries/commons-logging-1.1.2-bin.zip">commons-logging-1.1.2-bin.zip</a></td>
+              <td><a href="http://www.apache.org/dist/commons/logging/binaries/commons-logging-1.1.2-bin.zip.md5">md5</a></td>
+              <td><a href="http://www.apache.org/dist/commons/logging/binaries/commons-logging-1.1.2-bin.zip.asc">pgp</a></td>
           </tr>
         </table>
       </subsection>
       <subsection name="Source">
         <table>
           <tr>
-              <td><a href="[preferred]/commons/logging/source/commons-logging-1.1.1-src.tar.gz">commons-logging-1.1.1-src.tar.gz</a></td>
-              <td><a href="http://www.apache.org/dist/commons/logging/source/commons-logging-1.1.1-src.tar.gz.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/commons/logging/source/commons-logging-1.1.1-src.tar.gz.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/logging/source/commons-logging-1.1.2-src.tar.gz">commons-logging-1.1.2-src.tar.gz</a></td>
+              <td><a href="http://www.apache.org/dist/commons/logging/source/commons-logging-1.1.2-src.tar.gz.md5">md5</a></td>
+              <td><a href="http://www.apache.org/dist/commons/logging/source/commons-logging-1.1.2-src.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
-              <td><a href="[preferred]/commons/logging/source/commons-logging-1.1.1-src.zip">commons-logging-1.1.1-src.zip</a></td>
-              <td><a href="http://www.apache.org/dist/commons/logging/source/commons-logging-1.1.1-src.zip.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/commons/logging/source/commons-logging-1.1.1-src.zip.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/logging/source/commons-logging-1.1.2-src.zip">commons-logging-1.1.2-src.zip</a></td>
+              <td><a href="http://www.apache.org/dist/commons/logging/source/commons-logging-1.1.2-src.zip.md5">md5</a></td>
+              <td><a href="http://www.apache.org/dist/commons/logging/source/commons-logging-1.1.2-src.zip.asc">pgp</a></td>
           </tr>
         </table>
       </subsection>
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index b282151..157838f 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -81,6 +81,10 @@ This gives short introductions to topics such as advanced class loading.
 Binary and source distributions are available
        <a href="http://commons.apache.org/logging/download_logging.cgi">here</a>.
     </p>
+    <subsection name='1.1.2 Release - March 2013'>
+      <p>The 1.1.2 release is a packaging of bug fixes since release 1.1.1.</p>
+      <p>For the full details, see the release notes for this version.</p> 
+    </subsection>
     <subsection name='1.1.1 Release - November 2007'>
       <p>
        This release is a minor update to the 1.1 release that fixes a number of bugs, and 
@@ -108,32 +112,22 @@ Binary and source distributions are available
     accurately reflects the improvements made to the codebase.</p>
     </subsection>
     <subsection name='1.0.4 Release - 16 Jun 2004'>
-      <p>
-The 1.0.4 release of commons-logging is a service
-release containing support for both the 1.2.x and 1.3.x series of Log4J releases. 
-      </p>
+      <p>The 1.0.4 release of commons-logging is a service release containing support
+      for both the 1.2.x and 1.3.x series of Log4J releases.</p>
     </subsection>
     <subsection name='1.0.3 Release - 7 Apr 2003'>
-      <p>
-The 1.0.3 release is primarily a maintenance and code cleanup release with minimal new features. 
-      </p>
+      <p>The 1.0.3 release is primarily a maintenance and code cleanup release with minimal new features.</p>
     </subsection>
     <subsection name='1.0.2 Release - 27 September 2002'>
-      <p>
-The 1.0.2 release is a packaging of bug fixes since release 1.0.1.
-      </p>
+      <p>The 1.0.2 release is a packaging of bug fixes since release 1.0.1.</p>
     </subsection>
     <subsection name='1.0.1 Release - 13 August 2002'>
-      <p>
-The 1.0.1 release is a packaging of bug fixes and minor enhancements since release 1.0.
-      </p>
+      <p>The 1.0.1 release is a packaging of bug fixes and minor enhancements since release 1.0.</p>
     </subsection>
 </section>
 <section name="Development Builds">
-  <p>
-Regular builds of the current SVN HEAD code are made available. See the 
-<a href="http://wiki.apache.org/commons/Logging">wiki</a> for details.
-  </p>
+  <p>Regular builds of the current SVN HEAD code are made available. See the 
+  <a href="http://wiki.apache.org/commons/Logging">wiki</a> for details.</p>
 </section>
 </body>
 </document>
diff --git a/src/site/xdoc/issue-tracking.xml.bak b/src/site/xdoc/issue-tracking.xml.bak
deleted file mode 100644
index 14d7dcf..0000000
--- a/src/site/xdoc/issue-tracking.xml.bak
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0"?>
-<!--
-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.
--->
-<document>
-
-  <properties>
-    <title>Issue tracking</title>
-    <author email="dev@commons.apache.org">Commons Documentation Team</author>
-  </properties>
-
-  <body>
-    <!-- ================================================== -->
-    <section name="Issue tracking">
-      <p>
-        Commons Logging uses <a href="http://issues.apache.org/jira/browse/LOGGING">ASF JIRA</a> for tracking issues.
-      </p>
-      <p>
-        To use JIRA you may need to <a href="http://issues.apache.org/jira/secure/Signup!default.jspa">create an account</a>
-        (if you have previously created/updated Commons issues using Bugzilla an account will have been automatically
-        created and you can use the <a href="http://issues.apache.org/jira/secure/ForgotPassword!default.jspa">Forgot Password</a>
-        page to get a new password).
-      </p>
-      <p>
-        If you would like to report a bug, or raise an enhancement request with
-        Commons Logging please do the following:
-        <ol>
-        <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310484&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=1&amp;status=4">Search existing open bugs</a>.
-        If you find your issue listed then please add a comment with your details.</li>
-        <li><a href="http://mail-archives.apache.org/mod_mbox/commons-dev/">Search the mailing list archive</a>.
-        You may find your issue or idea has already been discussed.</li>
-        <li><a href="http://issues.apache.org/jira/browse/LOGGING">Submit a bug report or enhancement request</a>.</li>
-        </ol>
-      </p>
-      <p>
-        Please also remember these points:
-        <ul>
-          <li>the more information you provide, the better we can help you</li>
-          <li>test cases are vital, particularly for any proposed enhancements</li>
-          <li>the developers of Commons Logging are all unpaid volunteers</li>
-        </ul>
-      </p>
-      <p>
-        You may also find these links useful:
-        <ul>
-          <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310484&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=1&amp;status=4">All Open Logging bugs</a></li>
-          <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310484&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=5&amp;status=6">All Resolved Logging bugs</a></li>
-          <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310484&amp;sorter/field=issuekey&amp;sorter/order=DESC">All Logging bugs</a></li>
-        </ul>
-      </p>
-    </section>
-    <!-- ================================================== -->
-  </body>
-</document>
diff --git a/src/site/xdoc/junit-report.xml b/src/site/xdoc/junit-report.xml
index e867fa0..786c93c 100644
--- a/src/site/xdoc/junit-report.xml
+++ b/src/site/xdoc/junit-report.xml
@@ -29,9 +29,9 @@ limitations under the License.
         The Apache Commons Logging test cases make extensive use of
         sophisticated classloader configurations in order to simulate the
         behaviour of various containers. It is difficult to run these tests
-        under Maven (which is used to generate the website). Once JCL is
-        upgraded to Maven 2 it is hoped that we will be able to display a report
-        on the unit tests.
+        under Maven in the default "test" phase. As a consequence the tests
+        are executed via the failsafe-plugin as part of the "integration-test"
+        phase. The reports are available <a href="failsafe-report.html">here</a>.
       </p>
     </section>
     <!-- ================================================== -->